diff options
| -rw-r--r-- | misc/mmv/Makefile | 29 | ||||
| -rw-r--r-- | misc/mmv/distinfo | 4 | ||||
| -rw-r--r-- | misc/mmv/files/patch-aa | 33 | ||||
| -rw-r--r-- | misc/mmv/scripts/unshar | 8 |
4 files changed, 40 insertions, 34 deletions
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile index 9278bdd4fb54..b11625e0bdc2 100644 --- a/misc/mmv/Makefile +++ b/misc/mmv/Makefile @@ -8,33 +8,22 @@ PORTNAME= mmv PORTVERSION= 1.01b CATEGORIES= misc -MASTER_SITES= ftp://gatekeeper.dec.com/pub/usenet/comp.sources.unix/volume21/mmv/ -DISTFILES= part01.Z part02.Z - -PATCH_SITES= ftp://gatekeeper.dec.com/pub/usenet/comp.sources.unix/volume22/ -PATCHFILES= mmv.pch.Z +MASTER_SITES= http://wuarchive.wustl.edu/languages/c/unix-c/file-mgmt/ +DISTNAME= mmv +EXTRACT_SUFX= .tar.Z MAINTAINER= me@FreeBSD.org NO_CDROM= "No redistribution for charge" NO_PACKAGE= "No modification" -DIST_SUBDIR= ${PORTNAME} -NO_WRKSUBDIR= yes -PATCH_DIST_ARGS= -d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP} mmv.c +CFLAGS+= -DDIRENT +MAKE_FLAGS= -e MAN1= mmv.1 -do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR}/tmp - @(for file in ${DISTFILES}; do \ - ${CP} ${DISTDIR}/${DIST_SUBDIR}/$$file ${WRKDIR}/tmp; \ - done ; \ - uncompress ${WRKDIR}/tmp/*; \ - cd ${WRKDIR}; \ - for file in tmp/part0* ; do \ - ${SH} ${SCRIPTDIR}/unshar $$file; \ - done ; \ - ${CAT} mmv.c.? >mmv.c ; ${RM} mmv.c.? ) +post-extract: + (cd ${WRKDIR}/${DISTNAME} ; \ + ${CAT} mmv.c.? >mmv.c ; \ + ${PATCH} mmv.c < mmv.patch1 ; ) do-install: (cd ${PREFIX}/bin ; ${RM} -f mmv mad mcp mln ; \ diff --git a/misc/mmv/distinfo b/misc/mmv/distinfo index c7c9e45ddd9a..0556b644debb 100644 --- a/misc/mmv/distinfo +++ b/misc/mmv/distinfo @@ -1,3 +1 @@ -MD5 (mmv/part01.Z) = 8844a88bbe189e280361136f25a589d4 -MD5 (mmv/part02.Z) = 9e01b9aaceaab18cb9efafa6dec5df81 -MD5 (mmv/mmv.pch.Z) = e6f8cb26c8966a82d6f3f26a6e4bee23 +MD5 (mmv.tar.Z) = bc6dd229efc513140ec4d1caa364cab1 diff --git a/misc/mmv/files/patch-aa b/misc/mmv/files/patch-aa index 1d668147100a..e521e9c107bb 100644 --- a/misc/mmv/files/patch-aa +++ b/misc/mmv/files/patch-aa @@ -1,5 +1,5 @@ *** mmv.c.old Wed Mar 1 05:23:56 1995 ---- mmv.c Thu Mar 2 05:43:37 1995 +--- mmv.c Thu Jun 13 13:34:25 2002 *************** *** 88,94 **** #endif @@ -58,6 +58,33 @@ static int rename(/* char *from, char *to */); --- 386,391 ---- *************** +*** 410,416 **** + static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}}; + + static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad; +! static FILE *outfile = stdout; + + static char IDF[] = "$$mmvdid."; + static char TEMP[] = "$$mmvtmp."; +--- 406,412 ---- + static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}}; + + static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad; +! static FILE *outfile; + + static char IDF[] = "$$mmvdid."; + static char TEMP[] = "$$mmvtmp."; +*************** +*** 471,476 **** +--- 467,473 ---- + { + char *frompat, *topat; + ++ outfile = stdout; + init(); + procargs(argc, argv, &frompat, &topat); + domatch(frompat, topat); +*************** *** 2550,2559 **** } @@ -69,7 +96,7 @@ } ---- 2546,2554 ---- +--- 2547,2555 ---- } @@ -88,7 +115,7 @@ static void memmove(to, from, k) char *to, *from; unsigned k; ---- 2827,2833 ---- +--- 2828,2834 ---- } diff --git a/misc/mmv/scripts/unshar b/misc/mmv/scripts/unshar deleted file mode 100644 index f3ac82e72afc..000000000000 --- a/misc/mmv/scripts/unshar +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -ed $1 <<XXXEOF > /dev/null -/#! \/bin\/sh -1,.-1d -w -q -XXXEOF -/bin/sh $1 > /dev/null |