From c5af8657b06cbe258c027a1fa17b5f455d609e8a Mon Sep 17 00:00:00 2001 From: espie Date: Thu, 14 Dec 2000 13:22:59 +0000 Subject: [PATCH] Bye, bye, EXTRACT_CMD, EXTRACT_BEFORE_ARGS, EXTRACT_AFTER_ARGS --- comms/conserver/Makefile | 6 ++---- comms/zmtx-zmrx/Makefile | 5 ++--- games/xasteroids/Makefile | 6 ++---- japanese/intlfonts/Makefile | 6 +++--- mail/adcomplain/Makefile | 10 ++++------ mail/poppassd/Makefile | 13 +++++-------- math/hoc/Makefile | 8 ++------ misc/astrolog/Makefile | 9 ++++----- misc/tkcron/Makefile | 8 +++----- net/fping/Makefile | 7 +++---- net/tcpshow/Makefile | 8 +++----- plan9/9menu/Makefile | 9 +++------ plan9/9wm/Makefile | 8 ++------ plan9/sam/Makefile | 8 ++------ plan9/tcs/Makefile | 8 ++------ sysutils/tcplist/Makefile | 7 ++----- textproc/texi2html/Makefile | 7 ++----- x11/dclock/Makefile | 8 ++------ 18 files changed, 48 insertions(+), 93 deletions(-) diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile index 18dba6adf7a..cffd1cd7849 100644 --- a/comms/conserver/Makefile +++ b/comms/conserver/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.13 2000/10/22 14:02:59 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2000/12/14 13:22:59 espie Exp $ PKGNAME= conserver-5.21 DISTFILES= conserver-5.21-Beta.shar.gz CATEGORIES= comms -NEED_VERSION= 1.330 +NEED_VERSION= 1.342 MAINTAINER= Angelos D. Keromytis @@ -17,8 +17,6 @@ MASTER_SITES= ftp://ftp.uu.net/vendor/bitsko/config-mgmt/ \ ftp://unix.hensa.ac.uk/mirrors/uunet/vendor/bitsko/config-mgmt/ WRKDIST= ${WRKDIR} -EXTRACT_CASES= *.shar.gz) zcat ${FULLDISTDIR}/$$archive| /bin/sh -;; - # Set this to where you want console(8) to connect to by default # or use something like ``make DEFAULTHOST=myserver.mydomain.net'' DEFAULTHOST?= localhost diff --git a/comms/zmtx-zmrx/Makefile b/comms/zmtx-zmrx/Makefile index 00071686eb2..f186bbe4dde 100644 --- a/comms/zmtx-zmrx/Makefile +++ b/comms/zmtx-zmrx/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2000/09/15 13:42:00 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2000/12/14 13:22:59 espie Exp $ DISTNAME= zmtx-zmrx-1.02 DISTFILES= zmtx-zmrx.shar.gz CATEGORIES= comms -NEED_VERSION= 1.330 +NEED_VERSION= 1.342 MAINTAINER= ports@openbsd.org @@ -16,7 +16,6 @@ MASTER_SITES= ftp://ftp.inria.fr/network/modem/ \ ${MASTER_SITE_LOCAL} # see also comp.unix.sources for version 1.0 # ftp://ftp.lth.se/pub/usenet/comp.sources.unix/volume28/zm/part01.gz -EXTRACT_CASES=*.shar.gz) zcat ${FULLDISTDIR}/$$archive | /bin/sh - ;; WRKDIST= ${WRKDIR} MAKE_FILE= makefile diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile index f9082ee96e7..a3580106cc4 100644 --- a/games/xasteroids/Makefile +++ b/games/xasteroids/Makefile @@ -1,14 +1,12 @@ -# $OpenBSD: Makefile,v 1.16 2000/09/15 14:54:04 espie Exp $ +# $OpenBSD: Makefile,v 1.17 2000/12/14 13:22:59 espie Exp $ DISTNAME= xasteroids PKGNAME= xasteroids-5.0 CATEGORIES= games -NEED_VERSION= 1.330 +NEED_VERSION= 1.342 MASTER_SITES= ftp://ftp.freesoftware.com/pub/X11/R5contrib/ EXTRACT_SUFX= .sh.Z -EXTRACT_CASES= *.sh.Z) gzcat ${FULLDISTDIR}/$$archive | /bin/sh -s ;; - MAINTAINER= ports@openbsd.org PERMIT_PACKAGE_CDROM= Yes diff --git a/japanese/intlfonts/Makefile b/japanese/intlfonts/Makefile index bacc70d2f2f..d669252256b 100644 --- a/japanese/intlfonts/Makefile +++ b/japanese/intlfonts/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.4 2000/10/22 15:42:22 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2000/12/14 13:22:59 espie Exp $ CATEGORIES= japanese x11 -NEED_VERSION= 1.305 +NEED_VERSION= 1.330 DISTNAME= intlfonts-1.2 PKGNAME= ja-fonts-gnu-1.2 @@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes FONTDIR=${PREFIX}/lib/X11/fonts/ja # Don't bother extracting non-japanese fonts -EXTRACT_AFTER_ARGS= | tar -xf - `sed <${FILESDIR}/list -e s,^,${DISTNAME}/,` +EXTRACT_CASES=*) tar zxf ${FULLDISTDIR}/$$archive `sed <${FILESDIR}/list -e s,^,${DISTNAME}/,`;; CONFIGURE_STYLE= gnu dest NO_BUILD= Yes diff --git a/mail/adcomplain/Makefile b/mail/adcomplain/Makefile index 61776f513eb..069159dddd0 100644 --- a/mail/adcomplain/Makefile +++ b/mail/adcomplain/Makefile @@ -1,16 +1,14 @@ -# $OpenBSD: Makefile,v 1.13 2000/09/29 02:53:55 kevlo Exp $ +# $OpenBSD: Makefile,v 1.14 2000/12/14 13:22:59 espie Exp $ DISTNAME= adcomplain-3.52 CATEGORIES= mail news -NEED_VERSION= 1.301 +NEED_VERSION= 1.330 MASTER_SITES= http://www.rdrop.com/users/billmc/ DISTFILES= adcomplain.pl.uu -HOMEPAGE= http://www.rdrop.com/users/billmc/adcomplain.html +EXTRACT_CASES= *.uu) uudecode ${FULLDISTDIR}/$$archive;; -EXTRACT_CMD= uudecode -EXTRACT_BEFORE_ARGS= # -EXTRACT_AFTER_ARGS= # +HOMEPAGE= http://www.rdrop.com/users/billmc/adcomplain.html MAINTAINER= ports@openbsd.org diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile index 7831f41b93c..bbd365ebdc3 100644 --- a/mail/poppassd/Makefile +++ b/mail/poppassd/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2000/10/22 14:03:24 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2000/12/14 13:23:00 espie Exp $ -DISTNAME= pwserve-4 -PKGNAME= poppassd-4.0 +DISTNAME= poppassd-4.0 +DISTFILES= pwserve-4 CATEGORIES= mail -NEED_VERSION= 1.191 +NEED_VERSION= 1.330 MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/password/ MAINTAINER= Angelos D. Keromytis @@ -14,10 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -EXTRACT_CMD= cat -EXTRACT_SUFX= # empty -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= | sed -e '1,16d' | ${SH} +EXTRACT_CASES= *) sed -e '1,16d' <${FULLDISTDIR}/$$archive | /bin/sh;; WRKDIST= ${WRKDIR}/poppassd diff --git a/math/hoc/Makefile b/math/hoc/Makefile index 57912248760..c00806264c3 100644 --- a/math/hoc/Makefile +++ b/math/hoc/Makefile @@ -1,17 +1,13 @@ # Ports collection makefile for "hoc", the High Order Calculator -# $OpenBSD: Makefile,v 1.14 2000/10/22 15:42:36 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2000/12/14 13:23:00 espie Exp $ DISTNAME= hoc PKGNAME= hoc-1.1 CATEGORIES= math -NEED_VERSION= 1.210 +NEED_VERSION= 1.342 MASTER_SITES= http://cm.bell-labs.com/cm/cs/who/bwk/ EXTRACT_SUFX= .sh -EXTRACT_CMD= ${SH} -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= # empty - MAINTAINER= Ian Darwin PERMIT_PACKAGE_CDROM= Yes diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index cb782a906a3..0a4a79faee1 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2000/10/22 15:42:43 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2000/12/14 13:23:00 espie Exp $ # Original from: Ejovi Nuwere DISTNAME= ast53unx PKGNAME= astrolog-5.30 CATEGORIES= misc -NEED_VERSION= 1.191 +NEED_VERSION= 1.330 NO_CDROM= "NOFEE: Can not sell" MASTER_SITES= http://www.astrolog.org/ftp/ephem/ \ @@ -21,9 +21,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= No PERMIT_DISTFILES_FTP= Yes -EXTRACT_CMD= ${SH} -EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= +EXTRACT_CASES=*.shr) /bin/sh ${FULLDISTDIR}/$$archive;; + DIST_SUBDIR= astrolog ALL_TARGET= astrolog WRKDIST= ${WRKDIR} diff --git a/misc/tkcron/Makefile b/misc/tkcron/Makefile index 65eaed7aa43..dee02ec2f08 100644 --- a/misc/tkcron/Makefile +++ b/misc/tkcron/Makefile @@ -3,12 +3,12 @@ # Date created: May 20 1998 # Whom: Angelos D. Keromytis # -# $OpenBSD: Makefile,v 1.10 2000/10/22 15:42:52 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2000/12/14 13:23:00 espie Exp $ # DISTNAME= tkcron-2.12 CATEGORIES= misc -NEED_VERSION= 1.230 +NEED_VERSION= 1.330 MASTER_SITES= ftp://ftp.neosoft.com/languages/tcl/alcatel/code/ EXTRACT_SUFX= .tcl.gz @@ -21,9 +21,7 @@ PERMIT_DISTFILES_FTP= Yes RUN_DEPENDS= wish8.3::x11/tk/8.3 -EXTRACT_CMD= ${GZIP_CMD} -EXTRACT_BEFORE_ARGS= -cd -EXTRACT_AFTER_ARGS= > tkcron.tcl +EXTRACT_CASES=*) gunzip -c ${FULLDISTDIR}/$$archive >tkcron.tcl;; WRKDIST= ${WRKDIR} post-extract: diff --git a/net/fping/Makefile b/net/fping/Makefile index 567f1438105..7a79c170d32 100644 --- a/net/fping/Makefile +++ b/net/fping/Makefile @@ -1,18 +1,17 @@ # $FreeBSD: ports/net/fping/Makefile,v 1.8 2000/03/22 00:26:51 obrien Exp $ -# $OpenBSD: Makefile,v 1.4 2000/10/22 16:59:25 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2000/12/14 13:23:00 espie Exp $ DISTNAME= part01 PKGNAME= fping-1.20 CATEGORIES= net +NEED_VERSION= 1.330 MASTER_SITES= ftp://ftp.uu.net/usenet/comp.sources.unix/volume26/fping/ \ ftp://ftp.digital.com/pub/usenet/comp.sources.unix/volume26/fping/ \ ftp://ftp.wustl.edu/usenet/comp.sources.unix/volume26/fping/ \ ftp://ftp.isnet.is/pub/Usenet/Usenet.src/comp.sources.unix/v26/fping/ EXTRACT_SUFX= .Z -EXTRACT_CMD= zcat -EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= | sed -e '1,/Archive-Name/d' | sh +EXTRACT_CASES=*.Z) zcat ${FULLDISTDIR}/$$archive| sed -e '1,/Archive-Name/d' | /bin/sh;; PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/net/tcpshow/Makefile b/net/tcpshow/Makefile index 296e9c81750..4a0ac6e2bbe 100644 --- a/net/tcpshow/Makefile +++ b/net/tcpshow/Makefile @@ -1,15 +1,13 @@ -# $OpenBSD: Makefile,v 1.13 2000/10/22 15:43:08 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2000/12/14 13:23:01 espie Exp $ # $FreeBSD: Makefile,v 1.2 1997/11/10 11:33:04 asami Exp $ DISTNAME= tcpshow-1.74 CATEGORIES= net security -NEED_VERSION= 1.191 +NEED_VERSION= 1.330 MASTER_SITES= http://people.freebsd.org/~obrien/Distfiles/ DISTFILES= tcpshow.c tcpshow.1 -EXTRACT_CMD= cp -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= . +EXTRACT_CASES=*)cp ${FULLDISTDIR}/$$archive ${WRKDIST};; MAINTAINER= ports@openbsd.org diff --git a/plan9/9menu/Makefile b/plan9/9menu/Makefile index a2d6c1d5f74..42dda4919a1 100644 --- a/plan9/9menu/Makefile +++ b/plan9/9menu/Makefile @@ -1,14 +1,11 @@ -# $OpenBSD: Makefile,v 1.11 2000/10/22 14:03:39 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2000/12/14 13:23:01 espie Exp $ DISTNAME= 9menu-1.5 CATEGORIES= plan9 -NEED_VERSION= 1.310 +NEED_VERSION= 1.342 MASTER_SITES= ftp://ftp.mathcs.emory.edu/pub/arnold/ -EXTRACT_SUFX= .shar.gz -EXTRACT_CMD= gzcat -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= | ${SH} +EXTRACT_SUFX= .shar.gz MAINTAINER= Angelos D. Keromytis diff --git a/plan9/9wm/Makefile b/plan9/9wm/Makefile index 4df48e56f58..52afd266f99 100644 --- a/plan9/9wm/Makefile +++ b/plan9/9wm/Makefile @@ -1,16 +1,12 @@ -# $OpenBSD: Makefile,v 1.14 2000/12/12 23:46:14 markus Exp $ +# $OpenBSD: Makefile,v 1.15 2000/12/14 13:23:01 espie Exp $ PKGNAME= 9wm-1.2pre DISTNAME= pre-9wm-1.2 CATEGORIES= plan9 -NEED_VERSION= 1.310 +NEED_VERSION= 1.342 MASTER_SITES= ftp://ftp.cs.su.oz.au/dhog/9wm/ EXTRACT_SUFX= .shar.gz -EXTRACT_CMD= gzcat -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= | ${SH} - MAINTAINER= Markus Friedl PERMIT_PACKAGE_CDROM= Yes diff --git a/plan9/sam/Makefile b/plan9/sam/Makefile index d6adab5ad30..ce68363a6a1 100644 --- a/plan9/sam/Makefile +++ b/plan9/sam/Makefile @@ -1,17 +1,13 @@ -# $OpenBSD: Makefile,v 1.13 2000/10/22 17:02:40 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2000/12/14 13:23:01 espie Exp $ DISTNAME= sam PKGNAME= sam-4.3-19980506 CATEGORIES= plan9 -NEED_VERSION= 1.310 +NEED_VERSION= 1.342 MASTER_SITES= ftp://netlib.bell-labs.com/netlib/research/ \ http://netlib.bell-labs.com/netlib/research/ EXTRACT_SUFX= .shar.gz -EXTRACT_CMD= gzcat -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= | sh - MAINTAINER= Markus Friedl PERMIT_PACKAGE_CDROM= Yes diff --git a/plan9/tcs/Makefile b/plan9/tcs/Makefile index 0a776cd5a60..772d54f8aa8 100644 --- a/plan9/tcs/Makefile +++ b/plan9/tcs/Makefile @@ -1,17 +1,13 @@ -# $OpenBSD: Makefile,v 1.14 2000/10/22 17:02:40 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2000/12/14 13:23:01 espie Exp $ DISTNAME= tcs PKGNAME= tcs-19950325 CATEGORIES= plan9 -NEED_VERSION= 1.310 +NEED_VERSION= 1.342 MASTER_SITES= ftp://plan9.bell-labs.com/plan9/unixsrc/ \ ftp://ftp.gwdg.de/pub/gnu2/plan9/unixsrc/ EXTRACT_SUFX= .shar.Z -EXTRACT_CMD= gzcat -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= | sh - MAINTAINER= Markus Friedl PERMIT_PACKAGE_CDROM= Yes diff --git a/sysutils/tcplist/Makefile b/sysutils/tcplist/Makefile index c33bf688184..3dca5b2ea44 100644 --- a/sysutils/tcplist/Makefile +++ b/sysutils/tcplist/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2000/06/09 20:58:00 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2000/12/14 13:23:02 espie Exp $ # Original from: Ejovi Nuwere DISTNAME= tcplist-2.2 CATEGORIES= sysutils net -NEED_VERSION= 1.230 +NEED_VERSION= 1.342 MASTER_SITES= ftp://ftp.cdf.toronto.edu/pub/jdd/tcplist/ EXTRACT_SUFX= .shar @@ -18,9 +18,6 @@ PERMIT_DISTFILES_FTP= Yes RUN_DEPENDS= lsof::sysutils/lsof WRKDIST= ${WRKDIR} -EXTRACT_CMD= cat -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= | ${SH} INSTALL_TARGET= install install.man diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile index 29d67f5dae9..5720ca3e19c 100644 --- a/textproc/texi2html/Makefile +++ b/textproc/texi2html/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.10 2000/10/22 15:43:38 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2000/12/14 13:23:02 espie Exp $ DISTNAME= texi2html PKGNAME= texi2html-1.52 CATEGORIES= textproc -NEED_VERSION= 1.191 +NEED_VERSION= 1.342 MASTER_SITES= http://wwwcn.cern.ch/dci/texi2html/ \ ftp://ftp.scc.ru/pub/unix/ EXTRACT_SUFX= .shar.Z @@ -17,9 +17,6 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WRKDIST= ${WRKDIR} -EXTRACT_CMD= gzcat -EXTRACT_BEFORE_ARGS= # empty -EXTRACT_AFTER_ARGS= | ${SH} NO_BUILD= yes diff --git a/x11/dclock/Makefile b/x11/dclock/Makefile index ddf734f0856..bb0cc61c59d 100644 --- a/x11/dclock/Makefile +++ b/x11/dclock/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2000/10/22 14:03:55 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2000/12/14 13:23:02 espie Exp $ # $FreeBSD: Makefile,v 1.9 1999/08/31 06:52:30 mharo Exp $ PKGNAME= dclock-pl4 CATEGORIES= x11 -NEED_VERSION= 1.191 +NEED_VERSION= 1.342 DISTNAME= dclock EXTRACT_SUFX= .shar.Z @@ -20,10 +20,6 @@ PERMIT_DISTFILES_FTP= Yes USE_X11= Yes -EXTRACT_CMD= ${GZIP_CMD} -EXTRACT_BEFORE_ARGS= -cd -EXTRACT_AFTER_ARGS= |sh - - WRKDIST= ${WRKDIR} ALL_TARGET= dclock