diff options
| author | jlam <jlam> | 2004-02-01 10:48:46 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-01 10:48:46 +0000 |
| commit | cefd1c7afab63e549788f2a4c671a3441def0e25 (patch) | |
| tree | f2013be7003ffa2436a17aac89d96744d72dde29 /x11/xscreensaver | |
| parent | aae41242db20280cc23db2bc67df9619a5c993d3 (diff) | |
| download | pkgsrc-cefd1c7afab63e549788f2a4c671a3441def0e25.tar.gz | |
bl3ify
Diffstat (limited to 'x11/xscreensaver')
| -rw-r--r-- | x11/xscreensaver/Makefile | 9 | ||||
| -rw-r--r-- | x11/xscreensaver/Makefile.common | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index f25576f1b75..65015438802 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,17 +1,18 @@ -# $NetBSD: Makefile,v 1.64 2004/01/23 21:50:52 jmmv Exp $ -# +# $NetBSD: Makefile,v 1.65 2004/02/01 10:48:46 jlam Exp $ COMMENT= Screen saver and locker for the X window system PKGREVISION= 2 CONFLICTS+= xscreensaver-gnome<4.14 -.include "../../x11/xscreensaver/Makefile.common" +USE_BUILDLINK3= yes + +.include "Makefile.common" CONFIGURE_ARGS+= --without-gnome CONFIGURE_ARGS+= --without-gtk CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config -.include "../../textproc/libxml2/buildlink2.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 0632f64a853..684a97e4583 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.67 2004/02/01 01:43:30 jlam Exp $ +# $NetBSD: Makefile.common,v 1.68 2004/02/01 10:48:46 jlam Exp $ # DISTNAME= xscreensaver-4.14 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.jwz.org/xscreensaver/ BUILD_USES_MSGFMT= yes -USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_X11BASE= yes USE_PERL5= build @@ -64,6 +63,12 @@ CFLAGS+= -fno-strict-aliasing GCC_REQD+= 2.95.3 .endif -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../graphics/gle/buildlink2.mk" -.include "../../graphics/jpeg/buildlink2.mk" +.if !empty(USE_BUILDLINK3:M[yY][eE][sS]) +. include "../../devel/gettext-lib/buildlink3.mk" +. include "../../graphics/gle/buildlink3.mk" +. include "../../graphics/jpeg/buildlink3.mk" +.elif empty(USE_BUILDLINK2:M[nN][oO]) +. include "../../devel/gettext-lib/buildlink2.mk" +. include "../../graphics/gle/buildlink2.mk" +. include "../../graphics/jpeg/buildlink2.mk" +.endif |