Buildlinkify. Patches provided in private mail by Eric Gillespie

<epg@pretzelnet.org>, modified by me to work without xpkgwedge.

2 files changed, 62 insertions, 10 deletions

diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index a66f704eb19..2df415dbca9 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/09/27 23:18:59 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2001/10/06 13:09:52 rh Exp $
 
 DISTNAME=		control-center-1.4.0.1
 CATEGORIES=		x11 gnome
@@ -8,16 +8,14 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME control-center development library
 
-DEPENDS+=		gnome-libs>=1.2.13:../../x11/gnome-libs
-DEPENDS+=		gdk-pixbuf>=0.10.1:../../graphics/gdk-pixbuf
-DEPENDS+=		gnome-vfs>=1.0:../../sysutils/gnome-vfs
-DEPENDS+=		scrollkeeper-[0-9]*:../../textproc/scrollkeeper
+DEPENDS+=			scrollkeeper-[0-9]*:../../textproc/scrollkeeper
+BUILD_USES_MSGFMT=	YES
+
+BUILDLINK_DEPENDS.gnome-libs=	gnome-libs>=1.2.13
 
+USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
-USE_LIBINTL=		YES
-BUILD_USES_MSGFMT=	YES
-
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
@@ -25,10 +23,14 @@ LOCALSTATEDIR=		/var/gnome
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
-CONFIGURE_ARGS+=	--with-glib-prefix=${LOCALBASE}
-CPPFLAGS+=		-I${LOCALBASE}/include 		# libintl.h
 
 post-patch:
 	@${ECHO} >>${WRKSRC}/control-center/cappletConf.sh.in ""
 
+.include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../sysutils/gnome-vfs/buildlink.mk"
+.include "../../x11/gnome-libs/buildlink.mk"
+.include "../../devel/popt/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/controlcenter/buildlink.mk b/x11/controlcenter/buildlink.mk
new file mode 100644
index 00000000000..63f4f6beb3d
--- /dev/null
+++ b/x11/controlcenter/buildlink.mk
@@ -0,0 +1,50 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/10/06 13:09:52 rh Exp $
+#
+# This Makefile fragment is included by packages that use controlcenter.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.controlcenter to the dependency
+#     pattern for the version of controlcenter 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(CONTROLCENTER_BUILDLINK_MK)
+CONTROLCENTER_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.controlcenter?=	control-center>=1.4
+DEPENDS+=	${BUILDLINK_DEPENDS.controlcenter}:../../x11/controlcenter
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.controlcenter=controlcenter
+BUILDLINK_PREFIX.controlcenter_DEFAULTS=	${X11PREFIX}
+BUILDLINK_FILES.controlcenter=	include/capplet-widget.h
+BUILDLINK_FILES.controlcenter+=	lib/libcapplet.*
+
+.include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../sysutils/gnome-vfs/buildlink.mk"
+.include "../../x11/gnome-libs/buildlink.mk"
+
+BUILDLINK_TARGETS.controlcenter=	controlcenter-buildlink
+BUILDLINK_TARGETS.controlcenter+=	controlcenter-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.controlcenter}
+
+BUILDLINK_CONFIG.controlcenter=	${BUILDLINK_PREFIX.controlcenter}/lib/cappletConf.sh
+BUILDLINK_CONFIG_WRAPPER.controlcenter=	${BUILDLINK_DIR}/lib/cappletConf.sh
+
+.if defined(USE_CONFIG_WRAPPER)
+CONTROLCENTER_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.controlcenter}
+CONFIGURE_ENV+=			CONTROLCENTER_CONFIG="${CONTROLCENTER_CONFIG}"
+MAKE_ENV+=			CONTROLCENTER_CONFIG="${CONTROLCENTER_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.controlcenter}
+controlcenter-buildlink: _BUILDLINK_USE
+controlcenter-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# CONTROLCENTER_BUILDLINK_MK