pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Convert to buildlink3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2db454e23ea1
branches:  trunk
changeset: 474748:2db454e23ea1
user:      snj <snj%pkgsrc.org@localhost>
date:      Tue May 04 23:46:36 2004 +0000

description:
Convert to buildlink3.

diffstat:

 textproc/dict-client/Makefile          |   6 +++---
 textproc/dict-server/Makefile          |   6 +++---
 textproc/eperl/Makefile                |   6 +++---
 textproc/html2wml/Makefile             |   6 +++---
 textproc/ispell-base/Makefile          |   4 ++--
 textproc/kakasi/Makefile               |   4 ++--
 textproc/kakasi/buildlink2.mk          |  20 --------------------
 textproc/kakasi/buildlink3.mk          |  18 ++++++++++++++++++
 textproc/namazu2/Makefile              |   8 ++++----
 textproc/ndtpd/Makefile                |   8 ++++----
 textproc/openjade/Makefile             |   6 +++---
 textproc/p5-Convert-BER/Makefile       |   4 ++--
 textproc/p5-Cz-Cstools/Makefile        |   4 ++--
 textproc/p5-Filter/Makefile            |   4 ++--
 textproc/p5-PDF-API2/Makefile          |   4 ++--
 textproc/p5-PDF-Create/Makefile        |   4 ++--
 textproc/p5-PDF/Makefile               |   4 ++--
 textproc/p5-Pod-POM/Makefile           |   4 ++--
 textproc/p5-String-CRC32/Makefile      |   4 ++--
 textproc/p5-String-ShellQuote/Makefile |   4 ++--
 textproc/p5-Text-Autoformat/Makefile   |   4 ++--
 textproc/p5-Text-BibTeX/Makefile       |   4 ++--
 textproc/p5-Text-CSV-Hash/Makefile     |   4 ++--
 textproc/p5-Text-CSV_XS/Makefile       |   4 ++--
 textproc/p5-Text-DelimMatch/Makefile   |   4 ++--
 textproc/p5-Text-Diff/Makefile         |   4 ++--
 textproc/p5-Text-Format/Makefile       |   4 ++--
 textproc/p5-Text-Kakasi/Makefile       |   6 +++---
 textproc/p5-Text-Substitute/Makefile   |   4 ++--
 textproc/p5-Text-Template/Makefile     |   4 ++--
 textproc/p5-Text-Wrapper/Makefile      |   4 ++--
 textproc/p5-XML-Grove/Makefile         |   4 ++--
 textproc/p5-XML-Node/Makefile          |   4 ++--
 textproc/p5-XML-RSS/Makefile           |   4 ++--
 textproc/p5-XML-SAX-Expat/Makefile     |   4 ++--
 textproc/p5-XML-Stream/Makefile        |   4 ++--
 textproc/p5-XML-Writer-String/Makefile |   4 ++--
 textproc/p5-XML-XQL/Makefile           |   4 ++--
 textproc/p5-libxml-enno/Makefile       |   4 ++--
 textproc/py-SimpleParse/Makefile       |   6 +++---
 textproc/py-csv/Makefile               |   4 ++--
 textproc/regexx/Makefile               |   6 +++---
 textproc/ruby-eruby/buildlink2.mk      |  20 --------------------
 textproc/ruby-eruby/buildlink3.mk      |  18 ++++++++++++++++++
 www/ap-ruby/Makefile                   |  10 +++++-----
 www/ap2-ruby/Makefile                  |  12 ++++++------
 46 files changed, 139 insertions(+), 143 deletions(-)

diffs (truncated from 939 to 300 lines):

diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/dict-client/Makefile
--- a/textproc/dict-client/Makefile     Tue May 04 23:36:16 2004 +0000
+++ b/textproc/dict-client/Makefile     Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/28 21:43:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=        dict-client-1.8.0
@@ -10,7 +10,7 @@
 HOMEPAGE=      http://www.dict.org/
 COMMENT=       Dictionary Service Protocol client
 
-USE_BUILDLINK2=        # defined
+USE_BUILDLINK3=        yes
 USE_GNU_TOOLS+=        make
 GNU_CONFIGURE= # defined
 
@@ -24,5 +24,5 @@
 CONFIGURE_ARGS+=       --with-etcdir=${PKG_SYSCONFDIR}
 
 # XXX This is needed by libltdl.
-.include "../../devel/libtool/buildlink2.mk"
+.include "../../devel/libtool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/dict-server/Makefile
--- a/textproc/dict-server/Makefile     Tue May 04 23:36:16 2004 +0000
+++ b/textproc/dict-server/Makefile     Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/28 21:43:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=       dict-server-1.8.0
@@ -11,7 +11,7 @@
 HOMEPAGE=      http://www.dict.org/
 COMMENT=       Dictionary Service Protocol server
 
-USE_BUILDLINK2=        # defined
+USE_BUILDLINK3=        yes
 USE_GNU_TOOLS+=        make
 USE_PKGINSTALL=        yes
 GNU_CONFIGURE= # defined
@@ -41,5 +41,5 @@
                ${WRKSRC}/dictd.conf >${EGDIR}/dictd.conf
        ${INSTALL_DATA_DIR} ${PREFIX}/share/dictd
 
-.include "../../devel/libtool/buildlink2.mk"
+.include "../../devel/libtool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/eperl/Makefile
--- a/textproc/eperl/Makefile   Tue May 04 23:36:16 2004 +0000
+++ b/textproc/eperl/Makefile   Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/10 02:22:50 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=      eperl-2.2.14
 CATEGORIES=    lang perl5 textproc
@@ -8,7 +8,7 @@
 HOMEPAGE=      http://www.engelschall.com/sw/eperl/
 COMMENT=       Interpreter/preprocessor for Perl embedded in text documents
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 PERL5_PACKLIST=        ${PERL5_SITEARCH}/auto/Parse/ePerl/.packlist
 
 GNU_CONFIGURE=         YES
@@ -18,6 +18,6 @@
 
 post-configure: perl5-configure
 
-.include "../../lang/libperl/buildlink2.mk"
+.include "../../lang/libperl/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/html2wml/Makefile
--- a/textproc/html2wml/Makefile        Tue May 04 23:36:16 2004 +0000
+++ b/textproc/html2wml/Makefile        Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/26 02:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/04 23:46:36 snj Exp $
 
 DISTNAME=      html2wml-0.4.8r2
 PKGNAME=       html2wml-0.4.8.2
@@ -15,7 +15,7 @@
 DEPENDS+=      p5-Text-Template>=1.31:../../textproc/p5-Text-Template
 DEPENDS+=      p5-XML-LibXML>=1.31:../../textproc/p5-XML-LibXML
 
-USE_BUILDLINK2=        # defined
+USE_BUILDLINK3=        yes
 NO_CONFIGURE=  # defined
 NO_BUILD=      # defined
 
@@ -23,5 +23,5 @@
        ${INSTALL_SCRIPT} ${WRKSRC}/html2wml.cgi ${PREFIX}/bin/html2wml
        ${INSTALL_MAN} ${WRKSRC}/doc/html2wml.man ${PREFIX}/man/man1/html2wml.1
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/ispell-base/Makefile
--- a/textproc/ispell-base/Makefile     Tue May 04 23:36:16 2004 +0000
+++ b/textproc/ispell-base/Makefile     Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/20 12:26:49 agc Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=      ispell-3.1.20
@@ -26,7 +26,7 @@
 CFLAGS+=       -DHAVE_INTTYPES_H
 .endif
 
-USE_BUILDLINK2=        yes
+USE_BUILDLINK3=        yes
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/kakasi/Makefile
--- a/textproc/kakasi/Makefile  Tue May 04 23:36:16 2004 +0000
+++ b/textproc/kakasi/Makefile  Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/04 23:46:36 snj Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
 
 DISTNAME=      kakasi-2.3.4
@@ -10,7 +10,7 @@
 HOMEPAGE=      http://kakasi.namazu.org/
 COMMENT=       Kanji-Kana Simple Inverter, language filter for Japanese
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 GNU_CONFIGURE=         YES
 USE_GNU_TOOLS+=                make
 USE_LIBTOOL=           YES
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/kakasi/buildlink2.mk
--- a/textproc/kakasi/buildlink2.mk     Tue May 04 23:36:16 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:06 jlam Exp $
-
-.if !defined(KAKASI_BUILDLINK2_MK)
-KAKASI_BUILDLINK2_MK=  # defined
-
-BUILDLINK_PACKAGES+=           kakasi
-BUILDLINK_DEPENDS.kakasi?=     kakasi>=2.3.0
-BUILDLINK_PKGSRCDIR.kakasi?=   ../../textproc/kakasi
-
-EVAL_PREFIX+=                          BUILDLINK_PREFIX.kakasi=kakasi
-BUILDLINK_PREFIX.kakasi_DEFAULT=       ${LOCALBASE}
-
-BUILDLINK_FILES.kakasi=                include/libkakasi.h
-BUILDLINK_FILES.kakasi+=       lib/libkakasi.*
-
-BUILDLINK_TARGETS+=    kakasi-buildlink
-
-kakasi-buildlink: _BUILDLINK_USE
-
-.endif # KAKASI_BUILDLINK2_MK
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/kakasi/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/kakasi/buildlink3.mk     Tue May 04 23:46:36 2004 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/04 23:46:36 snj Exp $
+
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
+KAKASI_BUILDLINK3_MK:= ${KAKASI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    kakasi
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nkakasi}
+BUILDLINK_PACKAGES+=   kakasi
+
+.if !empty(KAKASI_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kakasi+=     kakasi>=2.3.0
+BUILDLINK_PKGSRCDIR.kakasi?=   ../../textproc/kakasi
+.endif # KAKASI_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/namazu2/Makefile
--- a/textproc/namazu2/Makefile Tue May 04 23:36:16 2004 +0000
+++ b/textproc/namazu2/Makefile Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:54:31 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/04 23:46:36 snj Exp $
 # FreeBSD Id: ports/japanese/namazu2/Makefile,v 1.16 2000/10/26 20:56:25 knu Exp
 
 DISTNAME=      namazu-2.0.12
@@ -33,7 +33,7 @@
 DEINSTALL_FILE=                ${WRKDIR}/DEINSTALL
 INSTALL_FILE=          ${WRKDIR}/INSTALL
 
-USE_BUILDLINK2=                # defined
+USE_BUILDLINK3=                yes
 USE_PKGLOCALEDIR=      # defined
 USE_PERL5=             # defined
 GNU_CONFIGURE=         # defined
@@ -58,6 +58,6 @@
        @${TEST} -d ${LOCALBASE}/etc/namazu || ${INSTALL_DATA_DIR} ${LOCALBASE}/etc/namazu
        @${SH} ${WRKDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/ndtpd/Makefile
--- a/textproc/ndtpd/Makefile   Tue May 04 23:36:16 2004 +0000
+++ b/textproc/ndtpd/Makefile   Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/03/21 12:30:33 uebayasi Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=      ndtpd-3.1.5
@@ -9,7 +9,7 @@
 HOMEPAGE=      http://www.sra.co.jp/people/m-kasahr/ndtpd/
 COMMENT=       Server for accessing CD-ROM books with NDTP
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_PKGINSTALL=        YES
 USE_LIBTOOL=   YES
 GNU_CONFIGURE= YES
@@ -39,7 +39,7 @@
        ${INSTALL_DATA} ${WRKSRC}/ndtpd.conf.sample \
                ${EGDIR}/ndtpd.conf.default
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../textproc/eb/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/eb/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/openjade/Makefile
--- a/textproc/openjade/Makefile        Tue May 04 23:36:16 2004 +0000
+++ b/textproc/openjade/Makefile        Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=      openjade-1.3.2
@@ -9,7 +9,7 @@
 HOMEPAGE=      http://openjade.sourceforge.net/
 COMMENT=       SGML/XML parser toolkit and DSSSL engine, successor to "jade"
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_GNU_TOOLS+=        make
 USE_PERL5=     build
 GNU_CONFIGURE= YES
@@ -33,5 +33,5 @@
        ${INSTALL_DATA} ${WRKSRC}/jadedoc/*.htm ${OPENJADE_DOC_DIR}/jadedoc
        ${INSTALL_DATA} ${WRKSRC}/jadedoc/images/* ${OPENJADE_DOC_DIR}/jadedoc/images
 
-.include "../../textproc/opensp/buildlink2.mk"
+.include "../../textproc/opensp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/p5-Convert-BER/Makefile
--- a/textproc/p5-Convert-BER/Makefile  Tue May 04 23:36:16 2004 +0000
+++ b/textproc/p5-Convert-BER/Makefile  Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:54:32 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=      Convert-BER-1.31
@@ -10,7 +10,7 @@
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 COMMENT=       Perl class to encode/decode objects using Basic Encoding Rules
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 PERL5_PACKLIST=                ${PERL5_SITEARCH}/auto/Convert/BER/.packlist
 
 .include "../../lang/perl5/module.mk"
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/p5-Cz-Cstools/Makefile
--- a/textproc/p5-Cz-Cstools/Makefile   Tue May 04 23:36:16 2004 +0000
+++ b/textproc/p5-Cz-Cstools/Makefile   Tue May 04 23:46:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:54:33 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/04 23:46:36 snj Exp $
 #
 
 DISTNAME=      Cstools-3.42
@@ -15,7 +15,7 @@
 DEPENDS+=      p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
 DEPENDS+=      p5-DBD-XBase>=0.232:../../databases/p5-DBD-XBase
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 PERL5_PACKLIST=        ${PERL5_SITEARCH}/auto/Cz/.packlist
 
 .include "../../lang/perl5/module.mk"
diff -r aeedebe5dc8d -r 2db454e23ea1 textproc/p5-Filter/Makefile



Home | Main Index | Thread Index | Old Index