diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
| commit | 1c57323789a922a7182ba378831f2c0a336a6959 (patch) | |
| tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /archivers | |
| parent | ee84541509a09b09b26167f474c4b53185c17b5f (diff) | |
| download | pkgsrc-1c57323789a922a7182ba378831f2c0a336a6959.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'archivers')
58 files changed, 296 insertions, 177 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 |