5 files changed, 77 insertions, 50 deletions

diff --git a/deskutils/cbb/Makefile b/deskutils/cbb/Makefile
index 5f28bf5e3282..bc4bfee67dd0 100644
--- a/deskutils/cbb/Makefile
+++ b/deskutils/cbb/Makefile
@@ -1,15 +1,17 @@
 # New ports collection Makefile for:	cbb
-# Version required:     	0.78
+# Version required:     	0.8.1
 # Date created:			24 September, 1998
 # Whom:				kline
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cbb-0.78
+DISTNAME=	cbb-0.8.1
 CATEGORIES=	deskutils
-MASTER_SITES=	ftp://ftp.me.umn.edu/pub/finance/ \
-		ftp://ftp.fifi.org/pub/cbb/
+MASTER_SITES=	http://www.FreeBSD.org/~jedgar/distfiles/
+# Former sites that may or may not be usable in the future:
+#		ftp://ftp.me.umn.edu/pub/finance/ \
+#		ftp://ftp.fifi.org/pub/cbb/
 
 MAINTAINER=	kline@thought.org
 
@@ -18,5 +20,6 @@ RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 NO_BUILD=       yes
 USE_PERL5=	yes
 MAKE_ENV=	PERL5=${PERL5}
+GNU_CONFIGURE=  yes
 
 .include <bsd.port.mk>
diff --git a/deskutils/cbb/distinfo b/deskutils/cbb/distinfo
index 1da8b6daf4dd..1875db8b1602 100644
--- a/deskutils/cbb/distinfo
+++ b/deskutils/cbb/distinfo
@@ -1 +1 @@
-MD5 (cbb-0.78.tar.gz) = 09ae39e2545ed601f91793d2500dcbf4
+MD5 (cbb-0.8.1.tar.gz) = 7a435ef954c5c2ba209d34ca5fa5c3a7
diff --git a/deskutils/cbb/files/patch-01 b/deskutils/cbb/files/patch-01
index 9d52612aaa75..96ce834a7341 100644
--- a/deskutils/cbb/files/patch-01
+++ b/deskutils/cbb/files/patch-01
@@ -1,20 +1,14 @@
---- Makefile.orig	Thu Jun 12 14:57:50 1997
-+++ Makefile	Fri Oct 10 20:52:22 1997
-@@ -26,14 +26,15 @@
- 
- CBB_ROOT = cbb-0.77
- TAR = tar
--PERL = perl
+--- Makefile.orig	Wed Jan  5 14:43:28 2000
++++ Makefile	Sun Jan 23 00:58:16 2000
+@@ -60,9 +60,9 @@
+ LN_S = ln -s
+ MAKEINFO = makeinfo
+ PACKAGE = cbb
+-PERL = /usr/bin/perl
 +PERL = ${PERL5}
+ VERSION = 0.8.1
+-WISH = /usr/bin/wish
++WISH = /usr/bin/wish8.2
+ language = english
  
- 
- all:
- 	@echo "Nothing is needed to build in advance of 'make install'"
- 
- install:
--	$(PERL) install.pl
-+	$(PERL) install.pl --prefix ${PREFIX} --libdir ${PREFIX}/lib/cbb  \
-+		--perlpath ${PERL5} --wishpath ${PREFIX}/bin/wish8.2
- 
- docs/cbb-man.dvi: docs/cbb-man.tex
- 	(cd docs; \
+ SUBDIRS = contrib demo docs graphs images languages reports
diff --git a/deskutils/cbb/files/patch-03 b/deskutils/cbb/files/patch-03
new file mode 100644
index 000000000000..389de827cd9f
--- /dev/null
+++ b/deskutils/cbb/files/patch-03
@@ -0,0 +1,20 @@
+--- configure.orig	Sun Jan 23 01:41:45 2000
++++ configure	Sun Jan 23 01:42:10 2000
+@@ -798,7 +798,7 @@
+ fi
+ 
+ if test "x$with_wish" = "x" ; then
+-    with_wish=wish
++    with_wish=wish8.2
+ fi
+ 
+ # Check whether --with-wish or --without-wish was given.
+@@ -988,7 +988,7 @@
+     fi
+   done
+   IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_WISH" && ac_cv_path_WISH=""wish""
++  test -z "$ac_cv_path_WISH" && ac_cv_path_WISH=""wish8.2""
+   ;;
+ esac
+ fi
diff --git a/deskutils/cbb/pkg-plist b/deskutils/cbb/pkg-plist
index 0b38b8c895fd..e0b3fd08994a 100644
--- a/deskutils/cbb/pkg-plist
+++ b/deskutils/cbb/pkg-plist
@@ -1,7 +1,12 @@
 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
@@ -41,33 +46,37 @@ 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/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/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/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
@@ -97,10 +106,11 @@ 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/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