Buildlinkify. Patches provided in private mail by Eric Gillespie

<epg@pretzelnet.org>

2 files changed, 68 insertions, 8 deletions

diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index b2c526a3a8b..1afccb7b8b1 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2001/09/27 23:19:00 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2001/10/06 14:47:35 rh Exp $
 
 DISTNAME=		gnome-core-1.4.0.4
 CATEGORIES=		x11 gnome
@@ -9,15 +9,10 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Base component of GNU Network Object Management Environment
 
-DEPENDS+=		gdk-pixbuf-gnome>=0.9.0nb1:../../graphics/gdk-pixbuf-gnome
-DEPENDS+=		libghttp>=1.0.9:../../www/libghttp
-DEPENDS+=		libxml-[0-9]*:../../textproc/libxml
 DEPENDS+=		xscreensaver-gnome>=3.25nb1:../xscreensaver-gnome
-DEPENDS+=		libglade>=0.14:../../devel/libglade
-DEPENDS+=		gtkhtml>=0.8.3:../../www/gtkhtml
 BUILD_USES_MSGFMT=	YES
 
-USE_LIBINTL=		YES
+USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
@@ -27,7 +22,6 @@ LOCALSTATEDIR=		/var/gnome
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
-CPPFLAGS+=		-I${LOCALBASE}/include	# libintl.h
 
 USE_PERL5=		YES
 PERL_SCRIPTS=		help-browser/gnome-convert help-browser/gnome-download
@@ -48,4 +42,11 @@ post-install:
 .endfor
 .endfor
 
+.include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
+.include "../../www/libghttp/buildlink.mk"
+.include "../../textproc/libxml/buildlink.mk"
+.include "../../devel/libglade/buildlink.mk"
+.include "../../www/gtkhtml/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-core/buildlink.mk b/x11/gnome-core/buildlink.mk
new file mode 100644
index 00000000000..ac3a8a74db8
--- /dev/null
+++ b/x11/gnome-core/buildlink.mk
@@ -0,0 +1,59 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/10/06 14:47:35 rh Exp $
+#
+# This Makefile fragment is included by packages that use gnome-core.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.gnome-core to the dependency pattern
+#     for the version of gnome-core 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(GNOME_CORE_BUILDLINK_MK)
+GNOME_CORE_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.gnome-core?=	gnome-core>=0.2
+DEPENDS+=			${BUILDLINK_DEPENDS.gnome-core}:../../x11/gnome-core
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-core=gnome-core
+BUILDLINK_PREFIX.gnome-core_DEFAULTS=	${X11PREFIX}
+BUILDLINK_FILES.gnome-core=	include/gnome-core/*
+BUILDLINK_FILES.gnome-core+=	lib/libgnome-core.*
+
+.include "../../devel/bonobo/buildlink.mk"
+.include "../../devel/gal/buildlink.mk"
+.include "../../print/gnome-print/buildlink.mk"
+.include "../../www/glibwww/buildlink.mk"
+.include "../../www/libghttp/buildlink.mk"
+.include "../../x11/controlcenter/buildlink.mk"
+
+BUILDLINK_TARGETS.gnome-core=	gnome-core-buildlink
+BUILDLINK_TARGETS.gnome-core+=	gnome-core-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gnome-core}
+
+BUILDLINK_CONFIG.applets=	${BUILDLINK_PREFIX.gnome-core}/lib/appletsConf.sh
+BUILDLINK_CONFIG.docklets=	${BUILDLINK_PREFIX.gnome-core}/lib/dockletsConf.sh
+BUILDLINK_CONFIG_WRAPPER.applets=	${BUILDLINK_DIR}/lib/appletsConf.sh
+BUILDLINK_CONFIG_WRAPPER.docklets=	${BUILDLINK_DIR}/lib/dockletsConf.sh
+
+.if defined(USE_CONFIG_WRAPPER)
+APPLETS_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.applets}
+DOCKLETS_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.docklets}
+CONFIGURE_ENV+=			APPLETS_CONFIG="${APPLETS_CONFIG}"
+CONFIGURE_ENV+=			DOCKLETS_CONFIG="${DOCKLETS_CONFIG}"
+MAKE_ENV+=			APPLETS_CONFIG="${APPLETS_CONFIG}"
+MAKE_ENV+=			DOCKLETS_CONFIG="${DOCKLETS_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.gnome-core}
+gnome-core-buildlink: _BUILDLINK_USE
+gnome-core-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# GNOME_CORE_BUILDLINK_MK
+
+appletsConf.sh dockletsConf.sh