CVS commit: pkgsrc/devel/goredo

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Oct 10 00:21:47 UTC 2023

Modified Files:
        pkgsrc/devel/goredo: Makefile PLIST distinfo
        pkgsrc/devel/goredo/patches: patch-main.go

Log Message:
goredo: update to 2.1.0. From the changelog:

* Mistakenly path to '.do' file was not absolute and OS can refuse to
  run it because it is not in '$PATH'.

* Huge quantity of performance optimisations.

* Fixed possible unexpected lock file closing.

* When resulting target has the same contents, it does not replace
  already existing one.  That was done previously.  But now it also
  copies the file's mode flags to the target (for example making it
  executable).

* If 'redo-*' command runs under control of another (top-level) redo,
  then it does not parse the flags as options and treat each argument
  as a target, allowing passing the targets with dashes in the
  beginning.

* Prevented possible concurrent stderr writing by multiple running
  targets.

* 'redo-depfix' command now always rewrites dependency files and
  calculates checksums of the files.

* Own binary format is used for dependency files ('.dep'), instead of
  recfile ('.rec') one.  It is several times smaller and much faster
  to parse.  You must run 'redo-depfix' to convert all existing
  '.redo/*.rec' files to that binary format.

* 'redo-dep2rec' command appeared, that can convert '.dep' to recfile
  on stdout.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/goredo/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/goredo/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/goredo/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/goredo/patches/patch-main.go

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

Modified files:

Index: pkgsrc/devel/goredo/Makefile
diff -u pkgsrc/devel/goredo/Makefile:1.35 pkgsrc/devel/goredo/Makefile:1.36
--- pkgsrc/devel/goredo/Makefile:1.35   Tue Sep 26 01:26:16 2023
+++ pkgsrc/devel/goredo/Makefile        Tue Oct 10 00:21:47 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2023/09/26 01:26:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.36 2023/10/10 00:21:47 schmonz Exp $
 
-DISTNAME=              goredo-1.32.0
+DISTNAME=              goredo-2.1.0
 CATEGORIES=            devel
 MASTER_SITES=          http://www.goredo.cypherpunks.ru/download/
 EXTRACT_SUFX=          .tar.zst

Index: pkgsrc/devel/goredo/PLIST
diff -u pkgsrc/devel/goredo/PLIST:1.2 pkgsrc/devel/goredo/PLIST:1.3
--- pkgsrc/devel/goredo/PLIST:1.2       Thu Jan 27 21:41:54 2022
+++ pkgsrc/devel/goredo/PLIST   Tue Oct 10 00:21:47 2023
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2022/01/27 21:41:54 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/10/10 00:21:47 schmonz Exp $
 bin/goredo
 bin/goredo-affects
 bin/goredo-always
 bin/goredo-cleanup
+bin/goredo-dep2rec
 bin/goredo-depfix
 bin/goredo-dot
 bin/goredo-ifchange
 bin/goredo-ifcreate
+bin/goredo-inode
 bin/goredo-log
 bin/goredo-ood
 bin/goredo-sources

Index: pkgsrc/devel/goredo/distinfo
diff -u pkgsrc/devel/goredo/distinfo:1.13 pkgsrc/devel/goredo/distinfo:1.14
--- pkgsrc/devel/goredo/distinfo:1.13   Tue Sep 26 01:26:16 2023
+++ pkgsrc/devel/goredo/distinfo        Tue Oct 10 00:21:47 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2023/09/26 01:26:16 schmonz Exp $
+$NetBSD: distinfo,v 1.14 2023/10/10 00:21:47 schmonz Exp $
 
-BLAKE2s (goredo-1.32.0.tar.zst) = 58b04913be3acaee40a1c0481b0f2e7b9b7613db75097c1083f4e50742e0ed6f
-SHA512 (goredo-1.32.0.tar.zst) = 6fca1ab185a2b2a4c4a59b54c2a3eaee1cce8702fc497a83450ade7cfc5a0fe2a193c97a5b8315f5353a9746704c02bf530a99e006be1b792949c32d59c66a82
-Size (goredo-1.32.0.tar.zst) = 450009 bytes
-SHA1 (patch-main.go) = abdff0d174deaf959802cd68402518829ce7526c
+BLAKE2s (goredo-2.1.0.tar.zst) = d50ba5b77f6ab0c98bba44ac37c8be24b9e907bcb4b1df2dc224a2325cae5f15
+SHA512 (goredo-2.1.0.tar.zst) = e87f353f218e2348343c676c071eddd2d6466fe1c765c701c929a7ba5d147ba2e3d2336ce0d19d6ef78af44ade0af42d6623ddd71ff3196b61fc32dd0eb77ecc
+Size (goredo-2.1.0.tar.zst) = 465988 bytes
+SHA1 (patch-main.go) = 3243e01dd2ebbf56e5c9a95607e276f2f971bb8c

Index: pkgsrc/devel/goredo/patches/patch-main.go
diff -u pkgsrc/devel/goredo/patches/patch-main.go:1.3 pkgsrc/devel/goredo/patches/patch-main.go:1.4
--- pkgsrc/devel/goredo/patches/patch-main.go:1.3       Tue Jan 17 19:30:41 2023
+++ pkgsrc/devel/goredo/patches/patch-main.go   Tue Oct 10 00:21:47 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-main.go,v 1.3 2023/01/17 19:30:41 schmonz Exp $
+$NetBSD: patch-main.go,v 1.4 2023/10/10 00:21:47 schmonz Exp $
 
 Avoid CONFLICTS with other redo implementations.
 
---- main.go.orig       2023-01-17 09:05:55.000000000 +0000
+--- main.go.orig       2023-10-09 20:09:32.000000000 +0000
 +++ main.go
-@@ -40,22 +40,21 @@ import (
+@@ -39,23 +39,22 @@ import (
  )
  
  const (
@@ -13,36 +13,56 @@ Avoid CONFLICTS with other redo implemen
 -      CmdNameRedoAffects  = "redo-affects"
 -      CmdNameRedoAlways   = "redo-always"
 -      CmdNameRedoCleanup  = "redo-cleanup"
+-      CmdNameRedoDep2Rec  = "redo-dep2rec"
+-      CmdNameRedoDepFix   = "redo-depfix"
 -      CmdNameRedoDot      = "redo-dot"
 -      CmdNameRedoIfchange = "redo-ifchange"
 -      CmdNameRedoIfcreate = "redo-ifcreate"
+-      CmdNameRedoInode    = "redo-inode"
 -      CmdNameRedoLog      = "redo-log"
 -      CmdNameRedoOOD      = "redo-ood"
 -      CmdNameRedoSources  = "redo-sources"
 -      CmdNameRedoStamp    = "redo-stamp"
 -      CmdNameRedoTargets  = "redo-targets"
 -      CmdNameRedoWhichdo  = "redo-whichdo"
--      CmdNameRedoDepFix   = "redo-depfix"
--      CmdNameRedoInode    = "redo-inode"
 +      CmdNameRedo         = "goredo"
 +      CmdNameRedoAffects  = "goredo-affects"
 +      CmdNameRedoAlways   = "goredo-always"
 +      CmdNameRedoCleanup  = "goredo-cleanup"
++      CmdNameRedoDep2Rec  = "goredo-dep2rec"
++      CmdNameRedoDepFix   = "goredo-depfix"
 +      CmdNameRedoDot      = "goredo-dot"
 +      CmdNameRedoIfchange = "goredo-ifchange"
 +      CmdNameRedoIfcreate = "goredo-ifcreate"
++      CmdNameRedoInode    = "goredo-inode"
 +      CmdNameRedoLog      = "goredo-log"
 +      CmdNameRedoOOD      = "goredo-ood"
 +      CmdNameRedoSources  = "goredo-sources"
 +      CmdNameRedoStamp    = "goredo-stamp"
 +      CmdNameRedoTargets  = "goredo-targets"
 +      CmdNameRedoWhichdo  = "goredo-whichdo"
-+      CmdNameRedoDepFix   = "goredo-depfix"
-+      CmdNameRedoInode    = "goredo-inode"
  )
  
  var (
-@@ -107,10 +106,9 @@ func main() {
+@@ -84,7 +83,7 @@ func mustParseFd(v, name string) *os.Fil
+ }
+ 
+ func CmdName() string {
+-      return path.Base(os.Args[0])
++      return path.Base(CmdNameRedo)
+ }
+ 
+ func main() {
+@@ -97,7 +96,7 @@ func main() {
+               symlinks = flag.Bool("symlinks", false, "create necessary symlinks in current directory")
+       }
+ 
+-      flag.Usage = func() { usage(os.Args[0]) }
++      flag.Usage = func() { usage(CmdNameRedo) }
+ 
+       BuildUUIDStr := os.Getenv(EnvBuildUUID)
+       IsTopRedo = BuildUUIDStr == ""
+@@ -118,10 +117,9 @@ func main() {
                fmt.Println("goredo", Version, "built with", runtime.Version())
                return
        }
@@ -54,7 +74,7 @@ Avoid CONFLICTS with other redo implemen
                        CmdNameRedoAffects,
                        CmdNameRedoAlways,
                        CmdNameRedoCleanup,
-@@ -125,8 +123,8 @@ func main() {
+@@ -138,8 +136,8 @@ func main() {
                        CmdNameRedoTargets,
                        CmdNameRedoWhichdo,
                } {
@@ -63,5 +83,5 @@ Avoid CONFLICTS with other redo implemen
 +                      fmt.Println(CmdNameRedo, "<-", cmdName)
 +                      if err := os.Symlink(CmdNameRedo, cmdName); err != nil {
                                rc = 1
-                               log.Println(err)
+                               log.Print(err)
                        }