From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 6 13:00:37 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3D8316A415 for ; Fri, 6 Oct 2006 13:00:36 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B64FE43D55 for ; Fri, 6 Oct 2006 13:00:35 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k96D0Ze0003374 for ; Fri, 6 Oct 2006 13:00:35 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k96D0Z6J003372; Fri, 6 Oct 2006 13:00:35 GMT (envelope-from gnats) Resent-Date: Fri, 6 Oct 2006 13:00:35 GMT Resent-Message-Id: <200610061300.k96D0Z6J003372@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Simon Olofsson" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9CEC616A47E for ; Fri, 6 Oct 2006 12:53:20 +0000 (UTC) (envelope-from simon@olofsson.de) Received: from mail-in-01.arcor-online.net (mail-in-01.arcor-online.net [151.189.21.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A61643D5D for ; Fri, 6 Oct 2006 12:53:14 +0000 (GMT) (envelope-from simon@olofsson.de) Received: from mail-in-01-z2.arcor-online.net (mail-in-08-z2.arcor-online.net [151.189.8.20]) by mail-in-01.arcor-online.net (Postfix) with ESMTP id 3163510423C; Fri, 6 Oct 2006 14:53:14 +0200 (CEST) Received: from mail-in-11.arcor-online.net (mail-in-11.arcor-online.net [151.189.21.51]) by mail-in-01-z2.arcor-online.net (Postfix) with ESMTP id 1A933213043; Fri, 6 Oct 2006 14:53:14 +0200 (CEST) Received: from gul.lan.gath3n.de (dslb-084-060-156-040.pools.arcor-ip.net [84.60.156.40]) by mail-in-11.arcor-online.net (Postfix) with SMTP id 892CE1052F; Fri, 6 Oct 2006 14:53:13 +0200 (CEST) Received: by gul.lan.gath3n.de (sSMTP sendmail emulation); Fri, 6 Oct 2006 14:53:13 +0200 Message-Id: <20061006125313.892CE1052F@mail-in-11.arcor-online.net> Date: Fri, 6 Oct 2006 14:53:13 +0200 From: "Simon Olofsson" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Dan Nelson Subject: ports/104058: [MAINTAINER] misc/mmv: Restore old escape char X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Oct 2006 13:00:37 -0000 >Number: 104058 >Category: ports >Synopsis: [MAINTAINER] misc/mmv: Restore old escape char >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Oct 06 13:00:34 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Simon Olofsson >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD gul.lan.gath3n.de 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #35: Tue Oct 3 20:51:07 CEST >Description: Allow both escape characters '#' (the Debian/DOS Way) and '=' (the FreeBSD/Unix one). Kudos to Dan Nelson for the patch. Added file(s): - files/patch-mmv.1 - files/patch-mmv.c Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- mmv-1.01b.14_1.patch begins here --- diff -ruN -ruN --exclude=CVS /usr/ports/misc/mmv/Makefile /usr/home/simon/src/ports/misc/mmv/Makefile --- /usr/ports/misc/mmv/Makefile Wed Oct 4 12:02:08 2006 +++ /usr/home/simon/src/ports/misc/mmv/Makefile Thu Oct 5 19:47:53 2006 @@ -7,6 +7,7 @@ PORTNAME= mmv PORTVERSION= 1.01b.14 +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_1.01b.orig diff -ruN -ruN --exclude=CVS /usr/ports/misc/mmv/files/patch-mmv.1 /usr/home/simon/src/ports/misc/mmv/files/patch-mmv.1 --- /usr/ports/misc/mmv/files/patch-mmv.1 Thu Jan 1 01:00:00 1970 +++ /usr/home/simon/src/ports/misc/mmv/files/patch-mmv.1 Thu Oct 5 19:14:06 2006 @@ -0,0 +1,36 @@ +--- mmv.1 Thu Oct 5 19:09:58 2006 ++++ mmv.1 Thu Oct 5 19:12:46 2006 +@@ -345,7 +345,7 @@ + with embedded + .I wildcard + .IR indexes , +-where an index consists of the character '#' ++where an index consists of the character '#' or '=' + followed by a string of digits. + When a source file matches a + .I from +@@ -406,7 +406,7 @@ + However, if "dir2\*(SLa" already exists and is itself a directory, + this is considered an error. + .PP +-To strip any character (e.g. '*', '?', or '#') ++To strip any character (e.g. '*', '?', '#', or '=') + of its special meaning to + .IR mmv , + as when the actual replacement name must contain the character '#', +@@ -639,6 +639,15 @@ + .SH "SEE ALSO" + mv(1), cp(1), ln(1), umask(1) + \} ++.SH "HISTORY" ++The original FreeBSD port of mmv was derived from the Usenet ++comp.sources.unix postings <2438@litchi.bbn.com>, ++<2439@litchi.bbn.com>, and <2643@litchi.bbn.com>. ++The current port is based on the comp.binaries.ibm.pc postings ++(no messageids available). ++The Unix version used '=' as the index escape character, ++while the MS-DOS version used '#'. ++This port allows both. + .SH "AUTHOR" + Vladimir Lanin + .br diff -ruN -ruN --exclude=CVS /usr/ports/misc/mmv/files/patch-mmv.c /usr/home/simon/src/ports/misc/mmv/files/patch-mmv.c --- /usr/ports/misc/mmv/files/patch-mmv.c Thu Jan 1 01:00:00 1970 +++ /usr/home/simon/src/ports/misc/mmv/files/patch-mmv.c Thu Oct 5 19:07:51 2006 @@ -0,0 +1,61 @@ +--- mmv.c Thu Oct 5 10:36:36 2006 ++++ mmv.c Thu Oct 5 10:38:31 2006 +@@ -73,7 +73,8 @@ + %s [-m|x|r|c|o|a|l%s] [-h] [-d|p] [-g|t] [-v|n] [from to]\n\ + \n\ + Use #[l|u]N in the ``to'' pattern to get the [lowercase|uppercase of the]\n\ +-string matched by the N'th ``from'' pattern wildcard.\n\ ++string matched by the N'th ``from'' pattern wildcard. = can be used\n\ ++instead of #.\n\ + \n\ + A ``from'' pattern containing wildcards should be quoted when given\n\ + on the command line. Also you may need to quote ``to'' pattern.\n\ +@@ -976,6 +977,9 @@ + lastname = p + 1; + break; + case '#': ++ case '=': ++ { ++ char index_char=c; + c = *(++p); + if (c == 'l' || c == 'u') { + #ifdef IS_MSDOS +@@ -986,8 +990,8 @@ + #endif + } + if (!isdigit(c)) { +- printf("%s -> %s : expected digit (not '%c') after #.\n", +- from, to, c); ++ printf("%s -> %s : expected digit (not '%c') after %c.\n", ++ from, to, c, index_char); + return(-1); + } + for(x = 0; ;x *= 10) { +@@ -998,8 +1002,8 @@ + p++; + } + if (x < 1 || x > totwilds) { +- printf("%s -> %s : wildcard #%d does not exist.\n", +- from, to, x); ++ printf("%s -> %s : wildcard %c%d does not exist.\n", ++ from, to, index_char, x); + return(-1); + } + #ifdef IS_MSDOS +@@ -1007,6 +1011,7 @@ + havedot = 1; + #endif + break; ++ } + case ESC: + if ((c = *(++p)) == '\0') { + printf(TRAILESC, from, to, ESC); +@@ -2029,7 +2034,7 @@ + repbad = 0; + p = fullrep; + for (pat = to, l = 0; (c = *pat) != '\0'; pat++, l++) { +- if (c == '#') { ++ if (c == '#' || c == '=') { + c = *(++pat); + #ifndef IS_MSDOS + if (c == 'l') { --- mmv-1.01b.14_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: