CVS commit: pkgsrc/sysutils/e2fsprogs

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 23 07:03:32 UTC 2025

Modified Files:
        pkgsrc/sysutils/e2fsprogs: distinfo
        pkgsrc/sysutils/e2fsprogs/patches: patch-scrub_Makefile.in

Log Message:
e2fsprogs: fix patch so it applies


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/e2fsprogs/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in

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

Modified files:

Index: pkgsrc/sysutils/e2fsprogs/distinfo
diff -u pkgsrc/sysutils/e2fsprogs/distinfo:1.30 pkgsrc/sysutils/e2fsprogs/distinfo:1.31
--- pkgsrc/sysutils/e2fsprogs/distinfo:1.30     Sat Mar 22 12:22:07 2025
+++ pkgsrc/sysutils/e2fsprogs/distinfo  Sun Mar 23 07:03:32 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2025/03/22 12:22:07 nia Exp $
+$NetBSD: distinfo,v 1.31 2025/03/23 07:03:32 wiz Exp $
 
 BLAKE2s (e2fsprogs-1.47.2.tar.xz) = 22ad92fbe4786671ff677cf218f1e9834fb7f52f241b35f04f36b37df67c06ca
 SHA512 (e2fsprogs-1.47.2.tar.xz) = a32632e072e535bf164503cf9992a4da7ea971e80f8f84ead4e7bc8899a92c27e4670bdebef1de0187596672e44af7b96078888e0cd4eefa3e3f551344d434d8
@@ -19,4 +19,4 @@ SHA1 (patch-lib_ext2fs_tdb.c) = dd50993c
 SHA1 (patch-lib_ext2fs_unix__io.c) = 78dcc99e04a981727d71271b5f4c69b426c6ada9
 SHA1 (patch-lib_uuid_gen__uuid.c) = 2f679453457522a10b90c489ce52e59b6e3909c5
 SHA1 (patch-misc_create__inode.c) = 43a9a2d3d53bfe055be3fd47f5db2990594a9faa
-SHA1 (patch-scrub_Makefile.in) = cd31c6d42e21280b78f689eef0257dcd4bcf5ce8
+SHA1 (patch-scrub_Makefile.in) = 76080c14fa8590a3c350ce241d62cc9da356146b

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in
diff -u pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in:1.1 pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in:1.2
--- pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in:1.1       Sat Mar 22 12:22:07 2025
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-scrub_Makefile.in   Sun Mar 23 07:03:32 2025
@@ -1,20 +1,20 @@
-$NetBSD: patch-scrub_Makefile.in,v 1.1 2025/03/22 12:22:07 nia Exp $
+$NetBSD: patch-scrub_Makefile.in,v 1.2 2025/03/23 07:03:32 wiz Exp $
 
 Use INSTALL_SCRIPT instead of INSTALL_PROGRAM so that it doesn't
 attempt to strip sh scripts.
 
---- scrub/Makefile.in.orig     2025-03-22 11:12:56.839342535 +0000
+--- scrub/Makefile.in.orig     2025-01-01 06:24:42.000000000 +0000
 +++ scrub/Makefile.in
-@@ -121,7 +121,7 @@ install-crond: installdirs-crond
+@@ -126,7 +126,7 @@ install-crond: installdirs-crond
  install-libprogs: $(LIBPROGS) installdirs-libprogs
        $(Q) for i in $(LIBPROGS); do \
-               $(ES) " INSTALL $(pkglibdir)/$$i"; \
--              $(INSTALL_PROGRAM) $$i $(DESTDIR)$(pkglibdir)/$$i; \
-+              $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkglibdir)/$$i; \
+               $(ES) " INSTALL $(pkglibexecdir)/$$i"; \
+-              $(INSTALL_PROGRAM) $$i $(DESTDIR)$(pkglibexecdir)/$$i; \
++              $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkglibexecdir)/$$i; \
        done
  
  install-systemd: $(SERVICE_FILES) installdirs-systemd
-@@ -135,7 +135,7 @@ install-strip: install
+@@ -140,7 +140,7 @@ install-strip: install
  install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs $(INSTALL_TGT)
        $(Q) for i in $(PROGS); do \
                $(ES) " INSTALL $(root_sbindir)/$$i"; \