Sun Mar 22 14:25:00 2020 UTC ()
netbsd-iscsi-lib: fix installation on Linux


(tnn)
diff -r1.7 -r1.8 pkgsrc/devel/netbsd-iscsi-lib/distinfo
diff -r0 -r1.1 pkgsrc/devel/netbsd-iscsi-lib/patches/patch-src_lib_Makefile.in
cvs diff -r1.7 -r1.8 pkgsrc/devel/netbsd-iscsi-lib/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/netbsd-iscsi-lib/distinfo 2015/11/03 03:27:51 1.7
+++ pkgsrc/devel/netbsd-iscsi-lib/distinfo 2020/03/22 14:24:59 1.8
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.7 2015/11/03 03:27:51 agc Exp $ 1$NetBSD: distinfo,v 1.8 2020/03/22 14:24:59 tnn Exp $
2 2
3SHA1 (netbsd-iscsi-20111006.tar.gz) = e8c0176a32416e17f90ec33ebd014ec19d978c3b 3SHA1 (netbsd-iscsi-20111006.tar.gz) = e8c0176a32416e17f90ec33ebd014ec19d978c3b
4RMD160 (netbsd-iscsi-20111006.tar.gz) = fcb28098f0048f726570ee0f10d6d84e641330f2 4RMD160 (netbsd-iscsi-20111006.tar.gz) = fcb28098f0048f726570ee0f10d6d84e641330f2
5SHA512 (netbsd-iscsi-20111006.tar.gz) = 79fb4c93d81b52ad00f0dcb9124e7ce7d93fdf9c367e6b7f273d23c73f18990b50f41c81f5525d43565942e272417088923eee0ceff43801e10eb5a3ea62f5ca 5SHA512 (netbsd-iscsi-20111006.tar.gz) = 79fb4c93d81b52ad00f0dcb9124e7ce7d93fdf9c367e6b7f273d23c73f18990b50f41c81f5525d43565942e272417088923eee0ceff43801e10eb5a3ea62f5ca
6Size (netbsd-iscsi-20111006.tar.gz) = 535267 bytes 6Size (netbsd-iscsi-20111006.tar.gz) = 535267 bytes
7SHA1 (patch-ab) = d769048053104c03739a7ff3f77280ef1357e23c 7SHA1 (patch-ab) = d769048053104c03739a7ff3f77280ef1357e23c
8SHA1 (patch-ac) = d7a7f72b83eb444f62bbfc34c2c02cc03b186ee9 8SHA1 (patch-ac) = d7a7f72b83eb444f62bbfc34c2c02cc03b186ee9
9SHA1 (patch-ad) = 3844a8f8a6ddf6e584f1c097f95be0501f901a3e 9SHA1 (patch-ad) = 3844a8f8a6ddf6e584f1c097f95be0501f901a3e
10SHA1 (patch-ae) = e6cad821057074c50d0388cf1e6b3df2e080678c 10SHA1 (patch-ae) = e6cad821057074c50d0388cf1e6b3df2e080678c
11SHA1 (patch-include_iscsi-md5.h) = 038355a84a1c979fe1c439eea4604b5323437ea4 11SHA1 (patch-include_iscsi-md5.h) = 038355a84a1c979fe1c439eea4604b5323437ea4
 12SHA1 (patch-src_lib_Makefile.in) = e7049779c58ae989bf806cf55a7aaaccf6b0dc39
12SHA1 (patch-src_lib_md5c.c) = 905c0e4000a401a105bb0521c20281158c6ad149 13SHA1 (patch-src_lib_md5c.c) = 905c0e4000a401a105bb0521c20281158c6ad149
13SHA1 (patch-src_lib_md5hl.c) = de4c44f00614fb871f2ac8619f3f41896c1d7f26 14SHA1 (patch-src_lib_md5hl.c) = de4c44f00614fb871f2ac8619f3f41896c1d7f26
File Added: pkgsrc/devel/netbsd-iscsi-lib/patches/patch-src_lib_Makefile.in
$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)'"; \