bl3ify

8 files changed, 117 insertions, 22 deletions

diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index 38312f932da..a68ceeca206 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/23 21:50:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/11 00:53:57 xtraeme Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
@@ -20,6 +20,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gconf/.libs/gconf-sanity-check-2 \
 		${PREFIX}/libexec
 
-.include "../../devel/GConf2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf2-ui/buildlink3.mk b/devel/GConf2-ui/buildlink3.mk
new file mode 100644
index 00000000000..42e535ffd9b
--- /dev/null
+++ b/devel/GConf2-ui/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:53:57 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use GConf2-ui.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GCONF2_UI_BUILDLINK3_MK:=	${GCONF2_UI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	GConf2-ui
+.endif
+
+.if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			GConf2-ui
+BUILDLINK_DEPENDS.GConf2-ui+=		GConf2-ui>=2.4.0.1nb1
+BUILDLINK_PKGSRCDIR.GConf2-ui?=		../../devel/GConf2-ui
+
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.endif # GCONF2_UI_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index 3ddb9635c12..be583b29873 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/02/10 18:10:31 minskim Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/11 00:53:57 xtraeme Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
@@ -23,11 +23,11 @@ CONF_FILES=	${EGDIR}/path ${PKG_SYSCONFDIR}/2/path
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gconf/schemas
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../net/ORBit2/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../textproc/xmlcatmgr/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/xmlcatmgr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 5cf7113b0f1..a31184e9e66 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2004/01/23 17:52:40 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/02/11 00:53:57 xtraeme Exp $
 #
 
 DISTNAME=		GConf-2.4.0.1
@@ -16,7 +16,7 @@ DISTINFO_FILE=		${.CURDIR}/../GConf2/distinfo
 FILESDIR=		${.CURDIR}/../GConf2/files
 PATCHDIR=		${.CURDIR}/../GConf2/patches
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
diff --git a/devel/GConf2/buildlink3.mk b/devel/GConf2/buildlink3.mk
new file mode 100644
index 00000000000..67542361e26
--- /dev/null
+++ b/devel/GConf2/buildlink3.mk
@@ -0,0 +1,42 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:53:57 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use GConf2.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GCONF2_BUILDLINK3_MK:=	${GCONF2_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	GConf2
+.endif
+
+.if !empty(GCONF2_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			GConf2
+BUILDLINK_DEPENDS.GConf2+=		GConf2>=2.4.0.1
+BUILDLINK_PKGSRCDIR.GConf2?=		../../devel/GConf2
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/xmlcatmgr/buildlink3.mk"
+
+BUILDLINK_TARGETS+=	GConf2-buildlink-fake
+
+_GCONF2_FAKE=		${BUILDLINK_DIR}/bin/gconftool-2
+
+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/schemas.mk b/devel/GConf2/schemas.mk
index c831da9bbb6..cf0fbdbaf6a 100644
--- a/devel/GConf2/schemas.mk
+++ b/devel/GConf2/schemas.mk
@@ -1,4 +1,4 @@
-# $NetBSD: schemas.mk,v 1.5 2003/12/28 14:34:08 jmmv Exp $
+# $NetBSD: schemas.mk,v 1.6 2004/02/11 00:53:57 xtraeme 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
@@ -52,6 +52,6 @@ DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/../../devel/GConf2/files/deinstall.tmpl
 USE_PKGINSTALL=		YES
 .endif
 
-.include "../../devel/GConf2/buildlink2.mk"
+.include "../../devel/GConf2/buildlink3.mk"
 
 .endif	# GCONF2_SCHEMAS_MK
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index d85e9e64349..7040ff7f5c6 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/06 20:34:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/11 00:53:57 xtraeme Exp $
 
 DISTNAME=		libbonobo-2.4.3
 CATEGORIES=		devel gnome
@@ -12,7 +12,7 @@ COMMENT=		GNOME2 Object activation framework library
 CONFLICTS=		bonobo-activation-[0-9]*
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
@@ -34,9 +34,9 @@ CONF_FILES=		${EGDIR}/bonobo-activation-config.xml \
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/bonobo/monikers
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../net/ORBit2/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk
new file mode 100644
index 00000000000..b6db46057c6
--- /dev/null
+++ b/devel/libbonobo/buildlink3.mk
@@ -0,0 +1,28 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:53:57 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use libbonobo.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBBONOBO_BUILDLINK3_MK:=	${LIBBONOBO_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libbonobo
+.endif
+
+.if !empty(LIBBONOBO_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			libbonobo
+BUILDLINK_DEPENDS.libbonobo+=		libbonobo>=2.4.2
+BUILDLINK_PKGSRCDIR.libbonobo?=		../../devel/libbonobo
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
+.endif # LIBBONOBO_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}