Wed Sep 20 11:03:14 2017 UTC ()
rename: Various fixes to resolve PR#52559

- Add LICENSE.
- Use INSTALLATION_DIRS.
- Honour pkgsrc CFLAGS and remove broken BUILDLINK_TRANSFORM.
- Add patch comments.

Bump PKGREVISION for the LICENSE change and in case any CFLAGS were not
honoured correctly.


(jperkin)
diff -r1.3 -r1.4 pkgsrc/sysutils/rename/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/rename/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/rename/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/sysutils/rename/patches/patch-rename.c
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/rename/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/rename/Makefile 2012/10/23 19:51:21 1.3
+++ pkgsrc/sysutils/rename/Makefile 2017/09/20 11:03:14 1.4
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1# $NetBSD: Makefile,v 1.3 2012/10/23 19:51:21 asau Exp $ 1# $NetBSD: Makefile,v 1.4 2017/09/20 11:03:14 jperkin Exp $
2 2
3DISTNAME= rename-1.3 3DISTNAME= rename-1.3
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rename/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rename/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://rename.sourceforge.net/ 9HOMEPAGE= http://rename.sourceforge.net/
10COMMENT= Rename recursively with regex patterns 10COMMENT= Rename recursively with regex patterns
 11LICENSE= gnu-gpl-v2
11 12
12USE_TOOLS+= gmake 13USE_TOOLS+= gmake
13GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
14 15
15BUILDLINK_TRANSFORM+= opt:-O3:${CFLAGS} 16INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
16 17
17do-install: 18do-install:
18 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin && \ 19 ${INSTALL_PROGRAM} ${WRKSRC}/rename ${DESTDIR}${PREFIX}/bin
19 ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && \ 
20 ${INSTALL_PROGRAM} ${WRKSRC}/rename ${DESTDIR}${PREFIX}/bin && \ 
21 ${INSTALL_MAN} ${WRKSRC}/rename.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 20 ${INSTALL_MAN} ${WRKSRC}/rename.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
22 21
23.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/rename/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/rename/distinfo 2015/11/04 01:32:28 1.3
+++ pkgsrc/sysutils/rename/distinfo 2017/09/20 11:03:14 1.4
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.3 2015/11/04 01:32:28 agc Exp $ 1$NetBSD: distinfo,v 1.4 2017/09/20 11:03:14 jperkin Exp $
2 2
3SHA1 (rename-1.3.tar.gz) = 8d835e628aeb1f71816e092c0de57daf2519f43a 3SHA1 (rename-1.3.tar.gz) = 8d835e628aeb1f71816e092c0de57daf2519f43a
4RMD160 (rename-1.3.tar.gz) = 56bd0ebaabbf9aae1fb93a12ca1cf9fccee5c5ab 4RMD160 (rename-1.3.tar.gz) = 56bd0ebaabbf9aae1fb93a12ca1cf9fccee5c5ab
5SHA512 (rename-1.3.tar.gz) = 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd 5SHA512 (rename-1.3.tar.gz) = 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
6Size (rename-1.3.tar.gz) = 83854 bytes 6Size (rename-1.3.tar.gz) = 83854 bytes
7SHA1 (patch-aa) = 5a287999d712b540964de5f447194c00160f8805 7SHA1 (patch-aa) = 660ee20f2397fed5df789569aa3519856b193db6
8SHA1 (patch-rename.c) = 983c48ff5f1f5d059bcaead62a79b34f521dc488 8SHA1 (patch-rename.c) = 84cc823baf7f15a626201756e84820c05a8ff9c4
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/rename/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/sysutils/rename/patches/patch-aa 2007/11/05 15:56:34 1.1.1.1
+++ pkgsrc/sysutils/rename/patches/patch-aa 2017/09/20 11:03:14 1.2
@@ -1,15 +1,21 @@ @@ -1,15 +1,21 @@
1$NetBSD: patch-aa,v 1.1.1.1 2007/11/05 15:56:34 rillig Exp $ 1$NetBSD: patch-aa,v 1.2 2017/09/20 11:03:14 jperkin Exp $
2 2
3--- Makefile.in.orig 2002-05-18 23:28:34.000000000 -0400 3Use pkgsrc CFLAGS
4+++ Makefile.in 2007-11-04 19:42:05.000000000 -0500 4Do not strip by default
5@@ -30,8 +30,8 @@ 5
6 rm -f core rename *.o config.status config.cache config.h config.log Makefile 6--- Makefile.in.orig 2002-05-19 03:28:34.000000000 +0000
 7+++ Makefile.in
 8@@ -15,9 +15,11 @@ OBJS = rename.o fixtoken.o misc.o @LIBOB
 9
 10 all: rename
 11
 12+$(OBJS):
 13+ $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 14+
 15 rename: $(OBJS)
 16- $(CC) $(CFLAGS) -o $@ $^
 17- strip $@
 18+ $(CC) $(CFLAGS) $(DEFINES) -o $@ $^
7  19
8 install: 20 static: $(OBJS)
9- install -o root -g root -m 0755 -s rename $(BINDIR) 21 $(CC) $(CFLAGS) -static -o $@ $^
10- install -o root -g root -m 0644 rename.1 $(MANDIR) 
11+ ${BSD_INSTALL_PROGRAM} rename $(BINDIR) 
12+ ${BSD_INSTALL_MAN} rename.1 $(MANDIR) 
13  
14 rename.o: rename.c rename.h 
15 regex.o: regex.c regex.h 
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/rename/patches/patch-rename.c (expand / switch to unified diff)

--- pkgsrc/sysutils/rename/patches/patch-rename.c 2011/09/10 16:35:04 1.1
+++ pkgsrc/sysutils/rename/patches/patch-rename.c 2017/09/20 11:03:14 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-rename.c,v 1.1 2011/09/10 16:35:04 abs Exp $ 1$NetBSD: patch-rename.c,v 1.2 2017/09/20 11:03:14 jperkin Exp $
 2
 3Fix CPP.
2 4
3--- rename.c.orig 2002-05-20 15:50:50.000000000 +0000 5--- rename.c.orig 2002-05-20 15:50:50.000000000 +0000
4+++ rename.c 6+++ rename.c
5@@ -65,7 +65,7 @@ 7@@ -65,7 +65,7 @@
6  8
7 #if HAVE_REGEX_H 9 #if HAVE_REGEX_H
8 #include <regex.h> 10 #include <regex.h>
9-#elif 11-#elif
10+#else 12+#else
11 #include "regex.h" 13 #include "regex.h"
12 #endif 14 #endif
13  15