[pkgsrc/trunk]: pkgsrc/devel/jdebp-redo Avoid CONFLICTS with other redo imple...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7fb1c2e062cb
branches:  trunk
changeset: 435341:7fb1c2e062cb
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Jul 06 15:16:49 2020 +0000

description:
Avoid CONFLICTS with other redo implementations. Bump PKGREVISION.

diffstat:

 devel/jdebp-redo/ALTERNATIVES                  |   4 ++
 devel/jdebp-redo/Makefile                      |   8 +++--
 devel/jdebp-redo/PLIST                         |  18 ++++++------
 devel/jdebp-redo/distinfo                      |   3 +-
 devel/jdebp-redo/patches/patch-source_redo.cpp |  38 ++++++++++++++++++++++++++
 5 files changed, 58 insertions(+), 13 deletions(-)

diffs (116 lines):

diff -r 068eac03b8ef -r 7fb1c2e062cb devel/jdebp-redo/ALTERNATIVES
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/jdebp-redo/ALTERNATIVES     Mon Jul 06 15:16:49 2020 +0000
@@ -0,0 +1,4 @@
+bin/cubehash @PREFIX@/bin/jdebp-cubehash
+bin/redo @PREFIX@/bin/jdebp-redo
+bin/redo-ifchange @PREFIX@/bin/jdebp-redo-ifchange
+bin/redo-ifcreate @PREFIX@/bin/jdebp-redo-ifcreate
diff -r 068eac03b8ef -r 7fb1c2e062cb devel/jdebp-redo/Makefile
--- a/devel/jdebp-redo/Makefile Mon Jul 06 14:38:24 2020 +0000
+++ b/devel/jdebp-redo/Makefile Mon Jul 06 15:16:49 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2019/08/02 21:54:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2020/07/06 15:16:49 schmonz Exp $
 
 DISTNAME=      redo-1.4
 PKGNAME=       jdebp-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://jdebp.eu/Repository/freebsd/
 
@@ -10,8 +11,6 @@
 COMMENT=       C++ implementation of DJB's redo build tool
 LICENSE=       isc OR 2-clause-bsd
 
-CONFLICTS+=    apenwarr-redo-[0-9]*
-
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= c++
 USE_TOOLS+=    pod2man
@@ -34,5 +33,8 @@
 do-install:
        cd ${WRKSRC} && ./package/makeinstall
        cd ${WRKSRC} && ./package/export ${DESTDIR}${PREFIX}/
+       for i in bin man/man1; do cd ${DESTDIR}${PREFIX}/$${i}; \
+         for j in *; do mv $${j} jdebp-$${j}; done; \
+       done
 
 .include "../../mk/bsd.pkg.mk"
diff -r 068eac03b8ef -r 7fb1c2e062cb devel/jdebp-redo/PLIST
--- a/devel/jdebp-redo/PLIST    Mon Jul 06 14:38:24 2020 +0000
+++ b/devel/jdebp-redo/PLIST    Mon Jul 06 15:16:49 2020 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2019/07/20 21:18:59 schmonz Exp $
-bin/cubehash
-bin/redo
-bin/redo-ifchange
-bin/redo-ifcreate
-man/man1/cubehash.1
-man/man1/redo-ifchange.1
-man/man1/redo-ifcreate.1
-man/man1/redo.1
+@comment $NetBSD: PLIST,v 1.2 2020/07/06 15:16:49 schmonz Exp $
+bin/jdebp-cubehash
+bin/jdebp-redo
+bin/jdebp-redo-ifchange
+bin/jdebp-redo-ifcreate
+man/man1/jdebp-cubehash.1
+man/man1/jdebp-redo-ifchange.1
+man/man1/jdebp-redo-ifcreate.1
+man/man1/jdebp-redo.1
diff -r 068eac03b8ef -r 7fb1c2e062cb devel/jdebp-redo/distinfo
--- a/devel/jdebp-redo/distinfo Mon Jul 06 14:38:24 2020 +0000
+++ b/devel/jdebp-redo/distinfo Mon Jul 06 15:16:49 2020 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2019/07/20 21:18:59 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2020/07/06 15:16:49 schmonz Exp $
 
 SHA1 (redo-1.4.tar.gz) = 3dc3d19e4b253478bd75c392fe988717f5f5fbaf
 RMD160 (redo-1.4.tar.gz) = 15a6a91a084a13a0c7eecafdb19f061562ea920c
 SHA512 (redo-1.4.tar.gz) = c90c75acc53cb478edefb6fa5d6e76807239f94837416cbf814e0d08c4b30bcf5a9edb7b9065358e30395619ad5deb749790819eb8ed45719facbe680e150d63
 Size (redo-1.4.tar.gz) = 21514 bytes
 SHA1 (patch-package_prepare) = 9dc0295ab3fe6830d920c49beeb9caae6bca0eab
+SHA1 (patch-source_redo.cpp) = 787086061157438762a9e03fa37f5570215834f1
diff -r 068eac03b8ef -r 7fb1c2e062cb devel/jdebp-redo/patches/patch-source_redo.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/jdebp-redo/patches/patch-source_redo.cpp    Mon Jul 06 15:16:49 2020 +0000
@@ -0,0 +1,38 @@
+$NetBSD: patch-source_redo.cpp,v 1.1 2020/07/06 15:16:49 schmonz Exp $
+
+Avoid CONFLICTS with other redo implementations.
+
+--- source/redo.cpp.orig       2017-04-18 18:09:52.000000000 +0000
++++ source/redo.cpp
+@@ -1373,6 +1373,7 @@ main ( int argc, const char * argv[] )
+       putenv(levelbuf);
+ 
+       if (0 == std::strcmp(prog, "redo-ifcreate")
++      ||  0 == std::strcmp(prog, "jdebp-redo-ifcreate")
+ #if defined(__OS2__) || defined(__WIN32__) || defined(__NT__)
+       ||  0 == stricmp(prog, "redo-ifcreate.exe")
+ #endif
+@@ -1380,6 +1381,7 @@ main ( int argc, const char * argv[] )
+               return redo_ifcreate(prog, filev) ? EXIT_SUCCESS : EXIT_FAILURE;
+       else
+       if (0 == std::strcmp(prog, "redo-ifchange")
++      ||  0 == std::strcmp(prog, "jdebp-redo-ifchange")
+ #if defined(__OS2__) || defined(__WIN32__) || defined(__NT__)
+       ||  0 == stricmp(prog, "redo-ifchange.exe")
+ #endif
+@@ -1390,6 +1392,7 @@ main ( int argc, const char * argv[] )
+       }
+       else
+       if (0 == std::strcmp(prog, "redo")
++      ||  0 == std::strcmp(prog, "jdebp-redo")
+ #if defined(__OS2__) || defined(__WIN32__) || defined(__NT__)
+       ||  0 == stricmp(prog, "redo.exe")
+ #endif
+@@ -1400,6 +1403,7 @@ main ( int argc, const char * argv[] )
+               return r ? EXIT_SUCCESS : EXIT_FAILURE;
+       }
+       if (0 == std::strcmp(prog, "cubehash")
++      ||  0 == std::strcmp(prog, "jdebp-cubehash")
+ #if defined(__OS2__) || defined(__WIN32__) || defined(__NT__)
+       ||  0 == stricmp(prog, "cubehash.exe")
+ #endif