pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update package Makefile now that bsd.pkg.extract.mk is...
details: https://anonhg.NetBSD.org/pkgsrc/rev/54ab2f4a357e
branches: trunk
changeset: 506762:54ab2f4a357e
user: jlam <jlam%pkgsrc.org@localhost>
date: Sat Jan 21 18:57:40 2006 +0000
description:
Update package Makefile now that bsd.pkg.extract.mk is using the
"extract" script for extraction. Many cases where a custom EXTRACT_CMD
simply copied the distfile into the work directory are no longer
needed. The extract script also hides differences between pax and
tar behind a common command-line interface, so we no longer need code
that's conditional on whether EXTRACT_USING is tar or pax.
diffstat:
archivers/makeself/Makefile | 3 +--
audio/flac2mp3/Makefile | 4 +---
benchmarks/paranoia/Makefile | 4 +---
benchmarks/whetstone/Makefile | 3 +--
converters/p5-chkjis/Makefile | 4 +---
converters/p5-jcode/Makefile | 3 +--
converters/rpm2cpio/Makefile | 4 +---
databases/gdbm_primitive/Makefile | 4 ++--
devel/as31/Makefile | 4 ++--
devel/gobo-eiffel/Makefile | 7 +++----
devel/p4-docs/Makefile | 6 +++---
devel/unidiff/Makefile | 4 ++--
editors/matlab-mode/Makefile | 3 +--
emulators/simh/Makefile | 6 +++---
emulators/xm7/Makefile | 5 ++---
fonts/cyberbit-ttf/Makefile.common | 6 +++---
games/falcons-eye/Makefile | 4 ++--
games/quakedata/Makefile | 6 ++++--
games/xdoom/Makefile | 7 ++++---
graphics/gimp-warp-sharp/Makefile | 3 +--
graphics/gimp2-wideangle/Makefile | 3 +--
graphics/py-gd/Makefile | 4 +---
lang/blackdown-jre13/Makefile.common | 4 ++--
lang/sun-jre13/Makefile.common | 4 +---
mail/mdfrm/Makefile | 4 +---
mail/qmail-lint/Makefile | 4 +---
misc/astrolog/Makefile | 5 ++---
net/ipcheck/Makefile | 4 ++--
net/lambdamoo-core/Makefile | 7 +------
net/lambdamoo-doc/Makefile | 7 ++-----
net/netsaint-plugin-cluster/Makefile | 3 +--
pkgtools/createbuildlink/Makefile | 3 +--
pkgtools/url2pkg/Makefile | 3 +--
print/ja-a2ps/Makefile | 3 +--
print/psjoin/Makefile | 3 +--
print/teTeX-share/Makefile | 15 +++++----------
print/teTeX3-texmf/Makefile | 13 ++++---------
security/md4-collision/Makefile | 3 +--
security/md5-collision/Makefile | 3 +--
shells/mudsh/Makefile | 3 +--
sysutils/cpuburn/Makefile | 3 +--
sysutils/crashme/Makefile | 4 ++--
sysutils/fix4SA110rev2/Makefile | 3 +--
textproc/awf/Makefile | 4 ++--
www/apache-tomcat55/Makefile | 11 ++++++-----
www/hiawatha/Makefile | 4 ++--
www/htdig/Makefile | 11 +++--------
www/jakarta-tomcat5/Makefile | 11 ++++++-----
48 files changed, 93 insertions(+), 146 deletions(-)
diffs (truncated from 942 to 300 lines):
diff -r becc7dcda1a3 -r 54ab2f4a357e archivers/makeself/Makefile
--- a/archivers/makeself/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/archivers/makeself/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/24 21:12:50 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/21 18:57:40 jlam Exp $
DISTNAME= makeself-1.5.3
CATEGORIES= archivers
@@ -11,7 +11,6 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}
NO_BUILD= yes
INSTALLATION_DIRS= bin
diff -r becc7dcda1a3 -r 54ab2f4a357e audio/flac2mp3/Makefile
--- a/audio/flac2mp3/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/audio/flac2mp3/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/01/21 18:57:40 jlam Exp $
DISTNAME= flac2mp3
PKGNAME= flac2mp3-20041223
@@ -13,8 +13,6 @@
DEPENDS+= lame-[0-9]*:../../audio/lame
DEPENDS+= p5-MP3-Info-[0-9]*:../../audio/p5-MP3-Info
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
-
PKG_INSTALLATION_TYPES= overwrite pkgviews
REPLACE_PERL= flac2mp3.pl
diff -r becc7dcda1a3 -r 54ab2f4a357e benchmarks/paranoia/Makefile
--- a/benchmarks/paranoia/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/benchmarks/paranoia/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/07/30 15:50:38 minskim Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/21 18:57:40 jlam Exp $
DISTNAME= paranoia
PKGNAME= paranoia-960101
@@ -9,8 +9,6 @@
MAINTAINER= root%garbled.net@localhost
COMMENT= Highly paranoid test of IEEE 754 conformance
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
-
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}
diff -r becc7dcda1a3 -r 54ab2f4a357e benchmarks/whetstone/Makefile
--- a/benchmarks/whetstone/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/benchmarks/whetstone/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/07/30 15:50:38 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/21 18:57:40 jlam Exp $
DISTNAME= whetstone
PKGNAME= whetstone-1.2
@@ -11,7 +11,6 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
WRKSRC= ${WRKDIR}
INSTALLATION_DIRS= bin
diff -r becc7dcda1a3 -r 54ab2f4a357e converters/p5-chkjis/Makefile
--- a/converters/p5-chkjis/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/converters/p5-chkjis/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:55 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:40 jlam Exp $
#
DISTNAME= chkjis
@@ -14,8 +14,6 @@
WRKSRC= ${WRKDIR}
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
-
VERSION= 0.18
DIST_SUBDIR= chkjis-${VERSION}
WRKSRC= ${WRKDIR}
diff -r becc7dcda1a3 -r 54ab2f4a357e converters/p5-jcode/Makefile
--- a/converters/p5-jcode/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/converters/p5-jcode/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/21 18:57:40 jlam Exp $
DISTNAME= jcode.pl-2.13
PKGNAME= p5-jcode-2.13
@@ -18,7 +18,6 @@
NO_BUILD= yes
NO_CONFIGURE= yes
PERL5_CONFIGURE= NO
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} .
do-install:
${INSTALL_DATA_DIR} ${PERL5_INSTALLVENDORLIB}
diff -r becc7dcda1a3 -r 54ab2f4a357e converters/rpm2cpio/Makefile
--- a/converters/rpm2cpio/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/converters/rpm2cpio/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/16 19:10:38 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/01/21 18:57:40 jlam Exp $
DISTNAME= rpm2cpio
PKGNAME= rpm2cpio-1.1
@@ -17,8 +17,6 @@
USE_TOOLS+= perl:run
REPLACE_PERL= rpm2cpio
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} .
-
INSTALLATION_DIRS= bin
# There is nothing to build
diff -r becc7dcda1a3 -r 54ab2f4a357e databases/gdbm_primitive/Makefile
--- a/databases/gdbm_primitive/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/databases/gdbm_primitive/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:57 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2006/01/21 18:57:40 jlam Exp $
#
DISTNAME= gdbm-prim-1.15
@@ -12,7 +12,7 @@
HOMEPAGE= http://homepage.mac.com/leffert/FileSharing.html
COMMENT= Shell primitives for working with GDBMs
-EXTRACT_CMD= ${_DFLT_EXTRACT_CMD}
+EXTRACT_OPTS= -f tar
MAKE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q}
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff -r becc7dcda1a3 -r 54ab2f4a357e devel/as31/Makefile
--- a/devel/as31/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/devel/as31/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/01 04:16:58 tv Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/21 18:57:40 jlam Exp $
DISTNAME= asm.8051
PKGNAME= as31-19900126
@@ -12,7 +12,7 @@
COMMENT= 8031/8051 assembler
WRKSRC= ${WRKDIR}
-EXTRACT_CMD= ${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | \
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | \
${SED} '1,/^.! \/bin\/sh/d' | ${SH}
MAKEFILE= makefile
BUILD_TARGET= as31
diff -r becc7dcda1a3 -r 54ab2f4a357e devel/gobo-eiffel/Makefile
--- a/devel/gobo-eiffel/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/devel/gobo-eiffel/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:46 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/21 18:57:40 jlam Exp $
#
DISTNAME= gobo15
@@ -15,10 +15,9 @@
BUILD_DEPENDS+= smalleiffel-0.77:../../lang/smalleiffel
+EXTRACT_OPTS_ZIP= -uLa
+
WRKSRC= ${WRKDIR}
-EXTRACT_CMD= ${LOCALBASE}/bin/unzip -uLa \
- ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-
GOBO= ${PREFIX}/share/gobo-eiffel
INSTALLATION_DIRS= bin
diff -r becc7dcda1a3 -r 54ab2f4a357e devel/p4-docs/Makefile
--- a/devel/p4-docs/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/devel/p4-docs/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:06 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2006/01/21 18:57:40 jlam Exp $
#
DISTNAME= p4-docs
@@ -35,8 +35,8 @@
EXTRACT_ONLY= cmdref_html.zip p4ftp_html.zip
EXTRACT_ONLY+= p4guide_html.zip p4sag_html.zip
-EXTRACT_CMD.zip= ${LOCALBASE}/bin/unzip -Laq $${extract_file} \
- -d `${BASENAME} $${extract_file} _html.zip`
+EXTRACT_OPTS+= -d `${BASENAME} ${DOWNLOADED_DISTFILE} _html.zip`
+EXTRACT_OPTS_ZIP= -Laq
DOCDIR= share/doc/p4
HTMLDIR= share/doc/html/p4
diff -r becc7dcda1a3 -r 54ab2f4a357e devel/unidiff/Makefile
--- a/devel/unidiff/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/devel/unidiff/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:09 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2006/01/21 18:57:40 jlam Exp $
#
DISTNAME= part01
@@ -15,7 +15,7 @@
BUILD_DEPENDS+= gsharutils>=4.2.1:../../archivers/gsharutils
WRKSRC= ${WRKDIR}
-EXTRACT_CMD= zcat ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar
+EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar
INSTALLATION_DIRS= bin man/man1
diff -r becc7dcda1a3 -r 54ab2f4a357e editors/matlab-mode/Makefile
--- a/editors/matlab-mode/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/editors/matlab-mode/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:29 uebayasi Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/21 18:57:40 jlam Exp $
#
DISTNAME= matlab.el
@@ -15,7 +15,6 @@
COMMENT= Matlab mode for Emacs
WRKSRC= ${WRKDIR}
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKDIR}
DIST_SUBDIR= ${BASEPKGNAME}
.include "../../mk/emacs.mk"
diff -r becc7dcda1a3 -r 54ab2f4a357e emulators/simh/Makefile
--- a/emulators/simh/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/emulators/simh/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:51 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/01/21 18:57:40 jlam Exp $
#
DISTNAME= simhv33-0
@@ -14,8 +14,8 @@
BUILDLINK_DEPENDS.libpcap+= libpcap>=0.6
-EXTRACT_CMD= unzip -aoq ${DOWNLOADED_DISTFILE}
-WRKSRC= ${WRKDIR}
+EXTRACT_OPTS_ZIP= -aoq
+WRKSRC= ${WRKDIR}
.include "../../mk/bsd.prefs.mk"
diff -r becc7dcda1a3 -r 54ab2f4a357e emulators/xm7/Makefile
--- a/emulators/xm7/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/emulators/xm7/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/01/19 18:13:38 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/01/21 18:57:41 jlam Exp $
#
DISTNAME= xm71010s
@@ -18,8 +18,7 @@
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
-# convert CRLF to LF
-EXTRACT_CMD= lha xqt ${DOWNLOADED_DISTFILE}
+EXTRACT_OPTS_LHA= qt # convert CRLF to LF
WRKSRC= ${WRKDIR}/vm
NO_CONFIGURE= yes
diff -r becc7dcda1a3 -r 54ab2f4a357e fonts/cyberbit-ttf/Makefile.common
--- a/fonts/cyberbit-ttf/Makefile.common Sat Jan 21 18:55:10 2006 +0000
+++ b/fonts/cyberbit-ttf/Makefile.common Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2005/12/29 07:04:27 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2006/01/21 18:57:41 jlam Exp $
#
DISTNAME= # empty
@@ -23,8 +23,8 @@
DIST_SUBDIR= cyberbit-ttf
-EXTRACT_CMD= ${LOCALBASE}/bin/unzip -Laq $${extract_file}
-EXTRACT_ONLY= ${FONT_FILE}
+EXTRACT_ONLY= ${FONT_FILE}
+EXTRACT_OPTS_ZIP= -Laq
USE_X11BASE= YES
NO_CONFIGURE= YES
diff -r becc7dcda1a3 -r 54ab2f4a357e games/falcons-eye/Makefile
--- a/games/falcons-eye/Makefile Sat Jan 21 18:55:10 2006 +0000
+++ b/games/falcons-eye/Makefile Sat Jan 21 18:57:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/12/11 09:40:41 wiz Exp $
Home |
Main Index |
Thread Index |
Old Index