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

Approved by:	portmgr blanket
MFH:		2015Q2

19 files changed, 46 insertions, 31 deletions

diff --git a/astro/cfitsio/Makefile b/astro/cfitsio/Makefile
index 0b3dab7ce2b6..2bacb7d68eec 100644
--- a/astro/cfitsio/Makefile
+++ b/astro/cfitsio/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cfitsio
 PORTVERSION=	3.370
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ \
 		http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/oldvers/ \
@@ -39,7 +40,8 @@ SHLIB_MINOR_VER=${PORTVERSION:S/0$//}
 
 do-install:
 	cd ${WRKSRC}/ && ${INSTALL_DATA} drvrsmem.h fitsio.h fitsio2.h longnam.h ${STAGEDIR}${PREFIX}/include/
-	cd ${WRKSRC}/ && ${INSTALL_LIB} libcfitsio.a libcfitsio.so.${SHLIB_MAJOR_VER}.${SHLIB_MINOR_VER} ${STAGEDIR}${PREFIX}/lib/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} libcfitsio.a ${STAGEDIR}${PREFIX}/lib/
+	cd ${WRKSRC}/ && ${INSTALL_LIB} libcfitsio.so.${SHLIB_MAJOR_VER}.${SHLIB_MINOR_VER} ${STAGEDIR}${PREFIX}/lib/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} cfitsio.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 	${LN} -fs libcfitsio.so.${SHLIB_MAJOR_VER}.${SHLIB_MINOR_VER} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so.${SHLIB_MAJOR_VER}
 	${LN} -fs libcfitsio.so.${SHLIB_MAJOR_VER} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so
diff --git a/comms/libfec/Makefile b/comms/libfec/Makefile
index 3974f3526185..9330e2b0ab24 100644
--- a/comms/libfec/Makefile
+++ b/comms/libfec/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libfec
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	comms astro hamradio math
 MASTER_SITES=	http://www.ka9q.net/code/fec/ \
 		${MASTER_SITE_LOCAL}
@@ -39,7 +40,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib
 	@${MKDIR} ${STAGEDIR}${MAN3PREFIX}/man/man3
 	${INSTALL_DATA} ${WRKSRC}/fec.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/libfec.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libfec.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libfec.so ${STAGEDIR}${PREFIX}/lib
 .for _man in dsp.3 simd-viterbi.3 rs.3
 	${INSTALL_MAN} ${WRKSRC}/${_man} ${STAGEDIR}${MAN3PREFIX}/man/man3
diff --git a/databases/leveldb/Makefile b/databases/leveldb/Makefile
index 8c92faba1b4b..e486e7b59861 100644
--- a/databases/leveldb/Makefile
+++ b/databases/leveldb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	leveldb
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -55,9 +56,9 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/leveldb/ ${STAGEDIR}${PREFIX}/include/memenv/ ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/include/leveldb/* ${STAGEDIR}${PREFIX}/include/leveldb/
 	${INSTALL_DATA} ${WRKSRC}/helpers/memenv/memenv.h ${STAGEDIR}${PREFIX}/include/memenv/
-	${INSTALL_LIB} ${WRKSRC}/libleveldb.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/libleveldb.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_LIB} ${WRKSRC}/libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/
-	${INSTALL_LIB} ${WRKSRC}/libmemenv.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/libmemenv.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_LIB} ${WRKSRC}/libmemenv.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/
 	${LN} -fs libleveldb.so.${SHLIB_MAJOR} ${STAGEDIR}${PREFIX}/lib/libleveldb.so
 	${LN} -fs libleveldb.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libleveldb.so.${SHLIB_MAJOR}
diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile
index 432cb886dd9a..828222c8d93b 100644
--- a/databases/lmdb/Makefile
+++ b/databases/lmdb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lmdb
 PORTVERSION=	0.9.14
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/delphij
 #		https://gitorious.org/${GO_ACCOUNT}/${GO_PROJECT}/archive/${GO_TAGNAME}.tar.gz?dummy=
@@ -27,7 +28,7 @@ FETCH_ARGS?=	-o ${DISTDIR}/${DISTFILES}
 MDB_APPS=	copy dump load stat
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/liblmdb.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/liblmdb.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_LIB} ${WRKSRC}/liblmdb.so ${STAGEDIR}${PREFIX}/lib/liblmdb.so.0
 	${LN} -sf liblmdb.so.0 ${STAGEDIR}${PREFIX}/lib/liblmdb.so
 .for f in ${MDB_APPS}
diff --git a/databases/mysac/Makefile b/databases/mysac/Makefile
index 231e92ebc44a..4c738d5f10c5 100644
--- a/databases/mysac/Makefile
+++ b/databases/mysac/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mysac
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.arpalert.org/src/ \
 		http://xz.cx/downloads/mysac/
@@ -28,7 +29,7 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/libmysac.so \
 		${STAGEDIR}${PREFIX}/lib/libmysac.so
 	${LN} -sf libmysac.so ${STAGEDIR}${PREFIX}/lib/libmysac.so.0
-	${INSTALL_LIB} ${WRKSRC}/libmysac-static.a ${STAGEDIR}${PREFIX}/lib/libmysac-static.a
+	${INSTALL_DATA} ${WRKSRC}/libmysac-static.a ${STAGEDIR}${PREFIX}/lib/libmysac-static.a
 	${INSTALL_DATA} ${WRKSRC}/mysac.h ${STAGEDIR}${PREFIX}/include/mysac.h
 
 .include <bsd.port.pre.mk>
diff --git a/devel/glui/Makefile b/devel/glui/Makefile
index c47ebb28adbf..1ce24ead188e 100644
--- a/devel/glui/Makefile
+++ b/devel/glui/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	glui
 PORTVERSION=	2.36
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel graphics
 MASTER_SITES=	SF/${PORTNAME}/Source/${PORTVERSION}
 
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/GL/glui.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/lib/libglui.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/libglui.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/libglui.so \
 		${STAGEDIR}${PREFIX}/lib/libglui.so.0
 	${LN} -s libglui.so.0 ${STAGEDIR}${PREFIX}/lib/libglui.so
diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile
index 76b118297c50..26fce8c5427f 100644
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	raknet
 PORTVERSION=	3.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	devel net
 MASTER_SITES=	http://www.jenkinssoftware.com/raknet/downloads/ \
@@ -61,7 +61,7 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/Lib/DLL/libRakNetDynamic.so \
 		${STAGEDIR}${PREFIX}/lib/libraknet.so.0
 	${LN} -sf ${PREFIX}/lib/libraknet.so.0 ${STAGEDIR}${PREFIX}/lib/libraknet.so
-	${INSTALL_LIB} ${WRKSRC}/Lib/LibStatic/libRakNetStatic.a \
+	${INSTALL_DATA} ${WRKSRC}/Lib/LibStatic/libRakNetStatic.a \
 		${STAGEDIR}${PREFIX}/lib/libraknet.a
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/Help
 	(cd ${WRKSRC}/Help/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/Help)
diff --git a/ftp/ftplib/Makefile b/ftp/ftplib/Makefile
index 76091f183073..c5fe8659d02e 100644
--- a/ftp/ftplib/Makefile
+++ b/ftp/ftplib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ftplib
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	http://nbpfaus.net/~pfau/ftplib/
 
@@ -33,7 +34,8 @@ do-install:
 	${LN} -sf qftp ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/ftplib.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/libftp.a ${WRKSRC}/libftp.so.4 ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libftp.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libftp.so.4 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf libftp.so.4 ${STAGEDIR}${PREFIX}/lib/libftp.so
 
 .include <bsd.port.mk>
diff --git a/games/libdungeonmaker/Makefile b/games/libdungeonmaker/Makefile
index ebf9aa508272..b24a69b03ebf 100644
--- a/games/libdungeonmaker/Makefile
+++ b/games/libdungeonmaker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libdungeonmaker
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	games devel
 MASTER_SITES=	SF/dungeonmaker/dungeonmaker/${PORTVERSION}
 DISTNAME=	dungeonmaker-${PORTVERSION}
@@ -21,7 +22,7 @@ MAKEFILE=	Makefile.bsd
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/libdungeonmaker.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libdungeonmaker.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libdungeonmaker.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libdungeonmaker.so.2 ${STAGEDIR}${PREFIX}/lib
 	${INSTALL} ${WRKSRC}/DungeonMaker.h ${STAGEDIR}${PREFIX}/include
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index b5e375559ab8..260654ca433d 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libshhcards
 PORTVERSION=	1.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 DISTNAME=	shhcards-${PORTVERSION}
@@ -19,7 +19,7 @@ MAKE_ENV=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/libshhcards.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libshhcards.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libshhcards.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libshhcards.so.1 ${STAGEDIR}${PREFIX}/lib
 	${INSTALL} ${WRKSRC}/shhcards.h ${STAGEDIR}${PREFIX}/include
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 3ac15ec1a268..3a1646a0f77b 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	1.11.2
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
@@ -144,7 +145,7 @@ post-patch:
 	@${RM} -fr ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 
 post-install:
-	${INSTALL_LIB} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme
 	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
 	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION}
diff --git a/graphics/libbpg/Makefile b/graphics/libbpg/Makefile
index 61dc815693fd..0d423d7c6b3e 100644
--- a/graphics/libbpg/Makefile
+++ b/graphics/libbpg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libbpg
 PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://bellard.org/bpg/
 
@@ -50,7 +51,7 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bpgview ${STAGEDIR}${PREFIX}/bin
 .endif
 	${INSTALL_DATA} ${WRKSRC}/libbpg.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/libbpg.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libbpg.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libbpg.so ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index e527a5e34e76..b0737a161b3e 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pgplot
 PORTVERSION=	5.2.2
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.astro.caltech.edu/pub/pgplot/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}
@@ -65,7 +65,8 @@ do-build:
 do-install:
 	@cd ${WRKSRC}; \
 	${INSTALL_PROGRAM} pgxwin_server pgdisp ${STAGEDIR}${PREFIX}/bin; \
-	${INSTALL_LIB} *.a *.so.5* ${STAGEDIR}${PREFIX}/lib; \
+	${INSTALL_DATA} *.a ${STAGEDIR}${PREFIX}/lib; \
+	${INSTALL_LIB} *.so.5* ${STAGEDIR}${PREFIX}/lib; \
 	${INSTALL_DATA} cpgplot.h ${STAGEDIR}${PREFIX}/include
 .for f in libcpgplot.so libpgplot.so
 	@${LN} -sf ${f}.5 ${STAGEDIR}${PREFIX}/lib/${f}
diff --git a/lang/p2c/Makefile b/lang/p2c/Makefile
index 4d086ab2e802..44ab01b9de83 100644
--- a/lang/p2c/Makefile
+++ b/lang/p2c/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	p2c
 PORTVERSION=	1.21a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	http://darkstar.ist.utl.pt/slackware/slackware_source/d/p2c/ \
 		http://www.slackware.at/data/slackware-10.0/source/d/p2c/
@@ -26,7 +26,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} p2cc \
 		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_LIB} libp2c.a \
+	(cd ${WRKSRC} && ${INSTALL_DATA} libp2c.a \
 		${STAGEDIR}${PREFIX}/lib)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/p2c
 	(cd ${WRKSRC} && ${INSTALL_DATA} p2c.h \
diff --git a/math/R/Makefile b/math/R/Makefile
index 7ba21e49beb6..aeb144548fb1 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	R
 PORTVERSION=	3.0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math lang
 MASTER_SITES=	http://cran.r-project.org/%SUBDIR%/ \
 		ftp://cran.r-project.org/pub/R/%SUBDIR%/ \
@@ -350,7 +350,7 @@ do-build:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/R/lib
-	@${INSTALL_LIB} ${WRKSRC}/src/main/libR.a ${STAGEDIR}${PREFIX}/lib/R/lib
+	@${INSTALL_DATA} ${WRKSRC}/src/main/libR.a ${STAGEDIR}${PREFIX}/lib/R/lib
 
 .else # LIBR_SLAVEPORT
 
diff --git a/math/cblas/Makefile b/math/cblas/Makefile
index 19401186a008..30fdc9b65aa7 100644
--- a/math/cblas/Makefile
+++ b/math/cblas/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cblas
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	NL/blas/blast-forum/ LOCAL/bf
 DISTFILES=	cblas.tgz
@@ -123,15 +123,15 @@ test-${o:tl}: build-${o:tl}
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
 .if ${PORT_OPTIONS:MSTATIC}
-	@${INSTALL_LIB} ${WRKSRC}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib
+	@${INSTALL_DATA} ${WRKSRC}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib
 .endif
 .if ${PORT_OPTIONS:MSHARED}
-	@${INSTALL_LIB} ${WRKSRC_SHARED}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_pic.a
+	@${INSTALL_DATA} ${WRKSRC_SHARED}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_pic.a
 	@${INSTALL_LIB} ${WRKSRC_SHARED}/lib/libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib
 	@${LN} -sf libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libcblas.so
 .endif
 .if ${PORT_OPTIONS:MPROFILE}
-	@${INSTALL_LIB} ${WRKSRC_PROFILE}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_p.a
+	@${INSTALL_DATA} ${WRKSRC_PROFILE}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_p.a
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/foma/Makefile b/math/foma/Makefile
index 4da3c91753fd..2b2f484f6c7d 100644
--- a/math/foma/Makefile
+++ b/math/foma/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	foma
 PORTVERSION=	0.9.17
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -17,7 +18,7 @@ USE_LDCONFIG=	yes
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_DATA} fomalib.h fomalibconf.h ${STAGEDIR}${PREFIX}/include/)
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} foma flookup cgflookup ${STAGEDIR}${PREFIX}/bin/)
-	${INSTALL_LIB} ${WRKSRC}/libfoma.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/libfoma.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_LIB} ${WRKSRC}/libfoma.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfoma.so.0
 	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s libfoma.so.0 libfoma.so)
 
diff --git a/math/kktdirect/Makefile b/math/kktdirect/Makefile
index 898e315a6a61..963a15e8ac72 100644
--- a/math/kktdirect/Makefile
+++ b/math/kktdirect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kktdirect
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://www.cs.ubc.ca/~rbridson/download/ LOCAL/bf
 DISTNAME=	KKTDirect${PORTVERSION}
@@ -82,8 +82,9 @@ check regression-test test: build
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/kktdirect.h ${STAGEDIR}${PREFIX}/include
-	@cd ${WRKDIR}; ${INSTALL_LIB} libkktdirect.a libkktdirect_pic.a \
-	libkktdirect.so.0 ${STAGEDIR}${PREFIX}/lib
+	@cd ${WRKDIR} && ${INSTALL_DATA} libkktdirect.a libkktdirect_pic.a \
+		${STAGEDIR}${PREFIX}/lib
+	@cd ${WRKDIR} && ${INSTALL_LIB} libkktdirect.so.0 ${STAGEDIR}${PREFIX}/lib
 	@cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libkktdirect.so.0 libkktdirect.so
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/textproc/libflate/Makefile b/textproc/libflate/Makefile
index 9f281f564808..ad278dbdad22 100644
--- a/textproc/libflate/Makefile
+++ b/textproc/libflate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libflate
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://flate.dead-inside.org/
 
@@ -15,6 +16,6 @@ MAKE_ARGS+=	CC="${CC}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/checktpl ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
 
 .include <bsd.port.mk>