From 139241c40cbf5698285b3afb26e5828bffdf57e6 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 27 Jan 2002 18:32:32 +0000 Subject: Use auto-extract code for .shar files. --- archivers/gtar-base/Makefile | 3 +-- archivers/gtar-info/Makefile | 4 +--- archivers/gzip-base/Makefile | 4 +--- archivers/gzip-info/Makefile | 4 +--- archivers/macutil/Makefile | 3 +-- games/svb/Makefile | 3 +-- graphics/prag/Makefile | 6 +----- misc/9menu/Makefile | 4 +--- sysutils/aperture/Makefile | 3 +-- time/dclock/Makefile | 3 +-- time/gnyaclock/Makefile | 4 +--- wm/9wm/Makefile | 3 +-- x11/xpaste/Makefile | 5 +---- 13 files changed, 13 insertions(+), 36 deletions(-) diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index 12e8c72a749..3f6ebe947cb 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/12/27 21:50:56 agc Exp $ +# $NetBSD: Makefile,v 1.19 2002/01/27 18:32:32 jlam Exp $ # DISTNAME= tar-1.12 @@ -18,7 +18,6 @@ CONFIGURE_ARGS= --program-prefix=g --with-catgets .if ${OPSYS} != "Darwin" EXTRACT_SUFX= .shar.gz -EXTRACT_CMD= ${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | ${SH} .endif .if (${OPSYS} != "NetBSD") diff --git a/archivers/gtar-info/Makefile b/archivers/gtar-info/Makefile index 1429fb8e0c1..205ea41b27a 100644 --- a/archivers/gtar-info/Makefile +++ b/archivers/gtar-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/10/18 15:20:01 veego Exp $ +# $NetBSD: Makefile,v 1.5 2002/01/27 18:32:32 jlam Exp $ # DISTNAME= tar-1.12 @@ -12,8 +12,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/tar/tar.html COMMENT= Info format documentation for the GNU tape archiver -EXTRACT_CMD= ${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | ${SH} - USE_GTEXINFO= yes INFO_FILES= tar.info diff --git a/archivers/gzip-base/Makefile b/archivers/gzip-base/Makefile index bf764e0e4a3..87f9ea54062 100644 --- a/archivers/gzip-base/Makefile +++ b/archivers/gzip-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/10/18 15:20:01 veego Exp $ +# $NetBSD: Makefile,v 1.9 2002/01/27 18:32:33 jlam Exp $ DISTNAME= gzip-1.2.4a PKGNAME= gzip-base-1.2.4a @@ -11,8 +11,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html COMMENT= Compress or expand files -EXTRACT_CMD= ${SH} ${DOWNLOADED_DISTFILE} - GNU_CONFIGURE= yes BUILD_TARGET= all manlinks=so INSTALL_TARGET= install manlinks=so diff --git a/archivers/gzip-info/Makefile b/archivers/gzip-info/Makefile index abedf76f4cc..a762e5bc5b7 100644 --- a/archivers/gzip-info/Makefile +++ b/archivers/gzip-info/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/10/18 15:20:02 veego Exp $ +# $NetBSD: Makefile,v 1.8 2002/01/27 18:32:33 jlam Exp $ DISTNAME= gzip-1.2.4a PKGNAME= gzip-info-1.2.4a @@ -11,8 +11,6 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/gzip/gzip.html COMMENT= Info format documentation for the GZIP utility -EXTRACT_CMD= ${SH} ${DOWNLOADED_DISTFILE} - USE_GTEXINFO= yes INFO_FILES= gzip.info diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile index 777a095aebf..d49d6824bd1 100644 --- a/archivers/macutil/Makefile +++ b/archivers/macutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/07/16 10:01:27 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/01/27 18:32:33 jlam Exp $ DISTNAME= macutil2.0b3 PKGNAME= macutil-2.0b3 @@ -11,7 +11,6 @@ COMMENT= Create & extract Mac archive files MAKEFILE= makefile MAKE_ENV+= CF="${CFLAGS}" -EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} WRKSRC= ${WRKDIR}/macutil USE_BUILDLINK_ONLY= # defined diff --git a/games/svb/Makefile b/games/svb/Makefile index b13bd237502..add0b5cd553 100644 --- a/games/svb/Makefile +++ b/games/svb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:28 agc Exp $ +# $NetBSD: Makefile,v 1.6 2002/01/27 18:32:33 jlam Exp $ DISTNAME= svb PKGNAME= svb-1.0 @@ -11,7 +11,6 @@ COMMENT= Spy Vs. Bob, the timeless classic USE_IMAKE= yes WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} NO_INSTALL_MANPAGES= yes post-install: diff --git a/graphics/prag/Makefile b/graphics/prag/Makefile index 282ee8b6ead..82fd14b115e 100644 --- a/graphics/prag/Makefile +++ b/graphics/prag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/02/16 15:22:32 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2002/01/27 18:32:34 jlam Exp $ DISTNAME= prag-1.0pl2 PKGNAME= prag-1.0.2 @@ -12,10 +12,6 @@ COMMENT= replacement to "grap" graph generator backend to pic WRKSRC= ${WRKDIR}/prag-1.0 NO_BUILD= yes -do-extract: - ${MKDIR} ${WRKDIR} - (cd ${WRKDIR}; ${SH} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) - post-patch: (cd ${WRKSRC}; ${MV} prag prag.orig) (cd ${WRKSRC}; ${SED} -e "1s,/bin/nawk,${AWK}," < prag.orig >prag) diff --git a/misc/9menu/Makefile b/misc/9menu/Makefile index d25cc59db39..ac05cf85a09 100644 --- a/misc/9menu/Makefile +++ b/misc/9menu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:36 agc Exp $ +# $NetBSD: Makefile,v 1.5 2002/01/27 18:32:34 jlam Exp $ # FreeBSD Id: Makefile,v 1.4 1997/09/08 12:23:55 tg Exp # @@ -16,8 +16,6 @@ MANCOMPRESSED= yes .endif WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} - USE_X11= yes .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile index d453ba941d0..1f21891ae72 100644 --- a/sysutils/aperture/Makefile +++ b/sysutils/aperture/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.17 2002/01/27 18:32:34 jlam Exp $ DISTNAME= apNetBSD PKGNAME= aperture-2.0 @@ -28,7 +28,6 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL ALL_TARGET= cleandir depend all DIST_SUBDIR= ${PKGNAME} -EXTRACT_CMD= ${SH} ${DOWNLOADED_DISTFILE} INSTALL_FILE= ${WRKDIR}/INSTALL INSTALL_TARGET= dirs includes install MANCOMPRESSED_IF_MANZ= YES diff --git a/time/dclock/Makefile b/time/dclock/Makefile index 8ff8f76e5f3..691656421be 100644 --- a/time/dclock/Makefile +++ b/time/dclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:01 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/01/27 18:32:34 jlam Exp $ # DISTNAME= dclock @@ -11,7 +11,6 @@ MAINTAINER= packages@netbsd.org COMMENT= Digital clock for X USE_X11BASE= yes -EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} - WRKSRC= ${WRKDIR} MAKE_ENV+= CC="${CC}" diff --git a/time/gnyaclock/Makefile b/time/gnyaclock/Makefile index aa67107aa91..fb2b70da689 100644 --- a/time/gnyaclock/Makefile +++ b/time/gnyaclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/17 17:32:03 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/01/27 18:32:34 jlam Exp $ # DISTNAME= gnya @@ -12,8 +12,6 @@ MAINTAINER= kei@netbsd.org HOMEPAGE= http://www2.is.titech.ac.jp/~sadayosi/lab/h-takasi/h.html COMMENT= Accessory with Bezier curve -EXTRACT_CMD= ${CAT} ${DOWNLOADED_DISTFILE} | ${SH} - USE_IMAKE= YES USE_XPM= YES diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile index f374b09d70d..a0ec797b4b5 100644 --- a/wm/9wm/Makefile +++ b/wm/9wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/09/09 20:36:51 agc Exp $ +# $NetBSD: Makefile,v 1.5 2002/01/27 18:32:35 jlam Exp $ # FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp # @@ -12,7 +12,6 @@ HOMEPAGE= http://dhog.g7.org/dhog/9wm.html COMMENT= 8 1/2-like Window Manager for X WRKSRC= ${WRKDIR} -EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} USE_IMAKE= yes .include "../../mk/bsd.pkg.mk" diff --git a/x11/xpaste/Makefile b/x11/xpaste/Makefile index c22cef37c62..783f6e19fb4 100644 --- a/x11/xpaste/Makefile +++ b/x11/xpaste/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/04/16 20:21:01 zuntum Exp $ +# $NetBSD: Makefile,v 1.2 2002/01/27 18:32:35 jlam Exp $ # DISTNAME= xpaste-1.1 @@ -9,10 +9,7 @@ EXTRACT_SUFX= .shar.gz MAINTAINER= seb@pbox.org COMMENT= Display the content of the X11 paste buffer in a window -EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH} - USE_IMAKE= yes - WRKSRC= ${WRKDIR} .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3