[pkgsrc/trunk]: pkgsrc bl3ify

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/afdd95c6cbd1
branches:  trunk
changeset: 465768:afdd95c6cbd1
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jan 05 23:46:42 2004 +0000

description:
bl3ify

diffstat:

 www/links-gui/Makefile    |   9 ++++-----
 www/links/Makefile        |   4 +---
 www/links/Makefile.common |   7 +++++--
 www/lynx/Makefile         |  22 ++++++++++++----------
 x11/gtk/Makefile          |  13 +++++++------
 5 files changed, 29 insertions(+), 26 deletions(-)

diffs (164 lines):

diff -r 7797c0c42470 -r afdd95c6cbd1 www/links-gui/Makefile
--- a/www/links-gui/Makefile    Mon Jan 05 23:34:03 2004 +0000
+++ b/www/links-gui/Makefile    Mon Jan 05 23:46:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/01/03 18:49:55 reed Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/05 23:46:42 jlam Exp $
 #
 
 PKGNAME=       links-gui-2.1.0.14
@@ -8,13 +8,12 @@
 
 CONFLICTS+=    links-[0-9]* elinks-0.3*
 
-USE_BUILDLINK2=        YES
 USE_X11=       YES
 
 CONFIGURE_ARGS+=       --enable-graphics
 
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
+.include "../../www/links/Makefile.common"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 
-.include "../../www/links/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 7797c0c42470 -r afdd95c6cbd1 www/links/Makefile
--- a/www/links/Makefile        Mon Jan 05 23:34:03 2004 +0000
+++ b/www/links/Makefile        Mon Jan 05 23:46:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/11/11 10:49:11 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2004/01/05 23:46:42 jlam Exp $
 #
 
 PKGNAME=       links-2.1.0.14
@@ -6,7 +6,5 @@
 
 CONFLICTS+=    links-gui-[0-9]* elinks-0.3*
 
-USE_BUILDLINK2=        YES
-
 .include "../../www/links/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 7797c0c42470 -r afdd95c6cbd1 www/links/Makefile.common
--- a/www/links/Makefile.common Mon Jan 05 23:34:03 2004 +0000
+++ b/www/links/Makefile.common Mon Jan 05 23:46:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2003/11/11 10:49:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2004/01/05 23:46:42 jlam Exp $
 
 DISTNAME=      links-2.1pre14
 CATEGORIES=    www
@@ -10,6 +10,9 @@
 MAINTAINER=    jschauma%NetBSD.org@localhost
 HOMEPAGE=      http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                YES
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --enable-javascript
 
@@ -17,4 +20,4 @@
 PATCHDIR=              ${.CURDIR}/../../www/links/patches
 DISTINFO_FILE=         ${.CURDIR}/../../www/links/distinfo
 
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
diff -r 7797c0c42470 -r afdd95c6cbd1 www/lynx/Makefile
--- a/www/lynx/Makefile Mon Jan 05 23:34:03 2004 +0000
+++ b/www/lynx/Makefile Mon Jan 05 23:46:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2003/11/12 03:39:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.63 2004/01/05 23:46:42 jlam Exp $
 #
 
 DISTNAME=              lynx2.8.4rel.1
@@ -24,9 +24,11 @@
 HOMEPAGE=              http://lynx.browser.org/
 COMMENT=               Alphanumeric display oriented World-Wide Web Client
 
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
 BUILD_USES_MSGFMT=     yes
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 INSTALL_TARGET=                install-bin install-cfg install-help install-lss
@@ -75,10 +77,10 @@
        ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx
 
 .if (${LYNX_SCREEN_LIB} == slang)
-.  include "../../devel/libslang/buildlink2.mk"
+.  include "../../devel/libslang/buildlink3.mk"
 .elif (${LYNX_SCREEN_LIB} == ncurses)
 USE_NCURSES=           color
-.  include "../../devel/ncurses/buildlink2.mk"
+.  include "../../devel/ncurses/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-color-style
 .elif (${LYNX_SCREEN_LIB} != curses)
 pre-configure:
@@ -105,10 +107,10 @@
 .endif
 .if ${USE_SOCKS} == 4
 CONFIGURE_ARGS+=       --with-socks
-.  include "../../net/socks4/buildlink2.mk"
+.  include "../../net/socks4/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --with-socks5
-.  include "../../net/socks5/buildlink2.mk"
+.  include "../../net/socks5/buildlink3.mk"
 .endif
 .endif
 
@@ -117,9 +119,9 @@
 CONFIGURE_ARGS+=       --enable-ipv6
 .endif
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 7797c0c42470 -r afdd95c6cbd1 x11/gtk/Makefile
--- a/x11/gtk/Makefile  Mon Jan 05 23:34:03 2004 +0000
+++ b/x11/gtk/Makefile  Mon Jan 05 23:46:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2003/10/04 18:03:26 danw Exp $
+# $NetBSD: Makefile,v 1.92 2004/01/05 23:47:11 jlam Exp $
 
 DISTNAME=              gtk+-1.2.10
 PKGREVISION=           5
@@ -11,9 +11,10 @@
 HOMEPAGE=              http://www.gtk.org/
 COMMENT=               The GIMP Toolkit - libraries for building X11 user interfaces
 
-BUILD_USES_MSGFMT=     yes
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-USE_BUILDLINK2=                yes
+BUILD_USES_MSGFMT=     yes
+USE_BUILDLINK3=                yes
 USE_PERL5=             build
 USE_X11BASE=           yes
 USE_GMAKE=             yes
@@ -66,8 +67,8 @@
 post-install:
        ${TEST} ${PREFIX} = ${LOCALBASE} || \
        ${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \
-         ${LOCALBASE}/share/aclocal/gtk.m4
+               ${LOCALBASE}/share/aclocal/gtk.m4
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"