[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SHAR fixes
I sent out a few diffs to maintainers earlier, but mostly this is all
the same type of thing, and probably just warrants general approval.
For each given diff either a workaround for an improper SHAR distfile (i.e.,
no '#!/bin/sh') is being applied, or standardization to recent
bsd.port.mk SHAR fixes is being updated.
jsyn
Index: benchmarks/xengine/Makefile
===================================================================
RCS file: /cvs/ports/benchmarks/xengine/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- benchmarks/xengine/Makefile 2001/07/30 21:03:16 1.17
+++ benchmarks/xengine/Makefile 2001/08/03 21:29:29
@@ -15,7 +15,7 @@ PERMIT_DISTFILES_CDROM= "no fee"
PERMIT_DISTFILES_FTP= Yes
DIST_SUBDIR= xengine
-EXTRACT_CASES+= *.z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | ${_SED_FIX_SHAR} | /bin/sh;;
+EXTRACT_CASES= *.z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | ${_SED_FIX_SHAR} | /bin/sh;;
PATCH_DIST_STRIP= -p1 # no ${PATCHFILES} but used below
WRKDIST= ${WRKDIR}
Index: games/connect4/Makefile
===================================================================
RCS file: /cvs/ports/games/connect4/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- games/connect4/Makefile 2001/06/27 20:56:25 1.15
+++ games/connect4/Makefile 2001/08/03 21:29:29
@@ -9,7 +9,7 @@ NEED_VERSION= 1.402
MASTER_SITES= ftp://scitsc.wlv.ac.uk/pub/infomagic/usenet/games/volume6/
EXTRACT_SUFX= # empty
-EXTRACT_CASES= connect4) gunshar ${FULLDISTDIR}/$$archive ;;
+EXTRACT_CASES= connect4) ${_SED_FIX_SHAR} ${FULLDISTDIR}/$$archive | /bin/sh;;
MAINTAINER= Angelos D. Keromytis <angelos@openbsd.org>
@@ -19,8 +19,6 @@ PERMIT_PACKAGE_FTP= "no license"
PERMIT_DISTFILES_CDROM= "no license"
PERMIT_DISTFILES_FTP= "no license"
-
-BUILD_DEPENDS= gunshar::archivers/gshar+gunshar
MAKE_FLAGS= CFLAGS='${CFLAGS} -DSCOREFILE=\"${SCOREFILE}\"'
WRKDIST= ${WRKDIR}
Index: games/xinvaders/Makefile
===================================================================
RCS file: /cvs/ports/games/xinvaders/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- games/xinvaders/Makefile 2001/07/30 21:03:16 1.12
+++ games/xinvaders/Makefile 2001/08/03 21:29:29
@@ -20,7 +20,7 @@ MASTER_SITES= ftp://ftp.uu.net/usenet/co
ftp://unix.hensa.ac.uk/archive/usenet/comp.sources.x/volume19/xinvaders/
DISTFILES= part01.Z part02.Z part03.Z
-EXTRACT_CASES+= *.Z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | ${_SED_FIX_SHAR} | /bin/sh;;
+EXTRACT_CASES= *.Z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | ${_SED_FIX_SHAR} | /bin/sh;;
CONFIGURE_STYLE= imake
Index: mail/poppassd/Makefile
===================================================================
RCS file: /cvs/ports/mail/poppassd/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- mail/poppassd/Makefile 2001/06/27 20:56:26 1.15
+++ mail/poppassd/Makefile 2001/08/03 21:29:29
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP= "no license"
PERMIT_DISTFILES_CDROM= "no license"
PERMIT_DISTFILES_FTP= "no license"
-EXTRACT_CASES= *) sed -e '1,16d' <${FULLDISTDIR}/$$archive | /bin/sh;;
+EXTRACT_CASES= pwserve-4) ${_SED_FIX_SHAR} ${FULLDISTDIR}/$$archive | /bin/sh;;
WRKDIST= ${WRKDIR}/poppassd
Index: math/hoc/Makefile
===================================================================
RCS file: /cvs/ports/math/hoc/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- math/hoc/Makefile 2001/05/06 01:58:49 1.17
+++ math/hoc/Makefile 2001/08/03 21:29:29
@@ -9,6 +9,7 @@ CATEGORIES= math
NEED_VERSION= 1.402
MASTER_SITES= http://cm.bell-labs.com/cm/cs/who/bwk/
EXTRACT_SUFX= .sh
+EXTRACT_CASES= *.sh) /bin/sh ${FULLDISTDIR}/$$archive;;
MAINTAINER= Ian Darwin <ian@openbsd.org>
Index: misc/astrolog/Makefile
===================================================================
RCS file: /cvs/ports/misc/astrolog/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- misc/astrolog/Makefile 2001/05/06 02:29:41 1.14
+++ misc/astrolog/Makefile 2001/08/03 21:29:29
@@ -22,7 +22,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= No
PERMIT_DISTFILES_FTP= Yes
-EXTRACT_CASES=*.shr) /bin/sh ${FULLDISTDIR}/$$archive;;
+EXTRACT_CASES= *.shr) ${_SED_FIX_SHAR} ${FULLDISTDIR}/$$archive | /bin/sh;;
DIST_SUBDIR= astrolog
ALL_TARGET= astrolog
Index: net/fping/Makefile
===================================================================
RCS file: /cvs/ports/net/fping/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- net/fping/Makefile 2001/03/29 10:14:27 1.6
+++ net/fping/Makefile 2001/08/03 21:29:29
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.uu.net/usenet/co
ftp://ftp.isnet.is/pub/Usenet/Usenet.src/comp.sources.unix/v26/fping/
EXTRACT_SUFX= .Z
-EXTRACT_CASES=*.Z) zcat ${FULLDISTDIR}/$$archive| sed -e '1,/Archive-Name/d' | /bin/sh;;
+EXTRACT_CASES= *.Z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | ${_SED_FIX_SHAR} | /bin/sh;;
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
Index: plan9/9wm/Makefile
===================================================================
RCS file: /cvs/ports/plan9/9wm/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- plan9/9wm/Makefile 2001/05/06 03:05:01 1.16
+++ plan9/9wm/Makefile 2001/08/03 21:29:29
@@ -8,6 +8,7 @@ CATEGORIES= plan9
NEED_VERSION= 1.402
MASTER_SITES= ftp://ftp.cs.su.oz.au/dhog/9wm/
EXTRACT_SUFX= .shar.gz
+EXTRACT_CASES= *.shar.gz) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | /bin/sh;;
MAINTAINER= Markus Friedl <markus@openbsd.org>
Index: plan9/sam/Makefile
===================================================================
RCS file: /cvs/ports/plan9/sam/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- plan9/sam/Makefile 2001/05/06 03:05:09 1.16
+++ plan9/sam/Makefile 2001/08/03 21:29:29
@@ -9,6 +9,7 @@ NEED_VERSION= 1.402
MASTER_SITES= ftp://netlib.bell-labs.com/netlib/research/ \
http://netlib.bell-labs.com/netlib/research/
EXTRACT_SUFX= .shar.gz
+EXTRACT_CASES= *.shar.gz) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | /bin/sh;;
MAINTAINER= Markus Friedl <markus@openbsd.org>
Index: plan9/tcs/Makefile
===================================================================
RCS file: /cvs/ports/plan9/tcs/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- plan9/tcs/Makefile 2001/05/06 03:05:12 1.16
+++ plan9/tcs/Makefile 2001/08/03 21:29:29
@@ -9,6 +9,7 @@ NEED_VERSION= 1.402
MASTER_SITES= ftp://plan9.bell-labs.com/plan9/unixsrc/ \
ftp://ftp.gwdg.de/pub/gnu2/plan9/unixsrc/
EXTRACT_SUFX= .shar.Z
+EXTRACT_CASES= *.shar.Z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | /bin/sh;;
MAINTAINER= Markus Friedl <markus@openbsd.org>
Index: textproc/texi2html/Makefile
===================================================================
RCS file: /cvs/ports/textproc/texi2html/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- textproc/texi2html/Makefile 2001/06/20 01:43:37 1.13
+++ textproc/texi2html/Makefile 2001/08/03 21:29:29
@@ -9,6 +9,7 @@ NEED_VERSION= 1.402
MASTER_SITES= http://wwwcn.cern.ch/dci/texi2html/ \
ftp://ftp.scc.ru/pub/unix/
EXTRACT_SUFX= .shar.Z
+EXTRACT_CASES= *.shar.Z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | /bin/sh;;
MAINTAINER= Angelos D. Keromytis <angelos@openbsd.org>