- Update to 0.9.5.b

- Update WWW in pkg-descr
- Support Tcl/Tk > 8.2

PR:		170703
Submitted by:	gahr
Approved by:	maintainer (timeout > 25 days)

4 files changed, 143 insertions, 131 deletions

diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile
index d0f1c4fce807..874d6d660deb 100644
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@@ -6,29 +6,28 @@
 #
 
 PORTNAME=	cbb
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+DISTVERSION=	0.9.5b
 CATEGORIES=	finance deskutils
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-0.8%20%28stable%29/${PORTVERSION}
+MASTER_SITES=	http://download.gna.org/cbb/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kline@thought.org
 COMMENT=	Checkbook balancing tool
 
-RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
+USE_TK=		yes
 
 NO_BUILD=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-perl=${PERL} \
+		--with-wish=${WISH}
+WRKSRC=		${WRKDIR}/${PKGNAME:R}
+PLIST_SUB+=	VERSION=${PORTVERSION:R:R}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|PERL = /usr/bin/perl|PERL = ${PERL5}|" \
-			-e "s|WISH = /usr/bin/wish|WISH = ${LOCALBASE}/bin/wish8.2|" \
-			-e "s|DESTDIR =||" ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} "s|DESTDIR =||" ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|$$destdir/bin|$$prefix/bin|' \
-			-e 's|$$destdir/lib/cbb|$$prefix/lib/cbb|' \
-			${WRKSRC}/install.pl
-	@${REINPLACE_CMD} -e "s|=wish|=wish8.2|" -e 's|=""wish""|=""wish8.2""|' \
-			${WRKSRC}/configure
+	${REINPLACE_CMD}  -e 's|.aboutwin.frame.a.l6 ||' \
+	    ${WRKSRC}/tcl/help.tcl
+	${REINPLACE_CMD}  -e 's|%4Y%02m%02d|%Y%m%d|' \
+	    ${WRKSRC}/tcl/main.tcl
 
 .include <bsd.port.mk>
diff --git a/finance/cbb/distinfo b/finance/cbb/distinfo
index a3083f218f1d..6fea298928c3 100644
--- a/finance/cbb/distinfo
+++ b/finance/cbb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cbb-0.8.1.tar.gz) = 5e6b6e5bc8c64c21690041f4d05529f032d014b258ec17a6768d46aef7a90b21
-SIZE (cbb-0.8.1.tar.gz) = 460490
+SHA256 (cbb-0.9.5b.tgz) = c18d707889608ae497b4c4cec030feb0129a73f4cfdcae227d20a6e61f41fc28
+SIZE (cbb-0.9.5b.tgz) = 298252
diff --git a/finance/cbb/pkg-descr b/finance/cbb/pkg-descr
index 1f1ccd02ee2b..fd13f1e2c7ae 100644
--- a/finance/cbb/pkg-descr
+++ b/finance/cbb/pkg-descr
@@ -6,4 +6,4 @@ Tcl/Tk and Perl and contains no compiled code.  It provides a simple
 interface for users to add their own reports, graphs, and external
 modules without having to modify any of the CBB source.
 
-WWW: http://cbb.sourceforge.net/
+WWW: http://gna.org/projects/cbb/
diff --git a/finance/cbb/pkg-plist b/finance/cbb/pkg-plist
index e0b3fd08994a..ae019efa8c4d 100644
--- a/finance/cbb/pkg-plist
+++ b/finance/cbb/pkg-plist
@@ -1,116 +1,129 @@
 bin/cbb
-bin/dialog4duplicate
-lib/cbb/languages/english.tcl
-lib/cbb/languages/french.tcl
-lib/cbb/languages/german.tcl
-lib/cbb/reports/reports.conf
-lib/cbb/reports/ave-by-cat.pl
-lib/cbb/reports/by-cat.pl
-lib/cbb/reports/by-payee.pl
-lib/cbb/reports/miss-check.pl
-lib/cbb/reports/shrt-by-cat.pl
-lib/cbb/reports/txn-list.pl
-lib/cbb/reports/uncleared-txn.pl
-lib/cbb/graphs/graphs.conf
-lib/cbb/graphs/cat-col.pl
-lib/cbb/graphs/cat-pie.pl
-lib/cbb/graphs/cat2-col.pl
-lib/cbb/graphs/desc-pie.pl
-lib/cbb/graphs/txn-list.pl
-lib/cbb/graphs/descpie
-lib/cbb/graphs/graphbal
-lib/cbb/graphs/graphcol
-lib/cbb/graphs/graphcolpos
-lib/cbb/graphs/graphpie
-lib/cbb/images/author.xbm
-lib/cbb/images/cbb.xbm
-lib/cbb/images/mini-cross.gif
-lib/cbb/images/mini-exclam.gif
-lib/cbb/images/splash-32.gif
-lib/cbb/contrib/change.pl
-lib/cbb/contrib/conv-french-qif.pl
-lib/cbb/contrib/emacs-edb
-lib/cbb/contrib/emacs-forms
-lib/cbb/contrib/fetch-latest.pl
-lib/cbb/contrib/importcat.README
-lib/cbb/contrib/importcat.pl
-lib/cbb/contrib/invest.pl
-lib/cbb/contrib/loan.gnuplot
-lib/cbb/contrib/loan.pl
-lib/cbb/contrib/loan_recur.pl
-lib/cbb/contrib/mym_to_cbb.pl
-lib/cbb/contrib/recur.pl
-lib/cbb/contrib/term.pl
-lib/cbb/contrib/trimold.pl
-lib/cbb/contrib/txn.README
-lib/cbb/contrib/txn
-lib/cbb/contrib/upgrade-splits.pl
-lib/cbb/contrib/yearend.pl
-lib/cbb/docs/cbb-man/icons.png/blueball.png
-lib/cbb/docs/cbb-man/icons.png/change_begin.png
-lib/cbb/docs/cbb-man/icons.png/change_delete.png
-lib/cbb/docs/cbb-man/icons.png/change_end.png
-lib/cbb/docs/cbb-man/icons.png/contents_motif.png
-lib/cbb/docs/cbb-man/icons.png/cross_ref_motif.png
-lib/cbb/docs/cbb-man/icons.png/foot_motif.png
-lib/cbb/docs/cbb-man/icons.png/greenball.png
-lib/cbb/docs/cbb-man/icons.png/image.png
-lib/cbb/docs/cbb-man/icons.png/index_motif.png
-lib/cbb/docs/cbb-man/icons.png/next_group_motif.png
-lib/cbb/docs/cbb-man/icons.png/next_group_motif_gr.png
-lib/cbb/docs/cbb-man/icons.png/next_motif.png
-lib/cbb/docs/cbb-man/icons.png/next_motif_gr.png
-lib/cbb/docs/cbb-man/icons.png/orangeball.png
-lib/cbb/docs/cbb-man/icons.png/pinkball.png
-lib/cbb/docs/cbb-man/icons.png/previous_group_motif.png
-lib/cbb/docs/cbb-man/icons.png/previous_group_motif_gr.png
-lib/cbb/docs/cbb-man/icons.png/previous_motif.png
-lib/cbb/docs/cbb-man/icons.png/previous_motif_gr.png
-lib/cbb/docs/cbb-man/icons.png/purpleball.png
-lib/cbb/docs/cbb-man/icons.png/redball.png
-lib/cbb/docs/cbb-man/icons.png/up_motif.png
-lib/cbb/docs/cbb-man/icons.png/up_motif_gr.png
-lib/cbb/docs/cbb-man/icons.png/whiteball.png
-lib/cbb/docs/cbb-man/icons.png/yellowball.png
-lib/cbb/docs/cbb-man/cbb-man.html
-lib/cbb/docs/cbb-man/index.html
-lib/cbb/docs/cbb-man/img1.png
-lib/cbb/docs/cbb-man/img2.png
-lib/cbb/docs/cbb-man/img3.png
-lib/cbb/docs/cbb-man.txt
-lib/cbb/wrapper.pl
-lib/cbb/categories.pl
-lib/cbb/common.pl
-lib/cbb/engine.pl
-lib/cbb/export.pl
-lib/cbb/file.pl
-lib/cbb/import.pl
-lib/cbb/log.pl
-lib/cbb/memorized.pl
-lib/cbb/reports.pl
-lib/cbb/balloon.tcl
-lib/cbb/balance.tcl
-lib/cbb/bindings.tcl
-lib/cbb/categories.tcl
-lib/cbb/common.tcl
-lib/cbb/file.tcl
-lib/cbb/filebox.tcl
-lib/cbb/help.tcl
-lib/cbb/init.tcl
-lib/cbb/main.tcl
-lib/cbb/menu.tcl
-lib/cbb/prefs.tcl
-lib/cbb/reports.tcl
-lib/cbb/splits.tcl
-lib/cbb/undo.tcl
-lib/cbb/default.cat
-lib/cbb/extern.conf
-@dirrm lib/cbb/contrib
-@dirrm lib/cbb/docs/cbb-man/icons.png
-@dirrm lib/cbb/docs/cbb-man
-@dirrm lib/cbb/docs
-@dirrm lib/cbb/graphs
-@dirrm lib/cbb/images
-@dirrm lib/cbb/languages
-@dirrm lib/cbb/reports
-@dirrm lib/cbb
+lib/cbb-%%VERSION%%/cbbdb
+lib/cbb-%%VERSION%%/contrib/change.pl
+lib/cbb-%%VERSION%%/contrib/conv-french-qif.pl
+lib/cbb-%%VERSION%%/contrib/emacs-edb
+lib/cbb-%%VERSION%%/contrib/emacs-forms
+lib/cbb-%%VERSION%%/contrib/fetch-latest.pl
+lib/cbb-%%VERSION%%/contrib/importcat.README
+lib/cbb-%%VERSION%%/contrib/importcat.pl
+lib/cbb-%%VERSION%%/contrib/invest.pl
+lib/cbb-%%VERSION%%/contrib/loan.gnuplot
+lib/cbb-%%VERSION%%/contrib/loan.pl
+lib/cbb-%%VERSION%%/contrib/loan_recur.pl
+lib/cbb-%%VERSION%%/contrib/mym_to_cbb.pl
+lib/cbb-%%VERSION%%/contrib/recur.pl
+lib/cbb-%%VERSION%%/contrib/term.pl
+lib/cbb-%%VERSION%%/contrib/trimold.pl
+lib/cbb-%%VERSION%%/contrib/txn
+lib/cbb-%%VERSION%%/contrib/txn.README
+lib/cbb-%%VERSION%%/contrib/upgrade-splits.pl
+lib/cbb-%%VERSION%%/contrib/yearend.pl
+lib/cbb-%%VERSION%%/docs/cbb-man.txt
+lib/cbb-%%VERSION%%/docs/cbb-man/cbb-man.html
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/blueball.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/change_begin.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/change_delete.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/change_end.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/contents_motif.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/cross_ref_motif.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/foot_motif.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/greenball.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/image.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/index_motif.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/next_group_motif.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/next_group_motif_gr.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/next_motif.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/next_motif_gr.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/orangeball.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/pinkball.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/previous_group_motif.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/previous_group_motif_gr.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/previous_motif.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/previous_motif_gr.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/purpleball.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/redball.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/up_motif.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/up_motif_gr.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/whiteball.png
+lib/cbb-%%VERSION%%/docs/cbb-man/icons.png/yellowball.png
+lib/cbb-%%VERSION%%/docs/cbb-man/img1.png
+lib/cbb-%%VERSION%%/docs/cbb-man/img2.png
+lib/cbb-%%VERSION%%/docs/cbb-man/img3.png
+lib/cbb-%%VERSION%%/docs/cbb-man/index.html
+lib/cbb-%%VERSION%%/docs/graphs.txt
+lib/cbb-%%VERSION%%/docs/notes
+lib/cbb-%%VERSION%%/docs/perl.commands
+lib/cbb-%%VERSION%%/docs/perl.functions
+lib/cbb-%%VERSION%%/docs/plsubs
+lib/cbb-%%VERSION%%/docs/tcl.functions
+lib/cbb-%%VERSION%%/docs/todo.txt
+lib/cbb-%%VERSION%%/docs/update.notes
+lib/cbb-%%VERSION%%/etc/default.cat
+lib/cbb-%%VERSION%%/etc/extern.conf
+lib/cbb-%%VERSION%%/graphs/cat-col.pl
+lib/cbb-%%VERSION%%/graphs/cat-pie.pl
+lib/cbb-%%VERSION%%/graphs/cat2-col.pl
+lib/cbb-%%VERSION%%/graphs/desc-pie.pl
+lib/cbb-%%VERSION%%/graphs/descpie
+lib/cbb-%%VERSION%%/graphs/graphbal
+lib/cbb-%%VERSION%%/graphs/graphcol
+lib/cbb-%%VERSION%%/graphs/graphcolpos
+lib/cbb-%%VERSION%%/graphs/graphpie
+lib/cbb-%%VERSION%%/graphs/graphs.conf
+lib/cbb-%%VERSION%%/graphs/txn-list.pl
+lib/cbb-%%VERSION%%/images/author.xbm
+lib/cbb-%%VERSION%%/images/cbb.xbm
+lib/cbb-%%VERSION%%/images/mini-cross.gif
+lib/cbb-%%VERSION%%/images/mini-exclam.gif
+lib/cbb-%%VERSION%%/images/splash-32.gif
+lib/cbb-%%VERSION%%/languages/english.tcl
+lib/cbb-%%VERSION%%/languages/french.tcl
+lib/cbb-%%VERSION%%/languages/german.tcl
+lib/cbb-%%VERSION%%/perl/accounts.pl
+lib/cbb-%%VERSION%%/perl/categories.pl
+lib/cbb-%%VERSION%%/perl/common.pl
+lib/cbb-%%VERSION%%/perl/engine.pl
+lib/cbb-%%VERSION%%/perl/export.pl
+lib/cbb-%%VERSION%%/perl/file.pl
+lib/cbb-%%VERSION%%/perl/groups.pl
+lib/cbb-%%VERSION%%/perl/import.pl
+lib/cbb-%%VERSION%%/perl/log.pl
+lib/cbb-%%VERSION%%/perl/memorized.pl
+lib/cbb-%%VERSION%%/perl/reports.pl
+lib/cbb-%%VERSION%%/reports/ave-by-cat.pl
+lib/cbb-%%VERSION%%/reports/by-cat.pl
+lib/cbb-%%VERSION%%/reports/by-payee.pl
+lib/cbb-%%VERSION%%/reports/miss-check.pl
+lib/cbb-%%VERSION%%/reports/rep-txn-list.pl
+lib/cbb-%%VERSION%%/reports/reports.conf
+lib/cbb-%%VERSION%%/reports/shrt-by-cat.pl
+lib/cbb-%%VERSION%%/reports/uncleared-txn.pl
+lib/cbb-%%VERSION%%/tcl/balance.tcl
+lib/cbb-%%VERSION%%/tcl/balloon.tcl
+lib/cbb-%%VERSION%%/tcl/bindings.tcl
+lib/cbb-%%VERSION%%/tcl/categories.tcl
+lib/cbb-%%VERSION%%/tcl/common.tcl
+lib/cbb-%%VERSION%%/tcl/dates.tcl
+lib/cbb-%%VERSION%%/tcl/file.tcl
+lib/cbb-%%VERSION%%/tcl/filebox.tcl
+lib/cbb-%%VERSION%%/tcl/help.tcl
+lib/cbb-%%VERSION%%/tcl/init.tcl
+lib/cbb-%%VERSION%%/tcl/main.tcl
+lib/cbb-%%VERSION%%/tcl/menu.tcl
+lib/cbb-%%VERSION%%/tcl/prefs.tcl
+lib/cbb-%%VERSION%%/tcl/reports.tcl
+lib/cbb-%%VERSION%%/tcl/splits.tcl
+lib/cbb-%%VERSION%%/tcl/undo.tcl
+@dirrm lib/cbb-%%VERSION%%/tcl
+@dirrm lib/cbb-%%VERSION%%/reports
+@dirrm lib/cbb-%%VERSION%%/perl
+@dirrm lib/cbb-%%VERSION%%/languages
+@dirrm lib/cbb-%%VERSION%%/images
+@dirrm lib/cbb-%%VERSION%%/graphs
+@dirrm lib/cbb-%%VERSION%%/etc
+@dirrm lib/cbb-%%VERSION%%/docs/cbb-man/icons.png
+@dirrm lib/cbb-%%VERSION%%/docs/cbb-man
+@dirrm lib/cbb-%%VERSION%%/docs
+@dirrm lib/cbb-%%VERSION%%/contrib
+@dirrm lib/cbb-%%VERSION%%