3 files changed, 107 insertions, 113 deletions

diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile
index 9b5487ed5df0..92e48b764873 100644
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@@ -1,30 +1,22 @@
-# New ports collection makefile for:	cbb
-# Version required:     	0.73
-# Date created:			14 September, 1997
+# New port makefile for:	cbb
+# Version required:     	0.74
+# Date created:			24 September, 1998
 # Whom:				kline
 #
-# $Id: Makefile,v 1.7 1998/09/15 21:31:59 asami Exp $
+# $Id: Makefile,v 1.1 1998/09/26 01:43:22 kline Exp kline $
 #
 
-DISTNAME=	cbb-0.73
-CATEGORIES=	deskutils tk42
+DISTNAME=	cbb-0.74
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.me.umn.edu/pub/finance/ \
 		ftp://ftp.fifi.org/pub/cbb/
 
 MAINTAINER=	kline@thought.org
 
-#	extern.conf could easily be patched to use `plan' over `ical'
-RUN_DEPENDS=	wish4.2:${PORTSDIR}/x11-toolkits/tk42 \
-		ical:${PORTSDIR}/deskutils/ical
-LIB_DEPENDS=    tk42.1:${PORTSDIR}/x11-toolkits/tk42
+RUN_DEPENDS=   wish4.2:${PORTSDIR}/x11-toolkits/tk42
 
 NO_BUILD=       yes
 USE_PERL5=	yes
 MAKE_ENV=	PERL5=${PERL5}
 
-pre-configure:
-	${MV} ${WRKSRC}/install.pl ${WRKSRC}/install.pl.in
-	${SED} -e "s:/usr/local:${PREFIX}:"  -e "s:lib/cbb:share/cbb:" \
-		${WRKSRC}/install.pl.in > ${WRKSRC}/install.pl
-
 .include <bsd.port.mk>
diff --git a/finance/cbb/distinfo b/finance/cbb/distinfo
index 3fd51da29a74..77b3a467764c 100644
--- a/finance/cbb/distinfo
+++ b/finance/cbb/distinfo
@@ -1 +1 @@
-MD5 (cbb-0.73.tar.gz) = 44136bed0611b0d629d920fcfcc0e82c
+MD5 (cbb-0.74.tar.gz) = f26140098c58599e245ce9f6fc3d941e
diff --git a/finance/cbb/pkg-plist b/finance/cbb/pkg-plist
index 6b186dbc8869..a19352a28cc3 100644
--- a/finance/cbb/pkg-plist
+++ b/finance/cbb/pkg-plist
@@ -1,98 +1,100 @@
 bin/cbb
-share/cbb/wrapper.pl
-share/cbb/categories.pl
-share/cbb/common.pl
-share/cbb/engine.pl
-share/cbb/export.pl
-share/cbb/file.pl
-share/cbb/import.pl
-share/cbb/log.pl
-share/cbb/memorized.pl
-share/cbb/reports.pl
-share/cbb/default.cat
-share/cbb/extern.conf
-share/cbb/reports/reports.conf
-share/cbb/reports/ave-by-cat.pl
-share/cbb/reports/by-cat.pl
-share/cbb/reports/miss-check.pl
-share/cbb/reports/shrt-by-cat.pl
-share/cbb/reports/txn-list.pl
-share/cbb/graphs/graphs.conf
-share/cbb/graphs/cat-col.pl
-share/cbb/graphs/cat-pie.pl
-share/cbb/graphs/cat2-col.pl
-share/cbb/graphs/txn-list.pl
-share/cbb/graphs/graphbal
-share/cbb/graphs/graphcol
-share/cbb/graphs/graphcolpos
-share/cbb/graphs/graphpie
-share/cbb/balloon.tcl
-share/cbb/balance.tcl
-share/cbb/bindings.tcl
-share/cbb/categories.tcl
-share/cbb/common.tcl
-share/cbb/file.tcl
-share/cbb/filebox.tcl
-share/cbb/help.tcl
-share/cbb/init.tcl
-share/cbb/main.tcl
-share/cbb/menu.tcl
-share/cbb/prefs.tcl
-share/cbb/reports.tcl
-share/cbb/splits.tcl
-share/cbb/undo.tcl
-share/cbb/images/author.xbm
-share/cbb/images/cbb.xbm
-share/cbb/images/mini-cross.gif
-share/cbb/images/mini-exclam.gif
-share/cbb/images/splash-32.gif
-share/cbb/contrib/fetch-latest.pl
-share/cbb/contrib/importcat.README
-share/cbb/contrib/importcat.pl
-share/cbb/contrib/invest.pl
-share/cbb/contrib/loan.gnuplot
-share/cbb/contrib/loan.pl
-share/cbb/contrib/recur.pl
-share/cbb/contrib/term.pl
-share/cbb/contrib/trimold.pl
-share/cbb/contrib/txn.README
-share/cbb/contrib/txn
-share/cbb/contrib/upgrade-splits.pl
-share/cbb/contrib/yearend.pl
-share/cbb/docs/cbb-man.txt
-share/cbb/docs/cbb-man/cbb-man.html
-share/cbb/docs/cbb-man/index.html
-share/cbb/docs/cbb-man/img1.gif
-share/cbb/docs/cbb-man/img2.gif
-share/cbb/docs/cbb-man/img3.gif
-share/cbb/docs/cbb-man/img4.gif
-share/cbb/docs/cbb-man/icons/00Contents
-share/cbb/docs/cbb-man/icons/blank.pbm
-share/cbb/docs/cbb-man/icons/change_begin.gif
-share/cbb/docs/cbb-man/icons/change_delete.gif
-share/cbb/docs/cbb-man/icons/change_end.gif
-share/cbb/docs/cbb-man/icons/contents.xbm
-share/cbb/docs/cbb-man/icons/contents_motif.gif
-share/cbb/docs/cbb-man/icons/cross_ref_motif.gif
-share/cbb/docs/cbb-man/icons/foot_motif.gif
-share/cbb/docs/cbb-man/icons/icons.html
-share/cbb/docs/cbb-man/icons/index_motif.gif
-share/cbb/docs/cbb-man/icons/invis_anchor.xbm
-share/cbb/docs/cbb-man/icons/next_group_motif.gif
-share/cbb/docs/cbb-man/icons/next_group_motif_gr.gif
-share/cbb/docs/cbb-man/icons/next_motif.gif
-share/cbb/docs/cbb-man/icons/next_motif_gr.gif
-share/cbb/docs/cbb-man/icons/previous_group_motif.gif
-share/cbb/docs/cbb-man/icons/previous_group_motif_gr.gif
-share/cbb/docs/cbb-man/icons/previous_motif.gif
-share/cbb/docs/cbb-man/icons/previous_motif_gr.gif
-share/cbb/docs/cbb-man/icons/up_motif.gif
-share/cbb/docs/cbb-man/icons/up_motif_gr.gif
-@dirrm share/cbb/contrib
-@dirrm share/cbb/docs/cbb-man/icons
-@dirrm share/cbb/docs/cbb-man
-@dirrm share/cbb/docs
-@dirrm share/cbb/graphs
-@dirrm share/cbb/images
-@dirrm share/cbb/reports
-@dirrm share/cbb
+lib/cbb/reports/reports.conf
+lib/cbb/reports/ave-by-cat.pl
+lib/cbb/reports/by-cat.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/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/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/00Contents
+lib/cbb/docs/cbb-man/icons/blank.pbm
+lib/cbb/docs/cbb-man/icons/change_begin.gif
+lib/cbb/docs/cbb-man/icons/change_delete.gif
+lib/cbb/docs/cbb-man/icons/change_end.gif
+lib/cbb/docs/cbb-man/icons/contents.xbm
+lib/cbb/docs/cbb-man/icons/contents_motif.gif
+lib/cbb/docs/cbb-man/icons/cross_ref_motif.gif
+lib/cbb/docs/cbb-man/icons/foot_motif.gif
+lib/cbb/docs/cbb-man/icons/icons.html
+lib/cbb/docs/cbb-man/icons/index_motif.gif
+lib/cbb/docs/cbb-man/icons/invis_anchor.xbm
+lib/cbb/docs/cbb-man/icons/next_group_motif.gif
+lib/cbb/docs/cbb-man/icons/next_group_motif_gr.gif
+lib/cbb/docs/cbb-man/icons/next_motif.gif
+lib/cbb/docs/cbb-man/icons/next_motif_gr.gif
+lib/cbb/docs/cbb-man/icons/previous_group_motif.gif
+lib/cbb/docs/cbb-man/icons/previous_group_motif_gr.gif
+lib/cbb/docs/cbb-man/icons/previous_motif.gif
+lib/cbb/docs/cbb-man/icons/previous_motif_gr.gif
+lib/cbb/docs/cbb-man/icons/up_motif.gif
+lib/cbb/docs/cbb-man/icons/up_motif_gr.gif
+lib/cbb/docs/cbb-man/cbb-man.html
+lib/cbb/docs/cbb-man/img1.gif
+lib/cbb/docs/cbb-man/img2.gif
+lib/cbb/docs/cbb-man/img3.gif
+lib/cbb/docs/cbb-man/img4.gif
+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
+@dirrm lib/cbb/docs/cbb-man
+@dirrm lib/cbb/docs
+@dirrm lib/cbb/graphs
+@dirrm lib/cbb/images
+@dirrm lib/cbb/reports
+@dirrm lib/cbb