pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net Convert to buildlink3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1fbf5795edf9
branches:  trunk
changeset: 474977:1fbf5795edf9
user:      snj <snj%pkgsrc.org@localhost>
date:      Sat May 08 07:37:40 2004 +0000

description:
Convert to buildlink3.

diffstat:

 net/freeradius/Makefile       |  10 +++++-----
 net/mrtg/Makefile             |  10 +++++-----
 net/ntp4/Makefile             |   6 +++---
 net/p5-INET6/Makefile         |   6 +++---
 net/p5-INET6/buildlink2.mk    |  22 ----------------------
 net/p5-INET6/buildlink3.mk    |  18 ++++++++++++++++++
 net/p5-Net-DNSServer/Makefile |   6 +++---
 net/p5-Net-Z3950/Makefile     |   6 +++---
 net/p5-Socket6/buildlink2.mk  |  22 ----------------------
 net/p5-Socket6/buildlink3.mk  |  18 ++++++++++++++++++
 net/wistumbler/Makefile       |   6 +++---
 net/yaz/Makefile              |   6 +++---
 net/yaz/buildlink2.mk         |  25 -------------------------
 net/yaz/buildlink3.mk         |  18 ++++++++++++++++++
 14 files changed, 82 insertions(+), 97 deletions(-)

diffs (truncated from 344 to 300 lines):

diff -r 98a679e981ff -r 1fbf5795edf9 net/freeradius/Makefile
--- a/net/freeradius/Makefile   Sat May 08 06:41:33 2004 +0000
+++ b/net/freeradius/Makefile   Sat May 08 07:37:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/30 21:44:39 david Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/08 07:37:40 snj Exp $
 
 DISTNAME=      freeradius-0.9.3
 CATEGORIES=    net
@@ -12,7 +12,7 @@
 CONFLICTS+=    radiusd-cistron*
 USE_GNU_TOOLS+=        make
 GNU_CONFIGURE= yes
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
 USE_LIBTOOL=   YES
 USE_PKGINSTALL=        YES
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
@@ -42,9 +42,9 @@
                ${INSTALL_DATA} $$f ${EGDIR}/$$f; \
        done
 
-.include "../../databases/gdbm/buildlink2.mk"
-.include "../../devel/libtool/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../devel/libtool/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
 CONFIGURE_ARGS+=       --with-threads=no
diff -r 98a679e981ff -r 1fbf5795edf9 net/mrtg/Makefile
--- a/net/mrtg/Makefile Sat May 08 06:41:33 2004 +0000
+++ b/net/mrtg/Makefile Sat May 08 07:37:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2004/02/15 07:34:03 martti Exp $
+# $NetBSD: Makefile,v 1.49 2004/05/08 07:37:40 snj Exp $
 
 DISTNAME=      mrtg-2.10.13
 CATEGORIES=    net
@@ -26,7 +26,7 @@
 HOMEPAGE=      http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html
 COMMENT=       The Multi-Router Traffic Grapher
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_PERL5=     YES
 PERL5_REQD+=   5.6.1
 USE_X11=       YES
@@ -86,7 +86,7 @@
          ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$FILE ${PREFIX}/bin/mrtg$$FILE; \
        done
 
-.include "../../graphics/freetype-lib/buildlink2.mk"
-.include "../../graphics/gd/buildlink2.mk"
-.include "../../net/p5-INET6/buildlink2.mk"
+.include "../../graphics/freetype-lib/buildlink3.mk"
+.include "../../graphics/gd/buildlink3.mk"
+.include "../../net/p5-INET6/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98a679e981ff -r 1fbf5795edf9 net/ntp4/Makefile
--- a/net/ntp4/Makefile Sat May 08 06:41:33 2004 +0000
+++ b/net/ntp4/Makefile Sat May 08 07:37:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/03/28 06:35:03 xtraeme Exp $
+# $NetBSD: Makefile,v 1.34 2004/05/08 07:37:40 snj Exp $
 #
 
 DISTNAME=      ntp-4.2.0
@@ -13,7 +13,7 @@
 
 GNU_CONFIGURE= YES
 USE_PERL5=     build
-#USE_BUILDLINK2=YES ***FIXME: Causes lots of "missing prototype" warnings.***
+USE_BUILDLINK3= YES
 USE_PKGINSTALL=        YES
 
 CONFIGURE_ENV+=        PATH_PERL="${PERL5}" ac_cv_header_sys_soundcard_h=no
@@ -53,5 +53,5 @@
 CONFIGURE_ENV+=        ac_cv_lib_md5_MD5Init=no
 .endif
 
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98a679e981ff -r 1fbf5795edf9 net/p5-INET6/Makefile
--- a/net/p5-INET6/Makefile     Sat May 08 06:41:33 2004 +0000
+++ b/net/p5-INET6/Makefile     Sat May 08 07:37:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/28 02:21:04 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/08 07:37:40 snj Exp $
 #
 
 DISTNAME=      INET6-2.00
@@ -10,9 +10,9 @@
 HOMEPAGE=      http://search.cpan.org/~mondejar/INET6/
 COMMENT=       Object interface for AF_INET|AF_INET6 domain sockets
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 PERL5_PACKLIST=        ${PERL5_SITEARCH}/auto/IO/Socket/INET6/.packlist
 
-.include "../../net/p5-Socket6/buildlink2.mk"
+.include "../../net/p5-Socket6/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98a679e981ff -r 1fbf5795edf9 net/p5-INET6/buildlink2.mk
--- a/net/p5-INET6/buildlink2.mk        Sat May 08 06:41:33 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/12/17 14:21:45 martti Exp $
-#
-# This Makefile fragment is included by packages that use p5-INET6.
-#
-# This file was created automatically using createbuildlink 2.8.
-#
-
-.if !defined(P5_INET6_BUILDLINK2_MK)
-P5_INET6_BUILDLINK2_MK=        # defined
-
-BUILDLINK_PACKAGES+=                   p5-INET6
-BUILDLINK_DEPENDS.p5-INET6?=           p5-INET6>=2.00
-BUILDLINK_PKGSRCDIR.p5-INET6?=         ../../net/p5-INET6
-
-EVAL_PREFIX+=  BUILDLINK_PREFIX.p5-INET6=p5-INET6
-BUILDLINK_PREFIX.p5-INET6_DEFAULT=     ${LOCALBASE}
-
-BUILDLINK_TARGETS+=    p5-INET6-buildlink
-
-p5-INET6-buildlink: _BUILDLINK_USE
-
-.endif # P5_INET6_BUILDLINK2_MK
diff -r 98a679e981ff -r 1fbf5795edf9 net/p5-INET6/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/p5-INET6/buildlink3.mk        Sat May 08 07:37:40 2004 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/08 07:37:40 snj Exp $
+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+P5_INET6_BUILDLINK3_MK:=       ${P5_INET6_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    p5-INET6
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Np5-INET6}
+BUILDLINK_PACKAGES+=   p5-INET6
+
+.if !empty(P5_INET6_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.p5-INET6+=   p5-INET6>=2.00
+BUILDLINK_PKGSRCDIR.p5-INET6?= ../../net/p5-INET6
+.endif # P5_INET6_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 98a679e981ff -r 1fbf5795edf9 net/p5-Net-DNSServer/Makefile
--- a/net/p5-Net-DNSServer/Makefile     Sat May 08 06:41:33 2004 +0000
+++ b/net/p5-Net-DNSServer/Makefile     Sat May 08 07:37:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/09 12:35:19 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/05/08 07:37:40 snj Exp $
 #
 
 DISTNAME=      Net-DNSServer-0.11
@@ -13,10 +13,10 @@
 DEPENDS+=      p5-Net-Bind-[0-9]*:../../net/p5-Net-Bind
 DEPENDS+=      p5-Net-Server-[0-9]*:../../net/p5-Net-Server
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 PERL5_PACKLIST=        ${PERL5_SITEARCH}/auto/Net/DNSServer/.packlist
 
-.include "../../databases/p5-DBI/buildlink2.mk"
+.include "../../databases/p5-DBI/buildlink3.mk"
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98a679e981ff -r 1fbf5795edf9 net/p5-Net-Z3950/Makefile
--- a/net/p5-Net-Z3950/Makefile Sat May 08 06:41:33 2004 +0000
+++ b/net/p5-Net-Z3950/Makefile Sat May 08 07:37:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/30 17:27:31 cjep Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/08 07:37:41 snj Exp $
 #
 
 DISTNAME=      Net-Z3950-0.32
@@ -14,9 +14,9 @@
 DEPENDS+=      p5-MARC>=1.15:../../databases/p5-MARC
 DEPENDS+=      p5-Event>=0.77:../../devel/p5-Event
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 PERL5_PACKLIST=                ${PERL5_SITEARCH}/auto/Net/Z3950/.packlist
 
 .include "../../lang/perl5/module.mk"
-.include "../../net/yaz/buildlink2.mk"
+.include "../../net/yaz/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98a679e981ff -r 1fbf5795edf9 net/p5-Socket6/buildlink2.mk
--- a/net/p5-Socket6/buildlink2.mk      Sat May 08 06:41:33 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/12/17 14:21:39 martti Exp $
-#
-# This Makefile fragment is included by packages that use p5-Socket6.
-#
-# This file was created automatically using createbuildlink 2.8.
-#
-
-.if !defined(P5_SOCKET6_BUILDLINK2_MK)
-P5_SOCKET6_BUILDLINK2_MK=      # defined
-
-BUILDLINK_PACKAGES+=                   p5-Socket6
-BUILDLINK_DEPENDS.p5-Socket6?=         p5-Socket6>=0.12
-BUILDLINK_PKGSRCDIR.p5-Socket6?=               ../../net/p5-Socket6
-
-EVAL_PREFIX+=  BUILDLINK_PREFIX.p5-Socket6=p5-Socket6
-BUILDLINK_PREFIX.p5-Socket6_DEFAULT=   ${LOCALBASE}
-
-BUILDLINK_TARGETS+=    p5-Socket6-buildlink
-
-p5-Socket6-buildlink: _BUILDLINK_USE
-
-.endif # P5_SOCKET6_BUILDLINK2_MK
diff -r 98a679e981ff -r 1fbf5795edf9 net/p5-Socket6/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/p5-Socket6/buildlink3.mk      Sat May 08 07:37:40 2004 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/08 07:37:41 snj Exp $
+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+P5_SOCKET6_BUILDLINK3_MK:=     ${P5_SOCKET6_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    p5-Socket6
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Np5-Socket6}
+BUILDLINK_PACKAGES+=   p5-Socket6
+
+.if !empty(P5_SOCKET6_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.p5-Socket6+= p5-Socket6>=0.12
+BUILDLINK_PKGSRCDIR.p5-Socket6?=       ../../net/p5-Socket6
+.endif # P5_SOCKET6_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 98a679e981ff -r 1fbf5795edf9 net/wistumbler/Makefile
--- a/net/wistumbler/Makefile   Sat May 08 06:41:33 2004 +0000
+++ b/net/wistumbler/Makefile   Sat May 08 07:37:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:22:22 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/08 07:37:41 snj Exp $
 
 DISTNAME=      wistumbler-20020816
 PKGNAME=       wistumbler-20020816.0
@@ -11,11 +11,11 @@
 COMMENT=       Network stumbler for WaveLAN/IEEE wireless networking
 
 WRKSRC=                ${WRKDIR}/wistumbler
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_X11=       YES
 
 NOT_FOR_PLATFORM=      NetBSD-0.*-* NetBSD-1.[01234]*-* NetBSD-1.5-*
 NOT_FOR_PLATFORM+=     NetBSD-1.5.*-* NetBSD-1.5[A-V]-*
 
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 98a679e981ff -r 1fbf5795edf9 net/yaz/Makefile
--- a/net/yaz/Makefile  Sat May 08 06:41:33 2004 +0000
+++ b/net/yaz/Makefile  Sat May 08 07:37:40 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:49 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/08 07:37:41 snj Exp $
 #
 
 DISTNAME=      yaz-2.0
@@ -10,13 +10,13 @@
 HOMEPAGE=      http://indexdata.dk/yaz
 COMMENT=       C/C++ toolkit for the development of Z39.50v3/SRW clients and servers
 
-USE_BUILDLINK2=        YES
+USE_BUILDLINK3=        YES
 USE_LIBTOOL=   YES
 GNU_CONFIGURE= YES
 
 PTHREAD_OPTS+= native optional
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
 PLIST_SUBST+=  YAZTHREAD="@comment "
 .else
diff -r 98a679e981ff -r 1fbf5795edf9 net/yaz/buildlink2.mk
--- a/net/yaz/buildlink2.mk     Sat May 08 06:41:33 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/05/16 12:41:44 dmcmahill Exp $
-#
-# This Makefile fragment is included by packages that use yaz.



Home | Main Index | Thread Index | Old Index