diff options
| author | snj <snj@pkgsrc.org> | 2004-04-25 06:58:43 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2004-04-25 06:58:43 +0000 |
| commit | 124c08223318aabd7419b3aeca428c2ff403d364 (patch) | |
| tree | 3f2ec27cec855a6431cd2ac0a66f486e2f234bfb /x11 | |
| parent | 87dcd1486440390b1dde82e50daabd97471e1ebb (diff) | |
| download | pkgsrc-124c08223318aabd7419b3aeca428c2ff403d364.tar.gz | |
Convert to buildlink3.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm1/Makefile | 10 | ||||
| -rw-r--r-- | x11/gtk+extra/Makefile | 6 | ||||
| -rw-r--r-- | x11/gtk+extra/buildlink3.mk | 20 |
3 files changed, 28 insertions, 8 deletions
diff --git a/x11/gdm1/Makefile b/x11/gdm1/Makefile index 63ff6b479d0..2722b6a8ff4 100644 --- a/x11/gdm1/Makefile +++ b/x11/gdm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/04/14 19:30:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2004/04/25 07:30:23 snj Exp $ DISTNAME= gdm-2.2.0 PKGREVISION= 6 @@ -13,7 +13,7 @@ COMMENT= Gnome Display Manager - a re-implementation of the xdm program EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_PKGINSTALL= YES DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL @@ -118,8 +118,8 @@ post-install: ${LN} -fs Gnome ${GDMCFGDIR}/Sessions/Default ${INSTALL_SCRIPT} ${WRKDIR}/gdm ${PREFIX}/etc/rc.d/ -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/libglade/buildlink2.mk" -.include "../../x11/gnome-libs/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../x11/gnome-libs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile index d41f7ac8644..bfeac6b8434 100644 --- a/x11/gtk+extra/Makefile +++ b/x11/gtk+extra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/24 15:30:33 grant Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/25 07:05:42 snj Exp $ # DISTNAME= gtk+extra-0.99.17 @@ -10,7 +10,7 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://gtkextra.sourceforge.net/ COMMENT= Useful set of GTK+ widgets for creating GUIs -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_X11BASE= YES USE_GNU_TOOLS+= make GNU_CONFIGURE= YES @@ -18,5 +18,5 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../x11/gtk/buildlink2.mk" +.include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk+extra/buildlink3.mk b/x11/gtk+extra/buildlink3.mk new file mode 100644 index 00000000000..6095d142a01 --- /dev/null +++ b/x11/gtk+extra/buildlink3.mk @@ -0,0 +1,20 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 07:05:42 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GTK+EXTRA_BUILDLINK3_MK:= ${GTK+EXTRA_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gtk+extra +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngtk+extra} +BUILDLINK_PACKAGES+= gtk+extra + +.if !empty(GTK+EXTRA_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2 +BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra +.endif # GTK+EXTRA_BUILDLINK3_MK + +.include "../../x11/gtk/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |