[pkgsrc/trunk]: pkgsrc/x11/xscreensaver bl3ify

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/12d967b53367
branches:  trunk
changeset: 467476:12d967b53367
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Feb 01 10:48:46 2004 +0000

description:
bl3ify

diffstat:

 x11/xscreensaver/Makefile        |   9 +++++----
 x11/xscreensaver/Makefile.common |  15 ++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diffs (59 lines):

diff -r d203d18f4b01 -r 12d967b53367 x11/xscreensaver/Makefile
--- a/x11/xscreensaver/Makefile Sun Feb 01 10:42:44 2004 +0000
+++ b/x11/xscreensaver/Makefile Sun Feb 01 10:48:46 2004 +0000
@@ -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 -r d203d18f4b01 -r 12d967b53367 x11/xscreensaver/Makefile.common
--- a/x11/xscreensaver/Makefile.common  Sun Feb 01 10:42:44 2004 +0000
+++ b/x11/xscreensaver/Makefile.common  Sun Feb 01 10:48:46 2004 +0000
@@ -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 @@
 
 BUILD_USES_MSGFMT=     yes
 
-USE_BUILDLINK2=                yes
 USE_PKGLOCALEDIR=      yes
 USE_X11BASE=           yes
 USE_PERL5=             build
@@ -64,6 +63,12 @@
 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