summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorjlam <jlam>2002-08-25 21:48:57 +0000
committerjlam <jlam>2002-08-25 21:48:57 +0000
commit02526271b78c18a0c07b3ea8be04d2a61b0bf8e7 (patch)
treec8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /net
parent521a29ec203c35a133d1b565a410d027176ebfc9 (diff)
downloadpkgsrc-02526271b78c18a0c07b3ea8be04d2a61b0bf8e7.tar.gz
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'net')
-rw-r--r--net/arpd/Makefile8
-rw-r--r--net/ddclient/Makefile7
-rw-r--r--net/echoping/Makefile13
-rw-r--r--net/gnet/Makefile6
-rw-r--r--net/gnet/PLIST2
-rw-r--r--net/gnet/distinfo2
-rw-r--r--net/gtk-gnutella/Makefile11
-rw-r--r--net/gtk-gnutella/PLIST2
-rw-r--r--net/gtk-gnutella/distinfo2
-rw-r--r--net/isic/Makefile6
-rw-r--r--net/jwhois/Makefile7
-rw-r--r--net/jwhois/PLIST2
-rw-r--r--net/jwhois/distinfo2
-rw-r--r--net/lftp/Makefile24
-rw-r--r--net/lftp/PLIST7
-rw-r--r--net/lftp/distinfo2
-rw-r--r--net/mtr-gtk/Makefile14
-rw-r--r--net/mtr/Makefile6
-rw-r--r--net/nap/Makefile9
-rw-r--r--net/ncftp2/Makefile16
-rw-r--r--net/ncftp3/Makefile6
-rw-r--r--net/net-snmp-current/Makefile2
-rw-r--r--net/net-snmp-current/PLIST2
-rw-r--r--net/net-snmp-current/buildlink2.mk2
-rw-r--r--net/netsaint-base/Makefile7
-rw-r--r--net/netsaint-base/distinfo2
-rw-r--r--net/ntop/Makefile9
-rw-r--r--net/polsms/Makefile8
-rw-r--r--net/polsms/PLIST2
-rw-r--r--net/polsms/distinfo4
-rw-r--r--net/polsms/patches/patch-aa4
-rw-r--r--net/polsms/patches/patch-ab2
-rw-r--r--net/samba/MESSAGE.smbpasswd2
-rw-r--r--net/samba/Makefile20
-rw-r--r--net/samba/Makefile.common2
-rw-r--r--net/samba/PLIST2
-rw-r--r--net/samba/distinfo2
-rw-r--r--net/samba/files/samba.sh2
-rw-r--r--net/samba/patches/patch-aa2
-rw-r--r--net/samba/patches/patch-ab2
-rw-r--r--net/samba/patches/patch-ad2
-rw-r--r--net/samba20/Makefile19
-rw-r--r--net/samba20/files/samba.sh2
-rw-r--r--net/sniffit/Makefile6
-rw-r--r--net/sniffit/distinfo2
-rw-r--r--net/sniffit/patches/patch-ac2
-rw-r--r--net/tcpdump/Makefile9
-rw-r--r--net/tcpslice/Makefile10
-rw-r--r--net/vtun/Makefile19
-rw-r--r--net/vtun/distinfo2
-rw-r--r--net/wget/Makefile7
-rw-r--r--net/zebra/Makefile6
-rw-r--r--net/zebra/PLIST2
-rw-r--r--net/zebra/distinfo2
-rw-r--r--net/zebra/patches/patch-aa2
-rw-r--r--net/zebra/patches/patch-ab2
-rw-r--r--net/zebra/patches/patch-ac2
-rw-r--r--net/zebra/patches/patch-ad2
-rw-r--r--net/zebra/patches/patch-ae2
-rw-r--r--net/zebra/patches/patch-af2
-rw-r--r--net/zebra/patches/patch-ba2
-rw-r--r--net/zebra/patches/patch-bb2
-rw-r--r--net/zebra/patches/patch-bc2
-rw-r--r--net/zebra/patches/patch-bd2
-rw-r--r--net/zebra/patches/patch-ca2
-rw-r--r--net/zebra/patches/patch-cc2
-rw-r--r--net/zebra/patches/patch-cd2
-rw-r--r--net/zebra/patches/patch-ce2
-rw-r--r--net/zebra/patches/patch-cf2
-rw-r--r--net/zebra/patches/patch-cg2
-rw-r--r--net/zebra/patches/patch-ch2
-rw-r--r--net/zebra/patches/patch-ci2
-rw-r--r--net/zebra/patches/patch-cj2
73 files changed, 189 insertions, 171 deletions
diff --git a/net/arpd/Makefile b/net/arpd/Makefile
index eca0f6c600c..151548bfcf8 100644
--- a/net/arpd/Makefile
+++ b/net/arpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/01/27 19:33:03 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:49:55 jlam Exp $
#
DISTNAME= arpd
@@ -9,12 +9,12 @@ MASTER_SITES= ftp://subzero.campus.luth.se/pub/arpd/
MAINTAINER= hubertf@netbsd.org
COMMENT= arp daemon
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
MAKE_ENV+= BINDIR=${PREFIX}/sbin
post-install:
- ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/arpd.README
- ${INSTALL_DATA} ${WRKSRC}/arpd.conf ${PREFIX}/etc/arpd.conf.example
+ ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/arpd.README
+ ${INSTALL_DATA} ${WRKSRC}/arpd.conf ${PREFIX}/etc/arpd.conf.example
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 7f54c9487ed..b571df4532b 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/03/25 01:18:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:56 jlam Exp $
DISTNAME= ddclient-3.6.2
CATEGORIES= net
@@ -8,7 +8,7 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://burry.ca:4141/ddclient/
COMMENT= Client to update dynamic DNS entries
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
DOCDIR= ${PREFIX}/share/doc/ddclient
EGDIR= ${PREFIX}/share/examples/ddclient
@@ -50,6 +50,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README.cisco ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/sample-* ${EGDIR}
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
+
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/echoping/Makefile b/net/echoping/Makefile
index 63911227e8c..c210ae7eb2e 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/06/17 10:06:52 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:49:56 jlam Exp $
#
DISTNAME= echoping-4.1.0
@@ -9,11 +9,10 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://echoping.sourceforge.net/
COMMENT= test performance of a remote TCP service
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+=--enable-icp
-CONFIGURE_ARGS+=--with-ssl=${SSLBASE}
+USE_BUILDLINK2= YES
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS+= --enable-icp
+CONFIGURE_ARGS+= --with-ssl=${SSLBASE}
-USE_BUILDLINK_ONLY= yes
-
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index 4ca7f548712..f003ecbfd9d 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/16 18:13:26 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:49:57 jlam Exp $
#
DISTNAME= gnet-1.1.4
@@ -12,7 +12,7 @@ COMMENT= simple network library
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
-.include "../../devel/glib/buildlink.mk"
+.include "../../devel/glib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnet/PLIST b/net/gnet/PLIST
index 9e34f966cce..5e648998bd1 100644
--- a/net/gnet/PLIST
+++ b/net/gnet/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/16 18:13:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:49:57 jlam Exp $
bin/gnet-config
include/gnet/conn.h
include/gnet/gnet.h
diff --git a/net/gnet/distinfo b/net/gnet/distinfo
index 28a9ed2aecb..3b76c50522a 100644
--- a/net/gnet/distinfo
+++ b/net/gnet/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/07/02 13:00:06 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/08/25 21:49:57 jlam Exp $
SHA1 (gnet-1.1.4.tar.gz) = 1970534bebbfbd9a5255e7d23c26fdbad1ea6acb
Size (gnet-1.1.4.tar.gz) = 363006 bytes
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 78731edb971..1e90a88dec6 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/07/07 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/25 21:49:58 jlam Exp $
#
DISTNAME= gtk-gnutella-0.90
@@ -11,13 +11,14 @@ COMMENT= GTk-based gnutella client
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
+USE_X11= yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gtk-gnutella
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gtk-gnutella
-.include "../../textproc/libxml2/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/PLIST b/net/gtk-gnutella/PLIST
index 794cbb0c5b4..155f5accf76 100644
--- a/net/gtk-gnutella/PLIST
+++ b/net/gtk-gnutella/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/07 19:27:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:49:58 jlam Exp $
bin/gtk-gnutella
share/doc/gtk-gnutella/README
share/gtk-gnutella/pixmaps/arrow_down.xpm
diff --git a/net/gtk-gnutella/distinfo b/net/gtk-gnutella/distinfo
index a5f1be8c151..2b66c1dc5c4 100644
--- a/net/gtk-gnutella/distinfo
+++ b/net/gtk-gnutella/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/07/07 19:27:28 wiz Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 21:49:58 jlam Exp $
SHA1 (gtk-gnutella-0.90.tar.gz) = b31984b6e83b0471a5ee2de2486d85b3400ecb67
Size (gtk-gnutella-0.90.tar.gz) = 469236 bytes
diff --git a/net/isic/Makefile b/net/isic/Makefile
index 127fcde8646..e76d36a7351 100644
--- a/net/isic/Makefile
+++ b/net/isic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/02 09:49:59 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:49:59 jlam Exp $
#
DISTNAME= isic-0.05
@@ -10,11 +10,11 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://expert.cc.purdue.edu/~frantzen/
COMMENT= Ip Stack Integrity Checker (IP, TCP, UDP, ICMP et. al.)
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
post-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/isic.README
-.include "../../devel/libnet/buildlink.mk"
+.include "../../devel/libnet/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index ae317480752..2be093a09b1 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/05/20 14:22:36 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/25 21:49:59 jlam Exp $
#
DISTNAME= jwhois-3.2.0
@@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/jwhois/
COMMENT= Configurable WHOIS client
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=/var/db
@@ -24,7 +24,8 @@ CONF_FILES_PERMS= /dev/null /var/db/jwhois.db \
post-install:
${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf ${PREFIX}/share/examples
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/jwhois/PLIST b/net/jwhois/PLIST
index 914f412c216..bd2e029c541 100644
--- a/net/jwhois/PLIST
+++ b/net/jwhois/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/06 19:16:58 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:00 jlam Exp $
bin/jwhois
@unexec ${INSTALL_INFO} --delete %D/info/jwhois.info %D/info/dir
info/jwhois.info
diff --git a/net/jwhois/distinfo b/net/jwhois/distinfo
index 30442ab1e84..cb2b45a1929 100644
--- a/net/jwhois/distinfo
+++ b/net/jwhois/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/05/20 14:22:36 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 21:50:00 jlam Exp $
SHA1 (jwhois-3.2.0.tar.gz) = dc325c688c56a31acd494029a053a7497a8df843
Size (jwhois-3.2.0.tar.gz) = 361144 bytes
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 3756c8524a4..8e5ebba163b 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/07/25 00:49:07 grant Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/25 21:50:01 jlam Exp $
DISTNAME= lftp-2.5.2
CATEGORIES= net
@@ -11,21 +11,29 @@ HOMEPAGE= http://lftp.yar.ru/
COMMENT= powerful command line ftp client
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} \
+CONFIGURE_ARGS+= --with-ssl=${SSLBASE} \
--sysconfdir=${PKG_SYSCONFDIR}
-USE_BUILDLINK_ONLY= YES
-# uses GNU readline internal variables (_rl_mark_modified_lines)
-USE_GNU_READLINE= YES
+USE_BUILDLINK2= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+# uses GNU readline internal variables (_rl_mark_modified_lines)
+USE_GNU_READLINE= YES
+
PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+EGDIR= ${PREFIX}/share/examples/lftp
+CONF_FILES= ${EGDIR}/lftp.conf ${PKG_SYSCONFDIR}/lftp.conf
+OWN_DIRS= ${PREFIX}/lib/lftp
+OWN_DIRS+= ${PREFIX}/lib/lftp/${PKG_VERSION}
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lftp
${INSTALL_DATA} ${WRKSRC}/lftp.conf ${PREFIX}/share/examples/lftp
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
+.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/lftp/PLIST b/net/lftp/PLIST
index ba3e409a455..0ef903187da 100644
--- a/net/lftp/PLIST
+++ b/net/lftp/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:29:52 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:01 jlam Exp $
bin/lftp
bin/lftpget
man/man1/lftp.1
share/examples/lftp/lftp.conf
-@exec test -f ${PKG_SYSCONFDIR}/lftp.conf || cp -p %D/%F ${PKG_SYSCONFDIR}
share/lftp/import-ncftp
share/lftp/import-netscape
share/locale/de/LC_MESSAGES/lftp.mo
@@ -17,8 +16,8 @@ share/locale/pt_BR/LC_MESSAGES/lftp.mo
share/locale/ru/LC_MESSAGES/lftp.mo
share/locale/zh_CN/LC_MESSAGES/lftp.mo
share/locale/zh_TW/LC_MESSAGES/lftp.mo
+@dirrm share/examples/lftp
+@dirrm share/lftp
@exec ${MKDIR} %D/lib/lftp/${PKGVERSION}
@dirrm lib/lftp/${PKGVERSION}
@dirrm lib/lftp
-@dirrm share/lftp
-@dirrm share/examples/lftp
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index dd9d7bd2f7a..916384e0030 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/05/17 13:34:48 grant Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:50:01 jlam Exp $
SHA1 (lftp-2.5.2.tar.bz2) = c44ef018edd64ffbb4cf5ff16a2cc091fb2a914b
Size (lftp-2.5.2.tar.bz2) = 1124212 bytes
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index 03c04467c94..3fa04486a3b 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/03/13 02:16:13 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:50:03 jlam Exp $
#
DISTNAME= mtr-0.49
@@ -11,9 +11,10 @@ MAINTAINER= sommerfeld@netbsd.org
HOMEPAGE= http://www.bitwizard.nl/mtr/
COMMENT= Traceroute and ping in a single graphical network diagnostic tool
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_BUILDLINK_ONLY= yes
+GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_BUILDLINK2= yes
+USE_X11= yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr-gtk
@@ -21,6 +22,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8/mtr-gtk.8
${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr-gtk
-.include "../../devel/ncurses/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 0deb78bd3d9..6f5f06d81ed 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/03/13 02:16:11 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2002/08/25 21:50:02 jlam Exp $
#
DISTNAME= mtr-0.49
@@ -12,7 +12,7 @@ COMMENT= Traceroute and ping in a single graphical network diagnostic tool
GNU_CONFIGURE= YES
USE_GMAKE= YES
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
CONFIGURE_ARGS+= --without-gtk
do-install:
@@ -21,5 +21,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8
${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/nap/Makefile b/net/nap/Makefile
index 7a38b826578..65cfc2b013c 100644
--- a/net/nap/Makefile
+++ b/net/nap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/07 06:10:35 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:50:03 jlam Exp $
DISTNAME= nap-1.4.4
CATEGORIES= net
@@ -9,7 +9,8 @@ HOMEPAGE= http://www.gis.net/~nite/
COMMENT= Terminal based Napster client similar to ircII
GNU_CONFIGURE= YES
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
+
# newterm()
INCOMPAT_CURSES= NetBSD-1.4*-*
INCOMPAT_CURSES+= NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-Z]-*
@@ -18,7 +19,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nap ${PREFIX}/share/examples/nap
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nap
${INSTALL_DATA} ${WRKSRC}/nap.conf.dist \
- ${PREFIX}/share/examples/nap/nap.conf
+ ${PREFIX}/share/examples/nap/nap.conf
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index de835d63314..099969daf29 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/07/27 19:11:29 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2002/08/25 21:50:04 jlam Exp $
# FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
#
@@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.ncftp.com/ncftp/
COMMENT= FTP replacement with advanced user interface
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-extra-dirs
CONFIGURE_ARGS+= --disable-ncurses
@@ -21,18 +21,18 @@ CONFIGURE_ENV+= ac_cv_lib_intl_strftime=no
# Include SOCKS firewall support
.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
BUILD_DEFS+= USE_SOCKS
-.if ${USE_SOCKS} == 4
+. if ${USE_SOCKS} == 4
CONFIGURE_ARGS+= --enable-socks
-.include "../../net/socks4/buildlink.mk"
-.else
+. include "../../net/socks4/buildlink2.mk"
+. else
CONFIGURE_ARGS+= --enable-socks5
-.include "../../net/socks5/buildlink.mk"
-.endif
+. include "../../net/socks5/buildlink2.mk"
+. endif
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2
${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1
-.include "../../devel/readline/buildlink.mk"
+.include "../../devel/readline/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ncftp3/Makefile b/net/ncftp3/Makefile
index e992559fd5b..ae0f6e223d2 100644
--- a/net/ncftp3/Makefile
+++ b/net/ncftp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/12/25 20:38:00 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:04 jlam Exp $
DISTNAME= ncftp-3.0.3-src
PKGNAME= ncftp3-3.0.3
@@ -11,12 +11,12 @@ COMMENT= FTP replacement with advanced user interface
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
GNU_CONFIGURE= yes
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
post-patch:
@${MV} ${WRKSRC}/ncftp/pref.h ${WRKSRC}/ncftp/pref.h.in
@${SED} -e "s:/etc/ncftp.firewall:${PREFIX}/etc/ncftp.firewall:" \
< ${WRKSRC}/ncftp/pref.h.in > ${WRKSRC}/ncftp/pref.h
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/net-snmp-current/Makefile b/net/net-snmp-current/Makefile
index c619ce637ad..a7093730002 100644
--- a/net/net-snmp-current/Makefile
+++ b/net/net-snmp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/25 18:39:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:50:05 jlam Exp $
DISTNAME= net-snmp-5.0.pre2
PKGNAME= net-snmp-5.0.0.2
diff --git a/net/net-snmp-current/PLIST b/net/net-snmp-current/PLIST
index 22f5433c2c2..70ea58c38a7 100644
--- a/net/net-snmp-current/PLIST
+++ b/net/net-snmp-current/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:39:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:05 jlam Exp $
bin/encode_keychange
bin/fixproc
bin/ipf-mod.pl
diff --git a/net/net-snmp-current/buildlink2.mk b/net/net-snmp-current/buildlink2.mk
index fd027ca2d28..afe7f090886 100644
--- a/net/net-snmp-current/buildlink2.mk
+++ b/net/net-snmp-current/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:34 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/08/25 21:50:06 jlam Exp $
.if !defined(NET_SNMP_BUILDLINK2_MK)
NET_SNMP_BUILDLINK2_MK= # defined
diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index 0c0fb7ac16f..2c7ec9edac8 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/04/14 10:57:11 rh Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 21:50:06 jlam Exp $
#
DISTNAME= netsaint-0.0.7
@@ -10,7 +10,7 @@ MAINTAINER= murray@river-styx.org
HOMEPAGE= http://www.netsaint.org/
COMMENT= network monitor
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
.include "../../net/netsaint-base/Makefile.common"
@@ -33,6 +33,7 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/logofullsize.gif ${PREFIX}/share/netsaint/images
${INSTALL_DATA} ${WRKDIR}/sblogo.gif ${PREFIX}/share/netsaint/images
-.include "../../graphics/gd/buildlink.mk"
+.include "../../graphics/gd/buildlink2.mk"
+
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/netsaint-base/distinfo b/net/netsaint-base/distinfo
index cb7651a133c..d45a7bd225e 100644
--- a/net/netsaint-base/distinfo
+++ b/net/netsaint-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/07/02 13:00:15 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:50:06 jlam Exp $
SHA1 (netsaint-0.0.7.tar.gz) = 5ce4832c9cccaba0baa49fe3e222c6753a811143
Size (netsaint-0.0.7.tar.gz) = 1278019 bytes
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 52ec2ea2d27..228116acc62 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/11/29 01:12:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.23 2002/08/25 21:50:07 jlam Exp $
DISTNAME= ntop-1.1
PKGREVISION= 1
@@ -10,12 +10,13 @@ MAINTAINER= kim@tac.nyc.ny.us
HOMEPAGE= http://www.ntop.org/
COMMENT= shows network usage (similar to "top" for processes)
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-threads=no
INSTALL_TARGET= install install-man
-.include "../../net/libpcap/buildlink.mk"
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../net/libpcap/buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/net/polsms/Makefile b/net/polsms/Makefile
index fae5b516454..a00978e711d 100644
--- a/net/polsms/Makefile
+++ b/net/polsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/06/13 08:27:10 martti Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:08 jlam Exp $
#
DISTNAME= sms-1.8.9i
@@ -10,8 +10,8 @@ MAINTAINER= zuntum@netbsd.org
HOMEPAGE= http://www.ceti.pl/~miki/komputery/sms.html
COMMENT= send SMS to cellular phones in Poland (Plus, Idea, Era)
-USE_BUILDLINK_ONLY= YES
-USE_GMAKE= YES
+USE_BUILDLINK2= YES
+USE_GMAKE= YES
WRKSRC= ${WRKDIR}/sms
@@ -27,5 +27,5 @@ do-install:
cd ${WRKSRC}/contrib && ${INSTALL_DATA} mimecut procmailrc \
sms.cgi sms.html ${PREFIX}/share/sms/contrib
-.include "../../databases/gdbm/buildlink.mk"
+.include "../../databases/gdbm/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/polsms/PLIST b/net/polsms/PLIST
index 4d75378df5f..ffa92a335e4 100644
--- a/net/polsms/PLIST
+++ b/net/polsms/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/13 08:27:10 martti Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:50:08 jlam Exp $
bin/sms
bin/smsaddr
share/sms/contrib/mimecut
diff --git a/net/polsms/distinfo b/net/polsms/distinfo
index 6acb0173741..f1cc6ac99da 100644
--- a/net/polsms/distinfo
+++ b/net/polsms/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/06/13 08:27:10 martti Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:50:08 jlam Exp $
SHA1 (sms-1.8.9i.tar.gz) = 57630a29c322b7c52e296249dd4dc8e399ee4d3f
Size (sms-1.8.9i.tar.gz) = 65488 bytes
-SHA1 (patch-aa) = 134fe5eb8bc789f826ecbec9241e54469bcded5d
+SHA1 (patch-aa) = 6cb148ccb4011c723057278be07f27da9f9f986b
SHA1 (patch-ab) = f31182167d15faa848dd667476ace0758ee170ac
diff --git a/net/polsms/patches/patch-aa b/net/polsms/patches/patch-aa
index fb7e363b70c..7f8c948c4c6 100644
--- a/net/polsms/patches/patch-aa
+++ b/net/polsms/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2002/06/13 08:27:11 martti Exp $
+$NetBSD: patch-aa,v 1.5 2002/08/25 21:50:09 jlam Exp $
--- Makefile.orig Thu Feb 7 00:45:27 2002
+++ Makefile
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.4 2002/06/13 08:27:11 martti Exp $
# Odkomentuj ponizsze linie jesli kompilujesz program na tych systemach
# BSD_INC=-I/usr/local/include -I/usr/pkg/include
-# BSD_LIB=-L/usr/local/lib -L/usr/pkg/lib
-+BSD_LIB=-L$(BUILDLINK_DIR)/lib -Wl -R$(LOCALBASE)/lib
++BSD_LIB=-L$(LOCALBASE)/lib -Wl -R$(LOCALBASE)/lib
# katalog pod ktorym program zostanie zainstalowany po make install - binaria
# ida do $DIR/$BIN, reszta do $DIR/$DOC
diff --git a/net/polsms/patches/patch-ab b/net/polsms/patches/patch-ab
index 9657680632e..363bd63d21d 100644
--- a/net/polsms/patches/patch-ab
+++ b/net/polsms/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/06/13 08:27:12 martti Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 21:50:09 jlam Exp $
--- main.cc.orig Thu Feb 7 00:35:33 2002
+++ main.cc
diff --git a/net/samba/MESSAGE.smbpasswd b/net/samba/MESSAGE.smbpasswd
index 795a34371b9..3537c25b3f4 100644
--- a/net/samba/MESSAGE.smbpasswd
+++ b/net/samba/MESSAGE.smbpasswd
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE.smbpasswd,v 1.2 2002/06/22 21:31:29 jlam Exp $
+$NetBSD: MESSAGE.smbpasswd,v 1.3 2002/08/25 21:50:10 jlam Exp $
*===* SECURITY NOTES *===*
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 8dfa81af3dc..ff7127755e7 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2002/08/01 02:40:05 jlam Exp $
-
-USE_BUILDLINK_ONLY= # defined
+# $NetBSD: Makefile,v 1.87 2002/08/25 21:50:10 jlam Exp $
.include "Makefile.common"
@@ -8,27 +6,29 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.samba.org/
COMMENT= SMB/CIFS protocol server suite for UNIX
+USE_BUILDLINK2= # defined
+
USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
CONFIGURE_ARGS+= --with-readline
CONFIGURE_ARGS+= --with-ssl
-CONFIGURE_ARGS+= --with-sslinc=${BUILDLINK_DIR}
-CFLAGS+= -I${BUILDLINK_DIR}/include/openssl # ssl.h, err.h
+CONFIGURE_ARGS+= --with-sslinc=${SSLBASE}
+CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h
.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink.mk"
+.include "../../print/cups/buildlink2.mk"
BUILD_DEFS+= USE_CUPS
CONFIGURE_ARGS+= --enable-cups
.endif
.if defined(USE_PAM)
-.include "../../security/PAM/buildlink.mk"
+.include "../../security/PAM/buildlink2.mk"
BUILD_DEFS+= USE_PAM
CONFIGURE_ARGS+= --with-pam
.endif
.if defined(SAMBA_USE_LDAP) && ${SAMBA_USE_LDAP} == "YES"
-.include "../../databases/openldap/buildlink.mk"
+.include "../../databases/openldap/buildlink2.mk"
BUILD_DEFS+= SAMBA_USE_LDAP
CONFIGURE_ARGS+= --with-ldapsam
PLIST_SUBST+= SAMBA_LDAP=""
@@ -96,8 +96,8 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/script/mksmbpasswd.sh \
${PREFIX}/sbin/mksmbpasswd
-.include "../../devel/readline/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba/Makefile.common b/net/samba/Makefile.common
index 48e749e5fa4..d88046abf77 100644
--- a/net/samba/Makefile.common
+++ b/net/samba/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2002/07/30 23:05:12 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/08/25 21:50:10 jlam Exp $
DISTNAME= samba-${SAMBA_DIST_VERS}
SAMBA_DIST_VERS= 2.2.5
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 3de4016848b..4e7ebef5873 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2002/08/01 02:55:07 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2002/08/25 21:50:11 jlam Exp $
bin/findsmb
bin/make_printerdef
bin/make_smbcodepage
diff --git a/net/samba/distinfo b/net/samba/distinfo
index 1670587bd88..cf832a114e9 100644
--- a/net/samba/distinfo
+++ b/net/samba/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2002/07/30 23:05:12 jlam Exp $
+$NetBSD: distinfo,v 1.21 2002/08/25 21:50:11 jlam Exp $
SHA1 (samba-2.2.5.tar.bz2) = 67e1025a8d01ba51b8cea6f04176fdbc57b7c012
Size (samba-2.2.5.tar.bz2) = 4343641 bytes
diff --git a/net/samba/files/samba.sh b/net/samba/files/samba.sh
index 1f94dc2aa59..ce2d3eaaa88 100644
--- a/net/samba/files/samba.sh
+++ b/net/samba/files/samba.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: samba.sh,v 1.11 2002/05/24 22:28:27 hubertf Exp $
+# $NetBSD: samba.sh,v 1.12 2002/08/25 21:50:12 jlam Exp $
#
# KEYWORD: nostart
diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 993ff06145a..cba80cf40cb 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.20 2002/07/30 23:05:13 jlam Exp $
+$NetBSD: patch-aa,v 1.21 2002/08/25 21:50:13 jlam Exp $
--- configure.in.orig Sun Jul 28 18:13:04 2002
+++ configure.in
diff --git a/net/samba/patches/patch-ab b/net/samba/patches/patch-ab
index 6a7184a46f6..4a87d72edbe 100644
--- a/net/samba/patches/patch-ab
+++ b/net/samba/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.16 2002/07/30 23:05:13 jlam Exp $
+$NetBSD: patch-ab,v 1.17 2002/08/25 21:50:13 jlam Exp $
--- configure.orig Sun Jul 28 18:13:04 2002
+++ configure
diff --git a/net/samba/patches/patch-ad b/net/samba/patches/patch-ad
index 3ad1f393963..761f42324be 100644
--- a/net/samba/patches/patch-ad
+++ b/net/samba/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.9 2002/07/30 23:05:13 jlam Exp $
+$NetBSD: patch-ad,v 1.10 2002/08/25 21:50:14 jlam Exp $
--- Makefile.in.orig Sun Jul 28 18:13:04 2002
+++ Makefile.in
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index 80cb7d84ac0..f52d13795ff 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/07/29 03:59:56 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 21:50:14 jlam Exp $
DISTNAME= samba-2.0.10
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -13,7 +13,7 @@ COMMENT= SMB/CIFS protocol server suite for UNIX
BUILD_USES_MSGFMT= # defined
GNU_CONFIGURE= # defined
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
.include "../../mk/bsd.prefs.mk"
@@ -34,16 +34,16 @@ CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/swat
CONFIGURE_ARGS+= --with-sambabook=${PREFIX}/share/swat/using_samba
CONFIGURE_ARGS+= --with-ssl
-CONFIGURE_ARGS+= --with-sslinc=${BUILDLINK_DIR}
-CFLAGS+= -I${BUILDLINK_DIR}/include/openssl # ssl.h, err.h
+CONFIGURE_ARGS+= --with-sslinc=${SSLBASE}
+CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h
.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
-.include "../../print/cups/buildlink.mk"
+.include "../../print/cups/buildlink2.mk"
BUILD_DEFS+= USE_CUPS
.endif
.if defined(USE_PAM)
-.include "../../security/PAM/buildlink.mk"
+.include "../../security/PAM/buildlink2.mk"
CONFIGURE_ARGS+= --with-pam
.endif
@@ -99,8 +99,9 @@ post-install:
${FILESDIR}/smb.conf.sample > ${WRKDIR}/smb.conf.sample
${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${EXAMPLESDIR}
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/samba20/files/samba.sh b/net/samba20/files/samba.sh
index 353938afa5c..ad0ab1cba7a 100644
--- a/net/samba20/files/samba.sh
+++ b/net/samba20/files/samba.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: samba.sh,v 1.7 2002/05/24 22:28:27 hubertf Exp $
+# $NetBSD: samba.sh,v 1.8 2002/08/25 21:50:15 jlam Exp $
#
# KEYWORD: nostart
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 9a2e99cd887..b9cecf788a1 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/11/29 23:49:12 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/25 21:50:15 jlam Exp $
#
DISTNAME= sniffit.0.3.5
@@ -13,7 +13,7 @@ COMMENT= Packet sniffer program
NOT_FOR_PLATFORM= *-*-alpha # severe LP64 loss
HAS_CONFIGURE= YES
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
ALL_TARGET=
do-install:
@@ -21,5 +21,5 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${PREFIX}/man/man8
-.include "../../devel/ncurses/buildlink.mk"
+.include "../../devel/ncurses/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/sniffit/distinfo b/net/sniffit/distinfo
index dd27c67e7ad..978e40eb90f 100644
--- a/net/sniffit/distinfo
+++ b/net/sniffit/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/05/25 20:51:26 dmcmahill Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:50:16 jlam Exp $
SHA1 (sniffit.0.3.5.tar.gz) = df9183fca2eec29a56bcfdc68a983c4e7d57bf9d
Size (sniffit.0.3.5.tar.gz) = 197255 bytes
diff --git a/net/sniffit/patches/patch-ac b/net/sniffit/patches/patch-ac
index 289948e2a60..8467ee66438 100644
--- a/net/sniffit/patches/patch-ac
+++ b/net/sniffit/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.7 2002/05/25 20:51:27 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.8 2002/08/25 21:50:16 jlam Exp $
--- sn_data.h.orig Fri Apr 18 05:33:58 1997
+++ sn_data.h Sat May 25 15:04:03 2002
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index d0d7ef47310..c0add5881ec 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/02/13 15:50:35 seb Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:50:17 jlam Exp $
DISTNAME= tcpdump-3.7.1
CATEGORIES= net
@@ -11,12 +11,13 @@ COMMENT= network monitoring tool
ONLY_FOR_PLATFORM= SunOS-*-* # in NetBSD base system
GNU_CONFIGURE= YES
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.if exists(/usr/include/netinet/ip6.h)
CONFIGURE_ARGS+= --enable-ipv6
.endif
-.include "../../net/libpcap/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../net/libpcap/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/net/tcpslice/Makefile b/net/tcpslice/Makefile
index a1878de2f98..58076377bf4 100644
--- a/net/tcpslice/Makefile
+++ b/net/tcpslice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/26 05:49:31 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:17 jlam Exp $
DISTNAME= tcpslice-1.2a1
PKGNAME= tcpslice-1.2.0.1
@@ -8,9 +8,9 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/
MAINTAINER= seb@pbox.org
COMMENT= tool for extracting portions of tcpdump's packet trace files
-USE_BUILDLINK_ONLY= YES
-GNU_CONFIGURE= YES
-INSTALL_TARGET= install install-man
+USE_BUILDLINK2= YES
+GNU_CONFIGURE= YES
+INSTALL_TARGET= install install-man
-.include "../../net/libpcap/buildlink.mk"
+.include "../../net/libpcap/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 42e89be6661..201c31e7eeb 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/07/23 23:55:45 taca Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 21:50:18 jlam Exp $
DISTNAME= vtun-2.5
CATEGORIES= net
@@ -8,14 +8,14 @@ MAINTAINER= hubertf@netbsd.org
HOMEPAGE= http://vtun.sourceforge.net/
COMMENT= Virtual Tunnels over TCP/IP networks with traffic shaping
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --with-ssl-headers=${BUILDLINK_DIR}/include/openssl
-CONFIGURE_ARGS+= --with-ssl-lib=${BUILDLINK_DIR}/lib
-CONFIGURE_ARGS+= --with-lzo-headers=${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+= --with-lzo-lib=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+= --with-ssl-headers=${SSLBASE}/include/openssl
+CONFIGURE_ARGS+= --with-ssl-lib=${SSLBASE}/lib
+CONFIGURE_ARGS+= --with-lzo-headers=${BUILDLINK_PREFIX.liblzo}/include
+CONFIGURE_ARGS+= --with-lzo-lib=${BUILDLINK_PREFIX.liblzo}/lib
ALL_TARGET= vtund
WRKSRC= ${WRKDIR}/vtun
@@ -48,8 +48,9 @@ do-install:
${RM} -f ${PREFIX}/man/man8/vtun.8
${LN} -s vtund.8 ${PREFIX}/man/man8/vtun.8
-.include "../../archivers/liblzo/buildlink.mk"
-.include "../../devel/zlib/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../archivers/liblzo/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/vtun/distinfo b/net/vtun/distinfo
index dd086d4aa4e..ce4b5e20c23 100644
--- a/net/vtun/distinfo
+++ b/net/vtun/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/07/23 23:55:45 taca Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:50:19 jlam Exp $
SHA1 (vtun-2.5.tar.gz) = 6220497fc64b8b4d42e972e3b7855ec97cab1975
Size (vtun-2.5.tar.gz) = 92510 bytes
diff --git a/net/wget/Makefile b/net/wget/Makefile
index dc540b0fdef..a44509a06c2 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/07/24 19:45:26 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2002/08/25 21:50:19 jlam Exp $
DISTNAME= wget-1.7
CATEGORIES= net
@@ -15,7 +15,7 @@ COMMENT= Retrieve files from the 'net via HTTP and FTP
USE_PERL5= build
BUILD_USES_MSGFMT= YES
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
@@ -35,6 +35,7 @@ CONFIGURE_ARGS+= --enable-ipv6
CONFIGURE_ARGS+= --disable-ipv6
.endif
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index ea32ac32924..e04f27e7c5e 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2002/08/03 12:27:18 itojun Exp $
+# $NetBSD: Makefile,v 1.53 2002/08/25 21:50:20 jlam Exp $
# Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
#
@@ -16,7 +16,7 @@ BUILD_DEPENDS+= automake>=1.4:../../devel/automake
.include "../../mk/bsd.prefs.mk"
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
PKG_SYSCONFSUBDIR?= zebra
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
@@ -27,7 +27,7 @@ PLIST_SRC= # empty
.if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
USE_GNU_READLINE= # uses rl_pending_input
-.include "../../devel/readline/buildlink.mk"
+. include "../../devel/readline/buildlink2.mk"
CONFIGURE_ARGS+= --enable-vtysh
PLIST_SRC+= ${PKGDIR}/PLIST.vtysh
.else
diff --git a/net/zebra/PLIST b/net/zebra/PLIST
index 63402e69dd2..596c29e9af2 100644
--- a/net/zebra/PLIST
+++ b/net/zebra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/09 23:48:17 itojun Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:20 jlam Exp $
@unexec ${INSTALL_INFO} --delete %D/info/zebra.info %D/info/dir
info/zebra.info
@exec ${INSTALL_INFO} %D/info/zebra.info %D/info/dir
diff --git a/net/zebra/distinfo b/net/zebra/distinfo
index bd1e467b64d..bc32feb482f 100644
--- a/net/zebra/distinfo
+++ b/net/zebra/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/08/03 12:27:19 itojun Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 21:50:21 jlam Exp $
SHA1 (zebra-0.93a.tar.gz) = aa9d307a53adcd6e9b76003f230c4cd79eefba6b
Size (zebra-0.93a.tar.gz) = 1335141 bytes
diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa
index b551330b5b8..fbda1e076a9 100644
--- a/net/zebra/patches/patch-aa
+++ b/net/zebra/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/07/09 23:48:17 itojun Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/25 21:50:21 jlam Exp $
--- bgpd/Makefile.am.orig Wed Jun 19 04:05:04 2002
+++ bgpd/Makefile.am Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ab b/net/zebra/patches/patch-ab
index 3ec6ea09da5..40de24c956b 100644
--- a/net/zebra/patches/patch-ab
+++ b/net/zebra/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-ab,v 1.5 2002/08/25 21:50:21 jlam Exp $
--- ospf6d/Makefile.am.orig Sat Jun 29 15:20:39 2002
+++ ospf6d/Makefile.am Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac
index ed7ac1f1cae..bd970951890 100644
--- a/net/zebra/patches/patch-ac
+++ b/net/zebra/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-ac,v 1.3 2002/08/25 21:50:22 jlam Exp $
--- ospfd/Makefile.am.orig Wed Jun 19 04:06:08 2002
+++ ospfd/Makefile.am Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ad b/net/zebra/patches/patch-ad
index 62c0f104d4a..6705fdd2480 100644
--- a/net/zebra/patches/patch-ad
+++ b/net/zebra/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-ad,v 1.3 2002/08/25 21:50:22 jlam Exp $
--- ripd/Makefile.am.orig Wed Jun 19 04:06:18 2002
+++ ripd/Makefile.am Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ae b/net/zebra/patches/patch-ae
index a1f5cb01d11..3e6705e6951 100644
--- a/net/zebra/patches/patch-ae
+++ b/net/zebra/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 21:50:22 jlam Exp $
--- ripngd/Makefile.am.orig Wed Jun 19 04:06:33 2002
+++ ripngd/Makefile.am Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-af b/net/zebra/patches/patch-af
index 0fc176c3952..a31717d3395 100644
--- a/net/zebra/patches/patch-af
+++ b/net/zebra/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2002/07/09 23:48:18 itojun Exp $
+$NetBSD: patch-af,v 1.4 2002/08/25 21:50:23 jlam Exp $
--- zebra/Makefile.am.orig Wed Jun 19 08:17:32 2002
+++ zebra/Makefile.am Wed Jul 10 08:34:31 2002
diff --git a/net/zebra/patches/patch-ba b/net/zebra/patches/patch-ba
index e9823bdfd1f..809f41f1faf 100644
--- a/net/zebra/patches/patch-ba
+++ b/net/zebra/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.1 2002/08/03 12:27:20 itojun Exp $
+$NetBSD: patch-ba,v 1.2 2002/08/25 21:50:23 jlam Exp $
diff -u1 bgpd/bgp_fsm.c /home/itojun/work/zebra/zebra/bgpd/bgp_fsm.c
--- bgpd/bgp_fsm.c Wed Jun 19 17:05:38 2002
diff --git a/net/zebra/patches/patch-bb b/net/zebra/patches/patch-bb
index de051834b0e..ce06665182b 100644
--- a/net/zebra/patches/patch-bb
+++ b/net/zebra/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.1 2002/08/03 12:27:20 itojun Exp $
+$NetBSD: patch-bb,v 1.2 2002/08/25 21:50:23 jlam Exp $
diff -u1 bgpd/bgp_open.c /home/itojun/work/zebra/zebra/bgpd/bgp_open.c
--- bgpd/bgp_open.c Wed Jun 19 17:05:38 2002
diff --git a/net/zebra/patches/patch-bc b/net/zebra/patches/patch-bc
index 1764f3f8e38..ad42df6cdfb 100644
--- a/net/zebra/patches/patch-bc
+++ b/net/zebra/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.1 2002/08/03 12:27:21 itojun Exp $
+$NetBSD: patch-bc,v 1.2 2002/08/25 21:50:23 jlam Exp $
diff -u1 bgpd/bgp_packet.c /home/itojun/work/zebra/zebra/bgpd/bgp_packet.c
--- bgpd/bgp_packet.c Sat Jun 29 15:20:39 2002
diff --git a/net/zebra/patches/patch-bd b/net/zebra/patches/patch-bd
index 82b52034c39..3db06222295 100644
--- a/net/zebra/patches/patch-bd
+++ b/net/zebra/patches/patch-bd
@@ -1,4 +1,4 @@
-$NetBSD: patch-bd,v 1.1 2002/08/03 12:27:21 itojun Exp $
+$NetBSD: patch-bd,v 1.2 2002/08/25 21:50:24 jlam Exp $
diff -u1 bgpd/bgp_vty.c /home/itojun/work/zebra/zebra/bgpd/bgp_vty.c
--- bgpd/bgp_vty.c Mon Jul 8 22:31:01 2002
diff --git a/net/zebra/patches/patch-ca b/net/zebra/patches/patch-ca
index e48afdbfb0b..06c1f8066b8 100644
--- a/net/zebra/patches/patch-ca
+++ b/net/zebra/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.1 2002/08/03 12:27:22 itojun Exp $
+$NetBSD: patch-ca,v 1.2 2002/08/25 21:50:24 jlam Exp $
diff -u1 ospf6d/ChangeLog /home/itojun/work/zebra/zebra/ospf6d/ChangeLog
--- ospf6d/ChangeLog Mon Jul 8 22:31:02 2002
diff --git a/net/zebra/patches/patch-cc b/net/zebra/patches/patch-cc
index 1e46c3d738d..6723e7ecfb9 100644
--- a/net/zebra/patches/patch-cc
+++ b/net/zebra/patches/patch-cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-cc,v 1.1 2002/08/03 12:27:22 itojun Exp $
+$NetBSD: patch-cc,v 1.2 2002/08/25 21:50:24 jlam Exp $
diff -u1 ospf6d/ospf6_area.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_area.c
--- ospf6d/ospf6_area.c Mon Jul 8 22:31:02 2002
diff --git a/net/zebra/patches/patch-cd b/net/zebra/patches/patch-cd
index 2cbd83dd266..834b213b6ed 100644
--- a/net/zebra/patches/patch-cd
+++ b/net/zebra/patches/patch-cd
@@ -1,4 +1,4 @@
-$NetBSD: patch-cd,v 1.1 2002/08/03 12:27:23 itojun Exp $
+$NetBSD: patch-cd,v 1.2 2002/08/25 21:50:24 jlam Exp $
diff -u1 ospf6d/ospf6_asbr.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_asbr.c
--- ospf6d/ospf6_asbr.c Mon Jul 8 22:31:02 2002
diff --git a/net/zebra/patches/patch-ce b/net/zebra/patches/patch-ce
index aba2ad7e868..380cf0ab29d 100644
--- a/net/zebra/patches/patch-ce
+++ b/net/zebra/patches/patch-ce
@@ -1,4 +1,4 @@
-$NetBSD: patch-ce,v 1.1 2002/08/03 12:27:23 itojun Exp $
+$NetBSD: patch-ce,v 1.2 2002/08/25 21:50:25 jlam Exp $
diff -u1 ospf6d/ospf6_dbex.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_dbex.c
--- ospf6d/ospf6_dbex.c Mon Jul 8 22:31:02 2002
diff --git a/net/zebra/patches/patch-cf b/net/zebra/patches/patch-cf
index 527f968d0a2..66fd1071050 100644
--- a/net/zebra/patches/patch-cf
+++ b/net/zebra/patches/patch-cf
@@ -1,4 +1,4 @@
-$NetBSD: patch-cf,v 1.1 2002/08/03 12:27:24 itojun Exp $
+$NetBSD: patch-cf,v 1.2 2002/08/25 21:50:25 jlam Exp $
diff -u1 ospf6d/ospf6_intra.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_intra.c
--- ospf6d/ospf6_intra.c Mon Jul 8 22:31:02 2002
diff --git a/net/zebra/patches/patch-cg b/net/zebra/patches/patch-cg
index ad81f22de6c..72bfc512fca 100644
--- a/net/zebra/patches/patch-cg
+++ b/net/zebra/patches/patch-cg
@@ -1,4 +1,4 @@
-$NetBSD: patch-cg,v 1.1 2002/08/03 12:27:24 itojun Exp $
+$NetBSD: patch-cg,v 1.2 2002/08/25 21:50:25 jlam Exp $
diff -u1 ospf6d/ospf6_lsa.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_lsa.c
--- ospf6d/ospf6_lsa.c Mon Jul 8 22:31:02 2002
diff --git a/net/zebra/patches/patch-ch b/net/zebra/patches/patch-ch
index 7e28a0d244f..001a37e3df5 100644
--- a/net/zebra/patches/patch-ch
+++ b/net/zebra/patches/patch-ch
@@ -1,4 +1,4 @@
-$NetBSD: patch-ch,v 1.1 2002/08/03 12:27:25 itojun Exp $
+$NetBSD: patch-ch,v 1.2 2002/08/25 21:50:25 jlam Exp $
diff -u1 ospf6d/ospf6_route.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_route.c
--- ospf6d/ospf6_route.c Sun Jul 7 17:12:48 2002
diff --git a/net/zebra/patches/patch-ci b/net/zebra/patches/patch-ci
index 231de44a424..d0069e497dc 100644
--- a/net/zebra/patches/patch-ci
+++ b/net/zebra/patches/patch-ci
@@ -1,4 +1,4 @@
-$NetBSD: patch-ci,v 1.1 2002/08/03 12:27:25 itojun Exp $
+$NetBSD: patch-ci,v 1.2 2002/08/25 21:50:26 jlam Exp $
diff -u1 ospf6d/ospf6_zebra.c /home/itojun/work/zebra/zebra/ospf6d/ospf6_zebra.c
--- ospf6d/ospf6_zebra.c Sun Jul 7 17:12:48 2002
diff --git a/net/zebra/patches/patch-cj b/net/zebra/patches/patch-cj
index d14eb860167..ce0f401f88c 100644
--- a/net/zebra/patches/patch-cj
+++ b/net/zebra/patches/patch-cj
@@ -1,4 +1,4 @@
-$NetBSD: patch-cj,v 1.1 2002/08/03 12:27:26 itojun Exp $
+$NetBSD: patch-cj,v 1.2 2002/08/25 21:50:26 jlam Exp $
diff -u1 ospf6d/ospf6d.h /home/itojun/work/zebra/zebra/ospf6d/ospf6d.h
--- ospf6d/ospf6d.h Mon Jul 8 22:31:04 2002