Avoid "echo -n" in subshells to fix build on OS X (by consistently

applying the pattern used by the socket.lib target).

2 files changed, 67 insertions, 4 deletions

diff --git a/devel/bglibs/distinfo b/devel/bglibs/distinfo
index e573476b20f..a8d671f62d9 100644
--- a/devel/bglibs/distinfo
+++ b/devel/bglibs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.25 2016/12/18 21:39:58 joerg Exp $
+$NetBSD: distinfo,v 1.26 2016/12/31 15:13:43 schmonz Exp $
 
 SHA1 (bglibs-1.106.tar.gz) = 5f1914299c0f91a3d5c83bf6c8c1d0b824ffe624
 RMD160 (bglibs-1.106.tar.gz) = d3ac009a0b9196701ff90b6cddbd58596ab480a9
 SHA512 (bglibs-1.106.tar.gz) = c1ae4bb9978b09ffe01231738d1f249c2040a51c2a0bbc4b04389a7085a3885cca6483f1bfe65deca213d991273bb3b7b925ebde8b6e2cd9182d8a57cb9a49d8
 Size (bglibs-1.106.tar.gz) = 481564 bytes
-SHA1 (patch-ab) = c23a0d4b20bd485a599ba445f6957f10190bdfa2
+SHA1 (patch-ab) = a1d06fcc1aa73afd92be9acd1001187a28ff03e0
 SHA1 (patch-ac) = 1b75516a494dbc0c7943bc89b2eaf2f9668048fd
 SHA1 (patch-crypto_hmac-md5.c) = 1982dfb84b42f0e2b3aa7a59664de7694dd65038
 SHA1 (patch-crypto_hmac-sha1.c) = aebb2be7721a38bd1c15fde32831ae6966b8b705
diff --git a/devel/bglibs/patches/patch-ab b/devel/bglibs/patches/patch-ab
index e3f4d3098f8..2b19f101443 100644
--- a/devel/bglibs/patches/patch-ab
+++ b/devel/bglibs/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2009/04/07 02:59:04 schmonz Exp $
+$NetBSD: patch-ab,v 1.7 2016/12/31 15:13:43 schmonz Exp $
 
---- Makefile.orig	2009-02-19 12:11:51.000000000 -0500
+--- Makefile.orig	2009-02-19 17:11:51.000000000 +0000
 +++ Makefile
 @@ -69,7 +69,7 @@ adt/hashb.lo adt/hashb.o: ltcompile adt/
  adt/hashs.lo adt/hashs.o: ltcompile adt/hashs.c adt/common.h
@@ -11,6 +11,33 @@ $NetBSD: patch-ab,v 1.6 2009/04/07 02:59:04 schmonz Exp $
  
  base64/asc2bin.lo base64/asc2bin.o: ltcompile base64/asc2bin.c base64/base64.h str/str.h
  	./ltcompile base64/asc2bin.c
+@@ -210,7 +210,7 @@ crypt.lib: compile load
+ 	@echo 'main() { ; }' >trylib-lcrypt.c
+ 	@{ ./compile trylib-lcrypt.c && ./load trylib-lcrypt -lcrypt; } >/dev/null 2>&1 \
+ 	  && { echo -lcrypt >crypt.lib; echo yes; } \
+-	  || { echo -n >crypt.lib; echo no; }
++	  || { : >crypt.lib; echo no; }
+ 	@rm -f trylib-lcrypt.c trylib-lcrypt.o trylib-lcrypt
+ 
+ crypto/hmac-md5.lo crypto/hmac-md5.o: ltcompile crypto/hmac-md5.c sysdeps.h crypto/hmac.h crypto/md5.h str/str.h
+@@ -290,7 +290,7 @@ dl.lib: compile load
+ 	@echo 'main() { ; }' >trylib-ldl.c
+ 	@{ ./compile trylib-ldl.c && ./load trylib-ldl -ldl; } >/dev/null 2>&1 \
+ 	  && { echo -ldl >dl.lib; echo yes; } \
+-	  || { echo -n >dl.lib; echo no; }
++	  || { : >dl.lib; echo no; }
+ 	@rm -f trylib-ldl.c trylib-ldl.o trylib-ldl
+ 
+ dotlibs: crypt.lib dl.lib m.lib net.lib rt.lib s.lib shadow.lib socket.lib
+@@ -624,7 +624,7 @@ m.lib: compile load
+ 	@echo 'main() { ; }' >trylib-lm.c
+ 	@{ ./compile trylib-lm.c && ./load trylib-lm -lm; } >/dev/null 2>&1 \
+ 	  && { echo -lm >m.lib; echo yes; } \
+-	  || { echo -n >m.lib; echo no; }
++	  || { : >m.lib; echo no; }
+ 	@rm -f trylib-lm.c trylib-lm.o trylib-lm
+ 
+ makeshlib: conf-ld conf-lib LIBVERSION Makefile
 @@ -632,7 +632,7 @@ makeshlib: conf-ld conf-lib LIBVERSION M
  	  echo '#!/bin/sh'; \
  	  echo 'lib="$$1"; shift';\
@@ -20,6 +47,15 @@ $NetBSD: patch-ab,v 1.6 2009/04/07 02:59:04 schmonz Exp $
  	) >makeshlib
  	chmod 755 makeshlib
  
+@@ -710,7 +710,7 @@ net.lib: compile load
+ 	@echo 'main() { ; }' >trylib-lnet.c
+ 	@{ ./compile trylib-lnet.c && ./load trylib-lnet -lnet; } >/dev/null 2>&1 \
+ 	  && { echo -lnet >net.lib; echo yes; } \
+-	  || { echo -n >net.lib; echo no; }
++	  || { : >net.lib; echo no; }
+ 	@rm -f trylib-lnet.c trylib-lnet.o trylib-lnet
+ 
+ net/accept4.lo net/accept4.o: ltcompile net/accept4.c net/socket.h net/ipv4.h sysdeps.h net/ipv6.h sysdeps.h
 @@ -876,9 +876,7 @@ path/mktemp.lo path/mktemp.o: ltcompile 
  	./ltcompile path/mktemp.c
  
@@ -31,3 +67,30 @@ $NetBSD: patch-ab,v 1.6 2009/04/07 02:59:04 schmonz Exp $
  	  echo "# WARNING: This file was auto-generated. Do not edit!"; \
  	  echo ) >perl-head.pl
  
+@@ -896,7 +894,7 @@ rt.lib: compile load
+ 	@echo 'main() { ; }' >trylib-lrt.c
+ 	@{ ./compile trylib-lrt.c && ./load trylib-lrt -lrt; } >/dev/null 2>&1 \
+ 	  && { echo -lrt >rt.lib; echo yes; } \
+-	  || { echo -n >rt.lib; echo no; }
++	  || { : >rt.lib; echo no; }
+ 	@rm -f trylib-lrt.c trylib-lrt.o trylib-lrt
+ 
+ s.lib: compile load
+@@ -904,7 +902,7 @@ s.lib: compile load
+ 	@echo 'main() { ; }' >trylib-ls.c
+ 	@{ ./compile trylib-ls.c && ./load trylib-ls -ls; } >/dev/null 2>&1 \
+ 	  && { echo -ls >s.lib; echo yes; } \
+-	  || { echo -n >s.lib; echo no; }
++	  || { : >s.lib; echo no; }
+ 	@rm -f trylib-ls.c trylib-ls.o trylib-ls
+ 
+ selftests: selftests.sh sysdeps.h libbg-sysdeps.la libbg.la
+@@ -915,7 +913,7 @@ shadow.lib: compile load
+ 	@echo 'main() { ; }' >trylib-lshadow.c
+ 	@{ ./compile trylib-lshadow.c && ./load trylib-lshadow -lshadow; } >/dev/null 2>&1 \
+ 	  && { echo -lshadow >shadow.lib; echo yes; } \
+-	  || { echo -n >shadow.lib; echo no; }
++	  || { : >shadow.lib; echo no; }
+ 	@rm -f trylib-lshadow.c trylib-lshadow.o trylib-lshadow
+ 
+ socket.lib: compile load