Fix build on OS X and quell pkglint.

5 files changed, 42 insertions, 7 deletions

diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index e8e91b574ba..dba5cfcdce9 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/03/14 01:06:39 wiedi Exp $
+# $NetBSD: Makefile,v 1.19 2017/01/01 22:00:12 schmonz Exp $
 #
 
 DISTNAME=		cvm-0.96
@@ -41,7 +41,7 @@ PLIST_SUBST+=		CVM_LIB_EXT=${CVM_LIB_EXT:Q}
 
 DJB_CONFIG_CMDS=							\
 	${ECHO} ${DJB_CONFIG_PREFIX}/include > conf-include;		\
-	${ECHO} ${DJB_CONFIG_PREFIX}/lib > conf-lib
+	${ECHO} ${DJB_CONFIG_PREFIX}/lib > conf-lib;
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/cvm/PLIST b/security/cvm/PLIST
index 97f595c881e..cd0128e8dec 100644
--- a/security/cvm/PLIST
+++ b/security/cvm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:05:13 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/01/01 22:00:12 schmonz Exp $
 bin/cvm-benchclient
 bin/cvm-chain
 bin/cvm-checkpassword
@@ -22,7 +22,6 @@ include/cvm/protocol.h
 include/cvm/sasl.h
 include/cvm/v1client.h
 include/cvm/v2client.h
-lib/libcvm-client.a
 lib/libcvm-client.la
 lib/libcvm-client.${CVM_LIB_EXT}
 lib/libcvm-command.la
diff --git a/security/cvm/distinfo b/security/cvm/distinfo
index 63a8b3fa232..eedea39fa62 100644
--- a/security/cvm/distinfo
+++ b/security/cvm/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 01:17:43 agc Exp $
+$NetBSD: distinfo,v 1.11 2017/01/01 22:00:12 schmonz Exp $
 
 SHA1 (cvm-0.96.tar.gz) = fb5cde8a88b932ff1e10363449a691e9383e1149
 RMD160 (cvm-0.96.tar.gz) = 059c4e4d859d6ba2f0dc24da94a85213ae128cb1
 SHA512 (cvm-0.96.tar.gz) = 23adf39571bf414fa61084ac824a54b3cb37ef32a46c72ad50734743fb66bb923168eb866d72fba7f88397b37831e2ce7603c7d543996b28761ed1d5b053d73d
 Size (cvm-0.96.tar.gz) = 127999 bytes
-SHA1 (patch-aa) = 49ed0270a0ecde312dd68acc9e9a6f1e87b672f6
+SHA1 (patch-Makefile) = bc0aeec5b7e85e8a7d0205e2e66ef428d2ba33d5
+SHA1 (patch-aa) = 522bb927f7b8d165cd24c81ceed2c180ec317d38
diff --git a/security/cvm/patches/patch-Makefile b/security/cvm/patches/patch-Makefile
new file mode 100644
index 00000000000..3bf9fc19511
--- /dev/null
+++ b/security/cvm/patches/patch-Makefile
@@ -0,0 +1,33 @@
+$NetBSD: patch-Makefile,v 1.1 2017/01/01 22:00:12 schmonz Exp $
+
+Avoid "echo -n" in subshells to fix build on OS X.
+
+--- Makefile.orig	2010-01-21 22:51:26.000000000 +0000
++++ Makefile
+@@ -49,7 +49,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
+ 
+ cvm-benchclient: cvm-benchclient.o ltload libcvm-v2client.la socket.lib
+@@ -317,7 +317,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
+ 
+ sasl-auth-test: sasl-auth-test.o ltload libcvm-sasl.la libcvm-v2client.la
+@@ -352,7 +352,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
diff --git a/security/cvm/patches/patch-aa b/security/cvm/patches/patch-aa
index 446acece210..d4b47f74fa7 100644
--- a/security/cvm/patches/patch-aa
+++ b/security/cvm/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2008/04/13 06:51:19 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2017/01/01 22:00:12 schmonz Exp $
+
+Use the system's shared library extension.
 
 --- INSTHIER.orig	2008-04-11 20:02:17.000000000 -0400
 +++ INSTHIER