CVS commit: pkgsrc/devel/netbsd-iscsi-lib

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 22 14:25:00 UTC 2020

Modified Files:
        pkgsrc/devel/netbsd-iscsi-lib: distinfo
Added Files:
        pkgsrc/devel/netbsd-iscsi-lib/patches: patch-src_lib_Makefile.in

Log Message:
netbsd-iscsi-lib: fix installation on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/netbsd-iscsi-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/netbsd-iscsi-lib/patches/patch-src_lib_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/devel/netbsd-iscsi-lib/distinfo
diff -u pkgsrc/devel/netbsd-iscsi-lib/distinfo:1.7 pkgsrc/devel/netbsd-iscsi-lib/distinfo:1.8
--- pkgsrc/devel/netbsd-iscsi-lib/distinfo:1.7  Tue Nov  3 03:27:51 2015
+++ pkgsrc/devel/netbsd-iscsi-lib/distinfo      Sun Mar 22 14:24:59 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 03:27:51 agc Exp $
+$NetBSD: distinfo,v 1.8 2020/03/22 14:24:59 tnn Exp $
 
 SHA1 (netbsd-iscsi-20111006.tar.gz) = e8c0176a32416e17f90ec33ebd014ec19d978c3b
 RMD160 (netbsd-iscsi-20111006.tar.gz) = fcb28098f0048f726570ee0f10d6d84e641330f2
@@ -9,5 +9,6 @@ SHA1 (patch-ac) = d7a7f72b83eb444f62bbfc
 SHA1 (patch-ad) = 3844a8f8a6ddf6e584f1c097f95be0501f901a3e
 SHA1 (patch-ae) = e6cad821057074c50d0388cf1e6b3df2e080678c
 SHA1 (patch-include_iscsi-md5.h) = 038355a84a1c979fe1c439eea4604b5323437ea4
+SHA1 (patch-src_lib_Makefile.in) = e7049779c58ae989bf806cf55a7aaaccf6b0dc39
 SHA1 (patch-src_lib_md5c.c) = 905c0e4000a401a105bb0521c20281158c6ad149
 SHA1 (patch-src_lib_md5hl.c) = de4c44f00614fb871f2ac8619f3f41896c1d7f26

Added files:

Index: pkgsrc/devel/netbsd-iscsi-lib/patches/patch-src_lib_Makefile.in
diff -u /dev/null pkgsrc/devel/netbsd-iscsi-lib/patches/patch-src_lib_Makefile.in:1.1
--- /dev/null   Sun Mar 22 14:25:00 2020
+++ pkgsrc/devel/netbsd-iscsi-lib/patches/patch-src_lib_Makefile.in     Sun Mar 22 14:25:00 2020
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_lib_Makefile.in,v 1.1 2020/03/22 14:25:00 tnn Exp $
+
+Work around an issue with Linux install(1). It does not like to
+install the same file twice. For example:
+
+$ install libiscsi.3 libiscsi.3 /tmp
+install: will not overwrite just-created '/tmp/libiscsi.3' with 'libiscsi.3'
+
+Removing the am__base_list sed script from the pipeline disables this
+coalescing and still installs the same file twice, but with two install(1)
+invocations. Why the file gets installed twice is an automake mystery.
+
+--- src/lib/Makefile.in.orig   2010-05-10 14:48:22.000000000 +0000
++++ src/lib/Makefile.in
+@@ -474,7 +474,7 @@ install-man3: $(dist_man_MANS) $(man3_MA
+           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
+         fi; \
+       done; \
+-      for i in $$list; do echo "$$i"; done | $(am__base_list) | \
++      for i in $$list; do echo "$$i"; done | \
+       while read files; do \
+         test -z "$$files" || { \
+           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \