Rename GConf2 to GConf and GConf2-ui to GConf-ui, to match the

upstream name.

23 files changed, 211 insertions, 217 deletions

diff --git a/devel/GConf2-ui/DESCR b/devel/GConf-ui/DESCR
index 1c2b7ec6a11..1c2b7ec6a11 100644
--- a/devel/GConf2-ui/DESCR
+++ b/devel/GConf-ui/DESCR
diff --git a/devel/GConf2-ui/Makefile b/devel/GConf-ui/Makefile
index 66bee08ee6e..25d97ae72e9 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf-ui/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.30 2007/07/09 17:16:39 drochner Exp $
+# $NetBSD: Makefile,v 1.1 2007/09/21 12:58:15 wiz Exp $
 #
 
-.include "../../devel/GConf2/Makefile.common"
+.include "../../devel/GConf/Makefile.common"
 
 PKGREVISION=	1
 
-PKGNAME=	${DISTNAME:S/GConf/GConf2-ui/}
+PKGNAME=	${DISTNAME:S/GConf/GConf-ui/}
 
-BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=${GCONF2_VERSION}
+BUILDLINK_API_DEPENDS.GConf+=	GConf>=${GCONF_VERSION}
 
 CONFIGURE_ARGS+=	--enable-gtk
 
@@ -20,6 +20,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gconf/.libs/gconf-sanity-check-2 \
 		${DESTDIR}${PREFIX}/libexec
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf-ui/PLIST b/devel/GConf-ui/PLIST
new file mode 100644
index 00000000000..2e6ff771f77
--- /dev/null
+++ b/devel/GConf-ui/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2007/09/21 12:58:15 wiz Exp $
+libexec/gconf-sanity-check-2
diff --git a/devel/GConf-ui/buildlink3.mk b/devel/GConf-ui/buildlink3.mk
new file mode 100644
index 00000000000..1699abb1f6b
--- /dev/null
+++ b/devel/GConf-ui/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2007/09/21 12:58:15 wiz Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GCONF_UI_BUILDLINK3_MK:=	${GCONF_UI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	GConf-ui
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf-ui}
+BUILDLINK_PACKAGES+=	GConf-ui
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf-ui
+
+.if !empty(GCONF_UI_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.GConf-ui+=	GConf-ui>=2.8.0.1
+BUILDLINK_ABI_DEPENDS.GConf-ui?=	GConf-ui>=2.14.0nb1
+BUILDLINK_PKGSRCDIR.GConf-ui?=	../../devel/GConf-ui
+.endif	# GCONF_UI_BUILDLINK3_MK
+
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2/DESCR b/devel/GConf/DESCR
index 0e4bfa1650b..d3085d3b1d2 100644
--- a/devel/GConf2/DESCR
+++ b/devel/GConf/DESCR
@@ -2,9 +2,3 @@ GConf is a configuration database system, functionally similar to the
 Windows registry but lots better. It was written for the GNOME
 desktop but does not require GNOME; configure should notice if GNOME
 is not installed and compile the basic GConf library anyway.
-
-There's an introductory article at
-http://developer.gnome.org/feature/current/index.html, written a while
-ago but mostly still valid.  Also, there's a mailing list
-gconf-list@gnome.org, see
-http://mail.gnome.org/mailman/listinfo/gconf-list
diff --git a/devel/GConf2/Makefile b/devel/GConf/Makefile
index 3be6d534ae5..fcce77dcfcf 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.42 2007/07/09 17:16:39 drochner Exp $
+# $NetBSD: Makefile,v 1.60 2007/09/21 12:58:12 wiz Exp $
 #
 
-.include "../../devel/GConf2/Makefile.common"
+.include "../../devel/GConf/Makefile.common"
 
 PKGREVISION=	1
 
-PKGNAME=	${DISTNAME:S/GConf/GConf2/}
-
 CONFIGURE_ARGS+=	--disable-gtk
 CONFIGURE_ARGS+=	ac_cv_header_ldap_h=no
 
+CONFLICTS+=	GConf-[0-9]*
+
 OWN_DIRS=	${PKG_SYSCONFDIR}/2
 OWN_DIRS+=	${PKG_SYSCONFDIR}/gconf.xml.defaults
 OWN_DIRS+=	${PKG_SYSCONFDIR}/gconf.xml.mandatory
 
-EGDIR=		${PREFIX}/share/examples/GConf2
+EGDIR=		${PREFIX}/share/examples/GConf
 CONF_FILES=	${EGDIR}/path ${PKG_SYSCONFDIR}/2/path
 
 PRINT_PLIST_AWK+=	/^@dirrm (include\/gconf|lib\/GConf|share\/gconf)$$/ \
diff --git a/devel/GConf2/Makefile.common b/devel/GConf/Makefile.common
index 0f929ac313a..25198d30cbd 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf/Makefile.common
@@ -1,25 +1,25 @@
-# $NetBSD: Makefile.common,v 1.44 2007/07/09 17:16:39 drochner Exp $
+# $NetBSD: Makefile.common,v 1.1 2007/09/21 12:58:13 wiz Exp $
 #
 
-GCONF2_VERSION=		2.18.0.1
+GCONF_VERSION=		2.18.0.1
 
-DISTNAME=		GConf-${GCONF2_VERSION}
+DISTNAME=		GConf-${GCONF_VERSION}
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/2.18/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/projects/gconf/
-COMMENT=		Configuration database system used by GNOME (v2)
+COMMENT=		Configuration database system used by GNOME
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 # not ready yet.  .schemas are installed in the depot.
 #PKG_INSTALLATION_TYPES= overwrite pkgviews
 
-DISTINFO_FILE=		${.CURDIR}/../GConf2/distinfo
-FILESDIR=		${.CURDIR}/../GConf2/files
-PATCHDIR=		${.CURDIR}/../GConf2/patches
+DISTINFO_FILE=		${.CURDIR}/../GConf/distinfo
+FILESDIR=		${.CURDIR}/../GConf/files
+PATCHDIR=		${.CURDIR}/../GConf/patches
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/devel/GConf2/PLIST b/devel/GConf/PLIST
index fb52fc18bab..e79712fae22 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2007/04/09 00:55:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2007/09/21 12:58:13 wiz Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -17,7 +17,7 @@ lib/pkgconfig/gconf-2.0.pc
 libexec/gconfd-2
 man/man1/gconftool-2.1
 share/aclocal/gconf-2.m4
-share/examples/GConf2/path
+share/examples/GConf/path
 share/gtk-doc/html/gconf/ch01.html
 share/gtk-doc/html/gconf/gconf-GConfClient.html
 share/gtk-doc/html/gconf/gconf-gconf-backend.html
@@ -118,7 +118,7 @@ share/sgml/gconf/gconf-1.0.dtd
 @exec ${MKDIR} %D/share/gconf/schemas
 @dirrm share/gconf/schemas
 @unexec ${RMDIR} -p %D/share/gconf 2>/dev/null || ${TRUE}
-@dirrm share/examples/GConf2
+@dirrm share/examples/GConf
 @dirrm lib/GConf/2
 @unexec ${RMDIR} -p %D/lib/GConf 2>/dev/null || ${TRUE}
 @dirrm include/gconf/2/gconf
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
new file mode 100644
index 00000000000..55c6cd603c7
--- /dev/null
+++ b/devel/GConf/buildlink3.mk
@@ -0,0 +1,41 @@
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 12:58:13 wiz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GCONF_BUILDLINK3_MK:=	${GCONF_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	GConf
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf}
+BUILDLINK_PACKAGES+=	GConf
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf
+
+.if !empty(GCONF_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.8.0.1
+BUILDLINK_ABI_DEPENDS.GConf?=	GConf>=2.12.1nb1
+BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
+.endif	# GCONF_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/xmlcatmgr/buildlink3.mk"
+
+.if !empty(GCONF_BUILDLINK3_MK:M+)
+BUILDLINK_TARGETS+=	GConf-buildlink-fake
+_GCONF_FAKE=		${BUILDLINK_DIR}/bin/gconftool-2
+
+.PHONY: GConf-buildlink-fake
+GConf-buildlink-fake:
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	if [ ! -f ${_GCONF_FAKE} ]; then				\
+		${ECHO_BUILDLINK_MSG} "Creating ${_GCONF_FAKE}";	\
+		${MKDIR} ${_GCONF_FAKE:H};				\
+		${ECHO} "#!${SH}" > ${_GCONF_FAKE};			\
+		${CHMOD} +x ${_GCONF_FAKE};				\
+	fi
+.endif	# GCONF_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2/distinfo b/devel/GConf/distinfo
index 96a37e7b64d..f75aea9c190 100644
--- a/devel/GConf2/distinfo
+++ b/devel/GConf/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.27 2007/04/09 00:55:45 wiz Exp $
+$NetBSD: distinfo,v 1.16 2007/09/21 12:58:13 wiz Exp $
 
 SHA1 (GConf-2.18.0.1.tar.bz2) = 6bbceafc636457ec14ec2d7b4358235ff6cf08d3
 RMD160 (GConf-2.18.0.1.tar.bz2) = 79bad5a19404277abfbd7f17b61e09274dcc1aa3
 Size (GConf-2.18.0.1.tar.bz2) = 1347765 bytes
 SHA1 (patch-ab) = ca0c9f45ff46ceb05a10c03c59f94b6a5be562b0
-SHA1 (patch-ac) = 856ff83a03658fcc33ba746a5aacbd74f2738583
+SHA1 (patch-ac) = 1a1989511b9bb78f0310e70289b54ed326dede1b
 SHA1 (patch-ad) = 5d90ad4651d4c2562277c9008a3056568afe7317
diff --git a/devel/GConf/files/deinstall.tmpl b/devel/GConf/files/deinstall.tmpl
new file mode 100644
index 00000000000..8167376223f
--- /dev/null
+++ b/devel/GConf/files/deinstall.tmpl
@@ -0,0 +1,26 @@
+# $NetBSD: deinstall.tmpl,v 1.1 2007/09/21 12:58:14 wiz Exp $
+#
+# Unregister GConf schema files from GConf's database at install time.
+#
+
+GCONFTOOL2="@GCONFTOOL2@"
+GCONF_ENTRIES="@GCONF_ENTRIES@"
+GCONF_SCHEMAS="@GCONF_SCHEMAS@"
+GCONF_SCHEMAS_DIR="@GCONF_SCHEMAS_DIR@"
+GCONF_CONFIG_SOURCE="@GCONF_CONFIG_SOURCE@"
+
+case ${STAGE} in
+DEINSTALL)
+	for f in ${GCONF_ENTRIES}; do
+		${GCONFTOOL2} --config-source=${GCONF_CONFIG_SOURCE} \
+			--direct --unload ${GCONF_SCHEMAS_DIR}/$f >/dev/null
+	done
+	for f in ${GCONF_SCHEMAS}; do
+		GCONF_CONFIG_SOURCE="${GCONF_CONFIG_SOURCE}" \
+			${GCONFTOOL2} --makefile-uninstall-rule \
+			${GCONF_SCHEMAS_DIR}/$f >/dev/null
+	done
+	;;
+*)
+	;;
+esac
diff --git a/devel/GConf/files/install.tmpl b/devel/GConf/files/install.tmpl
new file mode 100644
index 00000000000..0a2e3adf25f
--- /dev/null
+++ b/devel/GConf/files/install.tmpl
@@ -0,0 +1,26 @@
+# $NetBSD: install.tmpl,v 1.1 2007/09/21 12:58:14 wiz Exp $
+#
+# Register GConf schema files into GConf's database at install time.
+#
+
+GCONFTOOL2="@GCONFTOOL2@"
+GCONF_ENTRIES="@GCONF_ENTRIES@"
+GCONF_SCHEMAS="@GCONF_SCHEMAS@"
+GCONF_SCHEMAS_DIR="@GCONF_SCHEMAS_DIR@"
+GCONF_CONFIG_SOURCE="@GCONF_CONFIG_SOURCE@"
+
+case ${STAGE} in
+POST-INSTALL)
+	for f in ${GCONF_SCHEMAS}; do
+		GCONF_CONFIG_SOURCE="${GCONF_CONFIG_SOURCE}" \
+			${GCONFTOOL2} --makefile-install-rule \
+			${GCONF_SCHEMAS_DIR}/$f >/dev/null
+	done
+	for f in ${GCONF_ENTRIES}; do
+		${GCONFTOOL2} --config-source=${GCONF_CONFIG_SOURCE} \
+			--direct --load ${GCONF_SCHEMAS_DIR}/$f >/dev/null
+	done
+	;;
+*)
+	;;
+esac
diff --git a/devel/GConf2/patches/patch-ab b/devel/GConf/patches/patch-ab
index 90732dd557b..c1de80e5542 100644
--- a/devel/GConf2/patches/patch-ab
+++ b/devel/GConf/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2006/10/23 00:22:14 wiz Exp $
+$NetBSD: patch-ab,v 1.9 2007/09/21 12:58:14 wiz Exp $
 
 --- Makefile.in.orig	2006-10-05 12:48:26.000000000 +0000
 +++ Makefile.in
diff --git a/devel/GConf2/patches/patch-ac b/devel/GConf/patches/patch-ac
index 1ba77c12264..ac003f91c2b 100644
--- a/devel/GConf2/patches/patch-ac
+++ b/devel/GConf/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2006/10/23 00:22:14 wiz Exp $
+$NetBSD: patch-ac,v 1.9 2007/09/21 12:58:14 wiz Exp $
 
 --- gconf/Makefile.in.orig	2006-10-05 12:54:51.000000000 +0000
 +++ gconf/Makefile.in
@@ -8,8 +8,8 @@ $NetBSD: patch-ac,v 1.5 2006/10/23 00:22:14 wiz Exp $
  install-data-local: default.path
 -	$(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
 -	$(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/GConf2
-+	$(INSTALL_DATA) default.path $(DESTDIR)$(datadir)/examples/GConf2/path
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/GConf
++	$(INSTALL_DATA) default.path $(DESTDIR)$(datadir)/examples/GConf/path
  
  uninstall-local:
  	rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
diff --git a/devel/GConf2/patches/patch-ad b/devel/GConf/patches/patch-ad
index dd600bf46f5..151bbdca1cf 100644
--- a/devel/GConf2/patches/patch-ad
+++ b/devel/GConf/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.6 2007/04/09 00:55:45 wiz Exp $
+$NetBSD: patch-ad,v 1.5 2007/09/21 12:58:14 wiz Exp $
 
 Needed for Solaris 9. Without the <lber.h> header, struct berval, which
 is used as a member of another struct in <ldap.h>, has an unknown size.
diff --git a/devel/GConf/schemas.mk b/devel/GConf/schemas.mk
new file mode 100644
index 00000000000..d5fc6b6c365
--- /dev/null
+++ b/devel/GConf/schemas.mk
@@ -0,0 +1,61 @@
+# $NetBSD: schemas.mk,v 1.1 2007/09/21 12:58:13 wiz Exp $
+#
+# This Makefile fragment is intended to be included by packages that install
+# GConf schema files.  It takes care of registering them in the GConf
+# global configuration database.
+#
+# The following variables are automatically defined for free use in packages:
+#    GCONFTOOL2           - The gconftool-2 binary program.
+#    GCONF_CONFIG_SOURCE - URI of the global configuration database.
+#    GCONF_SCHEMAS_DIR   - Directory where .schemas files are installed.
+#
+# The following variables can be defined by a package to register .entries
+# and .schemas files:
+#    GCONF_ENTRIES - A list of .entries files to register.  When using this
+#                     variable, packages need to be fixed to not register
+#                     them and to install those files to GCONF_SCHEMAS_DIR.
+#    GCONF_SCHEMAS - A list of .schemas files to register.  When using this
+#                     variable, packages need to be fixed to not register
+#                     them and to install those files to GCONF_SCHEMAS_DIR.
+#
+
+.if !defined(GCONF_SCHEMAS_MK)
+GCONF_SCHEMAS_MK=	# defined
+
+# The gconftool-2 binary program.
+GCONFTOOL2=		${BUILDLINK_PREFIX.GConf}/bin/gconftool-2
+
+# Default configuration source (database).
+.if defined(PKG_SYSCONFDIR.GConf)
+GCONF_CONFIG_SOURCE=	xml::${PKG_SYSCONFDIR.GConf}/gconf/gconf.xml.defaults
+.else
+GCONF_CONFIG_SOURCE=	xml::${PKG_SYSCONFBASE}/gconf/gconf.xml.defaults
+.endif
+
+# Where .schemas files go.
+GCONF_SCHEMAS_DIR=	${BUILDLINK_PREFIX.GConf}/share/gconf/schemas
+
+.if defined(GNU_CONFIGURE) && !empty(GNU_CONFIGURE:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--disable-schemas-install
+CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${GCONF_SCHEMAS_DIR:Q}
+.endif
+
+.if (defined(GCONF_SCHEMAS) && !empty(GCONF_SCHEMAS)) || \
+    (defined(GCONF_ENTRIES) && !empty(GCONF_ENTRIES))
+FILES_SUBST+=		GCONFTOOL2=${GCONFTOOL2:Q}
+FILES_SUBST+=		GCONF_CONFIG_SOURCE=${GCONF_CONFIG_SOURCE:Q}
+FILES_SUBST+=		GCONF_ENTRIES=${GCONF_ENTRIES:Q}
+FILES_SUBST+=		GCONF_SCHEMAS=${GCONF_SCHEMAS:Q}
+FILES_SUBST+=		GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR:Q}
+INSTALL_TEMPLATES+=	${.CURDIR}/../../devel/GConf/files/install.tmpl
+DEINSTALL_TEMPLATES+=	${.CURDIR}/../../devel/GConf/files/deinstall.tmpl
+.endif
+
+PRINT_PLIST_AWK+=	/^@dirrm share\/gconf$$/ { next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/gconf\/schemas$$/ \
+				{ print "@comment in GConf: " $$0; next; }
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../devel/GConf/buildlink3.mk"
+
+.endif	# GCONF_SCHEMAS_MK
diff --git a/devel/GConf2-ui/PLIST b/devel/GConf2-ui/PLIST
deleted file mode 100644
index 36280df56b7..00000000000
--- a/devel/GConf2-ui/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/05 22:19:56 jmmv Exp $
-libexec/gconf-sanity-check-2
diff --git a/devel/GConf2-ui/buildlink3.mk b/devel/GConf2-ui/buildlink3.mk
deleted file mode 100644
index ae507239746..00000000000
--- a/devel/GConf2-ui/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:10:41 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GCONF2_UI_BUILDLINK3_MK:=	${GCONF2_UI_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	GConf2-ui
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf2-ui}
-BUILDLINK_PACKAGES+=	GConf2-ui
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf2-ui
-
-.if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.GConf2-ui+=	GConf2-ui>=2.8.0.1
-BUILDLINK_ABI_DEPENDS.GConf2-ui?=	GConf2-ui>=2.14.0nb1
-BUILDLINK_PKGSRCDIR.GConf2-ui?=	../../devel/GConf2-ui
-.endif	# GCONF2_UI_BUILDLINK3_MK
-
-.include "../../devel/GConf2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2/buildlink3.mk b/devel/GConf2/buildlink3.mk
deleted file mode 100644
index 0135cdf2952..00000000000
--- a/devel/GConf2/buildlink3.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/07/09 17:16:39 drochner Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GCONF2_BUILDLINK3_MK:=	${GCONF2_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	GConf2
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf2}
-BUILDLINK_PACKAGES+=	GConf2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}GConf2
-
-.if !empty(GCONF2_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.8.0.1
-BUILDLINK_ABI_DEPENDS.GConf2?=	GConf2>=2.12.1nb1
-BUILDLINK_PKGSRCDIR.GConf2?=	../../devel/GConf2
-.endif	# GCONF2_BUILDLINK3_MK
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/xmlcatmgr/buildlink3.mk"
-
-.if !empty(GCONF2_BUILDLINK3_MK:M+)
-BUILDLINK_TARGETS+=	GConf2-buildlink-fake
-_GCONF2_FAKE=		${BUILDLINK_DIR}/bin/gconftool-2
-
-.PHONY: GConf2-buildlink-fake
-GConf2-buildlink-fake:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	if [ ! -f ${_GCONF2_FAKE} ]; then				\
-		${ECHO_BUILDLINK_MSG} "Creating ${_GCONF2_FAKE}";	\
-		${MKDIR} ${_GCONF2_FAKE:H};				\
-		${ECHO} "#!${SH}" > ${_GCONF2_FAKE};			\
-		${CHMOD} +x ${_GCONF2_FAKE};				\
-	fi
-.endif	# GCONF2_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2/files/deinstall.tmpl b/devel/GConf2/files/deinstall.tmpl
deleted file mode 100644
index 1e2421859d5..00000000000
--- a/devel/GConf2/files/deinstall.tmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: deinstall.tmpl,v 1.5 2003/12/28 14:24:49 jmmv Exp $
-#
-# Unregister GConf2 schema files from GConf2's database at install time.
-#
-
-GCONFTOOL2="@GCONFTOOL2@"
-GCONF2_ENTRIES="@GCONF2_ENTRIES@"
-GCONF2_SCHEMAS="@GCONF2_SCHEMAS@"
-GCONF2_SCHEMAS_DIR="@GCONF2_SCHEMAS_DIR@"
-GCONF2_CONFIG_SOURCE="@GCONF2_CONFIG_SOURCE@"
-
-case ${STAGE} in
-DEINSTALL)
-	for f in ${GCONF2_ENTRIES}; do
-		${GCONFTOOL2} --config-source=${GCONF2_CONFIG_SOURCE} \
-			--direct --unload ${GCONF2_SCHEMAS_DIR}/$f >/dev/null
-	done
-	for f in ${GCONF2_SCHEMAS}; do
-		GCONF_CONFIG_SOURCE="${GCONF2_CONFIG_SOURCE}" \
-			${GCONFTOOL2} --makefile-uninstall-rule \
-			${GCONF2_SCHEMAS_DIR}/$f >/dev/null
-	done
-	;;
-*)
-	;;
-esac
diff --git a/devel/GConf2/files/install.tmpl b/devel/GConf2/files/install.tmpl
deleted file mode 100644
index c8241477e9d..00000000000
--- a/devel/GConf2/files/install.tmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: install.tmpl,v 1.4 2003/12/28 14:24:49 jmmv Exp $
-#
-# Register GConf2 schema files into GConf2's database at install time.
-#
-
-GCONFTOOL2="@GCONFTOOL2@"
-GCONF2_ENTRIES="@GCONF2_ENTRIES@"
-GCONF2_SCHEMAS="@GCONF2_SCHEMAS@"
-GCONF2_SCHEMAS_DIR="@GCONF2_SCHEMAS_DIR@"
-GCONF2_CONFIG_SOURCE="@GCONF2_CONFIG_SOURCE@"
-
-case ${STAGE} in
-POST-INSTALL)
-	for f in ${GCONF2_SCHEMAS}; do
-		GCONF_CONFIG_SOURCE="${GCONF2_CONFIG_SOURCE}" \
-			${GCONFTOOL2} --makefile-install-rule \
-			${GCONF2_SCHEMAS_DIR}/$f >/dev/null
-	done
-	for f in ${GCONF2_ENTRIES}; do
-		${GCONFTOOL2} --config-source=${GCONF2_CONFIG_SOURCE} \
-			--direct --load ${GCONF2_SCHEMAS_DIR}/$f >/dev/null
-	done
-	;;
-*)
-	;;
-esac
diff --git a/devel/GConf2/schemas.mk b/devel/GConf2/schemas.mk
deleted file mode 100644
index 5820f5c5b39..00000000000
--- a/devel/GConf2/schemas.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# $NetBSD: schemas.mk,v 1.16 2007/02/22 19:26:20 wiz Exp $
-#
-# This Makefile fragment is intended to be included by packages that install
-# GConf2 schema files.  It takes care of registering them in the GConf2
-# global configuration database.
-#
-# The following variables are automatically defined for free use in packages:
-#    GCONFTOOL2           - The gconftool-2 binary program.
-#    GCONF2_CONFIG_SOURCE - URI of the global configuration database.
-#    GCONF2_SCHEMAS_DIR   - Directory where .schemas files are installed.
-#
-# The following variables can be defined by a package to register .entries
-# and .schemas files:
-#    GCONF2_ENTRIES - A list of .entries files to register.  When using this
-#                     variable, packages need to be fixed to not register
-#                     them and to install those files to GCONF2_SCHEMAS_DIR.
-#    GCONF2_SCHEMAS - A list of .schemas files to register.  When using this
-#                     variable, packages need to be fixed to not register
-#                     them and to install those files to GCONF2_SCHEMAS_DIR.
-#
-
-.if !defined(GCONF2_SCHEMAS_MK)
-GCONF2_SCHEMAS_MK=	# defined
-
-# The gconftool-2 binary program.
-GCONFTOOL2=		${BUILDLINK_PREFIX.GConf2}/bin/gconftool-2
-
-# Default configuration source (database).
-.if defined(PKG_SYSCONFDIR.GConf2)
-GCONF2_CONFIG_SOURCE=	xml::${PKG_SYSCONFDIR.GConf2}/gconf/gconf.xml.defaults
-.else
-GCONF2_CONFIG_SOURCE=	xml::${PKG_SYSCONFBASE}/gconf/gconf.xml.defaults
-.endif
-
-# Where .schemas files go.
-GCONF2_SCHEMAS_DIR=	${BUILDLINK_PREFIX.GConf2}/share/gconf/schemas
-
-.if defined(GNU_CONFIGURE) && !empty(GNU_CONFIGURE:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=	--disable-schemas-install
-CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${GCONF2_SCHEMAS_DIR:Q}
-.endif
-
-.if (defined(GCONF2_SCHEMAS) && !empty(GCONF2_SCHEMAS)) || \
-    (defined(GCONF2_ENTRIES) && !empty(GCONF2_ENTRIES))
-FILES_SUBST+=		GCONFTOOL2=${GCONFTOOL2:Q}
-FILES_SUBST+=		GCONF2_CONFIG_SOURCE=${GCONF2_CONFIG_SOURCE:Q}
-FILES_SUBST+=		GCONF2_ENTRIES=${GCONF2_ENTRIES:Q}
-FILES_SUBST+=		GCONF2_SCHEMAS=${GCONF2_SCHEMAS:Q}
-FILES_SUBST+=		GCONF2_SCHEMAS_DIR=${GCONF2_SCHEMAS_DIR:Q}
-INSTALL_TEMPLATES+=	${.CURDIR}/../../devel/GConf2/files/install.tmpl
-DEINSTALL_TEMPLATES+=	${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl
-.endif
-
-PRINT_PLIST_AWK+=	/^@dirrm share\/gconf$$/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm share\/gconf\/schemas$$/ \
-				{ print "@comment in GConf2: " $$0; next; }
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../devel/GConf2/buildlink3.mk"
-
-.endif	# GCONF2_SCHEMAS_MK
diff --git a/devel/Makefile b/devel/Makefile
index d7673809df0..1e8474c5ad6 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.894 2007/09/21 10:15:40 taca Exp $
+# $NetBSD: Makefile,v 1.895 2007/09/21 12:58:12 wiz Exp $
 #
 
 COMMENT=	Development utilities
 
 SUBDIR+=	ArX
 SUBDIR+=	ExmanIDE
-SUBDIR+=	GConf2
-SUBDIR+=	GConf2-ui
+SUBDIR+=	GConf
+SUBDIR+=	GConf-ui
 SUBDIR+=	Gorm
 SUBDIR+=	ObjectiveLib
 SUBDIR+=	ProjectCenter
@@ -257,7 +257,7 @@ SUBDIR+=	libextractor
 SUBDIR+=	libffi
 SUBDIR+=	libgail-gnome
 SUBDIR+=	libgetopt
-SUBDIR+=	libglade2
+SUBDIR+=	libglade
 SUBDIR+=	libglademm
 SUBDIR+=	libgnome
 SUBDIR+=	libgnomemm
@@ -295,7 +295,7 @@ SUBDIR+=	libsetenv
 SUBDIR+=	libsexy
 SUBDIR+=	libsexymm
 SUBDIR+=	libsigc++
-SUBDIR+=	libsigc++2
+SUBDIR+=	libsigc++1
 SUBDIR+=	libsigsegv
 SUBDIR+=	libslang
 SUBDIR+=	libsmi