CVS commit: pkgsrc/sysutils/e2fsprogs

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun May 10 08:20:29 UTC 2026

Modified Files:
        pkgsrc/sysutils/e2fsprogs: Makefile PLIST distinfo
Added Files:
        pkgsrc/sysutils/e2fsprogs/patches: patch-lib_et_Makefile.in

Log Message:
sysutils/e2fsprogs: fix installation

Install target is broken when gettext tools are leaked from system,
generating NLS files. Make them, default.
Also, avoid PLIST conflict with mit-krb5.
Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/sysutils/e2fsprogs/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/e2fsprogs/PLIST
cvs rdiff -u -r1.33 -r1.34 pkgsrc/sysutils/e2fsprogs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/e2fsprogs/patches/patch-lib_et_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/Makefile
diff -u pkgsrc/sysutils/e2fsprogs/Makefile:1.41 pkgsrc/sysutils/e2fsprogs/Makefile:1.42
--- pkgsrc/sysutils/e2fsprogs/Makefile:1.41     Sun May 10 07:52:13 2026
+++ pkgsrc/sysutils/e2fsprogs/Makefile  Sun May 10 08:20:29 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2026/05/10 07:52:13 vins Exp $
+# $NetBSD: Makefile,v 1.42 2026/05/10 08:20:29 vins Exp $
 
 DISTNAME=      e2fsprogs-1.47.4
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PKGVERSION_NOREV}/
 #MASTER_SITES+=        ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
@@ -14,7 +15,8 @@ LICENSE=      gnu-gpl-v2 AND gnu-lgpl-v2 AND 
 USE_LANGUAGES=         c
 USE_CC_FEATURES=       c99
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake makeinfo pkg-config
+USE_TOOLS+=            gmake makeinfo msgmerge pkg-config xgettext
+USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 # Use external libraries
 CONFIGURE_ARGS+=       --disable-libblkid
@@ -93,6 +95,7 @@ REPLACE_BASH+=                scrub/e2scrub.in
 REPLACE_BASH+=         scrub/e2scrub_all.in
 .endif
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libblkid/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/e2fsprogs/PLIST
diff -u pkgsrc/sysutils/e2fsprogs/PLIST:1.13 pkgsrc/sysutils/e2fsprogs/PLIST:1.14
--- pkgsrc/sysutils/e2fsprogs/PLIST:1.13        Tue Jan 21 18:13:56 2025
+++ pkgsrc/sysutils/e2fsprogs/PLIST     Sun May 10 08:20:29 2026
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.13 2025/01/21 18:13:56 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.14 2026/05/10 08:20:29 vins Exp $
 bin/chattr
-bin/compile_et
+bin/e2compile_et
 bin/lsattr
 bin/mk_cmds
 include/com_err.h
@@ -42,7 +42,7 @@ lib/pkgconfig/e2p.pc
 lib/pkgconfig/ext2fs.pc
 lib/pkgconfig/ss.pc
 man/man1/chattr.1
-man/man1/compile_et.1
+man/man1/e2compile_et.1
 man/man1/lsattr.1
 man/man1/mk_cmds.1
 man/man3/com_err.3
@@ -98,5 +98,29 @@ sbin/tune2fs
 share/et/et_c.awk
 share/et/et_h.awk
 share/examples/ext2fs/mke2fs.conf
+share/locale/ca/LC_MESSAGES/e2fsprogs.mo
+share/locale/cs/LC_MESSAGES/e2fsprogs.mo
+share/locale/da/LC_MESSAGES/e2fsprogs.mo
+share/locale/de/LC_MESSAGES/e2fsprogs.mo
+share/locale/eo/LC_MESSAGES/e2fsprogs.mo
+share/locale/es/LC_MESSAGES/e2fsprogs.mo
+share/locale/fi/LC_MESSAGES/e2fsprogs.mo
+share/locale/fr/LC_MESSAGES/e2fsprogs.mo
+share/locale/fur/LC_MESSAGES/e2fsprogs.mo
+share/locale/hu/LC_MESSAGES/e2fsprogs.mo
+share/locale/id/LC_MESSAGES/e2fsprogs.mo
+share/locale/it/LC_MESSAGES/e2fsprogs.mo
+share/locale/ka/LC_MESSAGES/e2fsprogs.mo
+share/locale/ms/LC_MESSAGES/e2fsprogs.mo
+share/locale/nl/LC_MESSAGES/e2fsprogs.mo
+share/locale/pl/LC_MESSAGES/e2fsprogs.mo
+share/locale/pt/LC_MESSAGES/e2fsprogs.mo
+share/locale/ro/LC_MESSAGES/e2fsprogs.mo
+share/locale/sr/LC_MESSAGES/e2fsprogs.mo
+share/locale/sv/LC_MESSAGES/e2fsprogs.mo
+share/locale/tr/LC_MESSAGES/e2fsprogs.mo
+share/locale/uk/LC_MESSAGES/e2fsprogs.mo
+share/locale/vi/LC_MESSAGES/e2fsprogs.mo
+share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
 share/ss/ct_c.awk
 share/ss/ct_c.sed

Index: pkgsrc/sysutils/e2fsprogs/distinfo
diff -u pkgsrc/sysutils/e2fsprogs/distinfo:1.33 pkgsrc/sysutils/e2fsprogs/distinfo:1.34
--- pkgsrc/sysutils/e2fsprogs/distinfo:1.33     Sun May 10 07:52:13 2026
+++ pkgsrc/sysutils/e2fsprogs/distinfo  Sun May 10 08:20:29 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2026/05/10 07:52:13 vins Exp $
+$NetBSD: distinfo,v 1.34 2026/05/10 08:20:29 vins Exp $
 
 BLAKE2s (e2fsprogs-1.47.4.tar.xz) = c58f55a108f0e71f4b67076d45a58a85b9e03a8789bfe7e52471e1bb5dafbdd0
 SHA512 (e2fsprogs-1.47.4.tar.xz) = c316ce38d73786fb45b3728cd31991fe81b14a1e61dae645f3471c3f35983c4394e4606b47194c3e607897b7ae5a5ef1d376adb204383afa8c4219db8617d970
@@ -11,6 +11,7 @@ SHA1 (patch-as) = 6cf4a28a194d452c465137
 SHA1 (patch-aw) = 5046ba1d36046150b16292d4c24edf55c3e6fca6
 SHA1 (patch-debugfs_debugfs.c) = 791ce440216a15bf7711c022032e9c837dca0b8b
 SHA1 (patch-e2fsck_jfs__user.h) = a54b1a597d1d0b4526d8ba0e4c442e4705fb93be
+SHA1 (patch-lib_et_Makefile.in) = 1a2d7b4cef8ea3cc75a6b227fb3e4881c2071a2e
 SHA1 (patch-lib_ext2fs_bitops.c) = f641da9106c6a7e4314122d4b1f9d4067fc07f10
 SHA1 (patch-lib_ext2fs_bitops.h) = 4dd18ad892dbf91437e4996e7fcb7fd3a61758e8
 SHA1 (patch-lib_ext2fs_ext2fs.h) = 597435441fc537ec20f79d191181876ecdaa7b21

Added files:

Index: pkgsrc/sysutils/e2fsprogs/patches/patch-lib_et_Makefile.in
diff -u /dev/null pkgsrc/sysutils/e2fsprogs/patches/patch-lib_et_Makefile.in:1.1
--- /dev/null   Sun May 10 08:20:30 2026
+++ pkgsrc/sysutils/e2fsprogs/patches/patch-lib_et_Makefile.in  Sun May 10 08:20:29 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_et_Makefile.in,v 1.1 2026/05/10 08:20:29 vins Exp $
+
+Prevent PLIST conflict with mit-krb5.
+
+--- lib/et/Makefile.in.orig    2026-05-10 08:09:05.501127955 +0000
++++ lib/et/Makefile.in
+@@ -122,13 +122,13 @@ install:: compile_et libcom_err.a $(HFIL
+               echo "  INSTALL_DATA $(datadir)/et/$$i"; \
+               $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \
+       done
+-      $(E) "  INSTALL_SCRIPT $(bindir)/compile_et"
+-      $(Q) $(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
++      $(E) "  INSTALL_SCRIPT $(bindir)/e2compile_et"
++      $(Q) $(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/e2compile_et
+       $(E) "  INSTALL_DATA $(man3dir)/com_err.3"
+       $(Q) $(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
+-      $(E) "  INSTALL_DATA $(man1dir)/compile_et.1"
++      $(E) "  INSTALL_DATA $(man1dir)/e2compile_et.1"
+       $(Q) $(INSTALL_DATA) $(srcdir)/compile_et.1 \
+-                      $(DESTDIR)$(man1dir)/compile_et.1
++                      $(DESTDIR)$(man1dir)/e2compile_et.1
+       $(E) "  INSTALL_DATA $(pkgconfigdir)/com_err.pc"
+       $(Q) $(INSTALL_DATA) com_err.pc $(DESTDIR)$(pkgconfigdir)/com_err.pc
+