Use gtkhtml36 rather than gtkhtml3. Bump PKGREVISION.

Idea from wiz@ to let us remove gtkhtml3.

6 files changed, 134 insertions, 8 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 6a22e546064..f8810abcd0b 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/06/26 18:45:43 jmmv Exp $
 
 DISTNAME=	balsa-2.2.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://balsa.gnome.org/				\
 		ftp://ftp.newton.cx/pub/balsa/
@@ -60,7 +60,7 @@ BUILDLINK_DEPENDS.gmime+=	gmime>=2.1.9
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/gtkhtml3/buildlink3.mk"
+.include "../../www/gtkhtml36/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 2bc0e27af9b..a18eeb4a3cd 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 09:59:20 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/06/26 18:45:43 jmmv Exp $
 
 SHA1 (balsa-2.2.6.tar.bz2) = f3f9e567ccd936de2f321f31485ff04445de8318
 RMD160 (balsa-2.2.6.tar.bz2) = 88bf8e9a404729d600f0cbddf16ab972c96eb343
 Size (balsa-2.2.6.tar.bz2) = 2913847 bytes
+SHA1 (patch-aa) = 7d6ed19d7dbf0fb604e05840edb600a9ed7e564b
 SHA1 (patch-ab) = 47083f65d404e64ee238bc3e4f3e25008f5f82c8
 SHA1 (patch-ac) = 808f4546204fbc4a23007291637e4b4ca4175db1
 SHA1 (patch-ae) = fcd0ab1c062018b42469b033a98b4575ee2851f3
diff --git a/mail/balsa2/patches/patch-aa b/mail/balsa2/patches/patch-aa
new file mode 100644
index 00000000000..61ddb6dd5e3
--- /dev/null
+++ b/mail/balsa2/patches/patch-aa
@@ -0,0 +1,71 @@
+$NetBSD: patch-aa,v 1.4 2005/06/26 18:45:44 jmmv Exp $
+
+--- configure.orig	2004-11-20 21:58:50.000000000 +0100
++++ configure
+@@ -20726,7 +20726,7 @@ echo "$as_me:$LINENO: result: $use_gtkht
+ echo "${ECHO_T}$use_gtkhtml" >&6
+ 
+ if test x"$use_gtkhtml" = xyes ; then
+-    if $PKG_CONFIG --exists libgtkhtml-3.1 ; then
++    if $PKG_CONFIG --exists libgtkhtml-3.6 ; then
+ 
+   succeeded=no
+ 
+@@ -20782,14 +20782,14 @@ fi
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+         echo "$as_me:$LINENO: checking for
+-	libgtkhtml-3.1
++	libgtkhtml-3.6
+ 	" >&5
+ echo $ECHO_N "checking for
+-	libgtkhtml-3.1
++	libgtkhtml-3.6
+ 	... $ECHO_C" >&6
+ 
+         if $PKG_CONFIG --exists "
+-	libgtkhtml-3.1
++	libgtkhtml-3.6
+ 	" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+@@ -20798,7 +20798,7 @@ echo "${ECHO_T}yes" >&6
+             echo "$as_me:$LINENO: checking HTML_CFLAGS" >&5
+ echo $ECHO_N "checking HTML_CFLAGS... $ECHO_C" >&6
+             HTML_CFLAGS=`$PKG_CONFIG --cflags "
+-	libgtkhtml-3.1
++	libgtkhtml-3.6
+ 	"`
+             echo "$as_me:$LINENO: result: $HTML_CFLAGS" >&5
+ echo "${ECHO_T}$HTML_CFLAGS" >&6
+@@ -20806,7 +20806,7 @@ echo "${ECHO_T}$HTML_CFLAGS" >&6
+             echo "$as_me:$LINENO: checking HTML_LIBS" >&5
+ echo $ECHO_N "checking HTML_LIBS... $ECHO_C" >&6
+             HTML_LIBS=`$PKG_CONFIG --libs "
+-	libgtkhtml-3.1
++	libgtkhtml-3.6
+ 	"`
+             echo "$as_me:$LINENO: result: $HTML_LIBS" >&5
+ echo "${ECHO_T}$HTML_LIBS" >&6
+@@ -20816,7 +20816,7 @@ echo "${ECHO_T}$HTML_LIBS" >&6
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+             HTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
+-	libgtkhtml-3.1
++	libgtkhtml-3.6
+ 	"`
+             echo $HTML_PKG_ERRORS
+         fi
+@@ -20833,10 +20833,10 @@ echo "${ECHO_T}$HTML_LIBS" >&6
+      :
+   else
+      { { echo "$as_me:$LINENO: error: Library requirements (
+-	libgtkhtml-3.1
++	libgtkhtml-3.6
+ 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+ echo "$as_me: error: Library requirements (
+-	libgtkhtml-3.1
++	libgtkhtml-3.6
+ 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+    { (exit 1); exit 1; }; }
+   fi
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 92b76da4061..b7cb8f0deb7 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:03:23 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/26 18:45:44 jmmv Exp $
 
 DISTNAME=	gnotime-2.2.1
-PKGREVISION=	# empty
+PKGREVISION=	1
 CATEGORIES=	time gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gttr/}
 
@@ -30,6 +30,6 @@ GCONF2_SCHEMAS=		gnotime.schemas
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/gtkhtml3/buildlink3.mk"
+.include "../../www/gtkhtml36/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnotime/distinfo b/time/gnotime/distinfo
index e5999c639bb..09c9f0c33b2 100644
--- a/time/gnotime/distinfo
+++ b/time/gnotime/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/03/16 12:48:49 rillig Exp $
+$NetBSD: distinfo,v 1.7 2005/06/26 18:45:44 jmmv Exp $
 
 SHA1 (gnotime-2.2.1.tar.gz) = 87f9f28aaad66597e0ba27d88f506602ac93963d
 RMD160 (gnotime-2.2.1.tar.gz) = b72f9d0e2e236a98983237d99b01f5a9c7258fc0
@@ -15,6 +15,7 @@ SHA1 (patch-ai) = 440941dfaa4454f7d5dee90c43e79c950704d3ad
 SHA1 (patch-aj) = fbae54ccfb5a195852006ec85ee3e1c484fe5998
 SHA1 (patch-ak) = c198f95978471a946e0008d4d80f5630716ac991
 SHA1 (patch-al) = 36e08dfe8ee0a38a27db99f1edcb05669a57f29c
+SHA1 (patch-am) = 48ddfdf42d7eae6ba5ce996abcc5bcdd7be0b007
 SHA1 (patch-an) = 120164b440724278e4bb4d4bc97404b3e4e76481
 SHA1 (patch-ao) = 18df822656eb97273b496eb2476ecd39f6df2251
 SHA1 (patch-ap) = a37c79e17986963ffc3cecd4207270ff95cd16bf
diff --git a/time/gnotime/patches/patch-am b/time/gnotime/patches/patch-am
new file mode 100644
index 00000000000..85d41e9d162
--- /dev/null
+++ b/time/gnotime/patches/patch-am
@@ -0,0 +1,53 @@
+$NetBSD: patch-am,v 1.3 2005/06/26 18:45:44 jmmv Exp $
+
+--- configure.orig	2004-05-23 22:09:39.000000000 +0200
++++ configure
+@@ -12520,23 +12520,23 @@ fi
+   else
+      PKG_CONFIG_MIN_VERSION=0.9.0
+      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-        echo "$as_me:$LINENO: checking for libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED" >&5
+-echo $ECHO_N "checking for libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED... $ECHO_C" >&6
++        echo "$as_me:$LINENO: checking for libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED" >&5
++echo $ECHO_N "checking for libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED... $ECHO_C" >&6
+ 
+-        if $PKG_CONFIG --exists "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED" ; then
++        if $PKG_CONFIG --exists "libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED" ; then
+             echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+             succeeded=yes
+ 
+             echo "$as_me:$LINENO: checking LIBGTKHTML_CFLAGS" >&5
+ echo $ECHO_N "checking LIBGTKHTML_CFLAGS... $ECHO_C" >&6
+-            LIBGTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED"`
++            LIBGTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED"`
+             echo "$as_me:$LINENO: result: $LIBGTKHTML_CFLAGS" >&5
+ echo "${ECHO_T}$LIBGTKHTML_CFLAGS" >&6
+ 
+             echo "$as_me:$LINENO: checking LIBGTKHTML_LIBS" >&5
+ echo $ECHO_N "checking LIBGTKHTML_LIBS... $ECHO_C" >&6
+-            LIBGTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED"`
++            LIBGTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED"`
+             echo "$as_me:$LINENO: result: $LIBGTKHTML_LIBS" >&5
+ echo "${ECHO_T}$LIBGTKHTML_LIBS" >&6
+         else
+@@ -12544,7 +12544,7 @@ echo "${ECHO_T}$LIBGTKHTML_LIBS" >&6
+             LIBGTKHTML_LIBS=""
+             ## If we have a custom action on failure, don't print errors, but
+             ## do set a variable so people can do so.
+-            LIBGTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED"`
++            LIBGTKHTML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED"`
+             echo $LIBGTKHTML_PKG_ERRORS
+         fi
+ 
+@@ -12559,8 +12559,8 @@ echo "${ECHO_T}$LIBGTKHTML_LIBS" >&6
+   if test $succeeded = yes; then
+      :
+   else
+-     { { echo "$as_me:$LINENO: error: Library requirements (libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+-echo "$as_me: error: Library requirements (libgtkhtml-3.1 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++     { { echo "$as_me:$LINENO: error: Library requirements (libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
++echo "$as_me: error: Library requirements (libgtkhtml-3.6 >= $LIBGTKHTML_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+    { (exit 1); exit 1; }; }
+   fi
+