pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc bl3ify



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbab86b5e56c
branches:  trunk
changeset: 468204:cbab86b5e56c
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Feb 11 05:53:05 2004 +0000

description:
bl3ify

diffstat:

 devel/giblib/Makefile             |   8 ++++----
 devel/libast/Makefile             |   8 ++++----
 graphics/p5-Image-Imlib2/Makefile |   8 ++++----
 graphics/scrot/Makefile           |   6 +++---
 wm/3ddesktop/Makefile             |   8 ++++----
 wm/waimea/Makefile                |  14 +++++++-------
 www/ap-perl/Makefile              |   6 +++---
 www/ap-perl/buildlink3.mk         |  30 ++++++++++++++++++++++++++++++
 www/p5-Apache-Gallery/Makefile    |   8 ++++----
 9 files changed, 63 insertions(+), 33 deletions(-)

diffs (251 lines):

diff -r e9569b69e43f -r cbab86b5e56c devel/giblib/Makefile
--- a/devel/giblib/Makefile     Wed Feb 11 05:51:53 2004 +0000
+++ b/devel/giblib/Makefile     Wed Feb 11 05:53:05 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/11 05:53:05 xtraeme Exp $
 #
 
 DISTNAME=              giblib-1.2.3
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            devel
 MASTER_SITES=          http://www.linuxbrit.co.uk/downloads/
 
@@ -12,9 +12,9 @@
 
 GNU_CONFIGURE=         YES
 USE_X11=               YES
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_LIBTOOL=           YES
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 
-.include "../../graphics/imlib2/buildlink2.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e9569b69e43f -r cbab86b5e56c devel/libast/Makefile
--- a/devel/libast/Makefile     Wed Feb 11 05:51:53 2004 +0000
+++ b/devel/libast/Makefile     Wed Feb 11 05:53:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/11 05:53:05 xtraeme Exp $
 
 DISTNAME=              libast-0.5
 PKGREVISION=           5
@@ -10,7 +10,7 @@
 COMMENT=               The Library of Assorted Spiffy Things
 
 GNU_CONFIGURE=         YES
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_LIBTOOL=           YES
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 TEST_TARGET=           test
@@ -26,6 +26,6 @@
 LDFLAGS+=-lresolv
 .endif
 
-.include "../../devel/pcre/buildlink2.mk"
-.include "../../graphics/imlib2/buildlink2.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e9569b69e43f -r cbab86b5e56c graphics/p5-Image-Imlib2/Makefile
--- a/graphics/p5-Image-Imlib2/Makefile Wed Feb 11 05:51:53 2004 +0000
+++ b/graphics/p5-Image-Imlib2/Makefile Wed Feb 11 05:53:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/11 05:54:12 xtraeme Exp $
 #
 
 DISTNAME=      Image-Imlib2-0.12
@@ -16,7 +16,7 @@
 
 USE_PERL5=     run
 USE_X11=       YES
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 
 # If the X11 and Xext libraries are not weeded out,
 # they will be unresolved in the resulting .so
@@ -40,6 +40,6 @@
 do-install:
        cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build install
 
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e9569b69e43f -r cbab86b5e56c graphics/scrot/Makefile
--- a/graphics/scrot/Makefile   Wed Feb 11 05:51:53 2004 +0000
+++ b/graphics/scrot/Makefile   Wed Feb 11 05:53:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:44 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/11 05:54:12 xtraeme Exp $
 #
 
 DISTNAME=      scrot-0.8
@@ -10,9 +10,9 @@
 HOMEPAGE=      http://linuxbrit.co.uk/scrot/
 COMMENT=       Commandline screen capture util like "import", but using imlib2
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 GNU_CONFIGURE= YES
 USE_X11=       YES
 
-.include "../../devel/giblib/buildlink2.mk"
+.include "../../devel/giblib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e9569b69e43f -r cbab86b5e56c wm/3ddesktop/Makefile
--- a/wm/3ddesktop/Makefile     Wed Feb 11 05:51:53 2004 +0000
+++ b/wm/3ddesktop/Makefile     Wed Feb 11 05:53:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/11 05:55:08 xtraeme Exp $
 #
 
 DISTNAME=              3ddesktop-0.2.5
@@ -10,7 +10,7 @@
 HOMEPAGE=              http://desk3d.sourceforge.net/
 COMMENT=               3D Virtual Desktop Switcher
 
-USE_BUILDLINK2=                yes
+USE_BUILDLINK3=                yes
 USE_PKGINSTALL=                yes
 USE_X11=               yes
 GNU_CONFIGURE=         yes
@@ -22,6 +22,6 @@
        ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/3ddesktop.conf ${EGDIR}
 
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e9569b69e43f -r cbab86b5e56c wm/waimea/Makefile
--- a/wm/waimea/Makefile        Wed Feb 11 05:51:53 2004 +0000
+++ b/wm/waimea/Makefile        Wed Feb 11 05:53:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/11 05:55:08 xtraeme Exp $
 #
 
 DISTNAME=      waimea-0.4.0
@@ -11,7 +11,7 @@
 COMMENT=       Fast and highly customizable virtual window manager
 
 GNU_CONFIGURE= YES
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_GNU_TOOLS+=        make
 USE_PERL5=     run
 USE_X11=       YES
@@ -37,9 +37,9 @@
        data/scripts/procinfo.pl \
        data/scripts/stylesdir.pl.in
 
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../fonts/Xft2/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e9569b69e43f -r cbab86b5e56c www/ap-perl/Makefile
--- a/www/ap-perl/Makefile      Wed Feb 11 05:51:53 2004 +0000
+++ b/www/ap-perl/Makefile      Wed Feb 11 05:53:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/02/10 02:22:50 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/11 05:59:54 xtraeme Exp $
 #
 # NOTE:        Versions 1.27 and 1.28 cause apache to dump core,
 #      so this packages has been left at version 1.25
@@ -21,7 +21,7 @@
 DEPENDS+=              {libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl
 DEPENDS+=              p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 APACHE_MODULE=         YES
 LIBPERL5_REQD=         ${_PERL5_REQD}
 PERL5_PACKLIST=                ${PERL5_SITEARCH}/auto/mod_perl/.packlist
@@ -36,7 +36,7 @@
                ${PREFIX}/share/httpd/htdocs/manual/mod
 
 .include "../../lang/perl5/module.mk"
-.include "../../www/apache/buildlink2.mk"
+.include "../../www/apache/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
 
diff -r e9569b69e43f -r cbab86b5e56c www/ap-perl/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/ap-perl/buildlink3.mk Wed Feb 11 05:53:05 2004 +0000
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 05:59:54 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use ap-perl.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+AP_PERL_BUILDLINK3_MK:=        ${AP_PERL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    ap-perl
+.endif
+
+.if !empty(AP_PERL_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=                   ap-perl
+BUILDLINK_DEPENDS.ap-perl+=            ap-perl>=1.25nb1
+BUILDLINK_PKGSRCDIR.ap-perl?=          ../../www/ap-perl
+
+BUILDLINK_FILES.ap-perl+=      lib/httpd/mod_perl.*
+BUILDLINK_FILES.ap-perl+=      \
+       ${PERL5_SITEARCH:S/^${BUILDLINK_PREFIX.perl}\///}/auto/Apache/include/*
+BUILDLINK_FILES.ap-perl+=      \
+       ${PERL5_SITEARCH:S/^${BUILDLINK_PREFIX.perl}\///}/auto/Apache/include/modules/perl/*
+
+.include "../../www/apache/buildlink3.mk"
+
+.endif # AP_PERL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r e9569b69e43f -r cbab86b5e56c www/p5-Apache-Gallery/Makefile
--- a/www/p5-Apache-Gallery/Makefile    Wed Feb 11 05:51:53 2004 +0000
+++ b/www/p5-Apache-Gallery/Makefile    Wed Feb 11 05:53:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/08 21:49:57 kim Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/11 05:59:54 xtraeme Exp $
 #
 
 DISTNAME=      Apache-Gallery-0.7
@@ -20,7 +20,7 @@
 DEPENDS+=      p5-CGI-FastTemplate-[0-9]*:../../www/p5-CGI-FastTemplate
 DEPENDS+=      p5-libapreq-[0-9]*:../../www/p5-libapreq
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 USE_X11=               YES
 PERL5_PACKLIST=                ${PERL5_SITEARCH}/auto/Apache/Gallery/.packlist
@@ -92,8 +92,8 @@
        ${INSTALL_DATA_DIR} ${AG_EGDIR}
        ${INSTALL_DATA} ${WRKDIR}/${AG}.conf ${AG_EGDIR}
 
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../www/ap-perl/buildlink2.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../www/ap-perl/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index