buildlinkify

2 files changed, 69 insertions, 18 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index d08dcfbc9c1..652b5b0e72e 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,32 +1,33 @@
-# $NetBSD: Makefile,v 1.17 2001/08/26 16:55:46 rh Exp $
+# $NetBSD: Makefile,v 1.18 2001/10/01 11:57:10 rh Exp $
 #
 
-DISTNAME=	GConf-1.0.4
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=unstable/sources/GConf/}
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=		GConf-1.0.4
+CATEGORIES=		devel gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/GConf/}
+EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://advogato.org/proj/GConf/
-COMMENT=	configuration database system used by GNOME
+MAINTAINER=		rh@netbsd.org
+HOMEPAGE=		http://advogato.org/proj/GConf/
+COMMENT=		configuration database system used by GNOME
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS+=	oaf>=0.6.5:../../devel/oaf
-DEPENDS+=	guile>=1.3.4:../../lang/guile
+DEPENDS+=		guile>=1.3.4:../../lang/guile
 
-GNU_CONFIGURE=	YES
-USE_X11BASE=	YES
-USE_LIBINTL=	YES
-USE_LIBTOOL=	YES
+GNU_CONFIGURE=		YES
+USE_X11BASE=		YES
+USE_LIBTOOL=		YES
 
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CPPFLAGS+=	-I${LOCALBASE}/include/db3 -I${X11PREFIX}/include
-PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CPPFLAGS+=		-I${LOCALBASE}/include/db3 -I${X11PREFIX}/include
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/gconf-1.m4 \
-	  ${LOCALBASE}/share/aclocal/gconf-1.m4
+	    ${LOCALBASE}/share/aclocal/gconf-1.m4
 
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../databases/db3/buildlink.mk"
+.include "../../devel/oaf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf/buildlink.mk b/devel/GConf/buildlink.mk
new file mode 100644
index 00000000000..842951d74df
--- /dev/null
+++ b/devel/GConf/buildlink.mk
@@ -0,0 +1,50 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/10/01 11:57:11 rh Exp $
+#
+# This Makefile fragment is included by packages that use gconf.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.gconf to the dependency patthern
+#     for the version of gconf 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(GCONF_BUILDLINK_MK)
+GCONF_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.gconf?=	GConf>=0.6.6
+DEPENDS+=	${BUILDLINK_DEPENDS.gconf}:../../devel/GConf
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gconf=gconf
+BUILDLINK_PREFIX.gconf_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gconf=		include/gconf/*
+BUILDLINK_FILES.gconf+=		lib/libgconf-*
+
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../databases/db3/buildlink.mk"
+.include "../../devel/oaf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
+
+BUILDLINK_TARGETS.gconf=	gconf-buildlink
+BUILDLINK_TARGETS.gconf+=	gconf-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gconf}
+
+BUILDLINK_CONFIG.gconf=	${BUILDLINK_PREFIX.gconf}/bin/gconf-config
+BUILDLINK_CONFIG_WRAPPER.gconf=${BUILDLINK_DIR}/bin/gconf-config
+
+.if defined(USE_CONFIG_WRAPPER)
+GCONF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gconf}
+CONFIGURE_ENV+=		GCONF_CONFIG="${GCONF_CONFIG}"
+MAKE_ENV+=		GCONF_CONFIG="${GCONF_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.gconf}
+gconf-buildlink: _BUILDLINK_USE
+gconf-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# GCONF_BUILDLINK_MK