- Don't install static libraries with INSTALL_LIB (part 2/2)

Approved by:	portmgr blanket
MFH:		2015Q2

17 files changed, 32 insertions, 27 deletions

diff --git a/astro/swe/Makefile b/astro/swe/Makefile
index 5a2aef78ff80..4f0f00b47eec 100644
--- a/astro/swe/Makefile
+++ b/astro/swe/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	swe
 PORTVERSION=	2.01.00
+PORTREVISION=	1
 CATEGORIES=	astro devel
 MASTER_SITES=	ftp://ftp.astro.com/pub/swisseph/
 DISTNAME=	${PORTNAME}_unix_src_${PORTVERSION}
@@ -21,7 +22,7 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/libswe.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libswe.a ${STAGEDIR}${PREFIX}/lib
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/swe
 	${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/swe
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/chinese/autoconvert/Makefile b/chinese/autoconvert/Makefile
index 1d1cae4d2e6c..ae1bfbbcde44 100644
--- a/chinese/autoconvert/Makefile
+++ b/chinese/autoconvert/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	autoconvert
 PORTVERSION=	0.3.16
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	chinese
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	libhz
diff --git a/chinese/autoconvert/files/patch-Makefile b/chinese/autoconvert/files/patch-Makefile
index e8e1936d5565..4c7ecfaf433a 100644
--- a/chinese/autoconvert/files/patch-Makefile
+++ b/chinese/autoconvert/files/patch-Makefile
@@ -28,9 +28,9 @@
 -	install -m 644 include/*.h  $(DESTDIR)/usr/include
 -	ln -s autogb $(DESTDIR)/usr/bin/autob5
 +	${BSD_INSTALL_PROGRAM} autogb $(DESTDIR)$(PREFIX)/bin
-+	${BSD_INSTALL_PROGRAM} lib/libhz.so.0.0 $(DESTDIR)$(PREFIX)/lib
++	${BSD_INSTALL_LIB} lib/libhz.so.0.0 $(DESTDIR)$(PREFIX)/lib
 +	ln -sf libhz.so.0.0 $(DESTDIR)$(PREFIX)/lib/libhz.so.0
 +	ln -sf libhz.so.0.0 $(DESTDIR)$(PREFIX)/lib/libhz.so
-+	${BSD_INSTALL_LIB} lib/libhz.a $(DESTDIR)$(PREFIX)/lib
++	${BSD_INSTALL_DATA} lib/libhz.a $(DESTDIR)$(PREFIX)/lib
 +	${BSD_INSTALL_DATA} include/*.h $(DESTDIR)$(PREFIX)/include
 +	ln -sf autogb $(DESTDIR)$(PREFIX)/bin/autob5
diff --git a/devel/distorm/Makefile b/devel/distorm/Makefile
index 51c5d4c56f38..273177b1b210 100644
--- a/devel/distorm/Makefile
+++ b/devel/distorm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	distorm
 DISTVERSION=	20121220-r230
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	devel
 .if defined(PYTHON_SLAVEPORT)
 CATEGORIES+=	python
@@ -85,7 +85,7 @@ check regression-test test: build
 	@cd ${BUILD_WRKSRC}; ./disasm disasm
 
 do-install:
-	@(cd ${BUILD_WRKSRC}; ${INSTALL_LIB} libdistorm3.a ${STAGEDIR}${PREFIX}/lib; \
+	@(cd ${BUILD_WRKSRC}; ${INSTALL_DATA} libdistorm3.a ${STAGEDIR}${PREFIX}/lib; \
 	${INSTALL_LIB} libdistorm3.so ${STAGEDIR}${PREFIX}/lib/libdistorm3.so.1; \
 	${LN} -sf libdistorm3.so.1 ${STAGEDIR}${PREFIX}/lib/libdistorm3.so; \
 	${INSTALL_PROGRAM} disasm ${STAGEDIR}${PREFIX}/bin)
diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile
index aaf140fc1a87..5bed55cb7099 100644
--- a/devel/jsoncpp/Makefile
+++ b/devel/jsoncpp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jsoncpp
 DISTVERSION=	0.6.0-rc2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/jsoncpp/${DISTVERSION}
 DISTNAME=	jsoncpp-src-${DISTVERSION}
@@ -21,7 +22,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
 	(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
 	(cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ &&  \
-		${INSTALL_LIB} libjson_linux-gcc-FreeBSD_libmt.a \
+		${INSTALL_DATA} libjson_linux-gcc-FreeBSD_libmt.a \
 		${STAGEDIR}${PREFIX}/lib/libjsoncpp.a)
 	(cd ${WRKSRC}/libs/linux-gcc-FreeBSD/ && \
 		${INSTALL_LIB} libjson_linux-gcc-FreeBSD_libmt.so \
diff --git a/devel/libcxxrt/Makefile b/devel/libcxxrt/Makefile
index 1ae26c5d3cea..25ad7f1b8559 100644
--- a/devel/libcxxrt/Makefile
+++ b/devel/libcxxrt/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libcxxrt
 PORTVERSION=	20131225
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
@@ -19,7 +19,7 @@ CXXFLAGS+=	-nostdlib
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/lib/libcxxrt.so ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/lib/libcxxrt.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/libcxxrt.a ${STAGEDIR}${PREFIX}/lib
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/cxxrt
 	${INSTALL_DATA} ${WRKSRC}/src/*.h ${STAGEDIR}${PREFIX}/include/cxxrt
 
diff --git a/devel/libgpkg/Makefile b/devel/libgpkg/Makefile
index b5df1ea22ee6..d9c69de4db00 100644
--- a/devel/libgpkg/Makefile
+++ b/devel/libgpkg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgpkg
 PORTVERSION=	0.9.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/luciad/libgpkg/get/ \
 		LOCAL/sunpoet/${PORTNAME}
@@ -29,6 +29,6 @@ GEOS_CMAKE_ON=		-DGPKG_GEOS=ON
 GEOS_LIB_DEPENDS=	libgeos_c.so:${PORTSDIR}/graphics/geos
 
 post-install:
-	${INSTALL_LIB} ${WRKSRC}/gpkg/libgpkg.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/gpkg/libgpkg.a ${STAGEDIR}${PREFIX}/lib/
 
 .include <bsd.port.mk>
diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile
index b9b93834b558..2bf70d517504 100644
--- a/devel/shapelib/Makefile
+++ b/devel/shapelib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	shapelib
 PORTVERSION=	1.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel geography
 MASTER_SITES=	http://download.osgeo.org/shapelib/ \
 		ftp://ftp.remotesensing.org/shapelib/ \
diff --git a/devel/shapelib/files/patch-Makefile b/devel/shapelib/files/patch-Makefile
index df754235b82b..b21d85e31ef5 100644
--- a/devel/shapelib/files/patch-Makefile
+++ b/devel/shapelib/files/patch-Makefile
@@ -24,7 +24,7 @@
  
  shpopen.o:	shpopen.c shapefil.h
  	$(CC) $(CFLAGS) -c shpopen.c
-@@ -98,16 +101,20 @@
+@@ -98,16 +101,21 @@
  
  
  lib:	libshp.a
@@ -37,7 +37,8 @@
 -	cp libshp.a $(PREFIX)/lib
 -	cp shapefil.h $(PREFIX)/include
 +	$(BSD_INSTALL_DATA) shapefil.h $(DESTDIR)$(PREFIX)/include/
-+	$(BSD_INSTALL_LIB) libshp.a libshp.so.1 $(DESTDIR)$(PREFIX)/lib/
++	$(BSD_INSTALL_DATA) libshp.a $(DESTDIR)$(PREFIX)/lib/
++	$(BSD_INSTALL_LIB) libshp.so.1 $(DESTDIR)$(PREFIX)/lib/
  
  bin_install:	$(SHPBIN)
 -	cp $(SHPBIN) $(PREFIX)/bin
diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile
index 01b7fa406ab0..b9dff8896a71 100644
--- a/lang/onyx/Makefile
+++ b/lang/onyx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	onyx
 PORTVERSION=	5.1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	http://www.canonware.com/download/onyx/
 
@@ -40,7 +40,7 @@ do-install:
 	${LN} -sf bin/onyx_config ${STAGEDIR}${PREFIX}/bin/${PORTNAME}_config-${PORTVERSION}
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/libonyx
 	${INSTALL_DATA} ${WRKSRC}/lib/libonyx/include/libonyx/*.h ${STAGEDIR}${PREFIX}/include/libonyx
-	${INSTALL_LIB} ${WRKSRC}/lib/libonyx/lib/libonyx.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/libonyx/lib/libonyx.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/libonyx/lib/libonyx.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/libonyx/lib/libonyx.so.13 ${STAGEDIR}${PREFIX}/lib
 	${MKDIR} ${STAGEDIR}${DATADIR}/nx/modclopt
diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index 35755fc06a04..32908c47fb1b 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sid-milter
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/SenderID%20Milter/${PORTVERSION}
 
@@ -63,7 +64,7 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/man/man8/
 .endfor
 .if ${PORT_OPTIONS:MLIBAR}
-	${INSTALL_LIB} ${WRKSRC}/*/libar/libar.a ${STAGEDIR}${PREFIX}/lib/libar.a
+	${INSTALL_DATA} ${WRKSRC}/*/libar/libar.a ${STAGEDIR}${PREFIX}/lib/libar.a
 	${INSTALL_DATA} ${WRKSRC}/libar/ar.h ${STAGEDIR}${PREFIX}/include/libar.h
 .for i in ${MAN3}
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/man/man3/
diff --git a/math/msieve/Makefile b/math/msieve/Makefile
index 22babaed5e3f..ad5ee4956d72 100644
--- a/math/msieve/Makefile
+++ b/math/msieve/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	msieve
 PORTVERSION=	1.51
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	\
@@ -64,7 +65,7 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/msieve ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/msieve
 	@cd ${WRKSRC}/include; ${INSTALL_DATA} ${HEADERS} ${STAGEDIR}${PREFIX}/include/msieve
-	@${INSTALL_LIB} ${WRKSRC}/libmsieve.a ${STAGEDIR}${PREFIX}/lib
+	@${INSTALL_DATA} ${WRKSRC}/libmsieve.a ${STAGEDIR}${PREFIX}/lib
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/math/plplot-ada/Makefile b/math/plplot-ada/Makefile
index 51f65b185587..8b3a1c6b19e2 100644
--- a/math/plplot-ada/Makefile
+++ b/math/plplot-ada/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	plplot
 PORTVERSION=	${RELEASE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 PKGNAMESUFFIX=	-ada
diff --git a/math/plplot-ada/files/Makefile b/math/plplot-ada/files/Makefile
index 679a3a66b4ae..3bdb4f98c091 100644
--- a/math/plplot-ada/files/Makefile
+++ b/math/plplot-ada/files/Makefile
@@ -7,7 +7,7 @@ install:
 	mkdir -p ${DESTDIR}${PREFIX}/lib/gnat \
 		 ${DESTDIR}${PREFIX}/lib/plplotada \
 		 ${DESTDIR}${PREFIX}/include/plplotada
-	${BSD_INSTALL_LIB} ada/build/lib/libplplotada.a \
+	${BSD_INSTALL_DATA} ada/build/lib/libplplotada.a \
 		${DESTDIR}${PREFIX}/lib/plplotada
 	${BSD_INSTALL_DATA} ada/build/lib/*.ali \
 		${DESTDIR}${PREFIX}/lib/plplotada
diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile
index 6c7fb4419749..8dc292b2256c 100644
--- a/math/superlu_mt/Makefile
+++ b/math/superlu_mt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	superlu_mt
 PORTVERSION=	2.0.20080115
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 MASTER_SITES=	http://crd.lbl.gov/~xiaoye/SuperLU/ \
 		http://crd.lbl.gov/~xiaoye/:doc
@@ -104,7 +104,7 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_LIB} ${WRKDIR}/tmp_static/libsuperlu_mt.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKDIR}/tmp_static/libsuperlu_mt.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKDIR}/tmp_shared/libsuperlu_mt.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib
 	cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s -f libsuperlu_mt.so.${SVERSION} libsuperlu_mt.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
diff --git a/security/axTLS/Makefile b/security/axTLS/Makefile
index f106b56e4cdd..15d6eab9350e 100644
--- a/security/axTLS/Makefile
+++ b/security/axTLS/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	axTLS
 PORTVERSION=	1.4.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security devel net
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME:tl}/${PORTVERSION}
@@ -102,7 +102,7 @@ post-build:
 .endif
 
 do-install:
-	${INSTALL_LIB} ${STAGE}/libaxtls.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${STAGE}/libaxtls.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${STAGE}/libaxtls.so.1.2 ${STAGEDIR}${PREFIX}/lib
 	${LN} -s libaxtls.so.1.2 ${STAGEDIR}${PREFIX}/lib/libaxtls.so.1
 	${LN} -fs libaxtls.so.1 ${STAGEDIR}${PREFIX}/lib/libaxtls.so
diff --git a/security/keynote/Makefile b/security/keynote/Makefile
index 58b97ad71119..bed131e0f48d 100644
--- a/security/keynote/Makefile
+++ b/security/keynote/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	keynote
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www1.cs.columbia.edu/~angelos/Code/
 
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Trust-Management System
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKWRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake		# required to support parallel (-jX) builds
 USE_OPENSSL=	yes
@@ -29,7 +29,7 @@ OPTIONS_DEFINE=	DOCS
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/keynote ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/keynote.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/libkeynote.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libkeynote.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_MAN} ${WRKSRC}/man/keynote.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/man/keynote.3 ${STAGEDIR}${MANPREFIX}/man/man3
 	${INSTALL_MAN} ${WRKSRC}/man/keynote.4 \