CVS commit: pkgsrc/devel/jdebp-redo

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/jdebp-redo
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Tue, 29 Jul 2025 14:15:57 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jul 29 14:15:57 UTC 2025

Modified Files:
        pkgsrc/devel/jdebp-redo: Makefile distinfo
        pkgsrc/devel/jdebp-redo/patches: patch-source_redo.cpp
Added Files:
        pkgsrc/devel/jdebp-redo/patches: patch-package_bsd_prepare
            patch-package_compile
Removed Files:
        pkgsrc/devel/jdebp-redo/patches: patch-package_prepare

Log Message:
jdebp-redo: bump PKGREVISION. Changes:

* redo now hashes the targets of symbolic links rather than just looking
  at their last modification timestamps.

pkgsrc changes:

* Set DIST_SUBDIR, as distfile changed from what I'd thought was
  already 1.5.

Build-tested on NetBSD, macOS, and Ubuntu.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/jdebp-redo/Makefile \
    pkgsrc/devel/jdebp-redo/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/jdebp-redo/patches/patch-package_bsd_prepare \
    pkgsrc/devel/jdebp-redo/patches/patch-package_compile
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/jdebp-redo/patches/patch-package_prepare
cvs rdiff -u -r1.2 -r1.3 \
    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.6 pkgsrc/devel/jdebp-redo/Makefile:1.7
--- pkgsrc/devel/jdebp-redo/Makefile:1.6        Fri Feb 28 16:34:36 2025
+++ pkgsrc/devel/jdebp-redo/Makefile    Tue Jul 29 14:15:57 2025
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2025/02/28 16:34:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2025/07/29 14:15:57 schmonz Exp $
 
 DISTNAME=              redo-1.5
 PKGNAME=               jdebp-${DISTNAME}
+PKGREVISION=           1
 CATEGORIES=            devel
-# 1.5 distfile was updated in place; instead, use the same one as FreeBSD and Void
-MASTER_SITES=          ${MASTER_SITE_LOCAL}
+MASTER_SITES=          https://jdebp.uk/Repository/netbsd/
+DIST_SUBDIR=           ${PKGNAME_NOREV}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://jdebp.info/Softwares/redo/
@@ -24,18 +25,19 @@ SUBST_FILES.pkgmandir=      package/export
 SUBST_SED.pkgmandir=   -e 's|"man/man1|${PKGMANDIR}"/man1|g'
 
 do-configure:
-       cd ${WRKSRC} && ./package/prepare
+       cd ${WRKSRC} && ./package/bsd/prepare
+       ${MKDIR} ${WRKSRC}/build
        ${ECHO} ${CXX:Q} > ${WRKSRC}/build/cxx
        ${ECHO} ${CPPFLAGS:Q} > ${WRKSRC}/build/cppflags
        ${ECHO} ${CXXFLAGS:Q} > ${WRKSRC}/build/cxxflags
        ${ECHO} ${LDFLAGS:Q} > ${WRKSRC}/build/ldflags
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./package/make
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./package/compile
 
 do-install:
-       cd ${WRKSRC} && ./package/makeinstall
        cd ${WRKSRC} && ./package/export ${DESTDIR}${PREFIX}/
+       cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE} -f bsd/rules stage
        for i in bin ${PKGMANDIR}/man1; do cd ${DESTDIR}${PREFIX}/$${i}; \
          for j in *; do mv $${j} jdebp-$${j}; done; \
        done
Index: pkgsrc/devel/jdebp-redo/distinfo
diff -u pkgsrc/devel/jdebp-redo/distinfo:1.6 pkgsrc/devel/jdebp-redo/distinfo:1.7
--- pkgsrc/devel/jdebp-redo/distinfo:1.6        Sat Jun 28 02:53:31 2025
+++ pkgsrc/devel/jdebp-redo/distinfo    Tue Jul 29 14:15:57 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2025/06/28 02:53:31 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2025/07/29 14:15:57 schmonz Exp $
 
-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
+BLAKE2s (jdebp-redo-1.5/redo-1.5.tar.gz) = e16b24cccf01b9661b3f6b3511be10aa16d76675b336a172914be3bb66fea714
+SHA512 (jdebp-redo-1.5/redo-1.5.tar.gz) = 4ce92919e7ef2ee7bf52d9a672bf218a9cad027677174058151e21d3526f6eec39f0fe3a4805b1166d372ad3a2e993fa3417792d2105a6ee33b737abe666a496
+Size (jdebp-redo-1.5/redo-1.5.tar.gz) = 26680 bytes
+SHA1 (patch-package_bsd_prepare) = 8be6a94ab4f0a59ce1a03fcc4b37dad2619085ec
+SHA1 (patch-package_compile) = 37a1e53fcd3fbf0b8226d9009718c49a796fb318
 SHA1 (patch-source_lockfile.cpp) = c653049843aa7ccd0b08e6b778a93cfd2e55187f
-SHA1 (patch-source_redo.cpp) = 5c41649101d021dee2ef67b4e7f51c580b4f5eda
+SHA1 (patch-source_redo.cpp) = 0052a27a633d3e182ac0257cb21b5406e04aed05

Index: pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp
diff -u pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp:1.2 pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp:1.3
--- pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp:1.2   Fri Feb 28 16:34:36 2025
+++ pkgsrc/devel/jdebp-redo/patches/patch-source_redo.cpp       Tue Jul 29 14:15:57 2025
@@ -1,13 +1,13 @@
-$NetBSD: patch-source_redo.cpp,v 1.2 2025/02/28 16:34:36 schmonz Exp $
+$NetBSD: patch-source_redo.cpp,v 1.3 2025/07/29 14:15:57 schmonz Exp $
 
 Avoid CONFLICTS with other redo implementations.
 
---- source/redo.cpp.orig       2019-05-09 23:12:40.000000000 +0000
+--- source/redo.cpp.orig       2025-07-02 09:25:31.000000000 +0000
 +++ source/redo.cpp
-@@ -1221,13 +1221,16 @@ redo_main ( const char * prog, int argc,
-       putenv(gnulevelbuf);
+@@ -1323,13 +1323,16 @@ redo_main (
        putenv(bsdlevelbuf);
  
+       std::set<std::string> seen;
 -      if (0 == std::strcmp(prog, "redo-ifcreate"))
 +      if (0 == std::strcmp(prog, "redo-ifcreate")
 +      ||  0 == std::strcmp(prog, "jdebp-redo-ifcreate"))
@@ -16,15 +16,15 @@ Avoid CONFLICTS with other redo implemen
 -      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;
+               return redo_ifchange(prog, meta_depth, filev, seen) ? EXIT_SUCCESS : EXIT_FAILURE;
        else
 -      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;
+               return redo(true, prog, meta_depth, filev, seen) ? EXIT_SUCCESS : EXIT_FAILURE;
        } else
-@@ -1283,7 +1286,8 @@ main ( int argc, const char * argv[] )
+@@ -1390,7 +1393,8 @@ main ( int argc, const char * argv[] )
  {
        const char * prog(basename_of(argv[0]));
  

Added files:

Index: pkgsrc/devel/jdebp-redo/patches/patch-package_bsd_prepare
diff -u /dev/null pkgsrc/devel/jdebp-redo/patches/patch-package_bsd_prepare:1.1
--- /dev/null   Tue Jul 29 14:15:57 2025
+++ pkgsrc/devel/jdebp-redo/patches/patch-package_bsd_prepare   Tue Jul 29 14:15:57 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-package_bsd_prepare,v 1.1 2025/07/29 14:15:57 schmonz Exp $
+
+Avoid spurious output during configure.
+
+--- package/bsd/prepare.orig   2015-06-02 10:34:38.000000000 +0000
++++ package/bsd/prepare
+@@ -5,6 +5,8 @@ then
+       exit 100
+ fi
+ 
++unset CDPATH
++
+ # Create and populate the bsd directory.
+ mkdir -p bsd
+ (
Index: pkgsrc/devel/jdebp-redo/patches/patch-package_compile
diff -u /dev/null pkgsrc/devel/jdebp-redo/patches/patch-package_compile:1.1
--- /dev/null   Tue Jul 29 14:15:57 2025
+++ pkgsrc/devel/jdebp-redo/patches/patch-package_compile       Tue Jul 29 14:15:57 2025
@@ -0,0 +1,46 @@
+$NetBSD: patch-package_compile,v 1.1 2025/07/29 14:15:57 schmonz Exp $
+
+Let pkgsrc be in charge of build flags.
+
+--- package/compile.orig       2025-07-02 09:25:56.000000000 +0000
++++ package/compile
+@@ -8,38 +8,7 @@ fi
+ 
+ CDPATH=
+ 
+-if command -v >/dev/null clang++
+-then
+-      extra_flags=''
+-      major_version="`clang++ --version|sed -ne 's/^.*version *\([[:digit:]]*\)\..*$/\1/p'`"
+-      if test "${major_version}" -gt 3
+-      then
+-              extra_flags="${extra_flags}"' -Wno-suggest-destructor-override -Wno-suggest-override -Wno-disabled-macro-expansion -Wno-global-constructors -Wno-exit-time-destructors'
+-      fi
+-      if test "${major_version}" -gt 14
+-      then
+-              extra_flags="${extra_flags}"' -Wno-unsafe-buffer-usage'
+-      fi
+-      cxx=clang++
+-      cppflags=''
+-      cxxflags='-g -O3 -std=gnu++11 -Weverything -integrated-as -Wno-weak-vtables -Wno-padded -Wno-missing-prototypes -Wno-c++98-compat'"${extra_flags}"
+-      ldflags='-g'
+-elif command -v >/dev/null g++
+-then
+-      cxx=g++
+-      cppflags=''
+-      cxxflags=' -g -O3 -std=gnu++11 -Wall -Wextra -Wshadow -Wcast-qual -Wsynth -Woverloaded-virtual -Wcast-align'
+-      ldflags='-g'
+-elif command -v >/dev/null owcc
+-then
+-      cxx=owcc
+-      cppflags=''
+-      cxxflags=' -g -Wall -Wextra -Wc,-xs -Wc,-xr'
+-      ldflags='-g'
+-else
+-      echo "Cannot find clang++, g++, or owcc." 1>&2
+-      exit 100
+-fi
++cxx=c++
+ 
+ # Create and populate the build directory.
+ install -d -m 0755 build

Prev by Date: CVS commit: pkgsrc/lang/spark2014-14
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/lang/spark2014-14
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index