Update bonobo-conf to 0.14 and while at it, buildlinkify. Changes are

mainly bugfixes as well as some API enhancements.

4 files changed, 73 insertions, 11 deletions

diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 6521191a126..e721e4e2d2b 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/09/25 05:23:35 tron Exp $
+# $NetBSD: Makefile,v 1.3 2002/01/16 01:37:48 rh Exp $
 
-DISTNAME=		bonobo-conf-0.11
+DISTNAME=		bonobo-conf-0.14
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/bonobo-conf/}
 
@@ -8,13 +8,9 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Bonobo configuration system
 
-DEPENDS+=		oaf>=0.6.2:../../devel/oaf
-DEPENDS+=		GConf>=0.11:../../devel/GConf
-DEPENDS+=		bonobo>=0.37:../../devel/bonobo
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-USE_LIBINTL=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 USE_GMAKE=		YES
@@ -29,4 +25,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${PREFIX}/share/doc/bonobo-conf
 .endfor
 
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/bonobo/buildlink.mk"
+.include "../../devel/GConf/buildlink.mk"
+.include "../../devel/popt/buildlink.mk"
+.include "../../devel/oaf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bonobo-conf/PLIST b/devel/bonobo-conf/PLIST
index ea385f039e7..b6c7a1ea6ea 100644
--- a/devel/bonobo-conf/PLIST
+++ b/devel/bonobo-conf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:36 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/16 01:37:48 rh Exp $
 bin/bonobo-moniker-xmldb
 bin/cedit
 include/bonobo-conf/Bonobo_Config.h
@@ -29,14 +29,17 @@ lib/libbonobo_conf.so.0.0
 share/doc/bonobo-conf/bonobo-conf.pdf
 share/doc/bonobo-conf/bonobo-conf.sgml
 share/idl/Bonobo_Config.idl
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/bonobo-conf.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bonobo-conf.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bonobo-conf.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bonobo-conf.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/bonobo-conf.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/bonobo-conf.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/bonobo-conf.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bonobo-conf.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bonobo-conf.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/bonobo-conf.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/bonobo-conf.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/bonobo-conf.mo
 share/oaf/Bonobo_Moniker_config.oaf
 share/oaf/Bonobo_Moniker_gconf.oaf
 share/oaf/Bonobo_Moniker_xmldb.oaf
diff --git a/devel/bonobo-conf/buildlink.mk b/devel/bonobo-conf/buildlink.mk
new file mode 100644
index 00000000000..9c3993f345a
--- /dev/null
+++ b/devel/bonobo-conf/buildlink.mk
@@ -0,0 +1,57 @@
+# $NetBSD: buildlink.mk,v 1.1 2002/01/16 01:37:48 rh Exp $
+#
+# This Makefile fragment is included by packages that use bonobo-conf.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.bonobo-conf to the dependency pattern
+#     for the version of bonobo-conf desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(BONOBO_CONF_BUILDLINK_MK)
+BONOBO_CONF_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.bonobo-conf?=	bonobo-conf>0.14
+DEPENDS+=	${BUILDLINK_DEPENDS.bonobo-conf}:../../devel/bonobo-conf
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.bonobo-conf=bonobo-conf
+BUILDLINK_PREFIX.bonobo-conf_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.bonobo-conf=		include/bonobo-conf/*
+BUILDLINK_FILES.bonobo-conf+=		lib/bonobo/monikers/libmoniker_config*
+BUILDLINK_FILES.bonobo-conf+=		lib/bonobo/monikers/libmoniker_gconf*
+BUILDLINK_FILES.bonobo-conf+=		lib/bonobo_conf*
+BUILDLINK_FILES.bonobo-conf+=		lib/libbonobo_conf*
+
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/bonobo/buildlink.mk"
+.include "../../devel/GConf/buildlink.mk"
+.include "../../devel/popt/buildlink.mk"
+.include "../../devel/oaf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
+
+BUILDLINK_TARGETS.bonobo-conf=	bonobo-conf-buildlink
+BUILDLINK_TARGETS.bonobo-conf+=	bonobo-conf-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.bonobo-conf}
+
+BUILDLINK_CONFIG.bonobo-conf=	${BUILDLINK_PREFIX.bonobo-conf}/lib/bonobo_confConf.sh
+BUILDLINK_CONFIG_WRAPPER.bonobo-conf=${BUILDLINK_DIR}/lib/bonobo_confConf.sh
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.bonobo-conf}|${BUILDLINK_CONFIG.bonobo-conf}|g"
+
+.if defined(USE_CONFIG_WRAPPER)
+BONOBO_CONF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.bonobo-conf}
+CONFIGURE_ENV+=		BONOBO_CONF_CONFIG="${BONOBO_CONF_CONFIG}"
+MAKE_ENV+=		BONOBO_CONF_CONFIG="${BONOBO_CONF_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.bonobo-conf}
+bonobo-conf-buildlink: _BUILDLINK_USE
+bonobo-conf-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# BONOBO_CONF_BUILDLINK_MK
diff --git a/devel/bonobo-conf/distinfo b/devel/bonobo-conf/distinfo
index b95de1b3e78..ea0f4b87fb8 100644
--- a/devel/bonobo-conf/distinfo
+++ b/devel/bonobo-conf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/09/25 05:23:35 tron Exp $
+$NetBSD: distinfo,v 1.3 2002/01/16 01:37:48 rh Exp $
 
-SHA1 (bonobo-conf-0.11.tar.gz) = cec714d0c097eada65a5301ee2bbb5814763a1bd
-Size (bonobo-conf-0.11.tar.gz) = 434857 bytes
+SHA1 (bonobo-conf-0.14.tar.gz) = 9e33ec9eb7553cca90e4e1f9e018e2a7f2740d7a
+Size (bonobo-conf-0.14.tar.gz) = 438259 bytes