From owner-svn-ports-all@freebsd.org Tue Dec 24 13:13:16 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B68A91E8288; Tue, 24 Dec 2019 13:13:16 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47hxVN34FWz3Lbf; Tue, 24 Dec 2019 13:13:16 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6434AA72; Tue, 24 Dec 2019 13:13:16 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBODDGwY026341; Tue, 24 Dec 2019 13:13:16 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBODDFpE026338; Tue, 24 Dec 2019 13:13:15 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201912241313.xBODDFpE026338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Tue, 24 Dec 2019 13:13:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520802 - in head/misc/mmv: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/misc/mmv: . files X-SVN-Commit-Revision: 520802 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Dec 2019 13:13:16 -0000 Author: mandree Date: Tue Dec 24 13:13:15 2019 New Revision: 520802 URL: https://svnweb.freebsd.org/changeset/ports/520802 Log: misc/mmv: make fetchable, and align with Debian buster (stable) The patch file has become unfetchable, so fetch the Debian changes archive instead, which contains all Debian patches, and a series file, and apply the Debian patches per its order. This obsoletes our local man page patch, and two hunks from the mmv.c patch. Approved by: (blanket, repairing an unfetchable port) Deleted: head/misc/mmv/files/patch-mmv.1 Modified: head/misc/mmv/Makefile head/misc/mmv/distinfo head/misc/mmv/files/patch-mmv.c Modified: head/misc/mmv/Makefile ============================================================================== --- head/misc/mmv/Makefile Tue Dec 24 13:11:18 2019 (r520801) +++ head/misc/mmv/Makefile Tue Dec 24 13:13:15 2019 (r520802) @@ -6,16 +6,14 @@ PORTVERSION= 1.01b.19 CATEGORIES= misc MASTER_SITES= DEBIAN_POOL DISTNAME= ${PORTNAME}_1.01b.orig +DISTFILES= ${PORTNAME}_1.01b.orig${EXTRACT_SUFX} \ + ${_debfile} -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= ${PORTNAME}_1.01b-15.diff.gz PATCH_DIST_STRIP= -p1 MAINTAINER= se@FreeBSD.org COMMENT= Move/Copy/Append/Link multiple files -BROKEN= unfetchable - LICENSE= Freeware LICENSE_NAME= MMV LICENSE_FILE= ${PATCHDIR}/LICENSE @@ -24,8 +22,16 @@ LICENSE_PERMS= dist-mirror pkg-mirror auto-accept CFLAGS+= -DHAS_DIRENT WRKSRC= ${WRKDIR}/${PORTNAME}-1.01b.orig +_debfile= ${PORTNAME}_1.01b-19.debian.tar.xz + +pre-patch: + ${TAR} -C ${WRKDIR} -xvJf ${DISTDIR}/${_debfile} debian/patches + cd ${WRKSRC} && while read p ; do \ + ${PATCH} <${WRKDIR}/debian/patches/$$p ; \ + done <${WRKDIR}/debian/patches/series + do-build: - cd ${WRKSRC}; ${CC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c + cd ${WRKSRC} && ${CC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mmv ${STAGEDIR}${PREFIX}/bin/ Modified: head/misc/mmv/distinfo ============================================================================== --- head/misc/mmv/distinfo Tue Dec 24 13:11:18 2019 (r520801) +++ head/misc/mmv/distinfo Tue Dec 24 13:13:15 2019 (r520802) @@ -1,4 +1,5 @@ +TIMESTAMP = 1577192605 SHA256 (mmv_1.01b.orig.tar.gz) = 0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef SIZE (mmv_1.01b.orig.tar.gz) = 25656 -SHA256 (mmv_1.01b-15.diff.gz) = 9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13 -SIZE (mmv_1.01b-15.diff.gz) = 10613 +SHA256 (mmv_1.01b-19.debian.tar.xz) = 79e0d8d31f76f6121dc563fa626dfaf9e2d4d9cec840121dd42e6b8cfc638b3e +SIZE (mmv_1.01b-19.debian.tar.xz) = 12436 Modified: head/misc/mmv/files/patch-mmv.c ============================================================================== --- head/misc/mmv/files/patch-mmv.c Tue Dec 24 13:11:18 2019 (r520801) +++ head/misc/mmv/files/patch-mmv.c Tue Dec 24 13:13:15 2019 (r520802) @@ -50,18 +50,6 @@ case ESC: if ((c = *(++p)) == '\0') { printf(TRAILESC, from, to, ESC); -@@ -1215,7 +1220,11 @@ static int keepmatch(ffrom, pathend, pk, needslash, di - getstat(pathbuf, ffrom); - if ((ffrom->fi_stflags & FI_ISDIR) ? !dirs : !fils) - #endif -+ { -+ if (verbose) -+ printf("ignoring directory %s\n", ffrom->fi_name); - return(0); -+ } - - if (needslash) { - strcpy(pathend + *pk, SLASHSTR); @@ -2030,7 +2039,7 @@ static void makerep() repbad = 0; p = fullrep; @@ -71,12 +59,3 @@ c = *(++pat); #ifndef IS_MSDOS if (c == 'l') { -@@ -2828,7 +2837,7 @@ static int getreply(m, failact) - static FILE *tty = NULL; - int c, r; - -- fprintf(stderr, m); -+ fprintf(stderr, "%s", m); - if (tty == NULL && (tty = fopen(TTY, "r")) == NULL) { - fprintf(stderr, "Can not open %s to get reply.\n", TTY); - if (failact == -1)