diff options
-rw-r--r-- | lang/guile/Makefile | 10 | ||||
-rw-r--r-- | lang/guile/buildlink3.mk | 26 | ||||
-rw-r--r-- | x11/gdm/Makefile | 28 | ||||
-rw-r--r-- | x11/gnome-panel/Makefile | 26 | ||||
-rw-r--r-- | x11/gnome-panel/buildlink3.mk | 32 | ||||
-rw-r--r-- | x11/gnome-session/Makefile | 20 | ||||
-rw-r--r-- | x11/gnome-themes/Makefile | 14 | ||||
-rw-r--r-- | x11/gnome2-applets/Makefile | 22 | ||||
-rw-r--r-- | x11/gnome2-control-center/Makefile | 28 | ||||
-rw-r--r-- | x11/gnome2-control-center/buildlink3.mk | 35 | ||||
-rw-r--r-- | x11/gnome2-terminal/Makefile | 16 | ||||
-rw-r--r-- | x11/gtk2-engines/Makefile | 8 | ||||
-rw-r--r-- | x11/gtk2-engines/buildlink3.mk | 24 | ||||
-rw-r--r-- | x11/libzvt/Makefile | 10 | ||||
-rw-r--r-- | x11/libzvt/buildlink3.mk | 25 | ||||
-rw-r--r-- | x11/vte/Makefile | 10 | ||||
-rw-r--r-- | x11/vte/buildlink3.mk | 36 |
17 files changed, 274 insertions, 96 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 9da081cf3da..497a3027af5 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2004/01/24 13:51:14 grant Exp $ +# $NetBSD: Makefile,v 1.50 2004/02/11 07:16:47 xtraeme Exp $ DISTNAME= guile-1.6.4 CATEGORIES= lang @@ -10,7 +10,7 @@ COMMENT= GNU's Ubiquitous Intelligent Language for Extension CONFLICTS= guile14<1.4.1nb1 -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES GNU_CONFIGURE= YES USE_GNU_TOOLS+= make @@ -27,7 +27,7 @@ INFO_FILES= guile.info guile-tut.info goops.info r5rs.info TEST_DIRS= ${WRKSRC} TEST_TARGET= check -.include "../../devel/libtool/buildlink2.mk" -.include "../../devel/ncurses/buildlink2.mk" -.include "../../devel/readline/buildlink2.mk" +.include "../../devel/libtool/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/guile/buildlink3.mk b/lang/guile/buildlink3.mk new file mode 100644 index 00000000000..8003677a4a7 --- /dev/null +++ b/lang/guile/buildlink3.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:16:47 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use guile. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GUILE_BUILDLINK3_MK:= ${GUILE_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= guile +.endif + +.if !empty(GUILE_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= guile +BUILDLINK_DEPENDS.guile+= guile>=1.6.3nb1 +BUILDLINK_PKGSRCDIR.guile?= ../../lang/guile + +.include "../../devel/libtool/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" + +.endif # GUILE_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index a57b4993362..40734ff671d 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2004/02/09 18:47:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.50 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= gdm-2.4.4.7 @@ -12,10 +12,10 @@ MAINTAINER= mjl@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Gnome Display Manager - a re-implementation of the xdm program -BUILDLINK_DEPENDS.libart2=libart2>=2.3.11 +BUILDLINK_DEPENDS.libart2+= libart2>=2.3.11 BUILD_USES_MSGFMT= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES @@ -91,17 +91,17 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/Daemon.README ${PREFIX}/share/doc/gdm ${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/pixmaps -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../devel/libglade2/buildlink2.mk" -.include "../../devel/libgnome/buildlink2.mk" -.include "../../devel/libgnomeui/buildlink2.mk" -.include "../../graphics/libart2/buildlink2.mk" -.include "../../graphics/libgnomecanvas/buildlink2.mk" -.include "../../graphics/librsvg2/buildlink2.mk" -.include "../../textproc/intltool/buildlink2.mk" -.include "../../textproc/libxml2/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libgnome/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../graphics/libart2/buildlink3.mk" +.include "../../graphics/libgnomecanvas/buildlink3.mk" +.include "../../graphics/librsvg2/buildlink3.mk" +.include "../../textproc/intltool/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -.include "../../x11/gtk2/buildlink2.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 1020d583b4d..eb7c21baaf6 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/02/09 18:47:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.28 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= gnome-panel-2.4.2 @@ -15,7 +15,7 @@ DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs DEPENDS+= gnome-icon-theme>=1.0.9:../../graphics/gnome-icon-theme GNU_CONFIGURE= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_GNU_TOOLS+= make USE_PERL5= YES USE_PKGLOCALEDIR= YES @@ -41,18 +41,18 @@ GCONF2_SCHEMAS+= workspace-switcher.schemas GCONF2_SCHEMAS+= window-list.schemas GCONF2_ENTRIES= panel-default-setup.entries -BUILDLINK_DEPENDS.GConf2= GConf2>=2.4.0.1nb1 +BUILDLINK_DEPENDS.GConf2+= GConf2>=2.4.0.1nb1 .include "../../devel/GConf2/schemas.mk" -.include "../../devel/libbonobo/buildlink2.mk" -.include "../../devel/libwnck/buildlink2.mk" -.include "../../devel/libglade2/buildlink2.mk" -.include "../../devel/libgnomeui/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../sysutils/gnome-vfs2/buildlink2.mk" -.include "../../textproc/intltool/buildlink2.mk" +.include "../../devel/libbonobo/buildlink3.mk" +.include "../../devel/libwnck/buildlink3.mk" +.include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -.include "../../x11/gnome-desktop/buildlink2.mk" -.include "../../x11/gnome2-control-center/buildlink2.mk" -.include "../../x11/startup-notification/buildlink2.mk" +.include "../../x11/gnome-desktop/buildlink3.mk" +.include "../../x11/gnome2-control-center/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk new file mode 100644 index 00000000000..cd9b18cbc6e --- /dev/null +++ b/x11/gnome-panel/buildlink3.mk @@ -0,0 +1,32 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use gnome-panel. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GNOME_PANEL_BUILDLINK3_MK:= ${GNOME_PANEL_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gnome-panel +.endif + +.if !empty(GNOME_PANEL_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= gnome-panel +BUILDLINK_DEPENDS.gnome-panel+= gnome-panel>=2.4.1nb3 +BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel + +.include "../../devel/libbonobo/buildlink3.mk" +.include "../../devel/libwnck/buildlink3.mk" +.include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../x11/gnome-desktop/buildlink3.mk" +.include "../../x11/gnome2-control-center/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" + +.endif # GNOME_PANEL_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index c7e9ffa1410..22492216c59 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/02/09 18:47:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= gnome-session-2.4.2 @@ -16,7 +16,7 @@ DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs CONFLICTS+= gnome-core<1.4.2nb4 GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make USE_X11= yes @@ -27,13 +27,13 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GCONF2_SCHEMAS= gnome-session.schemas -.include "../../audio/esound/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../audio/esound/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" -.include "../../devel/GConf2-ui/buildlink2.mk" -.include "../../devel/libgnome/buildlink2.mk" -.include "../../devel/libgnomeui/buildlink2.mk" -.include "../../textproc/intltool/buildlink2.mk" -.include "../../textproc/scrollkeeper/buildlink2.mk" -.include "../../x11/gnome2-control-center/buildlink2.mk" +.include "../../devel/GConf2-ui/buildlink3.mk" +.include "../../devel/libgnome/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../textproc/intltool/buildlink3.mk" +.include "../../textproc/scrollkeeper/buildlink3.mk" +.include "../../x11/gnome2-control-center/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile index 43ca212bc1b..a08c30a283f 100644 --- a/x11/gnome-themes/Makefile +++ b/x11/gnome-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/02/09 18:47:38 jmmv Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= gnome-themes-2.4.1 @@ -14,7 +14,7 @@ COMMENT= Collection of themes and icons for GNOME 2 DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes @@ -23,10 +23,10 @@ GNU_CONFIGURE= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -.include "../../devel/libgnomeui/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../wm/metacity/buildlink2.mk" -.include "../../x11/gtk2-engines/buildlink2.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../wm/metacity/buildlink3.mk" +.include "../../x11/gtk2-engines/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index df2ccfa69bd..986aa57d8fb 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/02/09 18:47:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= gnome-applets-2.4.2 @@ -15,7 +15,7 @@ DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs BUILD_USES_MSGFMT= YES GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_X11= yes USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes @@ -64,15 +64,15 @@ PLIST_SUBST+= BATTSTAT="@comment " .include "../../devel/GConf2/schemas.mk" INSTALL_EXTRA_TMPL+= ${FILESDIR}/install.tmpl -.include "../../devel/gail/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/libglade2/buildlink2.mk" -.include "../../devel/libgnome/buildlink2.mk" -.include "../../devel/libgtop2/buildlink2.mk" -.include "../../sysutils/gnome-vfs2/buildlink2.mk" +.include "../../devel/gail/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libgnome/buildlink3.mk" +.include "../../devel/libgtop2/buildlink3.mk" +.include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -.include "../../x11/gnome-panel/buildlink2.mk" -.include "../../x11/gtk2/buildlink2.mk" +.include "../../x11/gnome-panel/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" -.include "../../mk/ossaudio.buildlink2.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index 1abb12691d5..f521ef3ed18 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/09 18:47:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.26 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= control-center-2.4.0 @@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= yes DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_GNU_TOOLS+= make @@ -48,17 +48,17 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/vfs-methods/fontilus/font-method.conf \ ${EGDIR} -.include "../../audio/esound/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../audio/esound/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" -.include "../../devel/libbonobo/buildlink2.mk" -.include "../../devel/libglade2/buildlink2.mk" -.include "../../devel/libbonoboui/buildlink2.mk" -.include "../../devel/libgnomeui/buildlink2.mk" -.include "../../sysutils/gnome-vfs2/buildlink2.mk" -.include "../../sysutils/nautilus/buildlink2.mk" -.include "../../wm/metacity/buildlink2.mk" -.include "../../x11/gtk2/buildlink2.mk" -.include "../../x11/gnome-desktop/buildlink2.mk" -.include "../../x11/startup-notification/buildlink2.mk" +.include "../../devel/libbonobo/buildlink3.mk" +.include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libbonoboui/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/nautilus/buildlink3.mk" +.include "../../wm/metacity/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/gnome-desktop/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk new file mode 100644 index 00000000000..f360965cedb --- /dev/null +++ b/x11/gnome2-control-center/buildlink3.mk @@ -0,0 +1,35 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use gnome2-control-center. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GNOME2_CONTROL_CENTER_BUILDLINK3_MK:= ${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gnome2-control-center +.endif + +.if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= gnome2-control-center +BUILDLINK_DEPENDS.gnome2-control-center+= gnome2-control-center>=2.4.0nb2 +BUILDLINK_PKGSRCDIR.gnome2-control-center?= ../../x11/gnome2-control-center + +.include "../../audio/esound/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libbonobo/buildlink3.mk" +.include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libbonoboui/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../sysutils/gnome-vfs2/buildlink3.mk" +.include "../../sysutils/nautilus/buildlink3.mk" +.include "../../wm/metacity/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/gnome-desktop/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" + +.endif # GNOME2_CONTROL_CENTER_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile index b53f918f680..d823c5c0921 100644 --- a/x11/gnome2-terminal/Makefile +++ b/x11/gnome2-terminal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/02/09 18:47:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.22 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= gnome-terminal-2.4.2 @@ -19,7 +19,7 @@ CONFLICTS= gnome-core-[0-9]* USE_PERL5= build GNU_CONFIGURE= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make USE_X11= YES @@ -29,11 +29,11 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GCONF2_SCHEMAS= gnome-terminal.schemas .include "../../devel/GConf2/schemas.mk" -.include "../../devel/libglade2/buildlink2.mk" -.include "../../devel/libgnomeui/buildlink2.mk" +.include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" -.include "../../x11/gtk2/buildlink2.mk" -.include "../../x11/libzvt/buildlink2.mk" -.include "../../x11/startup-notification/buildlink2.mk" -.include "../../x11/vte/buildlink2.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libzvt/buildlink3.mk" +.include "../../x11/startup-notification/buildlink3.mk" +.include "../../x11/vte/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile index b947ddbfd98..094a72d9379 100644 --- a/x11/gtk2-engines/Makefile +++ b/x11/gtk2-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/01/03 18:49:57 reed Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= gtk-engines-2.2.0 @@ -13,13 +13,13 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Theme engines for GTK+ version 2 GNU_CONFIGURE= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_X11= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/gtk-engines-2.pc.in -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../x11/gtk2/buildlink2.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-engines/buildlink3.mk b/x11/gtk2-engines/buildlink3.mk new file mode 100644 index 00000000000..38aac823847 --- /dev/null +++ b/x11/gtk2-engines/buildlink3.mk @@ -0,0 +1,24 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use gtk2-engines. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GTK2_ENGINES_BUILDLINK3_MK:= ${GTK2_ENGINES_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gtk2-engines +.endif + +.if !empty(GTK2_ENGINES_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= gtk2-engines +BUILDLINK_DEPENDS.gtk2-engines+= gtk2-engines>=2.2.0nb4 +BUILDLINK_PKGSRCDIR.gtk2-engines?= ../../x11/gtk2-engines + +.include "../../x11/gtk2/buildlink3.mk" + +.endif # GTK2_ENGINES_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile index 8b813c548d7..bbfee6a65d8 100644 --- a/x11/libzvt/Makefile +++ b/x11/libzvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/01/24 15:30:33 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= libzvt-2.0.1 @@ -12,14 +12,14 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Virtual Terminal Widget Library for GNOME2 GNU_CONFIGURE= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_GNU_TOOLS+= make USE_X11= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE= ${WRKSRC}/libzvt/libzvt-2.0.pc.in -.include "../../graphics/libart2/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../x11/gtk2/buildlink2.mk" +.include "../../graphics/libart2/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libzvt/buildlink3.mk b/x11/libzvt/buildlink3.mk new file mode 100644 index 00000000000..ba4dfca5441 --- /dev/null +++ b/x11/libzvt/buildlink3.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use libzvt. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +LIBZVT_BUILDLINK3_MK:= ${LIBZVT_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= libzvt +.endif + +.if !empty(LIBZVT_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= libzvt +BUILDLINK_DEPENDS.libzvt+= libzvt>=2.0.1nb5 +BUILDLINK_PKGSRCDIR.libzvt?= ../../x11/libzvt + +.include "../../graphics/libart2/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" + +.endif # LIBZVT_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/vte/Makefile b/x11/vte/Makefile index 29dfe04daec..c3c2b642909 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/24 15:30:34 grant Exp $ +# $NetBSD: Makefile,v 1.4 2004/02/11 07:11:28 xtraeme Exp $ # DISTNAME= vte-0.11.10 @@ -14,7 +14,7 @@ COMMENT= Terminal widget with improved accessibility and I18N support DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs BUILD_USES_MSGFMT= yes -USE_BUILDLINK2= yes +USE_BUILDLINK3= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PKGCONFIG_OVERRIDE+= ${WRKSRC}/vte.pc.in -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../x11/gtk2/buildlink2.mk" -.include "../../x11/libzvt/buildlink2.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libzvt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/vte/buildlink3.mk b/x11/vte/buildlink3.mk new file mode 100644 index 00000000000..88a66bf6315 --- /dev/null +++ b/x11/vte/buildlink3.mk @@ -0,0 +1,36 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use vte. +# +# This file was created automatically using createbuildlink-3.1. +# + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +VTE_BUILDLINK3_MK:= ${VTE_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= vte +.endif + +.if !empty(VTE_BUILDLINK3_MK:M+) +BUILDLINK_PACKAGES+= vte +BUILDLINK_DEPENDS.vte+= vte>=0.11.10nb1 +BUILDLINK_PKGSRCDIR.vte?= ../../x11/vte + +BUILDLINK_FILES.vte+= lib/vte/decset +BUILDLINK_FILES.vte+= lib/vte/interpret +BUILDLINK_FILES.vte+= lib/vte/iso8859mode +BUILDLINK_FILES.vte+= lib/vte/nativeecho +BUILDLINK_FILES.vte+= lib/vte/osc +BUILDLINK_FILES.vte+= lib/vte/slowcat +BUILDLINK_FILES.vte+= lib/vte/utf8echo +BUILDLINK_FILES.vte+= lib/vte/utf8mode +BUILDLINK_FILES.vte+= lib/vte/vterdb +BUILDLINK_FILES.vte+= lib/vte/window + +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libzvt/buildlink3.mk" + +.endif # VTE_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |