is there some reason this can't use tk 8.4? it seems to work here, but
can someone who uses this test the diff below? (it's larger than it seems due
to renamed patches.)
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/cbb/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- Makefile 9 Jul 2007 19:56:26 -0000 1.28
+++ Makefile 28 Jul 2007 10:58:22 -0000
@@ -3,7 +3,7 @@
COMMENT= checkbook balancing tool
DISTNAME= cbb-0.73
-PKGNAME= ${DISTNAME}p3
+PKGNAME= ${DISTNAME}p4
CATEGORIES= misc
HOMEPAGE= http://www.fifi.org/doc/cbb/html/
@@ -16,7 +16,7 @@
MASTER_SITES= ${MASTER_SITE_BACKUP}
RUN_DEPENDS= :plan-*:misc/plan \
- :tk->=8.0,<8.1:x11/tk/8.0
+ :tk-8.4.*:x11/tk/8.4
NO_BUILD= Yes
NO_REGRESS= Yes
Index: patches/patch-01
===================================================================
RCS file: patches/patch-01
diff -N patches/patch-01
--- patches/patch-01 29 Aug 2003 15:07:24 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-01,v 1.4 2003/08/29 15:07:24 naddy Exp $
---- Makefile.orig 1997-06-12 23:57:50.000000000 +0200
-+++ Makefile 2003-08-29 17:03:28.000000000 +0200
-@@ -26,14 +26,16 @@
-
- CBB_ROOT = cbb-0.73
- TAR = tar
--PERL = perl
-+PERL = /usr/bin/perl
-
-
- all:
- @echo "Nothing is needed to build in advance of 'make install'"
-
- install:
-- $(PERL) install.pl
-+ $(PERL) install.pl --prefix ${TRUEPREFIX} --libdir
${TRUEPREFIX}/share/cbb \
-+ --destdir ${PREFIX} --perlpath /usr/bin/perl \
-+ --wishpath ${LOCALBASE}/bin/wish8.0
-
- docs/cbb-man.dvi: docs/cbb-man.tex
- (cd docs; \
Index: patches/patch-02
===================================================================
RCS file: patches/patch-02
diff -N patches/patch-02
--- patches/patch-02 20 May 1998 07:27:47 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
---- install.pl.orig Tue May 6 18:17:45 1997
-+++ install.pl Fri Oct 10 21:05:30 1997
-@@ -500,12 +500,12 @@
-
- print " Installing to $dest_bindir\n";
- print " Installing to $dest_libdir\n";
--print " Installing to $dest_libdir" . "reports/\n";
--print " Installing to $dest_libdir" . "graphs/\n";
--print " Installing to $dest_libdir" . "images/\n";
--print " Installing to $dest_libdir" . "contrib/\n";
--print " Installing to $dest_libdir" . "docs/cbb-man/\n";
--print " Installing to $dest_libdir" . "docs/cbb-man/icons/\n";
-+print " Installing to $dest_libdir" . "/reports/\n";
-+print " Installing to $dest_libdir" . "/graphs/\n";
-+print " Installing to $dest_libdir" . "/images/\n";
-+print " Installing to $dest_libdir" . "/contrib/\n";
-+print " Installing to $dest_libdir" . "/docs/cbb-man/\n";
-+print " Installing to $dest_libdir" . "/docs/cbb-man/icons/\n";
- print "\n";
-
-
Index: patches/patch-03
===================================================================
RCS file: patches/patch-03
diff -N patches/patch-03
--- patches/patch-03 11 Feb 1999 23:03:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- extern.conf.~1~ Sun Dec 29 08:38:01 1996
-+++ extern.conf Thu Feb 11 14:30:20 1999
-@@ -21,7 +21,7 @@
-
-
- Calculator xcalc
--Calendar ical
-+Calendar plan
-
- -
-
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 28 Jul 2007 10:58:22 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- Makefile.orig Thu Jun 12 23:57:50 1997
++++ Makefile Sat Jul 28 12:55:51 2007
+@@ -26,14 +26,16 @@
+
+ CBB_ROOT = cbb-0.73
+ TAR = tar
+-PERL = perl
++PERL = /usr/bin/perl
+
+
+ all:
+ @echo "Nothing is needed to build in advance of 'make install'"
+
+ install:
+- $(PERL) install.pl
++ $(PERL) install.pl --prefix ${TRUEPREFIX} --libdir
${TRUEPREFIX}/share/cbb \
++ --destdir ${PREFIX} --perlpath /usr/bin/perl \
++ --wishpath ${LOCALBASE}/bin/wish8.4
+
+ docs/cbb-man.dvi: docs/cbb-man.tex
+ (cd docs; \
Index: patches/patch-extern_conf
===================================================================
RCS file: patches/patch-extern_conf
diff -N patches/patch-extern_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-extern_conf 28 Jul 2007 10:58:22 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- extern.conf.orig Sun Dec 29 17:38:01 1996
++++ extern.conf Sat Jul 28 12:55:51 2007
+@@ -21,7 +21,7 @@
+
+
+ Calculator xcalc
+-Calendar ical
++Calendar plan
+
+ -
+
Index: patches/patch-install_pl
===================================================================
RCS file: patches/patch-install_pl
diff -N patches/patch-install_pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-install_pl 28 Jul 2007 10:58:22 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+--- install.pl.orig Wed May 7 03:17:45 1997
++++ install.pl Sat Jul 28 12:55:51 2007
+@@ -500,12 +500,12 @@ if ( ! -e "$dest_libdir/docs/cbb-man/icons" ||
+
+ print " Installing to $dest_bindir\n";
+ print " Installing to $dest_libdir\n";
+-print " Installing to $dest_libdir" . "reports/\n";
+-print " Installing to $dest_libdir" . "graphs/\n";
+-print " Installing to $dest_libdir" . "images/\n";
+-print " Installing to $dest_libdir" . "contrib/\n";
+-print " Installing to $dest_libdir" . "docs/cbb-man/\n";
+-print " Installing to $dest_libdir" . "docs/cbb-man/icons/\n";
++print " Installing to $dest_libdir" . "/reports/\n";
++print " Installing to $dest_libdir" . "/graphs/\n";
++print " Installing to $dest_libdir" . "/images/\n";
++print " Installing to $dest_libdir" . "/contrib/\n";
++print " Installing to $dest_libdir" . "/docs/cbb-man/\n";
++print " Installing to $dest_libdir" . "/docs/cbb-man/icons/\n";
+ print "\n";
+
+