summaryrefslogtreecommitdiff
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
parent521a29ec203c35a133d1b565a410d027176ebfc9 (diff)
downloadpkgsrc-02526271b78c18a0c07b3ea8be04d2a61b0bf8e7.tar.gz
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
-rw-r--r--archivers/arc/Makefile6
-rw-r--r--archivers/bicom/Makefile16
-rw-r--r--archivers/bunzip/Makefile8
-rw-r--r--archivers/bzip2/Makefile6
-rw-r--r--archivers/bzip2/buildlink2.mk56
-rw-r--r--archivers/cabextract/Makefile5
-rw-r--r--archivers/cabextract/distinfo2
-rw-r--r--archivers/cabextract/patches/patch-aa2
-rw-r--r--archivers/dact/Makefile5
-rw-r--r--archivers/fastjar/Makefile8
-rw-r--r--archivers/freeze/Makefile8
-rw-r--r--archivers/gcpio/Makefile8
-rw-r--r--archivers/gsharutils/Makefile6
-rw-r--r--archivers/gtar-base/Makefile33
-rw-r--r--archivers/gtar-base/PLIST22
-rw-r--r--archivers/gtar-base/PLIST.NetBSD13
-rw-r--r--archivers/gtar-base/distinfo4
-rw-r--r--archivers/gtar-base/patches/patch-ad6
-rw-r--r--archivers/gtar-info/Makefile3
-rw-r--r--archivers/gtar/Makefile4
-rw-r--r--archivers/gzip-base/Makefile7
-rw-r--r--archivers/gzip-info/Makefile8
-rw-r--r--archivers/gzip/Makefile8
-rw-r--r--archivers/ha/Makefile6
-rw-r--r--archivers/hpack/Makefile13
-rw-r--r--archivers/lha/Makefile6
-rw-r--r--archivers/lha/distinfo4
-rw-r--r--archivers/lha/patches/patch-ae8
-rw-r--r--archivers/lha/patches/patch-ah2
-rw-r--r--archivers/lha/patches/patch-ai2
-rw-r--r--archivers/lha/patches/patch-aj2
-rw-r--r--archivers/liblzo/Makefile4
-rw-r--r--archivers/liblzo/buildlink2.mk30
-rw-r--r--archivers/liblzo/distinfo2
-rw-r--r--archivers/lzop/Makefile8
-rw-r--r--archivers/macutil/Makefile4
-rw-r--r--archivers/mscompress/Makefile4
-rw-r--r--archivers/nulib2/Makefile8
-rw-r--r--archivers/nulib2/distinfo5
-rw-r--r--archivers/nulib2/patches/patch-ab11
-rw-r--r--archivers/nulib2/patches/patch-ac26
-rw-r--r--archivers/ppunpack/Makefile6
-rw-r--r--archivers/rar/Makefile3
-rw-r--r--archivers/squsq/Makefile4
-rw-r--r--archivers/stuffit/Makefile3
-rw-r--r--archivers/unace/Makefile6
-rw-r--r--archivers/unarj/Makefile4
-rw-r--r--archivers/undms/Makefile8
-rw-r--r--archivers/unlzx/Makefile8
-rw-r--r--archivers/unrar/Makefile7
-rw-r--r--archivers/unrar/distinfo2
-rw-r--r--archivers/unzip/Makefile6
-rw-r--r--archivers/unzip/distinfo2
-rw-r--r--archivers/unzip/patches/patch-ab2
-rw-r--r--archivers/xbin/Makefile10
-rw-r--r--archivers/zip/Makefile4
-rw-r--r--archivers/zip1/Makefile4
-rw-r--r--archivers/zoo/Makefile5
-rw-r--r--audio/vorbis-tools/Makefile18
-rw-r--r--audio/vorbis-tools/distinfo2
-rw-r--r--chat/gaim/Makefile17
-rw-r--r--chat/gaim/Makefile.common5
-rw-r--r--chat/gaim/PLIST2
-rw-r--r--chat/gaim/PLIST.common2
-rw-r--r--chat/gaim/distinfo2
-rw-r--r--chat/gaim/patches/patch-aa2
-rw-r--r--chat/gaim/patches/patch-ab2
-rw-r--r--chat/ircII/Makefile22
-rw-r--r--chat/ircII/distinfo4
-rw-r--r--chat/ircII/patches/patch-aa25
-rw-r--r--databases/php4-dba/Makefile8
-rw-r--r--databases/postgresql-client/Makefile12
-rw-r--r--databases/postgresql-server/MESSAGE2
-rw-r--r--databases/postgresql-server/Makefile10
-rw-r--r--databases/postgresql-server/files/pgsql.sh2
-rw-r--r--devel/autoconf/Makefile7
-rw-r--r--devel/automake/Makefile10
-rw-r--r--devel/gindent/Makefile4
-rw-r--r--devel/gmake/Makefile6
-rw-r--r--devel/gmake/distinfo2
-rw-r--r--devel/gmake/patches/patch-ae2
-rw-r--r--devel/gmp/Makefile4
-rw-r--r--devel/gmp/PLIST2
-rw-r--r--devel/gmp/buildlink.mk2
-rw-r--r--devel/gmp/distinfo2
-rw-r--r--devel/gmp/patches/patch-ga2
-rw-r--r--devel/gmp/patches/patch-gb2
-rw-r--r--devel/gmp/patches/patch-gc2
-rw-r--r--devel/gmp/patches/patch-gd2
-rw-r--r--devel/m4/Makefile4
-rw-r--r--devel/p5-BSD-Resource/Makefile24
-rw-r--r--devel/p5-BSD-Resource/distinfo2
-rw-r--r--devel/sgi-stl/Makefile3
-rw-r--r--emulators/suse_base/Makefile3
-rw-r--r--emulators/suse_base/PLIST2
-rw-r--r--emulators/suse_compat/Makefile3
-rw-r--r--emulators/suse_libjpeg/Makefile3
-rw-r--r--emulators/suse_libpng/Makefile3
-rw-r--r--emulators/suse_x11/Makefile3
-rw-r--r--fonts/ghostscript-fonts/Makefile3
-rw-r--r--fonts/watanabe_vfont/Makefile4
-rw-r--r--graphics/freetype-utils/Makefile9
-rw-r--r--graphics/freetype/Makefile3
-rw-r--r--graphics/gqview/Makefile12
-rw-r--r--graphics/gqview/patches/patch-ab13
-rw-r--r--graphics/ns-flash/Makefile3
-rw-r--r--graphics/ns-flash/distinfo2
-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
-rw-r--r--news/cg/Makefile4
-rw-r--r--news/cg/PLIST2
-rw-r--r--news/cg/distinfo2
-rw-r--r--print/foomatic-gswrapper/Makefile6
-rw-r--r--print/ghostscript-nox11/Makefile4
-rw-r--r--print/ghostscript-nox11/Makefile.common6
-rw-r--r--print/ghostscript/Makefile6
-rw-r--r--print/gimp-print-lib/Makefile6
-rw-r--r--print/gimp-print-lib/distinfo2
-rw-r--r--print/gimp-print-lib/patches/patch-ac2
-rw-r--r--print/ja-vflib-utils/Makefile6
-rw-r--r--print/ja-vflib-utils/PLIST2
-rw-r--r--print/mgv/Makefile14
-rw-r--r--print/mpage/Makefile6
-rw-r--r--print/tcl-pdflib/Makefile13
-rw-r--r--print/tcl-pdflib/PLIST2
-rw-r--r--print/xpdf/Makefile17
-rw-r--r--print/xpdf/PLIST2
-rw-r--r--print/xpp/Makefile17
-rw-r--r--security/gnupg/Makefile17
-rw-r--r--security/gnupg/PLIST2
-rw-r--r--security/gnupg/distinfo2
-rw-r--r--security/gnupg/patches/patch-ad2
-rw-r--r--security/gnupg/patches/patch-ae2
-rw-r--r--security/gpa/Makefile9
-rw-r--r--security/mcrypt/Makefile14
-rw-r--r--security/mhash/Makefile2
-rw-r--r--security/mhash/buildlink2.mk2
-rw-r--r--security/pam-smbpass/Makefile11
-rw-r--r--security/pks/Makefile7
-rw-r--r--security/racoon/Makefile8
-rw-r--r--security/racoon/distinfo2
-rw-r--r--security/racoon/patches/patch-ag2
-rw-r--r--security/rats/Makefile6
-rw-r--r--security/sslwrap/Makefile6
-rw-r--r--security/stunnel/Makefile7
-rw-r--r--security/sudo/Makefile4
-rw-r--r--security/sudo/distinfo2
-rw-r--r--security/sudo/patches/patch-ac2
-rw-r--r--security/zebedee/Makefile13
220 files changed, 740 insertions, 619 deletions
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 2f4301db6cc..6cf1cea5f02 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:09 agc Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:48:57 jlam Exp $
# FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:09 fenner Exp
#
@@ -15,8 +15,8 @@ RESTRICTED= "Do not modify. Do not charge for redistribution"
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
-WRKSRC= ${WRKDIR}
-USE_BUILDLINK_ONLY= yes
+WRKSRC= ${WRKDIR}
+USE_BUILDLINK2= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/arc ${PREFIX}/bin/
diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index 1f8be07f61a..24fe279193d 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:09 agc Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 21:48:58 jlam Exp $
#
DISTNAME= bicom101
@@ -12,15 +12,19 @@ HOMEPAGE= http://www3.sympatico.ca/mtimmerm/bicom/
COMMENT= data compressor in the PPM family
LICENSE= no-commercial-use
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= # defined
WRKSRC= ${WRKDIR}
do-build:
- for i in bialib bicom; do \
- cd ${WRKSRC}/$$i && \
- for j in *.cpp; do ${CXX} -c -I./ -I../bialib $$j; done; \
+ for i in bialib bicom; do \
+ cd ${WRKSRC}/$$i && \
+ for file in *.cpp; do \
+ ${BUILDLINK_CXX} ${CXXFLAGS} -I./ -I../bialib \
+ -c $$file; \
+ done; \
done
- cd ${WRKSRC}/bicom && ${CXX} -o bicom *.o ../bialib/*.o
+ cd ${WRKSRC}/bicom && \
+ ${BUILDLINK_CXX} ${CXXFLAGS} -o bicom *.o ../bialib/*.o
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bicom/bicom ${PREFIX}/bin
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index 043e2984de5..654f2363a1b 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/02/25 04:47:21 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:48:59 jlam Exp $
DISTNAME= bunzip021.c
PKGNAME= bunzip-0.21
@@ -10,13 +10,13 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.muraroa.demon.co.uk/
COMMENT= Decompressor for bzip .bz files
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
WRKSRC= ${WRKDIR}
do-build:
- cd ${WRKSRC} && ${LINK.c} -o bunzip ${DISTNAME}
+ cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o bunzip ${DISTNAME}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bunzip ${PREFIX}/bin/
+ ${INSTALL_PROGRAM} ${WRKSRC}/bunzip ${PREFIX}/bin/bunzip
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index 9b7d79b0446..32ade65789a 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/03/24 14:02:35 mjl Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 21:48:59 jlam Exp $
#
DISTNAME= bzip2-1.0.2
@@ -9,9 +9,9 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://sourceware.cygnus.com/bzip2/
COMMENT= Block-sorting file compressor
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
USE_LIBTOOL= # defined
-MAKE_ENV+= REALCC="${CC}"
+MAKE_ENV+= REALCC="${BUILDLINK_CC}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bzip2 ${PREFIX}/bin
diff --git a/archivers/bzip2/buildlink2.mk b/archivers/bzip2/buildlink2.mk
new file mode 100644
index 00000000000..41ec56ed95e
--- /dev/null
+++ b/archivers/bzip2/buildlink2.mk
@@ -0,0 +1,56 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 21:49:00 jlam Exp $
+
+.if !defined(BZIP2_BUILDLINK2_MK)
+BZIP2_BUILDLINK2_MK= # defined
+
+.include "../../mk/bsd.prefs.mk"
+
+BUILDLINK_DEPENDS.bzip2?= bzip2>=1.0.1
+BUILDLINK_PKGSRCDIR.bzip2?= ../../archivers/bzip2
+
+.if defined(USE_BZIP2)
+_NEED_BZIP2= YES
+.else
+. if exists(/usr/include/bzlib.h)
+#
+# Recent versions of the libbz2 API prefix all functions with "BZ2_".
+#
+_BUILTIN_BZIP2!= ${EGREP} -c "BZ2_" /usr/include/bzlib.h || ${TRUE}
+. else
+_BUILTIN_BZIP2= 0
+. endif
+. if ${_BUILTIN_BZIP2} == "0"
+_NEED_BZIP2= YES
+. else
+_NEED_BZIP2= NO
+. endif
+#
+# This catch-all for SunOS is probably too broad, but better to err on
+# the safe side. We can narrow down the match when we have better
+# information.
+#
+_INCOMPAT_BZIP2= SunOS-*-*
+INCOMPAT_BZIP2?= # empty
+. for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2}
+. if !empty(MACHINE_PLATFORM:M${_pattern_})
+_NEED_BZIP2= YES
+. endif
+. endfor
+.endif
+
+.if ${_NEED_BZIP2} == "YES"
+BUILDLINK_PACKAGES+= bzip2
+EVAL_PREFIX+= BUILDLINK_PREFIX.bzip2=bzip2
+BUILDLINK_PREFIX.bzip2_DEFAULT= ${LOCALBASE}
+.else
+BUILDLINK_PREFIX.bzip2= /usr
+.endif
+
+BUILDLINK_FILES.bzip2= include/bzlib.h
+BUILDLINK_FILES.bzip2+= lib/libbz2.*
+
+BUILDLINK_TARGETS+= bzip2-buildlink
+
+bzip2-buildlink: _BUILDLINK_USE
+
+.endif # BZIP2_BUILDLINK2_MK
diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile
index 81009347415..0bfe8118e1c 100644
--- a/archivers/cabextract/Makefile
+++ b/archivers/cabextract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/08/21 16:18:51 dillo Exp $
+# $NetBSD: Makefile,v 1.3 2002/08/25 21:49:01 jlam Exp $
#
DISTNAME= cabextract-0.6
@@ -9,8 +9,7 @@ MAINTAINER= collver@linuxfreemail.com
HOMEPAGE= http://www.kyz.uklinux.net/cabextract.php3
COMMENT= Microsoft cabinet (.CAB) file extractor
-USE_BUILDLINK_ONLY= yes
-
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/archivers/cabextract/distinfo b/archivers/cabextract/distinfo
index 12f22303ba8..c6079b12296 100644
--- a/archivers/cabextract/distinfo
+++ b/archivers/cabextract/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/08/21 16:18:51 dillo Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:49:01 jlam Exp $
SHA1 (cabextract-0.6.tar.gz) = e788ad16b93c986f5db792288137bf98de11dd73
Size (cabextract-0.6.tar.gz) = 92469 bytes
diff --git a/archivers/cabextract/patches/patch-aa b/archivers/cabextract/patches/patch-aa
index db3d48ac653..a61a7299070 100644
--- a/archivers/cabextract/patches/patch-aa
+++ b/archivers/cabextract/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/08/21 16:18:52 dillo Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 21:49:02 jlam Exp $
--- cabextract.c.orig Mon Aug 12 03:39:05 2002
+++ cabextract.c
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index 92425ffafd5..7d89e5c9c46 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/09 15:06:11 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:49:02 jlam Exp $
#
DISTNAME= dact-0.8.3
@@ -9,7 +9,10 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.rkeene.org/devel/dact/
COMMENT= dynamic adaptive compression tool
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_GMAKE= YES
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/fastjar/Makefile b/archivers/fastjar/Makefile
index 7e12239d1e8..1562cfb8576 100644
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/07/15 11:23:25 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:49:03 jlam Exp $
#
DISTNAME= fastjar-0.90
@@ -10,8 +10,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://fastjar.sourceforge.net/
COMMENT= C language version of the 'jar' archiver normally used by Java
-GNU_CONFIGURE= YES
-USE_BUILDLINK_ONLY= YES
+GNU_CONFIGURE= YES
+USE_BUILDLINK2= YES
-.include "../../devel/zlib/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index a847534ef95..2290a56f116 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/09/14 18:47:16 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 21:49:03 jlam Exp $
DISTNAME= freeze-2.5
CATEGORIES= archivers
@@ -7,9 +7,9 @@ MASTER_SITES= ftp://ftp.cdrom.com/pub/unixfreeware/archive/
MAINTAINER= packages@netbsd.org
COMMENT= FREEZE / MELT compression program - often used in QNX
-USE_BUILDLINK_ONLY= yes
-GNU_CONFIGURE= yes
-ALL_TARGET= prog
+USE_BUILDLINK2= yes
+GNU_CONFIGURE= yes
+ALL_TARGET= prog
post-patch:
cd ${WRKSRC}; for file in *.1; do \
diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
index f7647895e7c..2914f4857ef 100644
--- a/archivers/gcpio/Makefile
+++ b/archivers/gcpio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/02/18 15:14:00 seb Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/25 21:49:04 jlam Exp $
#
DISTNAME= cpio-2.4.2
@@ -10,9 +10,9 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/cpio/cpio.html
COMMENT= GNU copy-in/out (cpio) with remote magnetic tape (rmt) support
-USE_BUILDLINK_ONLY= yes
-GNU_CONFIGURE= yes
-LIBS+= -lgnumalloc
+USE_BUILDLINK2= yes
+GNU_CONFIGURE= yes
+LIBS+= -lgnumalloc
INFO_FILES= cpio.info
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index 8ab424e04ed..50f964ca105 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:01 seb Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:49:04 jlam Exp $
DISTNAME= sharutils-4.2.1
PKGNAME= g${DISTNAME}
@@ -10,8 +10,8 @@ HOMEPAGE= http://www.gnu.org/software/sharutils/sharutils.html
COMMENT= Allow packing and unpacking of shell archives
BUILD_USES_MSGFMT= yes
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g --disable-uucode
CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
@@ -22,6 +22,6 @@ TEXINFO_OVERRIDE= YES
post-patch:
@${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/po/sharutils.pot
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 3f6ebe947cb..27216b157f0 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/01/27 18:32:32 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/25 21:49:06 jlam Exp $
#
DISTNAME= tar-1.12
@@ -6,39 +6,30 @@ PKGNAME= gtar-base-1.12
SVR4_PKGNAME= gtarb
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_GNU:=tar/}
+EXTRACT_SUFX= .shar.gz
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/tar/tar.html
COMMENT= The GNU tape archiver with remote magnetic tape support
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --program-prefix=g --with-catgets
+USE_BUILDLINK2= YES
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS+= --program-prefix=g --with-catgets
+CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Darwin"
-EXTRACT_SUFX= .shar.gz
-.endif
-
-.if (${OPSYS} != "NetBSD")
-PLIST_SRC= ${WRKDIR}/PLIST
-
-post-configure:
- @${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile
-
-pre-install:
- -${RM} -f ${PLIST_SRC}
-. if ${OPSYS} == "Darwin"
- ${CP} ${PKGDIR}/PLIST.Darwin ${PLIST_SRC}
-. else
- ${CAT} ${PKGDIR}/PLIST | ${SED} -e 's/cat$$/mo/' > ${PLIST_SRC}
-. endif
+.if ${OPSYS} == "NetBSD"
+PLIST_SRC= ${.CURDIR}/PLIST.NetBSD
+.elif ${OPSYS} == "Darwin"
+PLIST_SRC= ${.CURDIR}/PLIST.Darwin
+EXTRACT_SUFX= .tar.gz
.endif
post-patch:
@${ECHO} '' >>${WRKSRC}/po/fr.po
post-install:
- ${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/
+ ${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/gtar.1
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST
index dc17ba3a67c..440c864adb5 100644
--- a/archivers/gtar-base/PLIST
+++ b/archivers/gtar-base/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:25 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:49:06 jlam Exp $
bin/gtar
man/man1/gtar.1
-share/locale/de/LC_MESSAGES/tar.cat
-share/locale/fr/LC_MESSAGES/tar.cat
-share/locale/it/LC_MESSAGES/tar.cat
-share/locale/ko/LC_MESSAGES/tar.cat
-share/locale/nl/LC_MESSAGES/tar.cat
-share/locale/no/LC_MESSAGES/tar.cat
-share/locale/pl/LC_MESSAGES/tar.cat
-share/locale/pt/LC_MESSAGES/tar.cat
-share/locale/sl/LC_MESSAGES/tar.cat
-share/locale/sv/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/tar.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/tar.mo
diff --git a/archivers/gtar-base/PLIST.NetBSD b/archivers/gtar-base/PLIST.NetBSD
new file mode 100644
index 00000000000..cdfcc64e48a
--- /dev/null
+++ b/archivers/gtar-base/PLIST.NetBSD
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2002/08/25 21:49:07 jlam Exp $
+bin/gtar
+man/man1/gtar.1
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/tar.cat
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/tar.cat
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index 1632c1db074..bda4d8fde09 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/12/27 21:50:57 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:49:07 jlam Exp $
SHA1 (tar-1.12.tar.gz) = a426b8551a4b61289a1bb6d677ada162f8bbc51a
Size (tar-1.12.tar.gz) = 867759 bytes
@@ -7,5 +7,5 @@ Size (tar-1.12.shar.gz) = 1258219 bytes
SHA1 (patch-aa) = c0254788ea22dfdd746fb9c2bead8f93370e493e
SHA1 (patch-ab) = 7f58c1c752b7f5c020087dd4a2471887b5888c44
SHA1 (patch-ac) = 7b91433854e291cd963839cafe41441b5e09b6da
-SHA1 (patch-ad) = 06bce623e2c6041fc2a479154cd4e0853d4a560e
+SHA1 (patch-ad) = f3190475eb03e6b1dfe0dd7841ec77c2143d58c0
SHA1 (patch-ae) = 21862d6e4dfc81904ef2ae6276bce6c8131b5841
diff --git a/archivers/gtar-base/patches/patch-ad b/archivers/gtar-base/patches/patch-ad
index 02a67170ebf..90179926b10 100644
--- a/archivers/gtar-base/patches/patch-ad
+++ b/archivers/gtar-base/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 1999/09/18 14:52:26 kim Exp $
+$NetBSD: patch-ad,v 1.4 2002/08/25 21:49:08 jlam Exp $
--- configure.orig Fri Apr 25 16:03:34 1997
+++ configure Fri Sep 17 23:08:21 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.3 1999/09/18 14:52:26 kim Exp $
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
-+ DATADIRNAME=share
++ DATADIRNAME=${PKGLOCALEDIR}
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.3 1999/09/18 14:52:26 kim Exp $
CATOBJEXT=.cat
INSTOBJEXT=.cat
- DATADIRNAME=lib
-+ DATADIRNAME=share
++ DATADIRNAME=${PKGLOCALEDIR}
INTLDEPS="../intl/libintl.a"
INTLLIBS=$INTLDEPS
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile
index 12213b29ee7..6a199006f6d 100644
--- a/archivers/gtar-info/Makefile
+++ b/archivers/gtar-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/02/18 15:14:01 seb Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:49:08 jlam Exp $
#
DISTNAME= tar-1.12
@@ -14,6 +14,7 @@ COMMENT= Info format documentation for the GNU tape archiver
INFO_FILES= tar.info
+USE_BUILDLINK2= yes
NO_PATCH= yes
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index a75ec72b71a..03f4500d786 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/02/16 14:19:27 agc Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 21:49:05 jlam Exp $
#
DISTNAME= gtar-1.12
@@ -13,6 +13,8 @@ COMMENT= The "meta-package" for the GNU tape archiver (tar)
DEPENDS+= gtar-base-1.12:../../archivers/gtar-base
DEPENDS+= gtar-info-1.12:../../archivers/gtar-info
+USE_BUILDLINK2= yes
+
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
NO_PATCH= yes
diff --git a/archivers/gzip-base/Makefile b/archivers/gzip-base/Makefile
index 87f9ea54062..105a7d33a48 100644
--- a/archivers/gzip-base/Makefile
+++ b/archivers/gzip-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/01/27 18:32:33 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:49:09 jlam Exp $
DISTNAME= gzip-1.2.4a
PKGNAME= gzip-base-1.2.4a
@@ -11,14 +11,11 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html
COMMENT= Compress or expand files
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
BUILD_TARGET= all manlinks=so
INSTALL_TARGET= install manlinks=so
-.if exists(/usr/bin/gzip)
-IGNORE= "${PKGNAME} is part of your ${OPSYS} distribution"
-.endif
-
# We avoid using a patch for disabling the install of the info
# file. The easu part is that "install-info" is not called so
# we can simply remove the single installed info file.
diff --git a/archivers/gzip-info/Makefile b/archivers/gzip-info/Makefile
index 4f510202125..6dc7fcf9b79 100644
--- a/archivers/gzip-info/Makefile
+++ b/archivers/gzip-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/02/18 15:14:01 seb Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:49:10 jlam Exp $
DISTNAME= gzip-1.2.4a
PKGNAME= gzip-info-1.2.4a
@@ -13,14 +13,12 @@ COMMENT= Info format documentation for the GZIP utility
INFO_FILES= gzip.info
+USE_BUILDLINK2= yes
+
NO_PATCH= yes
NO_CONFIGURE= yes
NO_BUILD= yes
-.if exists(/usr/bin/gzip)
-IGNORE= "${PKGNAME} is part of your ${OPSYS} distribution"
-.endif
-
do-install:
${INSTALL_DATA} ${WRKSRC}/gzip.info ${PREFIX}/info
diff --git a/archivers/gzip/Makefile b/archivers/gzip/Makefile
index 99de150e5b6..2447bd4630a 100644
--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 14:19:26 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:49:09 jlam Exp $
DISTNAME= gzip-1.2.4a
CATEGORIES= archivers
@@ -12,6 +12,8 @@ COMMENT= The "meta-package" for the GZIP compression utility
DEPENDS+= gzip-base-1.2.4a:../../archivers/gzip-base
DEPENDS+= gzip-info-1.2.4a:../../archivers/gzip-info
+USE_BUILDLINK2= yes
+
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
NO_PATCH= yes
@@ -20,8 +22,4 @@ NO_BUILD= yes
do-install: # empty
-.if exists(/usr/bin/gzip)
-IGNORE= "${PKGNAME} is part of your ${OPSYS} distribution"
-.endif
-
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index d9ceef0f831..1462490685e 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/09/09 20:36:10 agc Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/25 21:49:10 jlam Exp $
# FreeBSD Id: Makefile,v 1.9 1997/08/10 22:31:19 fenner Exp
#
@@ -11,9 +11,9 @@ EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
COMMENT= The HA archiver using the HSC compression method
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
-WRKSRC= ${WRKDIR}
+WRKSRC= ${WRKDIR}
MAKEFILE= makefile.nix
MAKE_FLAGS= CC="${CC}"
ALL_TARGET= ha
diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 06becae3ea7..819ec1d35a5 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/03/14 13:02:30 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:49:11 jlam Exp $
DISTNAME= hpack79src
PKGNAME= hpack-0.79
@@ -8,19 +8,22 @@ MASTER_SITES= ftp://src.doc.ic.ac.uk/packages/hpack/
MAINTAINER= packages@netbsd.org
COMMENT= Multi-System Archiver with open keys PGP-based security
+USE_BUILDLINK2= yes
+
CRYPTO= yes
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
ALL_TARGET= hpack
+MAKE_FLAGS= CFLAGS="-c -DBSD386 -D__UNIX__ -DPREFIX=\\\"${PREFIX}\\\" -I. ${CFLAGS} -Icrypt"
+
.include "../../mk/bsd.prefs.mk"
+
.if ${OPSYS} == "Darwin"
-MAKE_FLAGS= CFLAGS="-c -DBSD386 -D__UNIX__ -DPREFIX=\\\"${PREFIX}\\\" -I. ${CFLAGS} -Icrypt" \
- CMDL="${LDFLAGS} -lcurses"
+MAKE_FLAGS+= CMDL="${LDFLAGS} -lcurses"
.else
-MAKE_FLAGS= CFLAGS="-c -DBSD386 -D__UNIX__ -DPREFIX=\\\"${PREFIX}\\\" -I. ${CFLAGS} -Icrypt" \
- CMDL="${LDFLAGS} -ltermcap"
+MAKE_FLAGS+= CMDL="${LDFLAGS} -ltermcap"
.endif
post-build:
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 7427db2f04e..a3633e7992e 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/03/09 04:55:33 yyamano Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 21:49:12 jlam Exp $
DISTNAME= lha-114i
PKGNAME= lha-114.9
@@ -9,9 +9,9 @@ MASTER_SITES= http://www2m.biglobe.ne.jp/~dolphin/lha/prog/ \
MAINTAINER= packages@netbsd.org
COMMENT= Archive files using LZW compression (.lzh files)
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
-MAKE_FLAGS= CC="${CC}" MAKE="${MAKE_PROGRAM}"
+MAKE_FLAGS= MAKE="${MAKE_PROGRAM}"
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
diff --git a/archivers/lha/distinfo b/archivers/lha/distinfo
index 4befaf3e9c5..c33f85c6bab 100644
--- a/archivers/lha/distinfo
+++ b/archivers/lha/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/07/19 03:14:31 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:49:12 jlam Exp $
SHA1 (lha-114i.tar.gz) = 79e35271f2cf783f946db3f22e304fef72dbac99
Size (lha-114i.tar.gz) = 64608 bytes
-SHA1 (patch-ae) = ad6040f318ecb2762618f210fbac35c03a17af66
+SHA1 (patch-ae) = a53647ccf72511ecd2b5306e23da1219fa5e7264
SHA1 (patch-af) = 0c2f6d5bf23c3c98b102487abe3dd1190470f50c
SHA1 (patch-ag) = 9ad3bc807a3cda4f71d8fbbbea19306f252f2489
SHA1 (patch-ah) = cd44b40fa7e25a9996b2441d1b78a1a6570977b2
diff --git a/archivers/lha/patches/patch-ae b/archivers/lha/patches/patch-ae
index af5957ff7ba..1a8ebee6cb3 100644
--- a/archivers/lha/patches/patch-ae
+++ b/archivers/lha/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2001/12/06 05:09:48 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2002/08/25 21:49:13 jlam Exp $
--- Makefile.orig Mon Dec 3 14:32:27 2001
+++ Makefile
@@ -8,12 +8,12 @@ $NetBSD: patch-ae,v 1.3 2001/12/06 05:09:48 jlam Exp $
-SHELL=/bin/sh
-MAKE = make
-+SHELL = ${SH}
-+MAKE = ${MAKE}
++#SHELL=/bin/sh
++#MAKE = make
-#CC = cc
-CC = gcc
-+CC = ${CC}
++#CC = gcc
SWITCHES = -DNEED_INCREMENTAL_INDICATOR \
-DTMP_FILENAME_TEMPLATE="\"/tmp/lhXXXXXX\""
diff --git a/archivers/lha/patches/patch-ah b/archivers/lha/patches/patch-ah
index e80189ec8bf..734474dd48f 100644
--- a/archivers/lha/patches/patch-ah
+++ b/archivers/lha/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2002/07/19 03:14:31 mycroft Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/25 21:49:13 jlam Exp $
--- src/lharc.c.orig Thu Oct 5 17:33:34 2000
+++ src/lharc.c Fri Jul 19 03:11:24 2002
diff --git a/archivers/lha/patches/patch-ai b/archivers/lha/patches/patch-ai
index d9e46c5a702..fe8284846b4 100644
--- a/archivers/lha/patches/patch-ai
+++ b/archivers/lha/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2002/07/19 03:14:32 mycroft Exp $
+$NetBSD: patch-ai,v 1.2 2002/08/25 21:49:13 jlam Exp $
--- src/slide.c.orig Wed Oct 4 14:57:38 2000
+++ src/slide.c Fri Jul 19 03:11:39 2002
diff --git a/archivers/lha/patches/patch-aj b/archivers/lha/patches/patch-aj
index 13e72891b2b..2e3bb93c80f 100644
--- a/archivers/lha/patches/patch-aj
+++ b/archivers/lha/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2002/07/19 03:14:33 mycroft Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/25 21:49:13 jlam Exp $
--- src/util.c.orig Wed Oct 4 14:57:38 2000
+++ src/util.c Fri Jul 19 03:11:46 2002
diff --git a/archivers/liblzo/Makefile b/archivers/liblzo/Makefile
index 21b4eeaaf46..9a44de6c5bc 100644
--- a/archivers/liblzo/Makefile
+++ b/archivers/liblzo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/08/22 23:51:13 mjl Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:49:14 jlam Exp $
#
VERS= 1.08
@@ -13,7 +13,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.oberhumer.com/opensource/lzo/
COMMENT= Portable lossless data compression library written in ANSI C
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/archivers/liblzo/buildlink2.mk b/archivers/liblzo/buildlink2.mk
new file mode 100644
index 00000000000..c2d9808fb42
--- /dev/null
+++ b/archivers/liblzo/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 21:49:14 jlam Exp $
+
+.if !defined(LIBLZO_BUILDLINK2_MK)
+LIBLZO_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= liblzo
+BUILDLINK_DEPENDS.liblzo?= liblzo>=1.06
+BUILDLINK_PKGSRCDIR.liblzo?= ../../archivers/liblzo
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.liblzo=liblzo
+BUILDLINK_PREFIX.liblzo_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.liblzo= include/lzo1.h
+BUILDLINK_FILES.liblzo+= include/lzo16bit.h
+BUILDLINK_FILES.liblzo+= include/lzo1a.h
+BUILDLINK_FILES.liblzo+= include/lzo1b.h
+BUILDLINK_FILES.liblzo+= include/lzo1c.h
+BUILDLINK_FILES.liblzo+= include/lzo1f.h
+BUILDLINK_FILES.liblzo+= include/lzo1x.h
+BUILDLINK_FILES.liblzo+= include/lzo1y.h
+BUILDLINK_FILES.liblzo+= include/lzo1z.h
+BUILDLINK_FILES.liblzo+= include/lzo2a.h
+BUILDLINK_FILES.liblzo+= include/lzoconf.h
+BUILDLINK_FILES.liblzo+= include/lzoutil.h
+BUILDLINK_FILES.liblzo+= lib/liblzo.*
+
+BUILDLINK_TARGETS+= liblzo-buildlink
+
+liblzo-buildlink: _BUILDLINK_USE
+
+.endif # LIBLZO_BUILDLINK2_MK
diff --git a/archivers/liblzo/distinfo b/archivers/liblzo/distinfo
index ab6afa4c9c3..361dee593f4 100644
--- a/archivers/liblzo/distinfo
+++ b/archivers/liblzo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/08/22 23:51:13 mjl Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:49:15 jlam Exp $
SHA1 (lzo-1.08.tar.gz) = ad1b458cf9d5d49153665d2adc25bd6129028221
Size (lzo-1.08.tar.gz) = 426692 bytes
diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index 0290eb309fd..4d13a7e0131 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/07/16 09:58:10 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:49:15 jlam Exp $
#
DISTNAME= lzop-1.00
@@ -9,8 +9,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://wildsau.idv.uni-linz.ac.at/mfx/lzop.html
COMMENT= Fast file compressor similar to gzip, using the LZO library
-USE_BUILDLINK_ONLY= YES
-GNU_CONFIGURE= YES
+USE_BUILDLINK2= YES
+GNU_CONFIGURE= YES
-.include "../../archivers/liblzo/buildlink.mk"
+.include "../../archivers/liblzo/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index d49d6824bd1..7ee266f374f 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/01/27 18:32:33 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:49:16 jlam Exp $
DISTNAME= macutil2.0b3
PKGNAME= macutil-2.0b3
@@ -13,7 +13,7 @@ MAKEFILE= makefile
MAKE_ENV+= CF="${CFLAGS}"
WRKSRC= ${WRKDIR}/macutil
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/macunpack/macunpack \
diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index 82379c5a84c..34adc6a9933 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/09/16 19:00:49 zuntum Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:49:17 jlam Exp $
#
DISTNAME= mscompress-0.3
@@ -10,7 +10,7 @@ MAINTAINER= collver@linuxfreemail.com
HOMEPAGE= ftp://ftp.penguin.cz/pub/users/mhi/mscompress/
COMMENT= Microsoft "compress.exe/expand.exe" compatible (de)compressor
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
do-install:
diff --git a/archivers/nulib2/Makefile b/archivers/nulib2/Makefile
index 9dd48b19ef7..278a92a846c 100644
--- a/archivers/nulib2/Makefile
+++ b/archivers/nulib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/08/01 02:31:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:49:17 jlam Exp $
#
DISTNAME= nulibdist
@@ -12,9 +12,9 @@ COMMENT= Handles Apple II ShrinkIt (NuFX) file/disk archives
WRKSRC= ${WRKDIR}/nulib2-101
-USE_BUILDLINK_ONLY= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --cache-file=${WRKDIR}/config.cache
+USE_BUILDLINK2= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --cache-file=${WRKDIR}/config.cache
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/nulib2/distinfo b/archivers/nulib2/distinfo
index 6f949a03462..6d80ffc77c6 100644
--- a/archivers/nulib2/distinfo
+++ b/archivers/nulib2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/07/16 10:09:45 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:49:18 jlam Exp $
SHA1 (nulibdist.tar.gz) = c3b351663444c20cd5e2f82763e1522298033280
Size (nulibdist.tar.gz) = 280311 bytes
SHA1 (patch-aa) = c6f629810a94376cf5150b3bff233e37bcb2bc44
-SHA1 (patch-ab) = 8b2aeaff89498614841fbae1dad1465469c5d254
+SHA1 (patch-ab) = 35c2cea8fc6c19d4ba759cbdce07fa85149808cb
+SHA1 (patch-ac) = 7d2de2035c5b16492dc93c040e4bfe2bcaf95ca5
diff --git a/archivers/nulib2/patches/patch-ab b/archivers/nulib2/patches/patch-ab
index 7ea9c607c69..644ec882f3d 100644
--- a/archivers/nulib2/patches/patch-ab
+++ b/archivers/nulib2/patches/patch-ab
@@ -1,16 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2001/07/16 10:09:45 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2002/08/25 21:49:18 jlam Exp $
--- Makefile.in.orig Mon May 22 20:42:57 2000
+++ Makefile.in
-@@ -38,7 +38,7 @@
- #OPT = @CFLAGS@ -DDEBUG_MSGS
- #OPT = @CFLAGS@ -DDEBUG_VERBOSE
- GCC_FLAGS = -Wall -Wwrite-strings -Wstrict-prototypes -Wpointer-arith -Wshadow
--CFLAGS = @BUILD_FLAGS@ -I. -I$(NUFXSRCDIR) -I$(includedir) @DEFS@
-+CFLAGS = @BUILD_FLAGS@ -I. -I$(NUFXSRCDIR) @DEFS@
-
- #ifdef PURIFY_BUILD
- # PURIFY = purify
@@ -64,7 +64,11 @@
# Build stuff
#
diff --git a/archivers/nulib2/patches/patch-ac b/archivers/nulib2/patches/patch-ac
new file mode 100644
index 00000000000..dadafff4f1b
--- /dev/null
+++ b/archivers/nulib2/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.2 2002/08/25 21:49:19 jlam Exp $
+
+--- ../nufxlib-101/Makefile.in.orig Mon May 22 20:15:37 2000
++++ ../nufxlib-101/Makefile.in
+@@ -76,10 +76,10 @@
+
+ # the build date is approximate, the build flags are accurate
+ Version.c: Version.c.in Makefile
+- (sed -e "s/BUILT/`date`/" -e "s/OPTFLAGS/$(OPT)/" < Version.c.in > Version.c)
++ (sed -e "s|BUILT|`date`|" -e "s|OPTFLAGS|$(OPT)|" < Version.c.in > Version.c)
+
+ clean:
+- (cd samples; make clean)
++ (cd samples; ${MAKE} clean)
+ -rm -f *.o core
+ -rm -f $(SHARED_PRODUCT) $(STATIC_PRODUCT)
+
+@@ -89,7 +89,7 @@
+ @#ctags *.[ch]
+
+ distclean: clean
+- (cd samples; make distclean)
++ (cd samples; ${MAKE} distclean)
+ -rm -f Version.c
+ -rm -f Makefile Makefile.bak
+ -rm -f config.log config.cache config.status config.h
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 4bcddb1166b..3f2fa626a9a 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/06/01 09:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:49:20 jlam Exp $
DISTNAME= ppsmall-1.0
PKGNAME= ppunpack-1.0
@@ -10,10 +10,10 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= packages@netbsd.org
COMMENT= Decompresses Amiga PowerPacker files
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
WRKSRC= ${WRKDIR}/PPUnpack
-MAKE_FLAGS= CC="${CC}" COPTS="${CFLAGS}"
+MAKE_FLAGS= CC="${BUILDLINK_CC}" COPTS="${CFLAGS}"
ALL_TARGET= ppunpack
LICENSE= no-commercial-use
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 1cb468ef763..6e41fb6d998 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/09/09 20:36:10 agc Exp $
+# $NetBSD: Makefile,v 1.30 2002/08/25 21:49:20 jlam Exp $
# FreeBSD Id: Makefile,v 1.7 1997/08/10 22:31:27 fenner Exp
#
@@ -21,6 +21,7 @@ NO_BIN_ON_FTP= ${RESTRICTED}
WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${DOWNLOADED_DISTFILE} >/dev/null
+USE_BUILDLINK2= # defined
pre-extract:
@if [ -z "$$KERNEL" ]; then \
diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile
index 93f1fce78a3..f20a1103b5a 100644
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/07/16 10:29:50 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:49:21 jlam Exp $
DISTNAME= t20-squsq-3.3
PKGNAME= squsq-3.3
@@ -11,7 +11,7 @@ COMMENT= Compressor/decompressor for CP/M Squeeze compressed files
WRKSRC= ${WRKDIR}/t20-squsq
MAKEFILE= ${FILESDIR}/Makefile
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sq ${WRKSRC}/usq ${PREFIX}/bin/
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index be5d698b044..3196b5387cf 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/04/04 12:29:46 tron Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:49:22 jlam Exp $
DISTNAME= stuffit520.611linux-i386
PKGNAME= stuffit-5.2.0.611
@@ -25,6 +25,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386
CHECK_SHLIBS= NO
NO_CONFIGURE= # defined
NO_BUILD= # defined
+USE_BUILDLINK2= # defined
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index 9210c8875df..c6b586e9981 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/12/03 22:04:39 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:22 jlam Exp $
#
DISTNAME= unace-1.2b
@@ -10,8 +10,8 @@ MAINTAINER= wiz@netbsd.org
HOMEPAGE= http://www.winace.com/
COMMENT= Extract, list and test files in ACE archives
-USE_BUILDLINK_ONLY= yes
-USE_GMAKE= yes
+USE_BUILDLINK2= yes
+USE_GMAKE= yes
ALL_TARGET= clean unace
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index be753ae3c52..84f80b864ab 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/16 10:29:50 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:49:23 jlam Exp $
DISTNAME= unarj-2.43
CATEGORIES= archivers
@@ -14,7 +14,7 @@ RESTRICTED= "Do not charge a fee for use, copying, or distribution"
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unarj
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index deac4b19e6f..9f381db88f9 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/02/25 04:47:21 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:49:24 jlam Exp $
DISTNAME= undms-1.3.c
PKGNAME= undms-1.3
@@ -10,11 +10,11 @@ EXTRACT_SUFX= .Z
MAINTAINER= packages@netbsd.org
COMMENT= Converts .dms Amiga disk images to uncompressed .adf images
-USE_BUILDLINK_ONLY= # defined
-WRKSRC= ${WRKDIR}
+USE_BUILDLINK2= # defined
+WRKSRC= ${WRKDIR}
do-build:
- cd ${WRKSRC} && ${LINK.c} -o undms undms-1.3.c
+ cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o undms undms-1.3.c
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/undms ${PREFIX}/bin/
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index ac33bae7586..8ecf1a0e36e 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/02/25 04:47:21 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:24 jlam Exp $
DISTNAME= unlzx.c
PKGNAME= unlzx-1.1
@@ -10,11 +10,11 @@ EXTRACT_SUFX= .gz
MAINTAINER= packages@netbsd.org
COMMENT= Extracts .lzx archives from Amiga systems
-USE_BUILDLINK_ONLY= # defined
-WRKSRC= ${WRKDIR}
+USE_BUILDLINK2= # defined
+WRKSRC= ${WRKDIR}
do-build:
- cd ${WRKSRC} && ${LINK.c} -o unlzx unlzx.c
+ cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o unlzx unlzx.c
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/unlzx ${PREFIX}/bin
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 0ba4db2720f..3d34c42b22e 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/08/05 13:37:01 veego Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 21:49:25 jlam Exp $
DISTNAME= unrarsrc
PKGNAME= unrar-3.0
@@ -20,7 +20,10 @@ RESTRICTED= "Do not modify. Do not charge a fee for redistribution."
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
+
+do-build:
+ cd ${WRKSRC} && ${BUILDLINK_CC} ${CFLAGS} -o unrar -D_UNIX unrar.c
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unrar
diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo
index 3736dae75e1..fc14d12d741 100644
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/08/05 13:37:01 veego Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:49:25 jlam Exp $
SHA1 (unrar-3.0/unrarsrc.tar.gz) = 1bdc6c1e1ebd344af2ece48b3d7b83b0832c78e9
Size (unrar-3.0/unrarsrc.tar.gz) = 108844 bytes
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 66a79da3030..56ee875324c 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/07/16 09:07:39 grant Exp $
+# $NetBSD: Makefile,v 1.33 2002/08/25 21:49:26 jlam Exp $
# FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp
#
@@ -15,7 +15,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.info-zip.org/pub/infozip/UnZip.html
COMMENT= List, test and extract compressed files in a ZIP archive
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
MAKEFILE= unix/Makefile
ALL_TARGET= generic_zlib unzipsfx
@@ -31,5 +31,5 @@ do-install:
cd ${WRKSRC} && ${INSTALL_DATA} BUGS COPYING.OLD LICENSE README WHERE \
${PREFIX}/share/doc/unzip
-.include "../../devel/zlib/buildlink.mk"
+.include "../../devel/zlib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unzip/distinfo b/archivers/unzip/distinfo
index ee48ee23ae9..971343d4cae 100644
--- a/archivers/unzip/distinfo
+++ b/archivers/unzip/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/07/16 08:58:33 grant Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:49:26 jlam Exp $
SHA1 (unzip550.tar.gz) = 51034a8098eddc8facb4db9ea1a935e813dbdb73
Size (unzip550.tar.gz) = 1068662 bytes
diff --git a/archivers/unzip/patches/patch-ab b/archivers/unzip/patches/patch-ab
index 5e2c45cc9dc..d25022194ab 100644
--- a/archivers/unzip/patches/patch-ab
+++ b/archivers/unzip/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/07/16 08:56:34 grant Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 21:49:26 jlam Exp $
--- unix/Makefile.orig Sun Feb 17 04:00:38 2002
+++ unix/Makefile Wed Jul 17 04:50:03 2002
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index e7b670cd912..92974ff611a 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/09 20:36:11 agc Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:27 jlam Exp $
#
DISTNAME= ${PRGNAME}unix
@@ -14,11 +14,11 @@ RESTRICTED= "May not be sold without permission"
NO_SRC_ON_CDROM=${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
-USE_BUILDLINK_ONLY= # defined
-WRKSRC= ${WRKDIR}
+USE_BUILDLINK2= # defined
+WRKSRC= ${WRKDIR}
PRGNAME= xbin
-EXTRACT_ONLY= # blank
+EXTRACT_ONLY= # empty
post-extract:
.for dfile in ${DISTFILES}
@@ -27,7 +27,7 @@ post-extract:
do-build:
cd ${WRKSRC} && \
- ${CC} ${CFLAGS} -DBSD -o ${PRGNAME} ${DISTNAME}.c -lcompat
+ ${BUILDLINK_CC} ${CFLAGS} -DBSD -o ${PRGNAME} ${DISTNAME}.c -lcompat
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PRGNAME} ${PREFIX}/bin
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 753953018f8..29a748a32a2 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/07/31 10:29:29 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/25 21:49:27 jlam Exp $
# FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp
#
@@ -27,7 +27,7 @@ ALL_TARGET= generic_gcc
ALL_TARGET= generic
.endif
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
post-extract:
@cd ${WRKSRC} && unzip -qo ${DISTDIR}/zcrypt29.zip
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index 4eaa929867f..8c7b25ef302 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/08/01 02:37:45 jschauma Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 21:49:28 jlam Exp $
#
DISTNAME= zip1-1.1
@@ -19,7 +19,7 @@ MAKEFILE= makefile
MAKE_FLAGS= CFLAGS="${CFLAGS} -DDIRENT" LFLAGS2="-lcompat"
ALL_TARGET= zip
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
WRKSRC= ${WRKDIR}
PLIST_SRC= ${WRKSRC}/PLIST
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index e54a0a29a92..35b88fa65ff 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/09/09 20:36:12 agc Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/25 21:49:28 jlam Exp $
# FreeBSD Id: Makefile,v 1.8 1997/08/10 22:31:36 fenner Exp
#
@@ -12,7 +12,8 @@ COMMENT= Manipulate archives of files in compressed form
LICENSE= zoo-license
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
+
WRKSRC= ${WRKDIR}
ALL_TARGET= bsdansi
MAKEFILE= makefile
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 537bbec368d..f1183b54aa1 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/08/05 13:12:43 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 21:49:29 jlam Exp $
DISTNAME= vorbis-tools-1.0
PKGNAME= vorbis-tools-1.0.0.8
@@ -16,21 +16,21 @@ DEPENDS= curl>=7.9.1:../../www/curl
CONFLICTS= vorbis-[0-9]*
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_DIR} \
- --with-vorbis-prefix=${BUILDLINK_DIR} \
- --with-ao-prefix=${BUILDLINK_DIR}
+CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
+ --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
+ --with-ao-prefix=${BUILDLINK_PREFIX.libao}
PLIST_SUBST+= DISTNAME="${DISTNAME}"
PTHREAD_OPTS+= require
-.include "../../audio/libao/buildlink.mk"
-.include "../../audio/libogg/buildlink.mk"
-.include "../../audio/libvorbis/buildlink.mk"
+.include "../../audio/libao/buildlink2.mk"
+.include "../../audio/libogg/buildlink2.mk"
+.include "../../audio/libvorbis/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/pthread.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index a741f1c5ac0..61fadd6634f 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/08/05 13:12:43 lukem Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 21:49:29 jlam Exp $
SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d
Size (vorbis-tools-1.0.tar.gz) = 425404 bytes
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index a373795bf87..a1088dd5d3a 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.19 2002/07/09 02:10:50 rafal Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/25 21:49:30 jlam Exp $
#
.include "Makefile.common"
+CONFLICTS+= gaim-gnome-[0-9]*
+
+USE_BUILDLINK2= YES
+
CONFIGURE_ARGS+= --disable-gnome
CONFIGURE_ARGS+= --disable-panel
-PLIST_SRC+= ${.CURDIR}/../gaim/PLIST
-
-CONFLICTS+= gaim-gnome-[0-9]*
+PLIST_SRC+= ${.CURDIR}/../gaim/PLIST
-.include "../../audio/esound/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../audio/esound/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
index 793be91f075..9140887bbd8 100644
--- a/chat/gaim/Makefile.common
+++ b/chat/gaim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2002/07/09 02:10:51 rafal Exp $
+# $NetBSD: Makefile.common,v 1.2 2002/08/25 21:49:31 jlam Exp $
#
DISTNAME= gaim-0.59
@@ -16,7 +16,6 @@ PATCHDIR= ${.CURDIR}/../gaim/patches
PKGDIR= ${.CURDIR}/../gaim
PLIST_SRC= ${.CURDIR}/../gaim/PLIST.common
-USE_BUILDLINK_ONLY= YES
USE_GMAKE= YES
USE_X11BASE= YES
@@ -32,5 +31,3 @@ CONFIGURE_ARGS+= --disable-screensaver
CONFIGURE_ARGS+= --enable-esd
CONFIGURE_ARGS+= --enable-perl
CONFIGURE_ARGS+= --enable-pixbuf
-
-CONFIGURE_ENV+= pixbufcfg="${GDK_PIXBUF_CONFIG}"
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index adef85ac27a..57b9d4c6815 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.9 2002/07/09 02:10:51 rafal Exp $
+@comment $NetBSD: PLIST,v 1.10 2002/08/25 21:49:31 jlam Exp $
bin/gaim
diff --git a/chat/gaim/PLIST.common b/chat/gaim/PLIST.common
index 091f5976978..586440be0bf 100644
--- a/chat/gaim/PLIST.common
+++ b/chat/gaim/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2002/07/09 02:10:51 rafal Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2002/08/25 21:49:31 jlam Exp $
lib/gaim/autorecon.so
lib/gaim/chatlist.so
lib/gaim/iconaway.so
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 2d90f391a3e..4c187b65895 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/07/19 05:13:33 mycroft Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 21:49:32 jlam Exp $
SHA1 (gaim-0.59.tar.gz) = 0a74bc3b48810291adf9725966efc4a6de28fa3f
Size (gaim-0.59.tar.gz) = 2047105 bytes
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
index bdfd9877e34..9ad60381cc8 100644
--- a/chat/gaim/patches/patch-aa
+++ b/chat/gaim/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2002/07/01 17:16:21 hubertf Exp $
+$NetBSD: patch-aa,v 1.7 2002/08/25 21:49:32 jlam Exp $
--- configure.orig Tue Jun 25 06:23:07 2002
+++ configure
diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab
index ed309a6e957..03817b3a04f 100644
--- a/chat/gaim/patches/patch-ab
+++ b/chat/gaim/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/07/19 05:13:35 mycroft Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 21:49:33 jlam Exp $
--- src/perl.c.orig Fri May 31 05:13:02 2002
+++ src/perl.c Fri Jul 19 05:07:30 2002
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile
index 0d0a4a10a55..563c5715588 100644
--- a/chat/ircII/Makefile
+++ b/chat/ircII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/04/03 14:00:49 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/25 21:49:34 jlam Exp $
DISTNAME= ircii-${VERS}
PKGNAME= ircII-${VERS}
@@ -17,7 +17,7 @@ PLIST_SUBST+= VERS=${VERS}
.include "../../mk/bsd.prefs.mk"
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
.if defined(DEFAULT_IRC_SERVER)
CONFIGURE_ARGS+= --with-default-server=${DEFAULT_IRC_SERVER}
@@ -34,20 +34,18 @@ BUILD_DEFS+= USE_SOCKS
# Include SOCKS firewall support
.if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5)
-CONFIGURE_ARGS+= --with-socks${USE_SOCKS}=${BUILDLINK_DIR}
-.if ${USE_SOCKS} == 4
-.include "../../net/socks4/buildlink.mk"
-.else
-.include "../../net/socks5/buildlink.mk"
-.endif
+. if ${USE_SOCKS} == 4
+. include "../../net/socks4/buildlink2.mk"
+CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.socks4}
+. elif ${USE_SOCKS} == 5
+. include "../../net/socks5/buildlink2.mk"
+CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_PREFIX.socks5}
+. endif
.endif
-.if defined(IRCII_CONFIGURE_ARGS)
+# Allow customizations from /etc/mk.conf.
CONFIGURE_ARGS+= ${IRCII_CONFIGURE_ARGS}
-.endif
-.if defined(IRCII_CONFIGURE_ENV)
CONFIGURE_ENV+= ${IRCII_CONFIGURE_ENV}
-.endif
pre-install:
@(if [ "X${MANZ}" != X"" ]; then \
diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo
index 7a56eee0047..56365df494f 100644
--- a/chat/ircII/distinfo
+++ b/chat/ircII/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2002/04/03 13:42:01 mrg Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 21:49:34 jlam Exp $
SHA1 (ircii-20020403.tar.bz2) = e6492a796dc068eafe34c60b4ad503b36c4dc198
Size (ircii-20020403.tar.bz2) = 537289 bytes
-SHA1 (patch-aa) = 80aa471bcb6f864bed32117ed437d9d1ca9aa1ee
+SHA1 (patch-aa) = aff3a8c5ff05797b8617be2b4b57920913ae9ca2
SHA1 (patch-ac) = 0afd36f3ad2247b0d42dfebab210822dd5dfe151
diff --git a/chat/ircII/patches/patch-aa b/chat/ircII/patches/patch-aa
index d6ba25ee00b..48978813371 100644
--- a/chat/ircII/patches/patch-aa
+++ b/chat/ircII/patches/patch-aa
@@ -1,25 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/07/15 12:22:17 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 21:49:35 jlam Exp $
---- configure.orig Mon Feb 12 07:46:44 2001
-+++ configure
-@@ -538,16 +538,6 @@
-
-
-
--# So many systems seem to need this that it is better do it here automatically.
--if test "x$prefix" != xNONE; then
-- if test -d "$prefix/lib"; then
-- LIBS="-L${prefix}/lib $LIBS"
-- fi
--else
-- if test -d "$ac_default_prefix/lib"; then
-- LIBS="-L${ac_default_prefix}/lib $LIBS"
-- fi
--fi
-
-
- VERSION=`sed -n -e 's/"[^"]*$//' -e '/#define[ ]*IRCII_VERSION[ ]*"/s///p' -e '/#define IRCII_VERSION/q' < ${srcdir}/source/irc.c`
-@@ -5499,7 +5489,7 @@
+--- configure.orig Wed Mar 27 09:20:46 2002
++++ configure Wed May 8 05:34:40 2002
+@@ -5578,7 +5578,7 @@
fi
if test "x$COPY_DIRECTORY" = "xpax";
then
diff --git a/databases/php4-dba/Makefile b/databases/php4-dba/Makefile
index 8995e5c6eeb..77f5500b879 100644
--- a/databases/php4-dba/Makefile
+++ b/databases/php4-dba/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2002/02/28 06:16:48 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:49:35 jlam Exp $
MODNAME= dba
CATEGORIES+= databases
PKGREVISION= # empty
COMMENT= PHP4 extension for DBM database access
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../www/php4/Makefile.module"
@@ -20,9 +20,9 @@ CONFIGURE_ARGS+= --without-dbm
CONFIGURE_ARGS+= --without-gdbm
CONFIGURE_ARGS+= --with-ndbm=/usr
.else
-CONFIGURE_ARGS+= --with-gdbm=shared,${BUILDLINK_DIR}
+CONFIGURE_ARGS+= --with-gdbm=shared,${BUILDLINK_PREFIX.gdbm}
CONFIGURE_ARGS+= --without-ndbm
-.include "../../databases/gdbm/buildlink.mk"
+.include "../../databases/gdbm/buildlink2.mk"
.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 1097281592a..cbf3ccf8c63 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2002/04/04 07:41:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 21:49:36 jlam Exp $
PKGNAME= postgresql-client-${BASE_VERS}
COMMENT= PostgreSQL database client programs
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../databases/postgresql/Makefile.common"
-CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
CONFIGURE_ARGS+= --enable-readline
MAKE_ENV+= INSTALLED_LIBPQ=1
@@ -34,7 +34,7 @@ post-install:
${SED} -e "s|^#.*||" ${FILESDIR}/exclude \
| ${GTAR} zxCXf ${PREFIX}/man - ${WRKSRC}/doc/man.tar.gz
-.include "../../databases/postgresql-lib/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
-.include "../../devel/zlib/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-server/MESSAGE b/databases/postgresql-server/MESSAGE
index 10f69ad6deb..98446b823db 100644
--- a/databases/postgresql-server/MESSAGE
+++ b/databases/postgresql-server/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/08/22 22:36:26 hubertf Exp $
+$NetBSD: MESSAGE,v 1.3 2002/08/25 21:49:36 jlam Exp $
To enable this package, put the following into your /etc/rc.conf:
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 20142078ebc..4eb75307abc 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/08/07 07:28:35 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/25 21:49:37 jlam Exp $
PKGNAME= postgresql-server-${BASE_VERS}
COMMENT= PostgreSQL database server programs
@@ -8,15 +8,15 @@ DEPENDS+= postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
# mips has no TAS implementation
NOT_FOR_PLATFORM= *-*-mips
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../databases/postgresql/Makefile.common"
-CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
DIRS_TO_BUILD= src/backend
.if defined(USE_PAM)
-.include "../../security/PAM/buildlink.mk"
+. include "../../security/PAM/buildlink2.mk"
CONFIGURE_ARGS+= --with-pam
.endif
@@ -78,6 +78,6 @@ post-install:
`${SED} -e "s|^#.*||" ${FILESDIR}/man.server`
${INSTALL_SCRIPT} ${WRKDIR}/pgsql.sh ${PREFIX}/etc/rc.d/pgsql
-.include "../../databases/postgresql-lib/buildlink.mk"
+.include "../../databases/postgresql-lib/buildlink2.mk"
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-server/files/pgsql.sh b/databases/postgresql-server/files/pgsql.sh
index f3b3c5c64f7..ff74cc74a78 100644
--- a/databases/postgresql-server/files/pgsql.sh
+++ b/databases/postgresql-server/files/pgsql.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: pgsql.sh,v 1.10 2002/07/18 01:40:07 cjs Exp $
+# $NetBSD: pgsql.sh,v 1.11 2002/08/25 21:49:37 jlam Exp $
#
# PostgreSQL database rc.d control script
#
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index ccbd66a6a8a..af1e45da76f 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/02/18 15:14:07 seb Exp $
+# $NetBSD: Makefile,v 1.33 2002/08/25 21:49:38 jlam Exp $
# FreeBSD Id: Makefile,v 1.12 1997/06/13 20:00:47 max Exp
#
@@ -14,8 +14,7 @@ DEPENDS= m4-1.4:../../devel/m4
CONFLICTS= autoconf-devel-[0-9]*
-USE_BUILDLINK_ONLY= YES
-
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV+= AWK="${AWK}"
M4= ${PREFIX}/bin/gm4
@@ -23,6 +22,6 @@ M4= ${PREFIX}/bin/gm4
INFO_FILES= autoconf.info standards.info
TEXINFO_OVERRIDE= YES
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index ba72b01c85d..3686d15c183 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/05/29 14:45:58 yyamano Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/25 21:49:39 jlam Exp $
# FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp
#
@@ -14,14 +14,14 @@ COMMENT= GNU Standards-compliant Makefile generator
DEPENDS= autoconf>=2.13:../../devel/autoconf
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV= PERL=${PERL5}
-_STRIPFLAG_INSTALL= # none
+_STRIPFLAG_INSTALL= # none
-INFO_FILES= automake.info
+INFO_FILES= automake.info
TEXINFO_OVERRIDE= YES
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index a0e1a9fa9a9..5fc0591b963 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/02/18 15:14:10 seb Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/25 21:49:39 jlam Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/08/29 09:20:00 obrien Exp
#
@@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/indent/indent.html
COMMENT= GNU version of pretty-printer for C source code
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 91495728a53..dafc62a9e54 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/08/19 18:39:16 seb Exp $
+# $NetBSD: Makefile,v 1.31 2002/08/25 21:49:40 jlam Exp $
# FreeBSD Id: Makefile,v 1.16 1997/06/13 20:00:47 max Exp
#
@@ -12,7 +12,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/make/make.html
COMMENT= GNU version of 'make' utility
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --program-prefix="g"
CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
@@ -36,6 +36,6 @@ post-install:
${CHMOD} g-s ${PREFIX}/bin/gmake
${CHGRP} ${BINGRP} ${PREFIX}/bin/gmake
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gmake/distinfo b/devel/gmake/distinfo
index 0b87b81c5e9..26bbd55c7dc 100644
--- a/devel/gmake/distinfo
+++ b/devel/gmake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/12 23:26:25 wiz Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:49:40 jlam Exp $
SHA1 (make-3.79.1.tar.gz) = d3cdff9f91a9cda71af8b2df2a94f9b844fa9704
Size (make-3.79.1.tar.gz) = 1030393 bytes
diff --git a/devel/gmake/patches/patch-ae b/devel/gmake/patches/patch-ae
index 1a8b47e4a8b..c9fd8588c32 100644
--- a/devel/gmake/patches/patch-ae
+++ b/devel/gmake/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2002/06/12 23:26:26 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2002/08/25 21:49:41 jlam Exp $
--- config.sub.orig Fri Jun 23 09:30:45 2000
+++ config.sub Wed Jun 5 19:09:07 2002
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index e58dc018035..0e9e30a125c 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/08/24 00:39:06 mjl Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/25 21:49:41 jlam Exp $
#
DISTNAME= gmp-4.1
@@ -11,7 +11,7 @@ COMMENT= Library for arbitrary precision arithmetic
BUILD_DEPENDS+= m4-1.4:../../devel/m4
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-cxx --without-readline
USE_LIBTOOL= YES
diff --git a/devel/gmp/PLIST b/devel/gmp/PLIST
index 832e186873b..85313335c72 100644
--- a/devel/gmp/PLIST
+++ b/devel/gmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/24 00:39:06 mjl Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/08/25 21:49:42 jlam Exp $
include/gmp.h
include/gmpxx.h
@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gmp.info
diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk
index bf584979b73..5fbb4bfd231 100644
--- a/devel/gmp/buildlink.mk
+++ b/devel/gmp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/08/24 00:39:06 mjl Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 21:49:42 jlam Exp $
#
# This Makefile fragment is included by packages that use gmp.
#
diff --git a/devel/gmp/distinfo b/devel/gmp/distinfo
index 1b7daa60dfc..e456ad7bd98 100644
--- a/devel/gmp/distinfo
+++ b/devel/gmp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/24 00:39:06 mjl Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 21:49:43 jlam Exp $
SHA1 (gmp-4.1.tar.gz) = 6385fdfda2da9bd8c47256f5766b917f767c181b
Size (gmp-4.1.tar.gz) = 2145387 bytes
diff --git a/devel/gmp/patches/patch-ga b/devel/gmp/patches/patch-ga
index 7cdd5c4d35e..9eeddc4628b 100644
--- a/devel/gmp/patches/patch-ga
+++ b/devel/gmp/patches/patch-ga
@@ -1,4 +1,4 @@
-$NetBSD: patch-ga,v 1.1 2002/08/24 00:39:07 mjl Exp $
+$NetBSD: patch-ga,v 1.2 2002/08/25 21:49:43 jlam Exp $
This is a patch for 4.1 from the GNU MP Homepage, it should be
removed in future versions
diff --git a/devel/gmp/patches/patch-gb b/devel/gmp/patches/patch-gb
index d65b0ad2a25..9ed1fd35e1f 100644
--- a/devel/gmp/patches/patch-gb
+++ b/devel/gmp/patches/patch-gb
@@ -1,4 +1,4 @@
-$NetBSD: patch-gb,v 1.1 2002/08/24 00:39:07 mjl Exp $
+$NetBSD: patch-gb,v 1.2 2002/08/25 21:49:44 jlam Exp $
This is a patch for 4.1 from the GNU MP Homepage, it should be
removed in future versions
diff --git a/devel/gmp/patches/patch-gc b/devel/gmp/patches/patch-gc
index 00a77a4bff8..bb138ee94d1 100644
--- a/devel/gmp/patches/patch-gc
+++ b/devel/gmp/patches/patch-gc
@@ -1,4 +1,4 @@
-$NetBSD: patch-gc,v 1.1 2002/08/24 00:39:08 mjl Exp $
+$NetBSD: patch-gc,v 1.2 2002/08/25 21:49:44 jlam Exp $
This is a patch for 4.1 from the GNU MP Homepage, it should be
removed in future versions
diff --git a/devel/gmp/patches/patch-gd b/devel/gmp/patches/patch-gd
index c2a30d496e8..a5fcf6edff1 100644
--- a/devel/gmp/patches/patch-gd
+++ b/devel/gmp/patches/patch-gd
@@ -1,4 +1,4 @@
-$NetBSD: patch-gd,v 1.1 2002/08/24 00:39:08 mjl Exp $
+$NetBSD: patch-gd,v 1.2 2002/08/25 21:49:45 jlam Exp $
This is a patch for 4.1 from the GNU MP Homepage, it should be
removed in future versions
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index d3a9ed7b16c..4322a0f7512 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/02/18 15:14:14 seb Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/25 21:49:45 jlam Exp $
# FreeBSD Id: Makefile,v 1.7 1997/06/16 08:22:35 max Exp
#
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=m4/}
MAINTAINER= packages@netbsd.org
COMMENT= GNU version of Unix m4 macro-processor
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
INFO_FILES= m4.info
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index eed22801585..28e698bbc5c 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.4 2002/07/02 19:14:57 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:49:46 jlam Exp $
-DISTNAME= BSD-Resource-1.15
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5bsd
-CATEGORIES= devel perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=BSD/}
+DISTNAME= BSD-Resource-1.15
+PKGNAME= p5-${DISTNAME}
+SVR4_PKGNAME= p5bsd
+CATEGORIES= devel perl5
+MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=BSD/}
-MAINTAINER= packages@NetBSD.org
-HOMEPAGE= http://iki.fi/jhi/
-COMMENT= BSD::Resource - Perl interface to BSD process resources library
+MAINTAINER= packages@NetBSD.org
+HOMEPAGE= http://iki.fi/jhi/
+COMMENT= BSD::Resource - Perl interface to BSD process resources library
-USE_BUILDLINK_ONLY= YES
-PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/BSD/Resource/.packlist
+USE_BUILDLINK2= YES
+PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/BSD/Resource/.packlist
do-configure:
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-BSD-Resource/distinfo b/devel/p5-BSD-Resource/distinfo
index aa26844a9f1..680ee7408dd 100644
--- a/devel/p5-BSD-Resource/distinfo
+++ b/devel/p5-BSD-Resource/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/02 19:14:57 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:49:46 jlam Exp $
SHA1 (BSD-Resource-1.15.tar.gz) = 03f50e1322aa70a9b2dbe82c1b00a7a45f714379
Size (BSD-Resource-1.15.tar.gz) = 16618 bytes
diff --git a/devel/sgi-stl/Makefile b/devel/sgi-stl/Makefile
index 2775e9e2281..d9b8fc5b0bb 100644
--- a/devel/sgi-stl/Makefile
+++ b/devel/sgi-stl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:21 agc Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:49:47 jlam Exp $
DISTNAME= stl
PKGNAME= sgi-stl-3.3
@@ -12,6 +12,7 @@ COMMENT= SGI Standard Template Library
DIST_SUBDIR= ${PKGNAME}
WRKSRC= ${WRKDIR}
+USE_BUILDLINK2= # defined
NO_CONFIGURE= # defined
NO_BUILD= # defined
diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile
index 23ad4be1407..237a056f8c7 100644
--- a/emulators/suse_base/Makefile
+++ b/emulators/suse_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/04/04 09:46:54 tron Exp $
+# $NetBSD: Makefile,v 1.30 2002/08/25 21:49:48 jlam Exp $
DISTNAME= suse_base-${SUSE_VERSION}
CATEGORIES= emulators
@@ -13,6 +13,7 @@ COMMENT= Linux compatibility package
CONFLICTS= linux_SuSE-5.3 linux_lib-2.4
ONLY_FOR_PLATFORM= NetBSD-1.5Z[C-Z]-i386 NetBSD-1.6*-i386
+USE_BUILDLINK2= # defined
EXTRACT_ONLY= # empty
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_base/PLIST b/emulators/suse_base/PLIST
index 098c8cd9eb3..a8091a8d265 100644
--- a/emulators/suse_base/PLIST
+++ b/emulators/suse_base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:29:41 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:49:48 jlam Exp $
sbin/linux-mkpwd
@unexec ${RM} -f %D/@@EMULSUBDIR@@/etc/ld.so.cache
@@EMULSUBDIR@@/etc/ld.so.conf
diff --git a/emulators/suse_compat/Makefile b/emulators/suse_compat/Makefile
index a597039aae4..5b2c27220b6 100644
--- a/emulators/suse_compat/Makefile
+++ b/emulators/suse_compat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/04/04 09:46:55 tron Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/25 21:49:49 jlam Exp $
DISTNAME= compat
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -14,6 +14,7 @@ DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386
+USE_BUILDLINK2= # defined
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_libjpeg/Makefile b/emulators/suse_libjpeg/Makefile
index ef3eaae63fd..3dc65db42a8 100644
--- a/emulators/suse_libjpeg/Makefile
+++ b/emulators/suse_libjpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/04/04 09:47:04 tron Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 21:49:49 jlam Exp $
DISTNAME= libjpeg
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -14,6 +14,7 @@ DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386
+USE_BUILDLINK2= # defined
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_libpng/Makefile b/emulators/suse_libpng/Makefile
index 4c86b39fd37..ef95aaa0efc 100644
--- a/emulators/suse_libpng/Makefile
+++ b/emulators/suse_libpng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/04/04 09:47:06 tron Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:49:50 jlam Exp $
DISTNAME= libpng
PKGNAME= suse_${DISTNAME}-${SUSE_VERSION}
@@ -14,6 +14,7 @@ DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386
+USE_BUILDLINK2= # defined
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/emulators/suse_x11/Makefile b/emulators/suse_x11/Makefile
index 9e8ffee4c3b..ad874ad7896 100644
--- a/emulators/suse_x11/Makefile
+++ b/emulators/suse_x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/04/07 17:00:13 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2002/08/25 21:49:50 jlam Exp $
DISTNAME= suse_x11-${SUSE_VERSION}
PKGREVISION= 2
@@ -14,6 +14,7 @@ DEPENDS+= suse_base>=${SUSE_VERSION}:../suse_base
ONLY_FOR_PLATFORM= NetBSD-*-i386
+USE_BUILDLINK2= # defined
EXTRACT_ONLY= # empty
NO_BUILD= YES
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/fonts/ghostscript-fonts/Makefile b/fonts/ghostscript-fonts/Makefile
index d6ccdb1e281..4d1b73db208 100644
--- a/fonts/ghostscript-fonts/Makefile
+++ b/fonts/ghostscript-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/02/25 04:46:37 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:49:51 jlam Exp $
DISTNAME= ghostscript-fonts-6.0
CATEGORIES= fonts
@@ -24,6 +24,7 @@ CONFLICTS= ghostscript-[0-5]* ghostscript-x11-[0-5]*
DIST_SUBDIR= ghostscript
EXTRACT_ONLY= # empty
+USE_BUILDLINK2= # defined
NO_PATCH= # defined
NO_CONFIGURE= # defined
NO_BUILD= # defined
diff --git a/fonts/watanabe_vfont/Makefile b/fonts/watanabe_vfont/Makefile
index f1bcb9815cc..da54c4ead86 100644
--- a/fonts/watanabe_vfont/Makefile
+++ b/fonts/watanabe_vfont/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/17 11:09:09 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:49:52 jlam Exp $
#
DISTNAME= watanabe-vf
@@ -9,6 +9,8 @@ MASTER_SITES= ftp://ftp.kuis.kyoto-u.ac.jp/TeX/watanabe-jfonts/
MAINTAINER= tech-pkg-ja@jp.netbsd.org
COMMENT= Watanabe-vector Japanese font
+USE_BUILDLINK2= yes
+
EXTRACT_ONLY= # empty
NO_PATCH= yes
NO_CONFIGURE= yes
diff --git a/graphics/freetype-utils/Makefile b/graphics/freetype-utils/Makefile
index a8c441ac423..88ea129c098 100644
--- a/graphics/freetype-utils/Makefile
+++ b/graphics/freetype-utils/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2001/10/24 22:11:00 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/25 21:49:53 jlam Exp $
PKGNAME= freetype-utils-${FT_VERS}
COMMENT= Utilities for manipulating TrueType fonts
BUILDLINK_DEPENDS.freetype= freetype-lib>=${FT_VERS}
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
+USE_X11= # defined
.include "../freetype-lib/Makefile.common"
@@ -12,6 +13,6 @@ CONFIGURE_ARGS+= --with-x
ALL_TARGET= tttest
INSTALL_TARGET= install-tttest
-.include "../../graphics/freetype-lib/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/freetype-lib/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freetype/Makefile b/graphics/freetype/Makefile
index ae2c10a9876..d88d2589727 100644
--- a/graphics/freetype/Makefile
+++ b/graphics/freetype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/16 15:22:19 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 21:49:52 jlam Exp $
DISTNAME= freetype-${FT_VERS}
FT_VERS= 1.3.1
@@ -13,6 +13,7 @@ COMMENT= FreeType libraries and utilities
DEPENDS+= freetype-lib-${FT_VERS}:../../graphics/freetype-lib
DEPENDS+= freetype-utils-${FT_VERS}:../../graphics/freetype-utils
+USE_BUILDLINK2= # defined
USE_X11= # defined # freetype-utils uses X11
EXTRACT_ONLY= # empty
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index e7b608ac7a7..e8bbcec8de5 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/03/13 17:37:09 fredb Exp $
+# $NetBSD: Makefile,v 1.30 2002/08/25 21:49:53 jlam Exp $
#
DISTNAME= gqview-1.0.1
@@ -11,8 +11,8 @@ HOMEPAGE= http://gqview.sourceforge.net/
COMMENT= another gtk-based graphic file viewer
BUILD_USES_MSGFMT= yes
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG=no
@@ -20,8 +20,8 @@ CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
BUILDLINK_DEPENDS.gdk-pixbuf= gdk-pixbuf>=0.11.0nb1
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/patches/patch-ab b/graphics/gqview/patches/patch-ab
deleted file mode 100644
index 2f3131cf7b1..00000000000
--- a/graphics/gqview/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2001/12/29 11:40:29 zuntum Exp $
-
---- src/Makefile.in.orig Sun Dec 16 02:43:25 2001
-+++ src/Makefile.in
-@@ -103,7 +103,7 @@
- INCLUDES = -I$(srcdir) -I$(builddir) \
- -I$(top_srcdir) -I$(top_builddir) \
- -DLOCALEDIR=\""$(localedir)"\" \
-- -I$(includedir) $(GTK_CFLAGS) \
-+ $(GTK_CFLAGS) \
- $(GDK_PIXBUF_CFLAGS)
-
-
diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile
index ac3bb94626a..59f750a67b3 100644
--- a/graphics/ns-flash/Makefile
+++ b/graphics/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/08/20 05:01:59 rh Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/25 21:49:54 jlam Exp $
DISTNAME= flash_${DISTUNAME}
CATEGORIES= graphics www
@@ -42,6 +42,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
+USE_BUILDLINK2= yes
NO_CONFIGURE= yes
NO_BUILD= yes
CHECK_SHLIBS= no
diff --git a/graphics/ns-flash/distinfo b/graphics/ns-flash/distinfo
index 3ad67483798..af411cdcbb0 100644
--- a/graphics/ns-flash/distinfo
+++ b/graphics/ns-flash/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/08/20 05:01:59 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:49:55 jlam Exp $
SHA1 (flash/5.0r50/flash_linux.tar.gz) = 572e13227afc18b7c0f5a6d675a8683fc903a5da
Size (flash/5.0r50/flash_linux.tar.gz) = 574447 bytes
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
diff --git a/news/cg/Makefile b/news/cg/Makefile
index ad0c8808cdf..86e7853941d 100644
--- a/news/cg/Makefile
+++ b/news/cg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/13 17:31:23 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:27 jlam Exp $
#
DISTNAME= cg-0.4
@@ -10,6 +10,6 @@ HOMEPAGE= http://ftp.giga.or.at/pub/nih/cg/
COMMENT= semi-automatic newsgroup binary downloader
GNU_CONFIGURE= YES
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/news/cg/PLIST b/news/cg/PLIST
index fc7008dc8e3..441f2f480e6 100644
--- a/news/cg/PLIST
+++ b/news/cg/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/13 17:31:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:50:27 jlam Exp $
bin/cg
man/man1/cg.1
diff --git a/news/cg/distinfo b/news/cg/distinfo
index c1223bf2185..d8cb0e4dc98 100644
--- a/news/cg/distinfo
+++ b/news/cg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/13 17:31:23 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/08/25 21:50:27 jlam Exp $
SHA1 (cg-0.4.tar.gz) = 8fdb3156e3ad11fd182d2adf1d87ff799beaac60
Size (cg-0.4.tar.gz) = 203503 bytes
diff --git a/print/foomatic-gswrapper/Makefile b/print/foomatic-gswrapper/Makefile
index 256bdbcb20c..0646a83905f 100644
--- a/print/foomatic-gswrapper/Makefile
+++ b/print/foomatic-gswrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/03/17 16:02:34 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:50:28 jlam Exp $
DISTNAME= foomatic-gswrapper
PKGNAME= foomatic-gswrapper-1.2
@@ -20,7 +20,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
WRKSRC= ${WRKDIR}
EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
@@ -31,5 +31,5 @@ do-build: # nothing
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin
-.include "../../lang/perl5/buildlink.mk"
+.include "../../lang/perl5/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-nox11/Makefile b/print/ghostscript-nox11/Makefile
index 02ce28f0d92..5b6a03b1e84 100644
--- a/print/ghostscript-nox11/Makefile
+++ b/print/ghostscript-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/03/16 23:34:37 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:29 jlam Exp $
PKGNAME= ghostscript-nox11-${GS_VERS}
PKGREVISION= 4
@@ -6,7 +6,7 @@ COMMENT= Aladdin Postscript interpreter without X11 drivers
CONFLICTS= ghostscript{,-x11}-[0-9]*
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
.include "../../print/ghostscript-nox11/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index ac8dd764f2d..4c7547c3c3a 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2002/05/31 15:19:59 seb Exp $
+# $NetBSD: Makefile.common,v 1.34 2002/08/25 21:50:29 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 6.01
@@ -285,5 +285,5 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/cpem.doc ${DOCDIR}/${MJC_DRV}
${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOCDIR}/${MJC_DRV}
-.include "../../graphics/png/buildlink.mk"
-.include "../../print/ja-vflib-lib/buildlink.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../print/ja-vflib-lib/buildlink2.mk"
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 0c458b0be3e..1947d221362 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/03/16 23:34:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:50:28 jlam Exp $
PKGNAME= ghostscript-${GS_VERS}
PKGREVISION= 4
@@ -6,7 +6,8 @@ COMMENT= Aladdin Postscript interpreter
CONFLICTS= ghostscript{,-x11,-nox11}-[0-9]*
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
+USE_X11= YES
.include "../../print/ghostscript-nox11/Makefile.common"
@@ -14,7 +15,6 @@ MAKEFRAGS+= ${FILESDIR}/devs.x11
GS_DISPLAY_DEVICE= x11.dev
XLIBS= Xt SM ICE Xext X11
-.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
# arm32 compiler has an optimizer problem
diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile
index 38ef8b020cc..9e8d7ef2e2c 100644
--- a/print/gimp-print-lib/Makefile
+++ b/print/gimp-print-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/05/03 12:43:06 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:50:30 jlam Exp $
#
DISTNAME= gimp-print-4.2.1
@@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://gimp-print.sourceforge.net/
COMMENT= drivers for Canon, Epson, Lexmark, and PCL printers
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -24,5 +24,5 @@ CONFIGURE_ARGS+= --without-translated-ppds
CONFIGURE_ARGS+= --without-samples
CONFIGURE_ARGS+= --disable-escputil
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/gimp-print-lib/distinfo b/print/gimp-print-lib/distinfo
index c7645b22f5a..ddbb2224e08 100644
--- a/print/gimp-print-lib/distinfo
+++ b/print/gimp-print-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/06/30 20:57:12 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 21:50:30 jlam Exp $
SHA1 (gimp-print-4.2.1.tar.gz) = 51a2c5a3da85950e876ee049f9a377b03bf502f8
Size (gimp-print-4.2.1.tar.gz) = 4691313 bytes
diff --git a/print/gimp-print-lib/patches/patch-ac b/print/gimp-print-lib/patches/patch-ac
index 8ecb1de321b..a929489bd78 100644
--- a/print/gimp-print-lib/patches/patch-ac
+++ b/print/gimp-print-lib/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2002/06/30 20:57:13 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 21:50:31 jlam Exp $
--- src/Makefile.in.orig Fri Apr 26 20:56:31 2002
+++ src/Makefile.in
diff --git a/print/ja-vflib-utils/Makefile b/print/ja-vflib-utils/Makefile
index b110f2baf30..096df4e6a60 100644
--- a/print/ja-vflib-utils/Makefile
+++ b/print/ja-vflib-utils/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:01:08 seb Exp $
+# $NetBSD: Makefile,v 1.2 2002/08/25 21:50:32 jlam Exp $
PKGNAME= ja-vflib-utils-${VFLIB_VERSION}
COMMENT= Utilities for manipulating VFlib vector font files
BUILDLINK_DEPENDS.vflib=ja-vflib-lib>=${VFLIB_VERSION}
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
.include "../../print/ja-vflib-lib/Makefile.common"
@@ -14,5 +14,5 @@ CONFIGURE_ARGS+= --enable-tools --with-x
ALL_TARGET= build-tools
INSTALL_TARGET= install-tools
-.include "../../print/ja-vflib-lib/buildlink.mk"
+.include "../../print/ja-vflib-lib/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-vflib-utils/PLIST b/print/ja-vflib-utils/PLIST
index a1f482f56c9..131e5af484e 100644
--- a/print/ja-vflib-utils/PLIST
+++ b/print/ja-vflib-utils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:08 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/08/25 21:50:32 jlam Exp $
bin/disol
bin/fmtest
bin/kban
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 4b9919222b0..918a6eab000 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/04/23 02:08:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 21:50:32 jlam Exp $
DISTNAME= mgv-3.1.5
PKGREVISION= 1
@@ -13,17 +13,17 @@ DEPENDS+= ghostscript-[6-9]*:../../print/ghostscript
GNU_CONFIGURE= yes
USE_X11BASE= yes
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
-CONFIGURE_ARGS+= --with-motif-includes=${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+= --with-motif-libs=${BUILDLINK_DIR}/lib
+CONFIGURE_ARGS+= --with-motif-includes=${MOTIFBASE}/include
+CONFIGURE_ARGS+= --with-motif-libs=${MOTIFBASE}/lib
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${PREFIX}/share/mgv/3.1.5/help
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html
${LN} -fs ${PREFIX}/share/mgv/3.1.5/help ${PREFIX}/share/doc/html/mgv
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/motif.buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../mk/motif.buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/print/mpage/Makefile b/print/mpage/Makefile
index 3d6afe0d26d..2234928b015 100644
--- a/print/mpage/Makefile
+++ b/print/mpage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/02/16 01:21:52 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/25 21:50:33 jlam Exp $
#
DISTNAME= mpage-2.5
@@ -9,8 +9,8 @@ EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
COMMENT= Print multiple pages per sheet of paper
-USE_BUILDLINK_ONLY= yes
-ALL_TARGET= default
+USE_BUILDLINK2= yes
+ALL_TARGET= default
.include "../../mk/bsd.prefs.mk"
diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile
index bf62d498e5e..c4a88c496a6 100644
--- a/print/tcl-pdflib/Makefile
+++ b/print/tcl-pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/03/13 17:37:38 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:50:34 jlam Exp $
.include "../pdflib/Makefile.common"
@@ -6,12 +6,12 @@ PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS}
PKGREVISION= 1
COMMENT= Tcl interface to PDFlib for generating PDF files
-USE_BUILDLINK_ONLY= YES
BUILDLINK_DEPENDS.pdflib= pdflib>=${PDFLIB_BASE_VERS}
+USE_BUILDLINK2= YES
CONFIGURE_ARGS+= --with-tcl=${TCLSH}
-CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_DIR}/include"
-TCLSH= ${LOCALBASE}/bin/tclsh
+CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include"
+TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh
DIRS_TO_BUILD= bind/tcl
@@ -30,6 +30,7 @@ do-install:
${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
.endfor
-.include "../pdflib/buildlink.mk"
-.include "../../lang/tcl/buildlink.mk"
+.include "../pdflib/buildlink2.mk"
+.include "../../lang/tcl/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/print/tcl-pdflib/PLIST b/print/tcl-pdflib/PLIST
index 28bba5698a4..a84ac3a2d0f 100644
--- a/print/tcl-pdflib/PLIST
+++ b/print/tcl-pdflib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/30 03:59:05 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:50:34 jlam Exp $
lib/tcl8.3/pdflib/pdflib_tcl.a
lib/tcl8.3/pdflib/pdflib_tcl.la
lib/tcl8.3/pdflib/pdflib_tcl.so
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 3cec75f81ee..846b81b7093 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/07/19 12:43:51 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:50:34 jlam Exp $
#
DISTNAME= xpdf-1.00
@@ -15,13 +15,12 @@ DEPENDS+= ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
CONFLICTS= xpdf-crypto-[0-9]*
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
USE_X11BASE= YES
-USE_FREETYPE2= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-freetype2-includes=${BUILDLINK_DIR}/include/freetype2
-CONFIGURE_ARGS+= --with-t1-includes=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+= --with-freetype2-includes=${BUILDLINK_PREFIX.freetype2}/include/freetype2
+CONFIGURE_ARGS+= --with-t1-includes=${BUILDLINK_PREFIX.t1lib}/include
CONFIGURE_ENV+= CXXFLAGS="${CXXFLAGS}"
MAKE_ENV+= SED="${SED}" ECHO="${ECHO}"
@@ -31,8 +30,8 @@ MAKE_ENV+= SED="${SED}" ECHO="${ECHO}"
CONFIGURE_ARGS+= --enable-a4-paper
.endif
-.include "../../fonts/t1lib/buildlink.mk"
-.include "../../graphics/freetype2/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../fonts/t1lib/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/print/xpdf/PLIST b/print/xpdf/PLIST
index 933ad69190d..68f1ad35339 100644
--- a/print/xpdf/PLIST
+++ b/print/xpdf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/10 10:58:58 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:50:35 jlam Exp $
bin/xpdf
bin/pdffonts
bin/pdftops
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 30071ff3575..3489d79c238 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/03/13 17:37:40 fredb Exp $
+# $NetBSD: Makefile,v 1.17 2002/08/25 21:50:35 jlam Exp $
DISTNAME= xpp-1.0
PKGREVISION= 1
@@ -9,11 +9,12 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://cups.sourceforge.net/xpp/index.html
COMMENT= X Printing Panel
-USE_BUILDLINK_ONLY= # defined
-USE_GMAKE= # defined
-GNU_CONFIGURE= # defined
+USE_BUILDLINK2= # defined
+USE_X11= # defined
+USE_GMAKE= # defined
+GNU_CONFIGURE= # defined
-DOCDIR= ${PREFIX}/share/doc/xpp
+DOCDIR= ${PREFIX}/share/doc/xpp
pre-configure:
cd ${WRKSRC}; ${TOUCH} Makefile.in aclocal.m4 configure
@@ -22,7 +23,7 @@ post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
cd ${WRKSRC}; ${INSTALL_DATA} LICENSE README ${DOCDIR}
-.include "../../print/cups/buildlink.mk"
-.include "../../x11/fltk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../print/cups/buildlink2.mk"
+.include "../../x11/fltk/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 3dd44b887d5..f653a7e1d75 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2002/07/18 20:44:52 heinz Exp $
+# $NetBSD: Makefile,v 1.33 2002/08/25 21:50:36 jlam Exp $
#
DISTNAME= gnupg-1.0.7
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.gnupg.org/
COMMENT= Privacy Guard, a public-Key encryption and digital signature utility
BUILD_USES_MSGFMT= yes
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
CRYPTO= yes
GNU_CONFIGURE= yes
@@ -36,19 +36,20 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PLIST_SUBST+= IDEA=""
post-extract:
- ${CP} ${_DISTDIR}/idea.c.20010605 ${WRKSRC}/idea.c
+ ${CP} ${_DISTDIR}/idea.c.20010605 ${WRKSRC}/idea.c
post-build:
- cd ${WRKSRC} && \
- ${CC} ${CFLAGS} -shared -Wl,-Bshareable -fPIC -o idea idea.c
+ cd ${WRKSRC} && \
+ ${BUILDLINK_CC} ${CFLAGS} -shared -Wl,-Bshareable -fPIC -o idea idea.c
post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/idea ${PREFIX}/lib/gnupg
+ ${INSTALL_PROGRAM} ${WRKSRC}/idea ${PREFIX}/lib/gnupg
.else
PLIST_SUBST+= IDEA="@comment "
.endif
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/zlib/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index a0699516806..72bf5e6f92f 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/18 20:44:52 heinz Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 21:50:36 jlam Exp $
bin/gpg
bin/gpgkeys_mailto
bin/gpgsplit
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index c9bcfd9e59b..21f3c99d9dd 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2002/07/18 20:44:52 heinz Exp $
+$NetBSD: distinfo,v 1.10 2002/08/25 21:50:37 jlam Exp $
SHA1 (gnupg-1.0.7.tar.gz) = 46da038c60143fa49abae2fae6fcbd0f58f7a46e
Size (gnupg-1.0.7.tar.gz) = 2399025 bytes
diff --git a/security/gnupg/patches/patch-ad b/security/gnupg/patches/patch-ad
index 2f9d074ae55..b2d69ed793d 100644
--- a/security/gnupg/patches/patch-ad
+++ b/security/gnupg/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/07/18 20:44:53 heinz Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 21:50:37 jlam Exp $
--- configure.orig Mon Apr 29 16:59:16 2002
+++ configure
diff --git a/security/gnupg/patches/patch-ae b/security/gnupg/patches/patch-ae
index 63da4075511..e7975763ee7 100644
--- a/security/gnupg/patches/patch-ae
+++ b/security/gnupg/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2002/07/18 20:44:53 heinz Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 21:50:38 jlam Exp $
--- configure.ac.orig Mon Apr 29 16:56:08 2002
+++ configure.ac
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 8b1c70e392b..59069ad7491 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/01/18 09:23:58 martin Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:38 jlam Exp $
#
DISTNAME= gpa-0.4.3
@@ -11,8 +11,9 @@ COMMENT= GUI frontend to gnupg
DEPENDS+= gnupg>=1.0.6:../../security/gnupg
-GNU_CONFIGURE= YES
-USE_BUILDLINK_ONLY= YES
+GNU_CONFIGURE= YES
+USE_BUILDLINK2= YES
+USE_X11= YES
-.include "../../x11/gtk/buildlink.mk"
+.include "../../x11/gtk/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index f686b43d10d..b9696eaa7e4 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/10/09 19:40:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 21:50:39 jlam Exp $
DISTNAME= mcrypt-2.5.10
CATEGORIES= security devel
@@ -9,11 +9,13 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://mcrypt.hellug.gr/
COMMENT= replacement to crypt(1), supports many crypto algorithms
-USE_BUILDLINK_ONLY= YES
-USE_LIBTOOL= YES
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
+USE_LIBTOOL= YES
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../security/libmcrypt/buildlink2.mk"
+.include "../../security/mhash/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../security/libmcrypt/buildlink.mk"
-.include "../../security/mhash/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 0955f9dbc77..c2234e0c033 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/08/25 18:39:55 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:50:39 jlam Exp $
DISTNAME= mhash-0.8.9
CATEGORIES= security devel
diff --git a/security/mhash/buildlink2.mk b/security/mhash/buildlink2.mk
index c126b491292..95caa3705a2 100644
--- a/security/mhash/buildlink2.mk
+++ b/security/mhash/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:56 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/08/25 21:50:40 jlam Exp $
.if !defined(MHASH_BUILDLINK2_MK)
MHASH_BUILDLINK2_MK= # defined
diff --git a/security/pam-smbpass/Makefile b/security/pam-smbpass/Makefile
index 2b9617b77d0..00903d9393f 100644
--- a/security/pam-smbpass/Makefile
+++ b/security/pam-smbpass/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2002/07/30 23:24:05 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/25 21:50:41 jlam Exp $
+
+.include "../../net/samba/Makefile.common"
PKGNAME= pam-smbpass-${SAMBA_DIST_VERS}
CATEGORIES= security
-USE_BUILDLINK_ONLY= # defined
-
-.include "../../net/samba/Makefile.common"
-
MAINTAINER= jlam@netbsd.org
COMMENT= PAM authentication against a Samba password database
DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba
+USE_BUILDLINK2= # defined
CONFIGURE_ARGS+= --with-pam
ALL_TARGET= pam_smbpass
@@ -31,5 +30,5 @@ do-install:
${INSTALL_DATA} $${file} ${EGDIR}/$${file}; \
done
-.include "../../security/PAM/buildlink.mk"
+.include "../../security/PAM/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 48322130c1d..7f8224c79cc 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/12/02 06:56:44 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 21:50:41 jlam Exp $
DISTNAME= pks-0.9.4
CATEGORIES= security www
@@ -15,7 +15,7 @@ MAINTAINER= burgess@neonramp.com
HOMEPAGE= http://www.mit.edu/people/marc/pks/
COMMENT= PGP Public Key Server
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/pks
CONFIGURE_ARGS+= --localstatedir=/var/pks
@@ -37,6 +37,7 @@ pre-install:
post-install:
${INSTALL_SCRIPT} ${WRKDIR}/pksd.sh ${PREFIX}/etc/rc.d/pksd
-.include "../../databases/db/buildlink.mk"
+.include "../../databases/db/buildlink2.mk"
+
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 42d0facce74..ee22f5946ab 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2002/06/28 09:05:18 seb Exp $
+# $NetBSD: Makefile,v 1.53 2002/08/25 21:50:42 jlam Exp $
#
DISTNAME= racoon-20020507a
@@ -13,13 +13,13 @@ CRYPTO= yes
# this is not compatible with cross build - there's no other way
.if !exists(/usr/include/netinet6/ipsec.h)
-IGNORE+= "${PKGNAME} requires ipsec-ready NetBSD"
+IGNORE+= "${PKGNAME} requires ipsec-ready NetBSD"
.endif
BUILD_DEFS+= USE_INET6
.include "../../mk/bsd.prefs.mk"
-USE_BUILDLINK_ONLY= yes
+USE_BUILDLINK2= yes
CONFLICTS+= racoon-[0-9]*
@@ -53,5 +53,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/samples/racoon.conf.sample \
${PREFIX}/share/examples/racoon
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/racoon/distinfo b/security/racoon/distinfo
index c0b386e734b..7881f084082 100644
--- a/security/racoon/distinfo
+++ b/security/racoon/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2002/05/20 13:25:16 itojun Exp $
+$NetBSD: distinfo,v 1.17 2002/08/25 21:50:42 jlam Exp $
SHA1 (racoon-20020507a.tar.gz) = 9ecf5fa5660362a967bf6e48499e834eab3a7181
Size (racoon-20020507a.tar.gz) = 620752 bytes
diff --git a/security/racoon/patches/patch-ag b/security/racoon/patches/patch-ag
index 5f3afdc79ba..f3c44a89ea3 100644
--- a/security/racoon/patches/patch-ag
+++ b/security/racoon/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2002/05/20 13:25:17 itojun Exp $
+$NetBSD: patch-ag,v 1.6 2002/08/25 21:50:43 jlam Exp $
--- algorithm.c.orig Thu Apr 25 18:48:32 2002
+++ algorithm.c Mon May 20 22:11:56 2002
diff --git a/security/rats/Makefile b/security/rats/Makefile
index 92099aedb2f..6395bcdb28e 100644
--- a/security/rats/Makefile
+++ b/security/rats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/05/03 14:14:23 taca Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 21:50:43 jlam Exp $
#
DISTNAME= rats-1.4
@@ -9,10 +9,10 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org
HOMEPAGE= http://www.securesw.com/rats/
COMMENT= Rough Auditing Tool for Security
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --libdir=${LOCALBASE}/share/rats
ALL_TARGET= rats
-.include "../../textproc/expat/buildlink.mk"
+.include "../../textproc/expat/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile
index 3b2908d500a..d7664d69b6c 100644
--- a/security/sslwrap/Makefile
+++ b/security/sslwrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/07/27 14:46:10 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:44 jlam Exp $
#
DISTNAME= ${PKGNAME:S/-//}
@@ -10,7 +10,7 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://www.rickk.com/sslwrap/
COMMENT= simple ssl wrapper
-USE_BUILDLINK_ONLY= YES
+USE_BUILDLINK2= YES
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index c2aaf0b9e72..f2978ed28f7 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/06/17 10:47:56 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2002/08/25 21:50:47 jlam Exp $
DISTNAME= stunnel-3.22
CATEGORIES= security
@@ -10,12 +10,13 @@ MAINTAINER= martti@netbsd.org
HOMEPAGE= http://www.stunnel.org/
COMMENT= Universal SSL tunnel
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-ssl=${SSLBASE} \
--with-cert-dir="${SSLCERTS}" \
--with-pem-dir="${SSLCERTS}" \
--with-tcp-wrappers
-.include "../../security/openssl/buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 27c6ae30453..ca5773072e6 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2002/06/16 20:21:20 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2002/08/25 21:50:47 jlam Exp $
#
DISTNAME= sudo-1.6.6
@@ -14,7 +14,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.courtesan.com/sudo/
COMMENT= Allow others to run commands as root
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
.include "../../mk/bsd.prefs.mk"
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 5bdc3966c03..799a154f935 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/06/16 20:20:18 wiz Exp $
+$NetBSD: distinfo,v 1.11 2002/08/25 21:50:48 jlam Exp $
SHA1 (sudo-1.6.6.tar.gz) = 6768cca950fc840857b01b0bd94dbd0ca756d324
Size (sudo-1.6.6.tar.gz) = 333074 bytes
diff --git a/security/sudo/patches/patch-ac b/security/sudo/patches/patch-ac
index b01a4f7d3b6..7840088fc3e 100644
--- a/security/sudo/patches/patch-ac
+++ b/security/sudo/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2002/06/16 20:20:19 wiz Exp $
+$NetBSD: patch-ac,v 1.9 2002/08/25 21:50:48 jlam Exp $
--- config.sub.old Mon Dec 31 14:02:47 2001
+++ config.sub Sun Jun 16 12:48:45 2002
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 79957e5cf20..6dead0ba651 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/07/24 19:45:27 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/08/25 21:50:49 jlam Exp $
#
DISTNAME= zebedee-2.3.1
@@ -12,13 +12,14 @@ COMMENT= Simple tunneling program for TCP or UDP with encryption
USE_PERL5= build
USE_GMAKE= # defined
-USE_BUILDLINK_ONLY= # defined
+USE_BUILDLINK2= # defined
MAKE_ENV+= PERL5=${PERL5}
MAKE_FLAGS= OS=${LOWER_OPSYS}
-.include "../../archivers/bzip2/buildlink.mk"
-.include "../../devel/zlib/buildlink.mk"
-.include "../../lang/tcl/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../lang/tcl/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
.include "../../mk/bsd.pkg.mk"