From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 1 18:10:16 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75D5D10656EC for ; Mon, 1 Oct 2012 18:10:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4F70C8FC28 for ; Mon, 1 Oct 2012 18:10:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q91IAGie015351 for ; Mon, 1 Oct 2012 18:10:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q91IAGqu015342; Mon, 1 Oct 2012 18:10:16 GMT (envelope-from gnats) Resent-Date: Mon, 1 Oct 2012 18:10:16 GMT Resent-Message-Id: <201210011810.q91IAGqu015342@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A369106566B for ; Mon, 1 Oct 2012 18:03:32 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166]) by mx1.freebsd.org (Postfix) with ESMTP id 1A5A18FC1A for ; Mon, 1 Oct 2012 18:03:32 +0000 (UTC) Received: from localhost.localdomain (ZT037251.ppp.dion.ne.jp [59.128.37.251]) by msa103lp.auone-net.jp (au one net msa) with ESMTP id 22F0F47C036 for ; Tue, 2 Oct 2012 03:03:29 +0900 (JST) Message-Id: <20121002025456.258ff78b2d174bb452be0fb9@yahoo.com> Date: Tue, 2 Oct 2012 02:54:56 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/172252: sysutils/linrename: Update to version 2.22 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: Mon, 01 Oct 2012 18:10:16 -0000 >Number: 172252 >Category: ports >Synopsis: sysutils/linrename: Update to version 2.22 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 01 18:10:15 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Update to version 2.22 Remove file: files/patch-lib__nls.h files/patch-misc-utils__rename.c >How-To-Repeat: >Fix: diff -urN /usr/ports/sysutils/linrename/Makefile sysutils/linrename/Makefile --- /usr/ports/sysutils/linrename/Makefile 2012-09-22 14:18:20.000000000 +0900 +++ sysutils/linrename/Makefile 2012-10-02 00:04:32.000000000 +0900 @@ -2,38 +2,53 @@ # $FreeBSD: ports/sysutils/linrename/Makefile,v 1.7 2012/09/22 05:18:20 tabthorpe Exp $ PORTNAME= linrename -PORTVERSION= 2.12r -PORTREVISION= 2 +PORTVERSION= 2.22 CATEGORIES= sysutils -MASTER_SITES= http://mirror.linux.org.au/pub/linux/utils/util-linux/ \ - http://debian.csail.mit.edu/pub/linux/utils/util-linux/ \ - http://www.club.cc.cmu.edu/pub/linux.out-of-date/utils/util-linux/ \ - ${MASTER_SITE_KERNEL_ORG} -MASTER_SITE_SUBDIR= linux/utils/util-linux +#MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION} +MASTER_SITES= http://ftp.ntu.edu.tw/ftp/linux/%SUBDIR%/ \ + http://ftp.sunet.se/pub/Linux/kernel.org/linux/%SUBDIR%/ \ + http://kernel.org/pub/linux/%SUBDIR%/ \ + ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,linux/kernel.org/&,} +MASTER_SITE_SUBDIR= utils/util-linux/v${PORTVERSION} DISTNAME= util-linux-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Rename multiple files using substitution -PLIST_FILES= bin/linrename -MAN1= linrename.1 +OPTIONS_DEFINE= NLS +OPTIONS_DEFAULT=NLS -USE_BZIP2= yes -USE_GETTEXT= yes +BUILD_WRKSRC= ${WRKSRC}/misc-utils +INSTALL_WRKSRC= ${WRKSRC}/misc-utils + +USE_XZ= yes + +CPPFLAGS+= -I../include -DHAVE_LOCALE_H -DHAVE_LANGINFO_H \ + -DPACKAGE_STRING=\"util-linux\ ${PORTVERSION}\" -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -lintl -I${WRKSRC}/lib -EXTRACT_AFTER_ARGS= | tar -xf - \ - ${DISTNAME}/lib/nls.h \ - ${DISTNAME}/misc-utils/rename.1 \ - ${DISTNAME}/misc-utils/rename.c +MAN1= ${PORTNAME}.1 +PLIST_FILES= bin/${PORTNAME} + +.include + +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +CPPFLAGS+= -I${LOCALBASE}/include -DENABLE_NLS \ + -DPACKAGE=\"util-linux\" \ + -DLOCALEDIR=\"${LOCALBASE}/share/locale\" +LDFLAGS+= -L${LOCALBASE}/lib -lintl +.endif -.include +post-patch: + ${LN} -sf rename.1 ${BUILD_WRKSRC}/${PORTNAME}.1 do-build: - ${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/misc-utils/rename.c + (cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME} \ + rename.c ${LDFLAGS}) do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/misc-utils/rename.1 ${PREFIX}/man/man1/${MAN1} + (cd ${INSTALL_WRKSRC} \ + && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin \ + && ${INSTALL_MAN} ${PORTNAME}.1 ${MANPREFIX}/man/man1) -.include +.include diff -urN /usr/ports/sysutils/linrename/distinfo sysutils/linrename/distinfo --- /usr/ports/sysutils/linrename/distinfo 2011-03-19 21:32:46.000000000 +0900 +++ sysutils/linrename/distinfo 2012-09-27 21:31:58.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (util-linux-2.12r.tar.bz2) = b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b -SIZE (util-linux-2.12r.tar.bz2) = 1370907 +SHA256 (util-linux-2.22.tar.xz) = 32b329aa72c2ea546378bf81f08e30cf30440196c2edf7777b4f509a3fdbe5a2 +SIZE (util-linux-2.22.tar.xz) = 3183868 diff -urN /usr/ports/sysutils/linrename/files/patch-lib__nls.h sysutils/linrename/files/patch-lib__nls.h --- /usr/ports/sysutils/linrename/files/patch-lib__nls.h 2006-12-26 01:02:15.000000000 +0900 +++ sysutils/linrename/files/patch-lib__nls.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,42 +0,0 @@ ---- ./lib/nls.h.orig Thu Jul 4 23:03:26 2002 -+++ ./lib/nls.h Mon Dec 25 14:54:11 2006 -@@ -1,7 +1,5 @@ - int main(int argc, char *argv[]); - --#include "../defines.h" /* for HAVE_locale_h */ -- - #ifndef PACKAGE - #define PACKAGE "util-linux" - #endif -@@ -10,25 +8,12 @@ - #define LOCALEDIR "/usr/share/locale" - #endif - --#ifdef HAVE_locale_h --# include --#endif -+#include - --#if defined MAY_ENABLE_NLS && !defined DISABLE_NLS --# include --# define _(Text) gettext (Text) --# ifdef gettext_noop --# define N_(String) gettext_noop (String) --# else --# define N_(String) (String) --# endif -+#include -+#define _(Text) gettext (Text) -+#ifdef gettext_noop -+# define N_(String) gettext_noop (String) - #else --# undef bindtextdomain --# define bindtextdomain(Domain, Directory) /* empty */ --# undef textdomain --# define textdomain(Domain) /* empty */ --# define _(Text) (Text) --# define N_(Text) (Text) -+# define N_(String) (String) - #endif -- -- diff -urN /usr/ports/sysutils/linrename/files/patch-misc-utils__rename.1 sysutils/linrename/files/patch-misc-utils__rename.1 --- /usr/ports/sysutils/linrename/files/patch-misc-utils__rename.1 2006-12-26 01:02:15.000000000 +0900 +++ sysutils/linrename/files/patch-misc-utils__rename.1 2012-09-28 00:44:36.000000000 +0900 @@ -1,37 +1,45 @@ ---- ./misc-utils/rename.1.orig Sun Aug 22 17:14:45 2004 -+++ ./misc-utils/rename.1 Mon Dec 25 14:54:11 2006 -@@ -3,11 +3,11 @@ +--- misc-utils/rename.1.orig 2012-06-11 19:06:53.730196000 +0900 ++++ misc-utils/rename.1 2012-09-28 00:43:17.000000000 +0900 +@@ -3,12 +3,12 @@ .\" - .TH RENAME 1 "1 January 2000" "" "Linux Programmer's Manual" + .TH RENAME 1 "June 2011" "util-linux" "User Commands" .SH NAME --rename \- Rename files -+linrename \- Rename files +-rename \- rename files ++linrename \- rename files .SH SYNOPSIS --.BI rename " from to file..." -+.BI linrename " from to file..." +-.B rename ++.B linrename + .RI [ options ] " expression replacement file" ... .SH DESCRIPTION -.B rename +.B linrename will rename the specified files by replacing the first occurrence of - .I from + .I expression in their name by -@@ -19,8 +19,8 @@ - +@@ -30,8 +30,8 @@ .RS + .PP .nf -rename foo foo0 foo? -rename foo foo0 foo?? +linrename foo foo0 foo? +linrename foo foo0 foo?? .fi + .PP .RE - -@@ -30,7 +30,7 @@ - And +@@ -41,7 +41,7 @@ .RS + .PP .nf -rename .htm .html *.htm +linrename .htm .html *.htm .fi + .PP .RE - +@@ -56,5 +56,5 @@ + .BR mmv (1), + .BR mv (1) + .SH AVAILABILITY +-The rename command is part of the util-linux package and is available from ++The linrename command is part of the util-linux package and is available from + ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff -urN /usr/ports/sysutils/linrename/files/patch-misc-utils__rename.c sysutils/linrename/files/patch-misc-utils__rename.c --- /usr/ports/sysutils/linrename/files/patch-misc-utils__rename.c 2006-12-26 01:02:15.000000000 +0900 +++ sysutils/linrename/files/patch-misc-utils__rename.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- ./misc-utils/rename.c.orig Tue May 9 23:39:03 2000 -+++ ./misc-utils/rename.c Mon Dec 25 14:54:11 2006 -@@ -19,6 +19,8 @@ - #include - #include "nls.h" - -+#define util_linux_version "util-linux-2.12r" -+ - static char *progname; - - static int diff -urN /usr/ports/sysutils/linrename/pkg-descr sysutils/linrename/pkg-descr --- /usr/ports/sysutils/linrename/pkg-descr 2006-12-26 18:08:35.000000000 +0900 +++ sysutils/linrename/pkg-descr 2012-09-27 21:01:08.000000000 +0900 @@ -1,4 +1,4 @@ linrename is a port of the Linux rename utility included with util-linux. It allows renaming multiple files using substitution. -WWW: http://freshmeat.net/projects/util-linux/ +WWW: http://freecode.com/projects/util-linux/ >Release-Note: >Audit-Trail: >Unformatted: