CVS commit: pkgsrc/sysutils/attr

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 14 08:34:07 UTC 2024

Modified Files:
        pkgsrc/sysutils/attr: distinfo
        pkgsrc/sysutils/attr/patches: patch-libattr_Makemodule.am
            patch-tools_Makemodule.am

Log Message:
attr: switch to upstream version of libintl patch


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/attr/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am \
    pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am

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

Modified files:

Index: pkgsrc/sysutils/attr/distinfo
diff -u pkgsrc/sysutils/attr/distinfo:1.5 pkgsrc/sysutils/attr/distinfo:1.6
--- pkgsrc/sysutils/attr/distinfo:1.5   Sat Jan 13 19:30:47 2024
+++ pkgsrc/sysutils/attr/distinfo       Sun Jan 14 08:34:07 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2024/01/13 19:30:47 wiz Exp $
+$NetBSD: distinfo,v 1.6 2024/01/14 08:34:07 wiz Exp $
 
 BLAKE2s (attr-2.5.1.tar.xz) = 52fb843466e2b96ad92b8f77fadb8da7cc65b838ca76380e8cb6a954769cb983
 SHA512 (attr-2.5.1.tar.xz) = 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
 Size (attr-2.5.1.tar.xz) = 318188 bytes
 SHA1 (patch-configure.ac) = 89c966ac640fb6ddaa4e5e4e1e936fe64a9c47ed
-SHA1 (patch-libattr_Makemodule.am) = 052a7ef5e67ce3202742cf079bd0f54f452af810
-SHA1 (patch-tools_Makemodule.am) = 225f45f023acdbbf3980808f6524951ce1bfd2b0
+SHA1 (patch-libattr_Makemodule.am) = 82be080f7cf58671c1d837686d9f08bf90817956
+SHA1 (patch-tools_Makemodule.am) = 220d3fa6f5702602926da2c05c2e808ff9356677
 SHA1 (patch-tools_attr.c) = 477e5f77394a4debb8ba5923fea29ea29c1cf4d4

Index: pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am
diff -u pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am:1.1 pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am:1.2
--- pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am:1.1        Sat Jan 13 19:30:47 2024
+++ pkgsrc/sysutils/attr/patches/patch-libattr_Makemodule.am    Sun Jan 14 08:34:07 2024
@@ -1,14 +1,21 @@
-$NetBSD: patch-libattr_Makemodule.am,v 1.1 2024/01/13 19:30:47 wiz Exp $
+$NetBSD: patch-libattr_Makemodule.am,v 1.2 2024/01/14 08:34:07 wiz Exp $
 
 https://git.savannah.nongnu.org/cgit/attr.git/diff/?h=7b3423dcbf6775539124c52a59e8bc76e33596f6
 
+and
+
+https://git.savannah.nongnu.org/cgit/attr.git/commit/?h=2979615e71fb53b3f2f9085eea516d4e2b3174ea
+
 --- libattr/Makemodule.am.orig 2017-09-15 13:10:38.000000000 +0000
 +++ libattr/Makemodule.am
-@@ -8,19 +8,30 @@ LT_CURRENT = 2
+@@ -8,19 +8,33 @@ LT_CURRENT = 2
  LT_AGE = 1
  LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
 -libattr_la_DEPENDENCIES = exports libattr/libattr.lds
++## Since libattr translates its error messages, we have to link libintl.
++## See the AM_GNU_GETTEXT documentation for details.
++libattr_la_LIBADD = $(LTLIBINTL)
 +libattr_la_DEPENDENCIES = \
 +      exports
 +if OS_LINUX
Index: pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am
diff -u pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am:1.1 pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am:1.2
--- pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am:1.1  Sat Jan 13 19:30:48 2024
+++ pkgsrc/sysutils/attr/patches/patch-tools_Makemodule.am      Sun Jan 14 08:34:07 2024
@@ -1,22 +1,12 @@
-$NetBSD: patch-tools_Makemodule.am,v 1.1 2024/01/13 19:30:48 wiz Exp $
+$NetBSD: patch-tools_Makemodule.am,v 1.2 2024/01/14 08:34:07 wiz Exp $
 
-https://savannah.nongnu.org/bugs/index.php?65159
+https://git.savannah.nongnu.org/cgit/attr.git/commit/?h=2979615e71fb53b3f2f9085eea516d4e2b3174ea
 
---- tools/Makemodule.am.orig   2024-01-13 19:19:07.705687493 +0000
+--- tools/Makemodule.am.orig   2024-01-14 08:32:58.357146753 +0000
 +++ tools/Makemodule.am
-@@ -2,12 +2,12 @@ tools_ldadd = $(LDADD) libattr.la libmis
+@@ -1,4 +1,4 @@
+-tools_ldadd = $(LDADD) libattr.la libmisc.la
++tools_ldadd = $(LDADD) libattr.la libmisc.la $(LTLIBINTL)
  
  bin_PROGRAMS += attr
  attr_SOURCES = tools/attr.c
--attr_LDADD = $(tools_ldadd)
-+attr_LDADD = $(tools_ldadd) $(INTLLIBS)
- 
- bin_PROGRAMS += getfattr
- getfattr_SOURCES = tools/getfattr.c
--getfattr_LDADD = $(tools_ldadd)
-+getfattr_LDADD = $(tools_ldadd) $(INTLLIBS)
- 
- bin_PROGRAMS += setfattr
- setfattr_SOURCES = tools/setfattr.c
--setfattr_LDADD = $(tools_ldadd)
-+setfattr_LDADD = $(tools_ldadd) $(INTLLIBS)