CVS commit: pkgsrc/devel/jdebp-redo

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Feb 28 16:34:36 UTC 2025

Modified Files:
        pkgsrc/devel/jdebp-redo: Makefile distinfo
        pkgsrc/devel/jdebp-redo/patches: patch-source_redo.cpp

Log Message:
jdebp-redo: update to 1.5. Changes:

- What OS/2 and Win32 support was there has been removed; this is now a
  POSIX-only program.
- redo now handles jobserver options correctly in MAKEFLAGS created
  by BSD make.
- A bug has been fixed in the jobserver that was permitting a deadlock
  condition. A running redo now never yields its original slot.
- redo now takes out a shared lock on prerequisites lists whilst
  processing them.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/jdebp-redo/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/jdebp-redo/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/jdebp-redo/Makefile
diff -u pkgsrc/devel/jdebp-redo/Makefile:1.5 pkgsrc/devel/jdebp-redo/Makefile:1.6
--- pkgsrc/devel/jdebp-redo/Makefile:1.5        Thu Jan  6 08:56:15 2022
+++ pkgsrc/devel/jdebp-redo/Makefile    Fri Feb 28 16:34:36 2025
@@ -1,19 +1,22 @@
-# $NetBSD: Makefile,v 1.5 2022/01/06 08:56:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2025/02/28 16:34:36 schmonz Exp $
 
-DISTNAME=      redo-1.4
-PKGNAME=       jdebp-${DISTNAME}
-PKGREVISION=   1
-CATEGORIES=    devel
-MASTER_SITES=  http://jdebp.info/Repository/freebsd/
-
-MAINTAINER=    schmonz%NetBSD.org@localhost
-HOMEPAGE=      http://jdebp.info/Softwares/redo/
-COMMENT=       C++ implementation of DJB's redo build tool
-LICENSE=       isc OR 2-clause-bsd
-
-WRKSRC=                ${WRKDIR}
-USE_LANGUAGES= c++
-USE_TOOLS+=    pod2man
+DISTNAME=              redo-1.5
+PKGNAME=               jdebp-${DISTNAME}
+CATEGORIES=            devel
+# 1.5 distfile was updated in place; instead, use the same one as FreeBSD and Void
+MASTER_SITES=          ${MASTER_SITE_LOCAL}
+
+MAINTAINER=            schmonz%NetBSD.org@localhost
+HOMEPAGE=              http://jdebp.info/Softwares/redo/
+COMMENT=               C++ implementation of DJB's redo build tool
+LICENSE=               isc OR 2-clause-bsd
+
+WRKSRC=                        ${WRKDIR}
+
+USE_LANGUAGES=         c++
+USE_CXX_FEATURES=      c++11
+FORCE_CXX_STD=         c++11
+USE_TOOLS+=            pod2man
 
 SUBST_CLASSES+=                pkgmandir
 SUBST_STAGE.pkgmandir= do-configure

Index: pkgsrc/devel/jdebp-redo/distinfo
diff -u pkgsrc/devel/jdebp-redo/distinfo:1.4 pkgsrc/devel/jdebp-redo/distinfo:1.5
--- pkgsrc/devel/jdebp-redo/distinfo:1.4        Tue Oct 26 10:15:07 2021
+++ pkgsrc/devel/jdebp-redo/distinfo    Fri Feb 28 16:34:36 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:15:07 nia Exp $
+$NetBSD: distinfo,v 1.5 2025/02/28 16:34:36 schmonz Exp $
 
-BLAKE2s (redo-1.4.tar.gz) = 5648e7b556f0a18d9371df59ea68d1689c2115f556d1414543aae71948557d73
-SHA512 (redo-1.4.tar.gz) = c90c75acc53cb478edefb6fa5d6e76807239f94837416cbf814e0d08c4b30bcf5a9edb7b9065358e30395619ad5deb749790819eb8ed45719facbe680e150d63
-Size (redo-1.4.tar.gz) = 21514 bytes
+BLAKE2s (redo-1.5.tar.gz) = 374ac7eaa75e6f52be860bff5b2477c18d6dd3faa99cdda0445a87bda4cbda9f
+SHA512 (redo-1.5.tar.gz) = 4bb174868b9a38df7b392ae0ae813cbb7de0c043afab28507fbf85a07aeabd38a4968523aa73608a799c434d61a44173a8019f976dce6b4ba6a30a0939e45667
+Size (redo-1.5.tar.gz) = 26587 bytes
 SHA1 (patch-package_prepare) = 9dc0295ab3fe6830d920c49beeb9caae6bca0eab
-SHA1 (patch-source_redo.cpp) = 787086061157438762a9e03fa37f5570215834f1
+SHA1 (patch-source_redo.cpp) = 5c41649101d021dee2ef67b4e7f51c580b4f5eda

Index: pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp
diff -u pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp:1.1 pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp:1.2
--- pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp:1.1   Mon Jul  6 15:16:49 2020
+++ pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp       Fri Feb 28 16:34:36 2025
@@ -1,38 +1,36 @@
-$NetBSD: patch-source_redo.cpp,v 1.1 2020/07/06 15:16:49 schmonz Exp $
+$NetBSD: patch-source_redo.cpp,v 1.2 2025/02/28 16:34:36 schmonz Exp $
 
 Avoid CONFLICTS with other redo implementations.
 
---- source/redo.cpp.orig       2017-04-18 18:09:52.000000000 +0000
+--- source/redo.cpp.orig       2019-05-09 23:12:40.000000000 +0000
 +++ source/redo.cpp
-@@ -1373,6 +1373,7 @@ main ( int argc, const char * argv[] )
-       putenv(levelbuf);
+@@ -1221,13 +1221,16 @@ redo_main ( const char * prog, int argc,
+       putenv(gnulevelbuf);
+       putenv(bsdlevelbuf);
  
-       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[] )
+-      if (0 == std::strcmp(prog, "redo-ifcreate"))
++      if (0 == std::strcmp(prog, "redo-ifcreate")
++      ||  0 == std::strcmp(prog, "jdebp-redo-ifcreate"))
                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[] )
-       }
+-      if (0 == std::strcmp(prog, "redo-ifchange"))
++      if (0 == std::strcmp(prog, "redo-ifchange")
++      ||  0 == std::strcmp(prog, "jdebp-redo-ifchange"))
+               return redo_ifchange(prog, meta_depth, filev) ? EXIT_SUCCESS : EXIT_FAILURE;
        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
+-      if (0 == std::strcmp(prog, "redo")) {
++      if (0 == std::strcmp(prog, "redo")
++      ||  0 == std::strcmp(prog, "jdebp-redo")) {
+               mkdir(".redo", 0777);
+               return redo(true, prog, meta_depth, filev) ? EXIT_SUCCESS : EXIT_FAILURE;
+       } else
+@@ -1283,7 +1286,8 @@ main ( int argc, const char * argv[] )
+ {
+       const char * prog(basename_of(argv[0]));
+ 
+-      if (0 == std::strcmp(prog, "cubehash"))
++      if (0 == std::strcmp(prog, "cubehash")
++      ||  0 == std::strcmp(prog, "jdebp-cubehash"))
+               return cubehash_main(prog, argc, argv);
+       else
+               return redo_main(prog, argc, argv);