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
--- 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 @@
-# $NetBSD: Makefile,v 1.3 2012/10/23 19:51:21 asau Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/20 11:03:14 jperkin Exp $
DISTNAME= rename-1.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rename/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://rename.sourceforge.net/
COMMENT= Rename recursively with regex patterns
+LICENSE= gnu-gpl-v2
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-BUILDLINK_TRANSFORM+= opt:-O3:${CFLAGS}
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
do-install:
- ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin && \
- ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && \
- ${INSTALL_PROGRAM} ${WRKSRC}/rename ${DESTDIR}${PREFIX}/bin && \
+ ${INSTALL_PROGRAM} ${WRKSRC}/rename ${DESTDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/rename.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../mk/bsd.pkg.mk"
--- 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 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:32:28 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/09/20 11:03:14 jperkin Exp $
SHA1 (rename-1.3.tar.gz) = 8d835e628aeb1f71816e092c0de57daf2519f43a
RMD160 (rename-1.3.tar.gz) = 56bd0ebaabbf9aae1fb93a12ca1cf9fccee5c5ab
SHA512 (rename-1.3.tar.gz) = 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
Size (rename-1.3.tar.gz) = 83854 bytes
-SHA1 (patch-aa) = 5a287999d712b540964de5f447194c00160f8805
+SHA1 (patch-aa) = 660ee20f2397fed5df789569aa3519856b193db6
-SHA1 (patch-rename.c) = 983c48ff5f1f5d059bcaead62a79b34f521dc488
+SHA1 (patch-rename.c) = 84cc823baf7f15a626201756e84820c05a8ff9c4
--- 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 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/11/05 15:56:34 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2017/09/20 11:03:14 jperkin Exp $
---- Makefile.in.orig 2002-05-18 23:28:34.000000000 -0400
-+++ Makefile.in 2007-11-04 19:42:05.000000000 -0500
-@@ -30,8 +30,8 @@
- rm -f core rename *.o config.status config.cache config.h config.log Makefile
+Use pkgsrc CFLAGS
+Do not strip by default
+
+--- Makefile.in.orig 2002-05-19 03:28:34.000000000 +0000
++++ Makefile.in
+@@ -15,9 +15,11 @@ OBJS = rename.o fixtoken.o misc.o @LIBOB
- install:
+ all: rename
-- install -o root -g root -m 0755 -s rename $(BINDIR)
+
-- install -o root -g root -m 0644 rename.1 $(MANDIR)
++$(OBJS):
-+ ${BSD_INSTALL_PROGRAM} rename $(BINDIR)
++ $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
-+ ${BSD_INSTALL_MAN} rename.1 $(MANDIR)
++
-
+ rename: $(OBJS)
- rename.o: rename.c rename.h
+- $(CC) $(CFLAGS) -o $@ $^
- regex.o: regex.c regex.h
+- strip $@
++ $(CC) $(CFLAGS) $(DEFINES) -o $@ $^
+
+ static: $(OBJS)
+ $(CC) $(CFLAGS) -static -o $@ $^
--- 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,4 +1,6 @@
-$NetBSD: patch-rename.c,v 1.1 2011/09/10 16:35:04 abs Exp $
+$NetBSD: patch-rename.c,v 1.2 2017/09/20 11:03:14 jperkin Exp $
+
+Fix CPP.
--- rename.c.orig 2002-05-20 15:50:50.000000000 +0000
+++ rename.c