Disable GTK2 support: it's only used by a helper tool. If it's needed some

day, we can easily create an independant package containing it.

Rationale: The GConf2 library itself does not depend on GTK2, nor any of
the main programs, and this removal will shrink the dependancy tree a lot
on other packages.

Bump PKGREVISION to 5.

5 files changed, 54 insertions, 8 deletions

diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index 640f3f37979..3cdd19e9619 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/01/05 22:12:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/25 16:29:49 jmmv Exp $
 #
 
 DISTNAME=		GConf-1.2.1
 PKGNAME=		${DISTNAME:S/GConf/GConf2/}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/1.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -32,5 +32,4 @@ CONFIGURE_ARGS+=	--enable-gtk-doc=no
 .include "../../net/ORBit2/buildlink2.mk"
 .include "../../net/linc/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index 108a95fbeb6..d3f39ee47ac 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/01/05 22:12:33 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/01/25 16:29:49 jmmv Exp $
 bin/gconftool-2
 etc/gconf/2/path
 include/gconf/2/gconf/gconf-changeset.h
@@ -19,7 +19,6 @@ lib/libgconf-2.so
 lib/libgconf-2.so.5
 lib/libgconf-2.so.5.0
 lib/pkgconfig/gconf-2.0.pc
-libexec/gconf-sanity-check-2
 libexec/gconfd-2
 share/aclocal/gconf-2.m4
 share/doc/html/gconf/c120.html
diff --git a/devel/GConf2/buildlink2.mk b/devel/GConf2/buildlink2.mk
index e11ad0613c7..9c4756c36be 100644
--- a/devel/GConf2/buildlink2.mk
+++ b/devel/GConf2/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/01/07 23:45:34 jmmv Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/01/25 16:29:50 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use GConf2.
 #
@@ -32,7 +32,6 @@ BUILDLINK_FILES.GConf2+=	lib/libgconf-2.*
 .include "../../net/ORBit2/buildlink2.mk"
 .include "../../net/linc/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	GConf2-buildlink
 
diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo
index b3bf5a877d5..560ded6f50f 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf2/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/09/07 00:36:53 rh Exp $
+$NetBSD: distinfo,v 1.4 2003/01/25 16:29:50 jmmv Exp $
 
 SHA1 (GConf-1.2.1.tar.bz2) = a0b585dbfbd598380bd4e40f275ff478b196eefc
 Size (GConf-1.2.1.tar.bz2) = 954798 bytes
+SHA1 (patch-aa) = 9a8f02de1d4b15a0d93387b78e29ad8b276363b9
diff --git a/devel/GConf2/patches/patch-aa b/devel/GConf2/patches/patch-aa
new file mode 100644
index 00000000000..425da649053
--- /dev/null
+++ b/devel/GConf2/patches/patch-aa
@@ -0,0 +1,48 @@
+$NetBSD: patch-aa,v 1.1 2003/01/25 16:29:50 jmmv Exp $
+
+Disable GTK2 support.  This is a workaround until bug #102825 gets fixed.
+See http://bugzilla.gnome.org/show_bug.cgi?id=102825 for more details.
+
+--- configure.orig	Sun Aug  4 20:18:52 2002
++++ configure
+@@ -8107,6 +8107,7 @@ fi
+ 
+   fi
+ 
++if false; then
+   if test "$PKG_CONFIG" = "no" ; then
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+@@ -8150,12 +8151,14 @@ echo "${ECHO_T}$DEPENDENT_WITH_GTK_LIBS"
+         echo "*** See http://www.freedesktop.org/software/pkgconfig"
+      fi
+   fi
++fi
+ 
+   if test $succeeded = yes; then
+      HAVE_GTK=yes
+   else
+      HAVE_GTK=no
+   fi
++HAVE_GTK=no
+ 
+ 
+   succeeded=no
+@@ -8203,6 +8206,7 @@ fi
+ 
+   fi
+ 
++if false; then
+   if test "$PKG_CONFIG" = "no" ; then
+      echo "*** The pkg-config script could not be found. Make sure it is"
+      echo "*** in your path, or set the PKG_CONFIG environment variable"
+@@ -8246,7 +8250,9 @@ echo "${ECHO_T}$DEPENDENT_WITH_XML_AND_G
+         echo "*** See http://www.freedesktop.org/software/pkgconfig"
+      fi
+   fi
++fi
+ 
++succeeded=no
+   if test $succeeded = yes; then
+      :
+   else