diff options
-rw-r--r-- | databases/gnome-mime-data/Makefile | 8 | ||||
-rw-r--r-- | databases/gnome-mime-data/buildlink3.mk | 25 | ||||
-rw-r--r-- | devel/GConf2-ui/Makefile | 6 | ||||
-rw-r--r-- | devel/GConf2-ui/buildlink3.mk | 25 | ||||
-rw-r--r-- | devel/GConf2/Makefile | 16 | ||||
-rw-r--r-- | devel/GConf2/Makefile.common | 4 | ||||
-rw-r--r-- | devel/GConf2/buildlink3.mk | 42 | ||||
-rw-r--r-- | devel/GConf2/schemas.mk | 4 | ||||
-rw-r--r-- | devel/libbonobo/Makefile | 14 | ||||
-rw-r--r-- | devel/libbonobo/buildlink3.mk | 28 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/Makefile | 30 | ||||
-rw-r--r-- | sysutils/gnome-vfs2/buildlink3.mk | 34 | ||||
-rw-r--r-- | textproc/intltool/Makefile | 6 | ||||
-rw-r--r-- | textproc/intltool/buildlink3.mk | 37 |
14 files changed, 235 insertions, 44 deletions
diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile index a6990d7ca22..23e24db06dd 100644 --- a/databases/gnome-mime-data/Makefile +++ b/databases/gnome-mime-data/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/06 18:53:24 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/11 00:48:07 xtraeme Exp $ # DISTNAME= gnome-mime-data-2.4.1 @@ -15,7 +15,7 @@ DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs CONFLICTS= gnome-vfs<=1.0.3 -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES USE_PERL5= build @@ -29,7 +29,7 @@ EGDIR= ${PREFIX}/share/examples/gnome-mime-data CONF_FILES= ${EGDIR}/gnome-vfs-mime-magic \ ${PKG_SYSCONFDIR}/gnome-vfs-mime-magic -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../lang/perl5/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/gnome-mime-data/buildlink3.mk b/databases/gnome-mime-data/buildlink3.mk new file mode 100644 index 00000000000..060d0f55713 --- /dev/null +++ b/databases/gnome-mime-data/buildlink3.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:48:07 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use gnome-mime-data. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GNOME_MIME_DATA_BUILDLINK3_MK:= ${GNOME_MIME_DATA_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gnome-mime-data +.endif + +.if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= gnome-mime-data +BUILDLINK_DEPENDS.gnome-mime-data+= gnome-mime-data>=2.4.0 +BUILDLINK_PKGSRCDIR.gnome-mime-data?= ../../databases/gnome-mime-data + +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" + +.endif # GNOME_MIME_DATA_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 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/+$//} diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile index 584d60156b3..cff3d6c1a7e 100644 --- a/sysutils/gnome-vfs2/Makefile +++ b/sysutils/gnome-vfs2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/02/09 18:45:52 jmmv Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/11 00:56:01 xtraeme Exp $ # DISTNAME= gnome-vfs-2.4.2 @@ -15,7 +15,7 @@ COMMENT= GNOME Virtual File System (v2) BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES @@ -54,18 +54,18 @@ CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f GCONF2_SCHEMAS= system_http_proxy.schemas -.include "../../archivers/bzip2/buildlink2.mk" -.include "../../audio/cdparanoia/buildlink2.mk" -.include "../../databases/gnome-mime-data/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../audio/cdparanoia/buildlink3.mk" +.include "../../databases/gnome-mime-data/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" -.include "../../devel/glib2/buildlink2.mk" -.include "../../devel/libbonobo/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../devel/popt/buildlink2.mk" -.include "../../net/ORBit2/buildlink2.mk" -.include "../../textproc/intltool/buildlink2.mk" -.include "../../textproc/libxml2/buildlink2.mk" -.include "../../security/openssl/buildlink2.mk" -.include "../../sysutils/fam/buildlink2.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/libbonobo/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" +.include "../../net/ORBit2/buildlink3.mk" +.include "../../textproc/intltool/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../sysutils/fam/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk new file mode 100644 index 00000000000..70e3cc07d2c --- /dev/null +++ b/sysutils/gnome-vfs2/buildlink3.mk @@ -0,0 +1,34 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:56:01 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use gnome-vfs2. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GNOME_VFS2_BUILDLINK3_MK:= ${GNOME_VFS2_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gnome-vfs2 +.endif + +.if !empty(GNOME_VFS2_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= gnome-vfs2 +BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.4.2nb2 +BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2 + +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../audio/cdparanoia/buildlink3.mk" +.include "../../databases/gnome-mime-data/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/libbonobo/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" +.include "../../net/ORBit2/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../sysutils/fam/buildlink3.mk" + +.endif # GNOME_VFS2_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile index 320ba630e40..f24b48c41d3 100644 --- a/textproc/intltool/Makefile +++ b/textproc/intltool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/02/06 18:26:49 minskim Exp $ +# $NetBSD: Makefile,v 1.15 2004/02/11 00:48:58 xtraeme Exp $ # DISTNAME= intltool-0.30 @@ -15,10 +15,10 @@ DEPENDS= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser CONFLICTS= xml-i18n-tools<=0.9 USE_GNU_TOOLS+= make -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES CONFIGURE_ENV+= PERL=${PERL5} -.include "../../lang/perl5/buildlink2.mk" +.include "../../lang/perl5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk new file mode 100644 index 00000000000..62d3c7289e9 --- /dev/null +++ b/textproc/intltool/buildlink3.mk @@ -0,0 +1,37 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 00:48:58 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use intltool. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +INTLTOOL_BUILDLINK3_MK:= ${INTLTOOL_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= intltool +.endif + +.if !empty(INTLTOOL_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= intltool +BUILDLINK_DEPENDS.intltool+= intltool>=0.30 +BUILDLINK_PKGSRCDIR.intltool?= ../../textproc/intltool +BUILDLINK_DEPMETHOD.intltool?= build + +USE_PERL5?= build + +.include "../../lang/perl5/buildlink3.mk" + +CONFIGURE_ENV+= INTLTOOL_PERL="${PERL5}" +INTLTOOLIZE= ${BUILDLINK_PREFIX.intltool}/bin/intltoolize + +_CONFIGURE_PREREQ+= intltoolize + +intltoolize: + ${_PKG_SILENT}${_PKG_DEBUG} \ + ${ECHO} "=> Overriding intltool." + @cd ${WRKSRC} && ${INTLTOOLIZE} --force >/dev/null 2>&1 + +.endif # INTLTOOL_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |