Rename INSTALLS_SHLIBS to INSTALLS_SHLIB. (There was a typo in the

previous commit message to bsd.port.mk, which said INSTALL_SHLIBS. Boo.) Line up the rhs of variable assignments nicely. Remove a couple of extra whitespaces while I'm here. Suggested by: sobomax
author: Satoshi Asami <asami@FreeBSD.org> 2000-06-16 21:52:40 +0000
committer: Satoshi Asami <asami@FreeBSD.org> 2000-06-16 21:52:40 +0000
commit: ffb21b5654e56c5c34ac39799d4746eb84c17ecc (patch)
tree: b1e4b6e4fe103d42cf22f4306aad320232380044
parent: 6ee8c0d0843a0c7e67e60565ca3dd4dc2fdbcdcb (diff)
download: ports-ffb21b5654e56c5c34ac39799d4746eb84c17ecc.tar.gz
ports-ffb21b5654e56c5c34ac39799d4746eb84c17ecc.zip
423 files changed, 435 insertions, 435 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index b3b4f0a41328..32d19624dc45 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -412,11 +412,11 @@ FreeBSD_MAINTAINER=	asami@FreeBSD.org
 #				  (default: ${WRKDIR}/.PLIST.mktmp).
 # PLIST_SUB		- List of "variable=value" pair for substitution in ${PLIST}
 # 				  (default: see below).
-# INSTALLS_SHLIBS - If set, bsd.port.mk will automatically run ldconfig commands
+# INSTALLS_SHLIB - If set, bsd.port.mk will automatically run ldconfig commands
 #				  from post-install and also add appropriate @exec/@unexec
 #				  directives to directories listed in LDCONFIG_DIRS.
 # LDCONFIG_DIRS - List of directories to run ldconfig if
-#				  INSTALLS_SHLIBS is set (default: %%PREFIX%%/lib).
+#				  INSTALLS_SHLIB is set (default: %%PREFIX%%/lib).
 #				  Note that this is passed through sed just like the
 #				  rest of PLIST, so ${PLIST_SUB} substitutions also
 #				  apply here.  It is recommended that you use
@@ -1247,7 +1247,7 @@ _MANPAGES:=	${_MANPAGES:S/$/.gz/}
 
 # Put this for down as possible so it will catch all PLIST_SUB definitions.
 
-.if defined(INSTALLS_SHLIBS)
+.if defined(INSTALLS_SHLIB)
 LDCONFIG_DIRS?=	%%PREFIX%%/lib
 LDCONFIG_PLIST!=	${ECHO} ${LDCONFIG_DIRS} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
 LDCONFIG_RUNLIST!=	${ECHO} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!"
@@ -1875,7 +1875,7 @@ _PORT_USE: .USE
 .if make(real-install) && (defined(_MANPAGES) || defined(_MLINKS))
 	@cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} compress-man
 .endif
-.if make(real-install) && defined(INSTALLS_SHLIBS)
+.if make(real-install) && defined(INSTALLS_SHLIB)
 	@${ECHO_MSG} "===>   Running ldconfig"
 	${LDCONFIG} -m ${LDCONFIG_RUNLIST}
 .endif
@@ -2662,7 +2662,7 @@ generate-plist:
 .endfor
 	@${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}
 	@${ECHO} "@unexec if [ -f %D/info/dir ]; then if sed -e '1,/Menu:/d' %D/info/dir | grep -q '^[*] '; then true; else rm %D/info/dir; fi; fi" >> ${TMPPLIST}
-.if defined(INSTALLS_SHLIBS)
+.if defined(INSTALLS_SHLIB)
 	@${ECHO} "@exec ${LDCONFIG} -m ${LDCONFIG_PLIST}" >> ${TMPPLIST}
 	@${ECHO} "@unexec ${LDCONFIG} -R" >> ${TMPPLIST}
 .endif
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index 8f4869bff570..9ea723fe32ce 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	obrien@FreeBSD.org
 
 FETCH_BEFORE_ARGS=	-b
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		bzip2.1
 MLINKS=		bzip2.1 bunzip2.1   bzip2.1 bzcat.1   bzip2.1 bz2cat.1 \
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index 319a8bacffe7..f52d96490d92 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	libs/compression
 MAINTAINER=	ports@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 319a8bacffe7..f52d96490d92 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	libs/compression
 MAINTAINER=	ports@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index a6e33408f2f4..fcdf4713e3d4 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -16,6 +16,6 @@ MAINTAINER=	vanilla@FreeBSD.org
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 7286cf39d427..c75381aff2b0 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/gsm-1.0-pl10
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		toast.1
 MAN3=		gsm.3 gsm_explode.3 gsm_option.3 gsm_print.3
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 77888573d2f2..42ae3ab8b53b 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	audiofile-${PORTVERSION}
 MAINTAINER=	vanilla@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAKE_ARGS=	"-E CFLAGS"
 
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 199bef75dd45..5e73216ed2fc 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -13,6 +13,6 @@ MASTER_SITES=	ftp://cdcd.undergrid.net/libcdaudio/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 1af45f3bae6b..9103cc9d8c9b 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	mharo@FreeBSD.org
 LIB_DEPENDS=	esd.2:${PORTSDIR}/audio/esound
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
 MAN1=	libmikmod-config.1
diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index 7719796eb846..efae89beb1ab 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://developer.icecast.org/libshout/releases/
 MAINTAINER=	zach@pabst.bendnet.com
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/audio/libshout2/Makefile b/audio/libshout2/Makefile
index 7719796eb846..efae89beb1ab 100644
--- a/audio/libshout2/Makefile
+++ b/audio/libshout2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://developer.icecast.org/libshout/releases/
 MAINTAINER=	zach@pabst.bendnet.com
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 86193bfcbd2d..8b79d6351863 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	sec@42.org
 WRKSRC=		${WRKDIR}/lib${PKGNAME}
 USE_XLIB=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index 86193bfcbd2d..8b79d6351863 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	sec@42.org
 WRKSRC=		${WRKDIR}/lib${PKGNAME}
 USE_XLIB=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index 873c32dfbebf..85f866f9d128 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	jim@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/libworkman
 USE_IMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-patch:
 	@${CP} ${WRKSRC}/Config ${WRKSRC}/Config.orig;
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index b0faddaaf86f..9b2642c322ea 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 ALL_TARGET=	World
 # no need to "xmkmf -a" and create the Makefiles twice -- see above
 XMKMF=		xmkmf
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index 86193bfcbd2d..8b79d6351863 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	sec@42.org
 WRKSRC=		${WRKDIR}/lib${PKGNAME}
 USE_XLIB=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile
index 6b00bbe409f3..3da32c2bf331 100644
--- a/audio/sphinx/Makefile
+++ b/audio/sphinx/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	sphinx2-0.2
 MAINTAINER=	trevor@jpj.net
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
 # contains i386 sound code
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 7b69f3b99505..d6e86389b9b2 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
 RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
 
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 MAKE_ARGS=	"-E CFLAGS"
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 7e79560ddafb..2cd58e282f2f 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .if defined(WITH_GNOME)
 CONFIGURE_ARGS=	--with-gnome
@@ -38,7 +38,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
- 		GLIB_CONFIG="${GLIB_CONFIG}" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 2986fe9420e6..c5988c78cbfd 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -22,7 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-gtk-config=${GTK_CONFIG}
 
 MAN1=		gschem.1 gnetlist.1
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/converters/iconv/Makefile b/converters/iconv/Makefile
index 4d74d266622b..d06d5c720f51 100644
--- a/converters/iconv/Makefile
+++ b/converters/iconv/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.urc.ac.ru/pub/OS/FreeBSD/converters/
 
 MAINTAINER=	joy@urc.ac.ru
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		iconv.1
 MAN3=		iconv.3 iconv_close.3 iconv_open.3
diff --git a/converters/kdesupport11/Makefile b/converters/kdesupport11/Makefile
index 59ede63a572f..9b9e51ccfbc4 100644
--- a/converters/kdesupport11/Makefile
+++ b/converters/kdesupport11/Makefile
@@ -18,7 +18,7 @@ USE_BZIP2=	yes
 
 USE_QT=		yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--without-libjpeg --without-libgif \
 		--without-libgdbm --without-libuulib
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)" INSTALL_SCRIPT="install -c -m 555"
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index e6d26d03bbc4..abf7378a4822 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	will@FreeBSD.org
 MOC=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/converters/libutf-8/Makefile b/converters/libutf-8/Makefile
index 380a11b7c508..ba90bfef7aa3 100644
--- a/converters/libutf-8/Makefile
+++ b/converters/libutf-8/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	libutf-8-1.0
 
 MAINTAINER=	adam@whizkidtech.net
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN3=		libutf-8.3 fgetu8.3 fputu8.3 sgetu8.3 sputu8.3
 
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 6e8dec78dcf3..146d849c9475 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	recode
 MAINTAINER=	torstenb@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		recode.1
 
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 6a8e21241c01..9c8d8308f0b2 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	uudeview-${PORTVERSION}
 MAINTAINER=	hoek@FreeBSD.org
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN3=		uulib.3
 
diff --git a/databases/db/Makefile b/databases/db/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db2/Makefile b/databases/db2/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db2/Makefile
+++ b/databases/db2/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db33/Makefile b/databases/db33/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db33/Makefile
+++ b/databases/db33/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db41/Makefile b/databases/db41/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db41/Makefile
+++ b/databases/db41/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db42/Makefile b/databases/db42/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db42/Makefile
+++ b/databases/db42/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db43/Makefile b/databases/db43/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db43/Makefile
+++ b/databases/db43/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db44/Makefile b/databases/db44/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db44/Makefile
+++ b/databases/db44/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db45/Makefile b/databases/db45/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db45/Makefile
+++ b/databases/db45/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db46/Makefile b/databases/db46/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/db47/Makefile b/databases/db47/Makefile
index 3150c3af63e3..9b1fe8a00a1e 100644
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@@ -17,7 +17,7 @@ Y2K=		http://www.sleepycat.com/faq.html#A8
 MANUAL_PACKAGE_BUILD=	incompatible with libc internal db calls
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 9ebe97593172..f14b40bae009 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	midom@dammit.lt
 WRKSRC=		${WRKDIR}/freetds
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-tdsver=7.0 \
 		--enable-dbmfix
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 9ebe97593172..f14b40bae009 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	midom@dammit.lt
 WRKSRC=		${WRKDIR}/freetds
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-tdsver=7.0 \
 		--enable-dbmfix
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index b2f449648e03..c943ff819238 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	gdbm
 MAINTAINER=	bjn@visi.com
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN3=		gdbm.3
 
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index ac1a6f03c907..03fda73a355e 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	rcarter@pinyon.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/builds
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	../unix/aclocal.m4
 CONFIGURE_SCRIPT= ../unix/configure
 MAKE_ARGS=	CXXFLAGS="-Dq4_STD ${CFLAGS}"
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 782f23057668..09808fdfea86 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -16,7 +16,7 @@ USE_PERL5=	yes
 MAKE_ENV+=	PERL=${PERL}
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared=yes
 CONFIGURE_ENV=	PERL=${PERL}
 
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 782f23057668..09808fdfea86 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -16,7 +16,7 @@ USE_PERL5=	yes
 MAKE_ENV+=	PERL=${PERL}
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared=yes
 CONFIGURE_ENV=	PERL=${PERL}
 
diff --git a/databases/typhoon/Makefile b/databases/typhoon/Makefile
index a806b5465914..d5d4d28f7976 100644
--- a/databases/typhoon/Makefile
+++ b/databases/typhoon/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 
 HAS_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN3=d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \
      d_dbget.3 d_dbset.3 d_delete.3 d_fillnew.3 d_getsequence.3 d_keyfind.3 \
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index cea63a965541..4c40a97a2164 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.unixodbc.org/
 MAINTAINER=	nsayer@FreeBSD.org
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 .if defined(WITH_X)
 USE_XLIB=	yes
 CONFIGURE_ARGS+=--enable-gui
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/devel/ORBacus/Makefile b/devel/ORBacus/Makefile
index 133d3f0d43b9..63c0cd148d64 100644
--- a/devel/ORBacus/Makefile
+++ b/devel/ORBacus/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	OB-${PORTVERSION}
 MAINTAINER=	ejc@bazzle.com
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 HAS_CONFIGURE=	yes
 USE_NEWGCC=	yes
 CONFIGURE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index a2432240994f..04151e07b3bf 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -20,7 +20,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libIDL/configure popt/configure
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 CONFIGURE_ARGS= --disable-indent
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index a2432240994f..04151e07b3bf 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -20,7 +20,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libIDL/configure popt/configure
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 CONFIGURE_ARGS= --disable-indent
diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index 9321a918b996..8686d4ede600 100644
--- a/devel/SWIG-devel/Makefile
+++ b/devel/SWIG-devel/Makefile
@@ -21,12 +21,12 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
 PLIST_SUB+=     VER="1.3"
-		
+
 .include <bsd.port.mk>
diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile
index 9321a918b996..8686d4ede600 100644
--- a/devel/SWIG/Makefile
+++ b/devel/SWIG/Makefile
@@ -21,12 +21,12 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
 PLIST_SUB+=     VER="1.3"
-		
+
 .include <bsd.port.mk>
diff --git a/devel/amulet/Makefile b/devel/amulet/Makefile
index f7e2836b5722..af7cd0b07e95 100644
--- a/devel/amulet/Makefile
+++ b/devel/amulet/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	bovynf@awe.be
 
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		$(WRKDIR)/amulet
 MAKE_ENV=	AMULET_DIR=$(WRKSRC) AMULET_VARS_FILE=Makefile.vars.gcc.FreeBSD
 
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 4c68c4fe130c..5f86d5fec6ea 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -25,7 +25,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libefs/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 4e6dd5b58d12..00675f9b5bf8 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	obrien@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 ALL_TARGET=	default
 
 MAN3=	cdk_alphalist.3 cdk_binding.3 cdk_buttonbox.3 cdk_calendar.3 cdk_cdk.3 \
diff --git a/devel/fastcrc/Makefile b/devel/fastcrc/Makefile
index 7a5cf83c01b4..4d742196ebc2 100644
--- a/devel/fastcrc/Makefile
+++ b/devel/fastcrc/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 ONLY_FOR_ARCHS=	i386
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libfcrc.so.1 ${PREFIX}/lib
diff --git a/devel/flux/Makefile b/devel/flux/Makefile
index 5f3fa5733e99..8a48b676ea8b 100644
--- a/devel/flux/Makefile
+++ b/devel/flux/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.styx.net/projects/flux/
 MAINTAINER=	will@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
 post-install:
diff --git a/devel/freelibiberty/Makefile b/devel/freelibiberty/Makefile
index 88b5f8d08161..4e24c3639424 100644
--- a/devel/freelibiberty/Makefile
+++ b/devel/freelibiberty/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	libiberty-${PORTVERSION}
 
 MAINTAINER=	howardjp@wam.umd.edu
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libiberty.a ${PREFIX}/lib
diff --git a/devel/gettext-devel/Makefile b/devel/gettext-devel/Makefile
index c66dce587751..7f88642da915 100644
--- a/devel/gettext-devel/Makefile
+++ b/devel/gettext-devel/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	gettext
 MAINTAINER=	reg@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
diff --git a/devel/gettext-old/Makefile b/devel/gettext-old/Makefile
index c66dce587751..7f88642da915 100644
--- a/devel/gettext-old/Makefile
+++ b/devel/gettext-old/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	gettext
 MAINTAINER=	reg@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index c66dce587751..7f88642da915 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	gettext
 MAINTAINER=	reg@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
 
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 5856940bfc1e..4af216fca9a1 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 MAINTAINER=	vanilla@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
 
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index 5856940bfc1e..4af216fca9a1 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 MAINTAINER=	vanilla@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
 
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 5856940bfc1e..4af216fca9a1 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 MAINTAINER=	vanilla@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
 
diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile
index 08b406ba1610..6e9aedefc28b 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	libPropList-${PORTVERSION}
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_AUTOCONF=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libU77/Makefile b/devel/libU77/Makefile
index 6c7fcad1f88f..7d945ed1b47b 100644
--- a/devel/libU77/Makefile
+++ b/devel/libU77/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://flo.mech.eng.usyd.edu.au/~norris/src/
 
 MAINTAINER=	ports@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 pre-build:
 	${CP} ${FILESDIR}/makefile.lib ${WRKSRC}/Makefile
diff --git a/devel/libcache/Makefile b/devel/libcache/Makefile
index 6219c89f440f..8d054577c4d0 100644
--- a/devel/libcache/Makefile
+++ b/devel/libcache/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.afro-productions.com/
 
 MAINTAINER=	will@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-shared
 WRKSRC=		${WRKDIR}/libcache
diff --git a/devel/libdlmalloc/Makefile b/devel/libdlmalloc/Makefile
index cc5757abc98e..7fccad2886c6 100644
--- a/devel/libdlmalloc/Makefile
+++ b/devel/libdlmalloc/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	malloc-2.6.5.c
 MAINTAINER=	roberto@FreeBSD.org
 
 NO_WRKSUBDIR=   yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 do-extract:
 	@${RM} -rf ${WRKDIR}
diff --git a/devel/libffi-devel/Makefile b/devel/libffi-devel/Makefile
index 9033938e3d80..664caf53e4ae 100644
--- a/devel/libffi-devel/Makefile
+++ b/devel/libffi-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://sourceware.cygnus.com/pub/libffi/
 MAINTAINER=	horance@freedom.ie.cycu.edu.tw
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	# empty
 
 .include <bsd.port.mk>
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile
index 9033938e3d80..664caf53e4ae 100644
--- a/devel/libffi/Makefile
+++ b/devel/libffi/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://sourceware.cygnus.com/pub/libffi/
 MAINTAINER=	horance@freedom.ie.cycu.edu.tw
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	# empty
 
 .include <bsd.port.mk>
diff --git a/devel/libgetline/Makefile b/devel/libgetline/Makefile
index 5cd99c8a939a..426ebdd58e09 100644
--- a/devel/libgetline/Makefile
+++ b/devel/libgetline/Makefile
@@ -17,6 +17,6 @@ MAN3=		getline.3
 
 WRKSRC=		${WRKDIR}/getline-39
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libgii/Makefile b/devel/libgii/Makefile
index beba0caedfe6..15c512b5d2ef 100644
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	mwest@uct.ac.za
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 # NOTE: We can not define USE_LIBTOOL for this port to build.
 #USE_LIBTOOL=	yes
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 9a2edcd3822b..dedc9b949068 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 9a2edcd3822b..dedc9b949068 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/devel/libgnugetopt/Makefile b/devel/libgnugetopt/Makefile
index 1e5831a45467..8b60e38e8376 100644
--- a/devel/libgnugetopt/Makefile
+++ b/devel/libgnugetopt/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= 	ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/obrien/
 
 MAINTAINER=	obrien@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/getopt.h ${PREFIX}/include
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 01452d55130d..036a794dbfb2 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -21,7 +21,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 01452d55130d..036a794dbfb2 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -21,7 +21,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
diff --git a/devel/libmalloc/Makefile b/devel/libmalloc/Makefile
index 42a90a235f94..ae12889e66f1 100644
--- a/devel/libmalloc/Makefile
+++ b/devel/libmalloc/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	malloc-${PORTVERSION}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/libol/Makefile b/devel/libol/Makefile
index ebd7807f6da7..bd54233fcb11 100644
--- a/devel/libol/Makefile
+++ b/devel/libol/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.balabit.hu/downloads/libol/0.2/
 MAINTAINER=	vince@blue-box.net
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libshhmsg/Makefile b/devel/libshhmsg/Makefile
index 27a6ba5ccded..4e9afac935df 100644
--- a/devel/libshhmsg/Makefile
+++ b/devel/libshhmsg/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	shhmsg-${PORTVERSION}
 MAINTAINER=	obrien@FreeBSD.org
 
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/libshhopt/Makefile b/devel/libshhopt/Makefile
index 2b2e137075ca..b7107c152953 100644
--- a/devel/libshhopt/Makefile
+++ b/devel/libshhopt/Makefile
@@ -14,7 +14,7 @@ DISTNAME=		shhopt-${PORTVERSION}
 MAINTAINER=		obrien@FreeBSD.org
 
 USE_GMAKE=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 50555f962862..9fe3cc62cbf0 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	JoeLu@JoeLu.m8.ntu.edu.tw
 
 GNU_CONFIGURE=	yes
 USE_NEWGCC=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index 50555f962862..9fe3cc62cbf0 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	JoeLu@JoeLu.m8.ntu.edu.tw
 
 GNU_CONFIGURE=	yes
 USE_NEWGCC=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 50555f962862..9fe3cc62cbf0 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	JoeLu@JoeLu.m8.ntu.edu.tw
 
 GNU_CONFIGURE=	yes
 USE_NEWGCC=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 98f040f4d7d2..737112d5d014 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	xaa+ports@timewasters.nl
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 #WRKSRC=		${WRKDIR}/slang
 
 ALL_TARGET=	all elf
diff --git a/devel/libxalloc/Makefile b/devel/libxalloc/Makefile
index 12ac7b884ee4..b8cc8ac61ff4 100644
--- a/devel/libxalloc/Makefile
+++ b/devel/libxalloc/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	xalloc-${PORTVERSION}
 MAINTAINER=	obrien@FreeBSD.org
 
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index d33952ac070a..4398b05758a8 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -14,6 +14,6 @@ MAINTAINER=	coda@cs.cmu.edu
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 628a4606b140..cdafde1e5a82 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -19,7 +19,7 @@ MICOVER=	`${ECHO} ${DISTNAME} | ${SED} 's/mico-//'`
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_NEWGCC=	yes
 
 .if defined(QT2)
diff --git a/devel/mm/Makefile b/devel/mm/Makefile
index 780a5731c814..ba6f33f4f735 100644
--- a/devel/mm/Makefile
+++ b/devel/mm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.engelschall.com/sw/mm/ \
 
 MAINTAINER=	rse@engelschall.com
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		mm-config.1
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index e230fe15e688..30be96354182 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	rpm2cpio:${PORTSDIR}/misc/rpm \
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/newt-0.50
 VERSION=	0
 MAKE_ENV+=	prefix=${PREFIX} VERSION=${VERSION} CC=${CC} PCFLAGS="${CFLAGS}"
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 304e2eafc760..32c114747eec 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -23,7 +23,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--enable-static --enable-shared
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 1d57423040f4..954609d03004 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	export
 MAKE_ENV=	CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" \
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 1947daedf160..9adb47598cc8 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ycheng@sinica.edu.tw
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/devel/pth-devel/Makefile b/devel/pth-devel/Makefile
index b7a107ca9705..5884766e67d6 100644
--- a/devel/pth-devel/Makefile
+++ b/devel/pth-devel/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	rse@engelschall.com
 NO_LATEST_LINK=	yes
 NO_CDROM=	yes
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-pthread \
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 019980edf6cd..69bc12106722 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	pth
 
 MAINTAINER=	rse@engelschall.com
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--enable-pthread \
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 656924bc9293..72de56584f6f 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -16,6 +16,6 @@ LIB_DEPENDS=	lwp.1:${PORTSDIR}/devel/lwp
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index 4d9c7f9786b7..595a9ef2642b 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -16,6 +16,6 @@ LIB_DEPENDS=	lwp.1:${PORTSDIR}/devel/lwp
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile
index 940a3cfb4619..1005819d5cae 100644
--- a/devel/sdl-devel/Makefile
+++ b/devel/sdl-devel/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=		yes
 USE_XLIB=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV=		NASM="${LOCALBASE}/bin/nasm" \
diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile
index 75728acd9ec3..676e187c1a22 100644
--- a/devel/sdl/Makefile
+++ b/devel/sdl/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=		yes
 USE_XLIB=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		NASM="${LOCALBASE}/bin/nasm" \
 			LOCALBASE="${LOCALBASE}"
diff --git a/devel/sdl10/Makefile b/devel/sdl10/Makefile
index 75728acd9ec3..676e187c1a22 100644
--- a/devel/sdl10/Makefile
+++ b/devel/sdl10/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=		yes
 USE_XLIB=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		NASM="${LOCALBASE}/bin/nasm" \
 			LOCALBASE="${LOCALBASE}"
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 940a3cfb4619..1005819d5cae 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
 
 USE_GMAKE=		yes
 USE_XLIB=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV=		NASM="${LOCALBASE}/bin/nasm" \
diff --git a/devel/sip/Makefile b/devel/sip/Makefile
index 2b8136c62d7a..7389f55c11ea 100644
--- a/devel/sip/Makefile
+++ b/devel/sip/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	adsharma@home.com
 BUILD_DEPENDS=	${LOCALBASE}/include/python1.5/Python.h:${PORTSDIR}/lang/python
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_QT=		yes
 CONFIGURE_ARGS=	--enable-qt --with-qt-includes=${X11BASE}/include/X11/qt
 GNU_CONFIGURE=	yes
diff --git a/devel/str/Makefile b/devel/str/Makefile
index f54b0d725f24..5f36edb33e72 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.engelschall.com/sw/str/ \
 MAINTAINER=	rse@engelschall.com
 
 HAS_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 MAN1=		str-config.1
diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index cf7b0331db90..618fef768a35 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	ffi.2:${PORTSDIR}/devel/libffi \
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-defaultdir=${PREFIX} \
 		--with-tclincludedir=${PREFIX}/include/tcl8.2 \
 		--with-tkincludedir=${PREFIX}/include/tk8.2 \
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index 9321a918b996..8686d4ede600 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -21,12 +21,12 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
 PLIST_SUB+=     VER="1.3"
-		
+
 .include <bsd.port.mk>
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 9321a918b996..8686d4ede600 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -21,12 +21,12 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
 PLIST_SUB+=     VER="1.3"
-		
+
 .include <bsd.port.mk>
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 9321a918b996..8686d4ede600 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -21,12 +21,12 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
 		${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 
 USE_PERL5=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/SWIG${PORTVERSION}
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-tclincl=${PREFIX}/include/tcl8.2/ \
 		--with-tcllib=${PREFIX}/lib/tcl8.2/
 ALL_TARGET=     swig runtime
 PLIST_SUB+=     VER="1.3"
-		
+
 .include <bsd.port.mk>
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index 59d497651168..ea9704c7b432 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -14,6 +14,6 @@ MASTER_SITE_SUBDIR=	devel/lang/c++
 MAINTAINER=	ssigala@globalnet.it
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/dns/adns/Makefile b/dns/adns/Makefile
index 519bf62b0e61..df906fd019c9 100644
--- a/dns/adns/Makefile
+++ b/dns/adns/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	adns
 MAINTAINER=	lukin@okbmei.msk.su
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
 post-install:
diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index bf7e8c4ee8fd..2273e77214d7 100644
--- a/dns/hesiod/Makefile
+++ b/dns/hesiod/Makefile
@@ -23,7 +23,7 @@ MAN3=			hesiod.3 hesiod_end.3 hesiod_free_list.3 	\
 MAN5=			hesiod.conf.5
 
 GNU_CONFIGURE=		yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index c3461fb0f19b..bbab8a974677 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index a303a7e7fa1f..3030688e0de9 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		intl.1:${PORTSDIR}/devel/gettext
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_XLIB=       yes
 USE_GMAKE=      yes
 
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index c3461fb0f19b..bbab8a974677 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index c3461fb0f19b..bbab8a974677 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile
index c3461fb0f19b..bbab8a974677 100644
--- a/editors/koffice/Makefile
+++ b/editors/koffice/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index b673aba71e9f..41d13e4e819f 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	giffunip@asme.org
 
 WRKSRC=		$(WRKDIR)/twin
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	depend world
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 15221bef061a..ba5872da3c87 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 
 WRKSRC=		${WRKDIR}/wine-${PORTVERSION:S/.//g}
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/wine
 MAN1=		wine.1
 MAN5=		wine.conf.5
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 15221bef061a..ba5872da3c87 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 
 WRKSRC=		${WRKDIR}/wine-${PORTVERSION:S/.//g}
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/wine
 MAN1=		wine.1
 MAN5=		wine.conf.5
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index e82700dcd015..689d802dcf65 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	ncftp-${PORTVERSION}-src
 MAINTAINER=	obrien@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ncurses
 MAN1=		ncftp3.1 ncftpbatch.1 ncftpget.1 ncftpls.1 ncftpput.1
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index f9b35b3339e5..cd0b21c2b7d1 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -22,7 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile
index f9b35b3339e5..cd0b21c2b7d1 100644
--- a/games/gnomegames/Makefile
+++ b/games/gnomegames/Makefile
@@ -22,7 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index f9b35b3339e5..cd0b21c2b7d1 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -22,7 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index 37e6baf1458f..48417c6b5cdb 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_GMAKE=		yes
 USE_X_PREFIX=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 SOLIB=			libshhcards.so
 
 .include <bsd.port.pre.mk>
diff --git a/games/powerpak/Makefile b/games/powerpak/Makefile
index f8d9f71738f8..cd79ba6d2f10 100644
--- a/games/powerpak/Makefile
+++ b/games/powerpak/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl \
 
 MAKEFILE=	Makefile.FreeBSD
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-extract:
 	@ /usr/bin/find ${WRKSRC} -type f | xargs ${PERL} -pi -e 's/\r//g'
diff --git a/graphics/Cgraph/Makefile b/graphics/Cgraph/Makefile
index ab6ba33dc690..be7ea4e4401f 100644
--- a/graphics/Cgraph/Makefile
+++ b/graphics/Cgraph/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	tobez@plab.ku.dk
 
 WRKSRC=		${WRKDIR}/Cgraph/source
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-extract:
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/Makefile
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index 906c103aac45..0b4d65fd474e 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.3:${PORTSDIR}/graphics/png
 
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index 80d840e7a6c4..b72e4f2ab13e 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	http://tzo.linux.tucows.com/files/x11/dev/ \
 MAINTAINER=	will@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
 post-install:
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 7e4ec06be476..92f7b1126dd3 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -40,7 +40,7 @@ MAN5=		quantize.5
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 CONFIGURE_ARGS= --prefix=${PREFIX} --enable-shared --with-perl=${PERL5} \
 		--enable-16bit-pixel
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index b624fd2fd3c8..055180fb3dae 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index a71ec1e53699..5901a5c78fc5 100644
--- a/graphics/diacanvas/Makefile
+++ b/graphics/diacanvas/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index c42ed77cf5bb..61a97f1068c8 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.djvu.com/open/
 
 MAINTAINER=	mi@aldan.algebra.com
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 IS_INTERACTIVE=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index de941cfb4222..5ef9b5529583 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index f52d25594171..e6f749684217 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype \
 USE_XLIB=	yes
 .endif
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 pre-fetch:
 .if !defined(WITH_X11)
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index f52d25594171..e6f749684217 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype \
 USE_XLIB=	yes
 .endif
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 pre-fetch:
 .if !defined(WITH_X11)
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index f52d25594171..e6f749684217 100644
--- a/graphics/gd2/Makefile
+++ b/graphics/gd2/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype \
 USE_XLIB=	yes
 .endif
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 pre-fetch:
 .if !defined(WITH_X11)
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 23a6335ead14..c5b24c6f4149 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 36787d9a0fd1..3c818cbad5d0 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -23,7 +23,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 DOCDIR=		${PREFIX}/share/doc/libungif
 
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 6f1e935a8310..e31c449cf70f 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -36,7 +36,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 .if !defined(WITH_PERL)
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 6f1e935a8310..e31c449cf70f 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -36,7 +36,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 .if !defined(WITH_PERL)
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 6f1e935a8310..e31c449cf70f 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -36,7 +36,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 .if !defined(WITH_PERL)
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 6f1e935a8310..e31c449cf70f 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -36,7 +36,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 .if !defined(WITH_PERL)
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 6f1e935a8310..e31c449cf70f 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -36,7 +36,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 .if !defined(WITH_PERL)
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 6f1e935a8310..e31c449cf70f 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -36,7 +36,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 
 .if !defined(WITH_PERL)
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index 65c4044f3657..dab297fad783 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -19,7 +19,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 65c4044f3657..dab297fad783 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -19,7 +19,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 713507b4d2f3..3299b7086735 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -20,6 +20,6 @@ CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
 		--with-dps-libraries=${X11BASE}/lib
 CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config"
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 3a13d89858a9..74b6503703d6 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -24,7 +24,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 3a13d89858a9..74b6503703d6 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -24,7 +24,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 3a13d89858a9..74b6503703d6 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -24,7 +24,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index de0ddcd9823c..6e3308fb42e6 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	mi@aldan.algebra.com
 
 WRKSRC= ${WRKDIR}/${PORTNAME}
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=	jbgtopbm.1 pbmtojbg.1
 
diff --git a/graphics/jpeg-mmx/Makefile b/graphics/jpeg-mmx/Makefile
index c39f68aa20be..7b0ffb0720de 100644
--- a/graphics/jpeg-mmx/Makefile
+++ b/graphics/jpeg-mmx/Makefile
@@ -16,7 +16,7 @@ DISTNAME=       jpegsrc.v${PORTVERSION}
 MAINTAINER=	jseger@FreeBSD.org
 
 WRKSRC=         ${WRKDIR}/jpeg-6b
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 MAN1=		cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index c39f68aa20be..7b0ffb0720de 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -16,7 +16,7 @@ DISTNAME=       jpegsrc.v${PORTVERSION}
 MAINTAINER=	jseger@FreeBSD.org
 
 WRKSRC=         ${WRKDIR}/jpeg-6b
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static
 MAN1=		cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
diff --git a/graphics/lfview/Makefile b/graphics/lfview/Makefile
index 75f20bb4e04f..64fccd3038cc 100644
--- a/graphics/lfview/Makefile
+++ b/graphics/lfview/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	s974123@cc.matsuyama-u.ac.jp
 
 USE_IMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 NO_INSTALL_MANPAGES=	yes
 
 do-install:
diff --git a/graphics/libdjvu++/Makefile b/graphics/libdjvu++/Makefile
index c42ed77cf5bb..61a97f1068c8 100644
--- a/graphics/libdjvu++/Makefile
+++ b/graphics/libdjvu++/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.djvu.com/open/
 
 MAINTAINER=	mi@aldan.algebra.com
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 IS_INTERACTIVE=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 32c9126d0e44..a8120df04b5a 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	gii.0:${PORTSDIR}/devel/libgii
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gii=${PREFIX}
 
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index 0e07ef1fe6f5..cc3c903abdc9 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}/img1.2.2
 
 ALL_TARGET=	default
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.2 --with-tk=${PREFIX}/lib/tk8.2 \
 		--disable-stubs
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 36787d9a0fd1..3c818cbad5d0 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -23,7 +23,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 DOCDIR=		${PREFIX}/share/doc/libungif
 
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index a4fcbd5f1a98..bfcd1357566d 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype \
 		          -I${LOCALBASE}/include" \
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index bcf55d651db2..1a803d8d1e13 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.bic.mni.mcgill.ca/pub/mpeg/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OPTIMIZE="${CFLAGS}"
 
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index dfb57d9e0589..65bd321ae82c 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.3:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	merge
 INSTALL_TARGET=	install-merge install-dev
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index cf5732c24a48..e36af7ca5fcf 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -14,7 +14,7 @@ DISTNAME=       ${PORTNAME}${PORTVERSION}
 MAINTAINER=	jmz@FreeBSD.org
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/pgplot
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 8d8652595996..0aeb0fce0fc0 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	chuckr@FreeBSD.org
 
 USE_XLIB=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-libplotter --enable-libxmi
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index ac23d3cbeaf5..3296b21c63da 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -21,7 +21,7 @@ PATCHFILES=     libpng-1.0.6-patch-a.txt.gz \
 
 MAINTAINER=     ache@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN3=           libpng.3 libpngpf.3
 MAN5=           png.5
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index e74019aed032..cb087faea72c 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index e74019aed032..cb087faea72c 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index e74019aed032..cb087faea72c 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/smpeg/Makefile b/graphics/smpeg/Makefile
index fc2d23f5e26c..ebfe9135952c 100644
--- a/graphics/smpeg/Makefile
+++ b/graphics/smpeg/Makefile
@@ -19,7 +19,7 @@ GTK_CONFIG=	${X11BASE}/bin/gtk12-config
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		SDL_CONFIG="${SDL_CONFIG}" \
 		GLBASE="${X11BASE}" \
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 39ab0b5072e7..932ad16d2465 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ZIP --with-JPEG \
 		--with-DIR_BIN=${PREFIX}/bin \
diff --git a/graphics/tifmerge/Makefile b/graphics/tifmerge/Makefile
index a9d9340193ce..86f52cef2368 100644
--- a/graphics/tifmerge/Makefile
+++ b/graphics/tifmerge/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	adam@whizkidtech.net
 
 BUILD_DEPENDS=	tuc:${PORTSDIR}/converters/tuc
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_ZIP=	yes
 DIST_SUBDIR=	tifmerge
 MAN3=		tifmerge.3
diff --git a/graphics/twinlib/Makefile b/graphics/twinlib/Makefile
index 271cccc8c068..7eac387ebe58 100644
--- a/graphics/twinlib/Makefile
+++ b/graphics/twinlib/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/tmake:${PORTSDIR}/devel/tmake
 
 USE_QT=		yes
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/twinlib
 MAKE_ENV+=	PREFIX=${PREFIX} CXX=${CXX}
 VERSION=	0
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index a1262091f88c..29726e08d8ac 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libpbm.a:${PORTSDIR}/graphics/netpbm
 EXTRACT_ONLY=	urt-3.1b.tar.Z
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 NO_WRKSUBDIR=   yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	config/urt
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index cc5b4727eb59..cde32bd34a19 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://avahi.inria.fr/pub/xpm/
 MAINTAINER=	jseger@FreeBSD.org
 
 USE_IMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		cxpm.1 sxpm.1
 
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index 620c5f83f3f7..16ef7810a4dd 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	max@FreeBSD.org
 
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 ALL_TARGET=	canna
 INSTALL_TARGET=	install install.man
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index b3e5d23112b0..a035ebe46486 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	taoka@FreeBSD.org
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
 FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
 PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index b3e5d23112b0..a035ebe46486 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	taoka@FreeBSD.org
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
 FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
 PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index c63fc4867fe8..5ef5e4a81f8b 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 WRKSRC=		${WRKDIR}/src/contrib/im/Xsi
 DOCDIR=		${PREFIX}/share/doc/ja-Wnn6-lib
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 # Warning: we cannot use USE_IMAKE.
 do-build:
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index c63fc4867fe8..5ef5e4a81f8b 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 WRKSRC=		${WRKDIR}/src/contrib/im/Xsi
 DOCDIR=		${PREFIX}/share/doc/ja-Wnn6-lib
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 # Warning: we cannot use USE_IMAKE.
 do-build:
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 620c5f83f3f7..16ef7810a4dd 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	max@FreeBSD.org
 
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 ALL_TARGET=	canna
 INSTALL_TARGET=	install install.man
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 620c5f83f3f7..16ef7810a4dd 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	max@FreeBSD.org
 
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 ALL_TARGET=	canna
 INSTALL_TARGET=	install install.man
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 872ad7b9e82e..68576f8fe32a 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -50,7 +50,7 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 
 DIST_SUBDIR=	eb
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-zlib
 
 APPENDIXDIR=	${PREFIX}/share/eb/appendix
diff --git a/japanese/eb2/Makefile b/japanese/eb2/Makefile
index 872ad7b9e82e..68576f8fe32a 100644
--- a/japanese/eb2/Makefile
+++ b/japanese/eb2/Makefile
@@ -50,7 +50,7 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 
 DIST_SUBDIR=	eb
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-zlib
 
 APPENDIXDIR=	${PREFIX}/share/eb/appendix
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index 872ad7b9e82e..68576f8fe32a 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -50,7 +50,7 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 
 DIST_SUBDIR=	eb
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-zlib
 
 APPENDIXDIR=	${PREFIX}/share/eb/appendix
diff --git a/japanese/libjcode/Makefile b/japanese/libjcode/Makefile
index f5dd555475a7..150033effca1 100644
--- a/japanese/libjcode/Makefile
+++ b/japanese/libjcode/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	stanaka@bb.mbn.or.jp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}-${PORTVERSION}
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 do-install:
 	${INSTALL_DATA}	${WRKSRC}/libjcode.a	${PREFIX}/lib/libjcode.a
diff --git a/japanese/pine/Makefile b/japanese/pine/Makefile
index 34f0568f1415..1e2febbc6a93 100644
--- a/japanese/pine/Makefile
+++ b/japanese/pine/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	max@FreeBSD.org
 
 BROKEN_ELF=	yes
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 BUILD_DEPENDS=	${PREFIX}/lib/libcanna.a:${PORTSDIR}/japanese/Canna
diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index 30775eb203f6..1ea53fb4b93c 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	max@FreeBSD.org
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 EXTRACT_ONLY=	${DISTFILES:Ntexmflib-*}
 DIST_SUBDIR=	${PORTNAME}
diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile
index 30775eb203f6..1ea53fb4b93c 100644
--- a/japanese/ptex-common/Makefile
+++ b/japanese/ptex-common/Makefile
@@ -18,7 +18,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	max@FreeBSD.org
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 EXTRACT_ONLY=	${DISTFILES:Ntexmflib-*}
 DIST_SUBDIR=	${PORTNAME}
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index d080fd1a43a1..954a51bd9a01 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg/INSTALL.tclsh
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index 8244fcde802d..d9eb55a757d0 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	tcl76jp.1:${PORTSDIR}/japanese/tcl76
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 USE_AUTOCONF=	yes
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 7895aaf28d9e..622d3cfc677f 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -22,7 +22,7 @@ PLIST_SUB=	VFLIB_VERSION=${VFLIB_VERSION}
 
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-freetype \
 		--with-freetype-includedir=${PREFIX}/include \
 		--with-freetype-libdir=${PREFIX}/lib
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index c1d7d6b18b64..abe1edbde964 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		kaffe.1
 
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 9ffff2f391d7..97bc079d528c 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/cim/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 MAN1=		cim.1
 
 .include <bsd.port.mk>
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index ed4ec0488326..c78f613931e7 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS?=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/expect-5.31
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?= --enable-shared \
 		--with-tclconfig=${PREFIX}/lib/tcl8.2 \
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index a5910d7490c4..cc112c1229a8 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	guile
 MAINTAINER=	jseger@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure guile-readline/configure
 CONFIGURE_ARGS=	--with-threads
 
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 2b1430da430b..44cea5a43fb5 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	dmlb@ragnet.demon.co.uk
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
 
 WRKSRC=		${WRKDIR}/itcl3.0.1/itcl/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} ITCL_LIB_FILE=${ITCL_LIB_FILE}
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 8bdf851bbcee..936bfdc9c817 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -20,7 +20,7 @@ PLIST_SUB=	GNUHOST=${ARCH}--freebsd${OSREL} VERSION=${PORTVERSION}
 
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl"
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index 8bdf851bbcee..936bfdc9c817 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -20,7 +20,7 @@ PLIST_SUB=	GNUHOST=${ARCH}--freebsd${OSREL} VERSION=${PORTVERSION}
 
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lxpg4 -lintl"
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 704e4fa52af2..7c2c62d0ee45 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -14,10 +14,10 @@ MAINTAINER=	obonilla@fisicc-ufm.edu
 
 LIB_DEPENDS=    tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
-USE_AUTOCONF= yes
+USE_AUTOCONF=	yes
 PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg/INSTALL.tclsh
 PKGDEINSTALL=	${PORTSDIR}/lang/tcl82/pkg/DEINSTALL.tclsh
 
diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index 7163b81c16f9..c91e34186683 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -17,7 +17,7 @@ PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAKE_ENV=	MKDIR="${MKDIR}" OPTFLAGS="${CFLAGS}"
 MAN1=		rexx.1
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index b3739fb3fb17..a6a65d813bfd 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 MAINTAINER=	yasuf@bsdclub.org
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
 MAN1=		ruby.1
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
diff --git a/lang/ruby14/Makefile b/lang/ruby14/Makefile
index b3739fb3fb17..a6a65d813bfd 100644
--- a/lang/ruby14/Makefile
+++ b/lang/ruby14/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 MAINTAINER=	yasuf@bsdclub.org
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
 MAN1=		ruby.1
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index b3739fb3fb17..a6a65d813bfd 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 MAINTAINER=	yasuf@bsdclub.org
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
 MAN1=		ruby.1
 PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
diff --git a/lang/schemetoc/Makefile b/lang/schemetoc/Makefile
index b91135121d73..23610cf9fbb2 100644
--- a/lang/schemetoc/Makefile
+++ b/lang/schemetoc/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	jmacd@FreeBSD.org
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 NO_WRKSUBDIR=	yes
 MAN1=		scc.1 sci.1
 
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index 712b4b32b891..8e295624b272 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jkoshy@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 6a4f0f2ee68d..4b79debfbf3a 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -17,7 +17,7 @@ Y2K=            http://www.scriptics.com/Y2K.html
 
 NO_LATEST_LINK=	yes
 WRKSRC=		${WRKDIR}/tcl8.0.5/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
diff --git a/lang/tcl81-thread/Makefile b/lang/tcl81-thread/Makefile
index 7be91f7c48af..5c5f51d704ac 100644
--- a/lang/tcl81-thread/Makefile
+++ b/lang/tcl81-thread/Makefile
@@ -18,7 +18,7 @@ Y2K=            http://www.scriptics.com/Y2K.html
 FILE_DEPENDS=	${PORTSDIR}/lang/tcl80
 
 NO_LATEST_LINK=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-threads
diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index 30ce1994bf77..93d0830ed231 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	jseger@FreeBSD.org
 Y2K=            http://www.scriptics.com/Y2K.html
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 2edf4c42f1a8..7a8acfba5f83 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -22,7 +22,7 @@ Y2K=            http://www.scriptics.com/Y2K.html
 
 PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 2edf4c42f1a8..7a8acfba5f83 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -22,7 +22,7 @@ Y2K=            http://www.scriptics.com/Y2K.html
 
 PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index c336d300dcc4..55d52f9d6198 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	jseger@FreeBSD.org
 LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared --with-tk
 PLIST_SUB=	TCLX_LONG_VER=8.0.4 TCLX_SHORT_VER=804
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index c336d300dcc4..55d52f9d6198 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	jseger@FreeBSD.org
 LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared --with-tk
 PLIST_SUB=	TCLX_LONG_VER=8.0.4 TCLX_SHORT_VER=804
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index c336d300dcc4..55d52f9d6198 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	jseger@FreeBSD.org
 LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared --with-tk
 PLIST_SUB=	TCLX_LONG_VER=8.0.4 TCLX_SHORT_VER=804
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 4f1cf6fa200e..2626a3ba4476 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		$(WRKDIR)/faces
 MAN1=		compface.1 faces.1 face_update.1
 MAN3=		compface.3
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index ae3722622bcc..caa140833199 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -22,7 +22,7 @@ MAINTAINER=	imap-uw@freebsd.ady.ro
 
 Y2K=		http://www.washington.edu/imap/IMAP-FAQs/FAQ-00002.html
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 PAMAUTH?=	yes
 .if ${PAMAUTH} != "no"
 ALL_TARGET=	bfp
diff --git a/mail/mh/Makefile b/mail/mh/Makefile
index 54355c6d2bf7..ef2f1f707bfe 100644
--- a/mail/mh/Makefile
+++ b/mail/mh/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	pst@FreeBSD.org
 
 FORBIDDEN=	"Buffer overflow in MIME parsing code, exploitable via email. Since mh is no longer actively developed, this bug may not get fixed - consider using the nmh port in ${PORTSDIR}/mail/nmh, which is the successor to mh"
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=	ali.1 anno.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 mark.1  \
 	mh-chart.1 mh.1 mhl.1 mhook.1 mhmail.1 mhn.1 mhparam.1 mhpath.1  \
diff --git a/math/bihar/Makefile b/math/bihar/Makefile
index cc70f91f6939..d12a8930d7fe 100644
--- a/math/bihar/Makefile
+++ b/math/bihar/Makefile
@@ -20,7 +20,7 @@ EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	# empty
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/blas/Makefile b/math/blas/Makefile
index c9dbdc74af10..3bf27a353119 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 NO_WRKSUBDIR=	yes
 
 pre-build:
diff --git a/math/dcdflib/Makefile b/math/dcdflib/Makefile
index 33668fa0a7fb..09963a9c4da8 100644
--- a/math/dcdflib/Makefile
+++ b/math/dcdflib/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	tobez@plab.ku.dk
 
 WRKSRC=		${WRKDIR}/dcdflib.c/src
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index cefb32887f6a..f040a760548e 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	blas.1:${PORTSDIR}/math/blas
 
 DIST_SUBDIR=	${PORTNAME}
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 NO_WRKSUBDIR=	yes
 
 SRCS =	csroot.f epslon.f pythag.f bakvec.f balanc.f balbak.f bandr.f \
diff --git a/math/fftpack/Makefile b/math/fftpack/Makefile
index cc70f91f6939..d12a8930d7fe 100644
--- a/math/fftpack/Makefile
+++ b/math/fftpack/Makefile
@@ -20,7 +20,7 @@ EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	# empty
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 815d0db687b2..01dbeb04708d 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS=	--enable-i386-hacks
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 815d0db687b2..01dbeb04708d 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS=	--enable-i386-hacks
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index bcedec4912ae..47cf8f0a1873 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -28,7 +28,7 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libole2/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index bcedec4912ae..47cf8f0a1873 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -28,7 +28,7 @@ USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libole2/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index f15d0d429f9c..2576f53fff12 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -21,7 +21,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	andrew@chg.ru
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GSLREF=		gsl-ref.ps.gz
 
 post-install:
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 8b828e03ae75..297d86c93a75 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 DIST_SUBDIR=	lapack
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MANCOMPRESSED=	maybe
 MANL=	cbdsqr.l cgbbrd.l cgbcon.l cgbequ.l cgbmv.l cgbrfs.l cgbsv.l cgbsvx.l \
diff --git a/math/librandlib/Makefile b/math/librandlib/Makefile
index 484aacbc9c92..f168d39d268d 100644
--- a/math/librandlib/Makefile
+++ b/math/librandlib/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	ranlib.c
 
 MAINTAINER=	tg@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 MAKE_ENV=	NOPROFILE=true
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
diff --git a/math/libranlib/Makefile b/math/libranlib/Makefile
index 484aacbc9c92..f168d39d268d 100644
--- a/math/libranlib/Makefile
+++ b/math/libranlib/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	ranlib.c
 
 MAINTAINER=	tg@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 MAKE_ENV=	NOPROFILE=true
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index 9c5d1fd3fcb1..6f7626dace0c 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=    blas.1:${PORTSDIR}/math/blas
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 
diff --git a/math/netcdf/Makefile b/math/netcdf/Makefile
index a51c997f5191..e003cd84657c 100644
--- a/math/netcdf/Makefile
+++ b/math/netcdf/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	${PORTNAME}-3.5-beta3.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.5-beta3/src
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-fPIC -DPIC -Df2cFortran"
 
diff --git a/math/pari/Makefile b/math/pari/Makefile
index 5e84e537898b..188afbc17140 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=     yoshiaki@kt.rim.or.jp
 
 ONLY_FOR_ARCHS=	i386
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 HAS_CONFIGURE = yes
 CONFIGURE_SCRIPT = Configure
 CONFIGURE_ARGS = --prefix=${PREFIX}
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 185b4ce33a19..b309df8313d1 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -17,7 +17,7 @@ DISTNAME=       plplot4p99j
 MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-gcc=yes --with-double=yes
 
diff --git a/math/randlib/Makefile b/math/randlib/Makefile
index 484aacbc9c92..f168d39d268d 100644
--- a/math/randlib/Makefile
+++ b/math/randlib/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	ranlib.c
 
 MAINTAINER=	tg@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 MAKE_ENV=	NOPROFILE=true
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
diff --git a/math/simpack/Makefile b/math/simpack/Makefile
index a392d204af7b..3321ea533abf 100644
--- a/math/simpack/Makefile
+++ b/math/simpack/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	SimPack3.tar.Z
 MAINTAINER=	rssh@cki.ipri.kiev.ua
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 WRKSRC=		${WRKDIR}/simpack
 
diff --git a/math/vtk/Makefile b/math/vtk/Makefile
index e1787bd2f32d..1c5f8008184a 100644
--- a/math/vtk/Makefile
+++ b/math/vtk/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3	\
 		tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/vtk31
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mesa --with-shared --with-tcl --with-bsdmake
 CONFIGURE_ARGS+=	--with-contrib --with-tkwidget
diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile
index e1787bd2f32d..1c5f8008184a 100644
--- a/math/vtk43/Makefile
+++ b/math/vtk43/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3	\
 		tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/vtk31
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mesa --with-shared --with-tcl --with-bsdmake
 CONFIGURE_ARGS+=	--with-contrib --with-tkwidget
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index e1787bd2f32d..1c5f8008184a 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3	\
 		tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/vtk31
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mesa --with-shared --with-tcl --with-bsdmake
 CONFIGURE_ARGS+=	--with-contrib --with-tkwidget
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda24-client/Makefile b/misc/amanda24-client/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda24-client/Makefile
+++ b/misc/amanda24-client/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda24-server/Makefile b/misc/amanda24-server/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda24-server/Makefile
+++ b/misc/amanda24-server/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda24/Makefile b/misc/amanda24/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda24/Makefile
+++ b/misc/amanda24/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 54787ef34e86..0a98f5029b76 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 WRKSRC=		${WRKDIR}/amanda-2.4.1p1
 NO_LATEST_LINK=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/cassowary/Makefile b/misc/cassowary/Makefile
index fac1b83e73a3..4221e72e601a 100644
--- a/misc/cassowary/Makefile
+++ b/misc/cassowary/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	nakai@FreeBSD.org
 BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile
 LIB_DEPENDS=	GTL.3:${PORTSDIR}/misc/gtl
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-guile-prefix=${LOCALBASE} \
 		--enable-guile-build \
diff --git a/misc/gtl/Makefile b/misc/gtl/Makefile
index 099cb791292e..9087914227bc 100644
--- a/misc/gtl/Makefile
+++ b/misc/gtl/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	GTL-${PORTVERSION}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_NEWGCC=	yes
 
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index ebae3e36e425..e11a687bfcd7 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS=-L${LOCALBASE}/lib \
 		GLIB_CONFIG="${GLIB_CONFIG}"
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index fc2d23f5e26c..ebfe9135952c 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -19,7 +19,7 @@ GTK_CONFIG=	${X11BASE}/bin/gtk12-config
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
 		SDL_CONFIG="${SDL_CONFIG}" \
 		GLBASE="${X11BASE}" \
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 7e79560ddafb..2cd58e282f2f 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .if defined(WITH_GNOME)
 CONFIGURE_ARGS=	--with-gnome
@@ -38,7 +38,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
- 		GLIB_CONFIG="${GLIB_CONFIG}" \
+		GLIB_CONFIG="${GLIB_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index dc534790b709..f88658e93604 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	paxvel@iname.com
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 3312cdf5b086..b7ffb2a30cf0 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/libsmi/Makefile b/net-mgmt/libsmi/Makefile
index deae458eb8d8..92061e9149f0 100644
--- a/net-mgmt/libsmi/Makefile
+++ b/net-mgmt/libsmi/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	saper@system.pl
 #USE_X_PREFIX=	yes
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 MIBDIR=		${PREFIX}/share/smi/mibs
 CONFIGURE_ARGS+=--with-data-dir=${PREFIX}/share/smi \
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index d48fd69eba6f..e43dbce6be3e 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 MAINTAINER=	billf@FreeBSD.org
 
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index d48fd69eba6f..e43dbce6be3e 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 MAINTAINER=	billf@FreeBSD.org
 
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index d48fd69eba6f..e43dbce6be3e 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 MAINTAINER=	billf@FreeBSD.org
 
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index d48fd69eba6f..e43dbce6be3e 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 MAINTAINER=	billf@FreeBSD.org
 
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
diff --git a/net/adns/Makefile b/net/adns/Makefile
index 519bf62b0e61..df906fd019c9 100644
--- a/net/adns/Makefile
+++ b/net/adns/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	adns
 MAINTAINER=	lukin@okbmei.msk.su
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 
 post-install:
diff --git a/net/gnet-glib2/Makefile b/net/gnet-glib2/Makefile
index 7013bed25c3c..b30b57b39b11 100644
--- a/net/gnet-glib2/Makefile
+++ b/net/gnet-glib2/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12
 GLIB_CONFIG=	${LOCALBASE}/bin/glib12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index 7013bed25c3c..b30b57b39b11 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12
 GLIB_CONFIG=	${LOCALBASE}/bin/glib12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile
index 7013bed25c3c..b30b57b39b11 100644
--- a/net/gnet2/Makefile
+++ b/net/gnet2/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12
 GLIB_CONFIG=	${LOCALBASE}/bin/glib12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile
index bf7e8c4ee8fd..2273e77214d7 100644
--- a/net/hesiod/Makefile
+++ b/net/hesiod/Makefile
@@ -23,7 +23,7 @@ MAN3=			hesiod.3 hesiod_end.3 hesiod_free_list.3 	\
 MAN5=			hesiod.conf.5
 
 GNU_CONFIGURE=		yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/net/icqlib/Makefile b/net/icqlib/Makefile
index dc534790b709..f88658e93604 100644
--- a/net/icqlib/Makefile
+++ b/net/icqlib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	paxvel@iname.com
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/icqlib0/Makefile b/net/icqlib0/Makefile
index dc534790b709..f88658e93604 100644
--- a/net/icqlib0/Makefile
+++ b/net/icqlib0/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	paxvel@iname.com
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 843dd5fd9635..52ae2c399117 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 843dd5fd9635..52ae2c399117 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 843dd5fd9635..52ae2c399117 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/net/libetherx/Makefile b/net/libetherx/Makefile
index c676365a38ba..0d593a6c889f 100644
--- a/net/libetherx/Makefile
+++ b/net/libetherx/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	jabber.1:${PORTSDIR}/net/libjabber \
 		adns.0:${PORTSDIR}/net/adns
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		etherx-config.1
 
diff --git a/net/libicq/Makefile b/net/libicq/Makefile
index 3312cdf5b086..b7ffb2a30cf0 100644
--- a/net/libicq/Makefile
+++ b/net/libicq/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}"
 
 .include <bsd.port.mk>
diff --git a/net/libjabber/Makefile b/net/libjabber/Makefile
index 8090ea7b30de..e310fc898062 100644
--- a/net/libjabber/Makefile
+++ b/net/libjabber/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	lukin@okbmei.msk.su
 LIB_DEPENDS=	xode.1:${PORTSDIR}/textproc/libxode
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		jabber-config.1
 
diff --git a/net/libsmi/Makefile b/net/libsmi/Makefile
index deae458eb8d8..92061e9149f0 100644
--- a/net/libsmi/Makefile
+++ b/net/libsmi/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	saper@system.pl
 #USE_X_PREFIX=	yes
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 MIBDIR=		${PREFIX}/share/smi/mibs
 CONFIGURE_ARGS+=--with-data-dir=${PREFIX}/share/smi \
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index a4da06fa380e..d9c9de81c2ae 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -18,7 +18,7 @@ DISTNAME=	socket++-1.10
 MAINTAINER=	narvi@haldjas.folklore.ee
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 NOPROFILE=	true
 
 post-configure:
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index d48fd69eba6f..e43dbce6be3e 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 MAINTAINER=	billf@FreeBSD.org
 
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index d48fd69eba6f..e43dbce6be3e 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 MAINTAINER=	billf@FreeBSD.org
 
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
diff --git a/net/radiusclient/Makefile b/net/radiusclient/Makefile
index d70383d39467..f15536b80773 100644
--- a/net/radiusclient/Makefile
+++ b/net/radiusclient/Makefile
@@ -15,6 +15,6 @@ MAINTAINER=	maurice@serc.rmit.edu.au
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index 782f23057668..09808fdfea86 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -16,7 +16,7 @@ USE_PERL5=	yes
 MAKE_ENV+=	PERL=${PERL}
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared=yes
 CONFIGURE_ENV=	PERL=${PERL}
 
diff --git a/net/rrdtool10/Makefile b/net/rrdtool10/Makefile
index 782f23057668..09808fdfea86 100644
--- a/net/rrdtool10/Makefile
+++ b/net/rrdtool10/Makefile
@@ -16,7 +16,7 @@ USE_PERL5=	yes
 MAKE_ENV+=	PERL=${PERL}
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared=yes
 CONFIGURE_ENV=	PERL=${PERL}
 
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 4acfe7807834..9329b3154851 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -25,7 +25,7 @@ RESTRICTED=	"no commercial use"
 #		--with-passwd
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libconffile=${PREFIX}/etc/libsocks5.conf \
 		--with-srvconffile=${PREFIX}/etc/socks5.conf \
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index aef21dab9898..0ec083e664af 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://cvs.cleveland.lug.net/pub/tn5250/
 MAINTAINER=	ports@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		scs2ascii.1 scs2pdf.1 tn5250.1 lp5250d.1
 
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index d48fd69eba6f..e43dbce6be3e 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 MAINTAINER=	billf@FreeBSD.org
 
 USE_AUTOCONF=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index e257b3fe808c..12f0d7dec1a1 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -26,7 +26,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-pisock=${LOCALBASE}/pilot
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index e257b3fe808c..12f0d7dec1a1 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -26,7 +26,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-pisock=${LOCALBASE}/pilot
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index e257b3fe808c..12f0d7dec1a1 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -26,7 +26,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-pisock=${LOCALBASE}/pilot
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index 04314bb3a3c4..f2bda596885a 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	dima@freebsd.org
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 PREFIX=		${LOCALBASE}/pilot
 GNU_CONFIGURE=	yes
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 04314bb3a3c4..f2bda596885a 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	dima@freebsd.org
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_PERL5=	yes
 PREFIX=		${LOCALBASE}/pilot
 GNU_CONFIGURE=	yes
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index 3c4138f255a8..aad1081db14b 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -16,7 +16,7 @@ DISTFILES=	a2ps-${PORTVERSION}${EXTRACT_SUFX} sheets.map
 MAINTAINER=	chuckr@FreeBSD.org
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAN1=		a2ps.1 ogonkify.1 card.1 psmandup.1 fixps.1 pdiff.1 psset.1
 
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index 6f4f21c7ca95..af1b1ce88201 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -23,7 +23,7 @@ MAINTAINER=	jseger@FreeBSD.org
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
 
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 6f4f21c7ca95..af1b1ce88201 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -23,7 +23,7 @@ MAINTAINER=	jseger@FreeBSD.org
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
 
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index cf98097056e4..463d35f314ea 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${PREFIX}
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index cf98097056e4..463d35f314ea 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${PREFIX}
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index cf98097056e4..463d35f314ea 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${PREFIX}
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index eb58b1208296..e42635be3632 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 FETCH_BEFORE_ARGS=	-b
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl5=${PERL} \
 		--with-tiff=${PREFIX} \
diff --git a/print/pdflib3/Makefile b/print/pdflib3/Makefile
index eb58b1208296..e42635be3632 100644
--- a/print/pdflib3/Makefile
+++ b/print/pdflib3/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 FETCH_BEFORE_ARGS=	-b
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl5=${PERL} \
 		--with-tiff=${PREFIX} \
diff --git a/print/pdflib4/Makefile b/print/pdflib4/Makefile
index eb58b1208296..e42635be3632 100644
--- a/print/pdflib4/Makefile
+++ b/print/pdflib4/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 FETCH_BEFORE_ARGS=	-b
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-perl5=${PERL} \
 		--with-tiff=${PREFIX} \
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index a51c997f5191..e003cd84657c 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	${PORTNAME}-3.5-beta3.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.5-beta3/src
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-fPIC -DPIC -Df2cFortran"
 
diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile
index a51c997f5191..e003cd84657c 100644
--- a/science/netcdf4/Makefile
+++ b/science/netcdf4/Makefile
@@ -14,7 +14,7 @@ DISTFILES=	${PORTNAME}-3.5-beta3.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.5-beta3/src
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-fPIC -DPIC -Df2cFortran"
 
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index de5d00e64bf5..75b9e5164b0a 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	hetzels@westbend.net
 
 USE_OPENSSL=	RSA
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index de5d00e64bf5..75b9e5164b0a 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	hetzels@westbend.net
 
 USE_OPENSSL=	RSA
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 40f1c5f9fe3f..26bf0ae8e59b 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -30,7 +30,7 @@ MAN8=			ftpd.8 hprop.8 hpropd.8 kdc.8 kpasswdd.8 kstash.8 \
 			string2key.8
 
 USE_LIBTOOL=		yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=		yes
 CONFIGURE_ARGS=		--prefix=${PREFIX} --enable-shared
 
 .if defined(HEIMDAL_HOME)
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index acd501567d7a..799d910670a3 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
 KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
 USE_GMAKE=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
 CONFIGURE_ENV=		INSTALL="${INSTALL}"
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index acd501567d7a..799d910670a3 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
 KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
 USE_GMAKE=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
 CONFIGURE_ENV=		INSTALL="${INSTALL}"
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index acd501567d7a..799d910670a3 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
 KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
 USE_GMAKE=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
 CONFIGURE_ENV=		INSTALL="${INSTALL}"
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index acd501567d7a..799d910670a3 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
 KERBEROSV_URL=		http://web.mit.edu/network/kerberos-form.html
 USE_GMAKE=		yes
-INSTALLS_SHLIBS=		yes
+INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS?=	--enable-shared --with-ccopts="${CFLAGS}"
 CONFIGURE_ENV=		INSTALL="${INSTALL}"
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index 3880ab6860e2..e46bcd8d8264 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://argeas.cs-net.gr/pub/unix/mcrypt/old/ \
 
 MAINTAINER=	nsayer@freebsd.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-posix-threads
 
diff --git a/security/libparanoia/Makefile b/security/libparanoia/Makefile
index de8e89a0cdef..b7ea1b70c995 100644
--- a/security/libparanoia/Makefile
+++ b/security/libparanoia/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	snar@paranoia.ru
 
 ONLY_FOR_ARCHS=	i386
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 # this library depends on system-defined headers "SYS.h" and "DEFS.h"
 # which may differ from release to release.
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 720d6a1202e0..a171a98a24f3 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://schumann.cx/mhash/dl/
 
 MAINTAINER=	nsayer@freebsd.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --with-LDFLAGS='-lc_r'
 
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 01e4790221df..a8d34fdd75ce 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -23,7 +23,7 @@ MAINTAINER=	kris@FreeBSD.ORG
 WRKSRC=		${WRKDIR}/source
 RESTRICTED=	"Contains cryptography"
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 pre-extract:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
diff --git a/security/tcp_wrapper/Makefile b/security/tcp_wrapper/Makefile
index 5b070338407a..7118e5c34e51 100644
--- a/security/tcp_wrapper/Makefile
+++ b/security/tcp_wrapper/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 FORBIDDEN=	tcp_wrappers is in the base system
 .endif
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 ALL_TARGET=	freebsd
 MAN3=		hosts_access.3
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 55d649f1994f..b436bf414a24 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${PREFIX}
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 55d649f1994f..b436bf414a24 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${PREFIX}
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index 55d649f1994f..b436bf414a24 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${PREFIX}
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 55d649f1994f..b436bf414a24 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-gnome=${PREFIX}
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 6ca9487dcaf3..be2f9e2cd5db 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 91bb4d278621..f4e4701f08d4 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	pspell.2:${PORTSDIR}/textproc/pspell
 
 USE_NEWGCC=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index 9753e595528e..259424716330 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -14,6 +14,6 @@ MASTER_SITES=	http://arturo.directmail.org/filters/archive/ \
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 9ad122d27a84..dfd642cd50ca 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -22,7 +22,7 @@ BROKEN=		nsgmls coredumps in static constructors
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index be4e23fcf5d3..e0023765b0ef 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -14,6 +14,6 @@ MASTER_SITE_SUBDIR=	stable/sources/libxml
 MAINTAINER=	ade@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index be4e23fcf5d3..e0023765b0ef 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -14,6 +14,6 @@ MASTER_SITE_SUBDIR=	stable/sources/libxml
 MAINTAINER=	ade@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 41f18d258969..bc2f3b62d8f7 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -13,6 +13,6 @@ MASTER_SITES=	http://download.jabber.org/dists/1.0/
 MAINTAINER=	lukin@okbmei.msk.su
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/pspell/Makefile b/textproc/pspell/Makefile
index d929d55853d3..8fc62acf00cd 100644
--- a/textproc/pspell/Makefile
+++ b/textproc/pspell/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ade@FreeBSD.org
 
 USE_NEWGCC=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure modules/configure
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -I${WRKSRC}"
 MAKE_ARGS+=	NOPORTDOCS=${NOPORTDOCS}
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index 8e5fe9c2a286..37e90707465b 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.jclark.com/pub/sp/
 
 MAINTAINER=	chuckr@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-patch:
 	$(CP) $(WRKSRC)/Makefile $(WRKSRC)/Makefile.sed
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index 59da5d1c2ff7..5fe9e0b7aebd 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -17,6 +17,6 @@ LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole \
 		xml.5:${PORTSDIR}/textproc/libxml
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/www/cgic/Makefile b/www/cgic/Makefile
index ddade5379097..cdc671ad53c4 100644
--- a/www/cgic/Makefile
+++ b/www/cgic/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 ALL_TARGET=	libcgic.so.1
 
diff --git a/www/cgihtml/Makefile b/www/cgihtml/Makefile
index 843a0e8d36b6..f6d0ac8a4baa 100644
--- a/www/cgihtml/Makefile
+++ b/www/cgihtml/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.eekim.com/pub/users/eekim/cgihtml/
 
 MAINTAINER=	i.vaudrey@bigfoot.com
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 post-extract:
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index f8d9fe219f79..c5a63b6d33f9 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -22,7 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index f8d9fe219f79..c5a63b6d33f9 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -22,7 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index f8d9fe219f79..c5a63b6d33f9 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -22,7 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 14f9942cbf1e..e3a3cccf195e 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -14,6 +14,6 @@ MASTER_SITE_SUBDIR=	stable/sources/libghttp
 MAINTAINER=	vanilla@FreeBSD.org
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index f8d9fe219f79..c5a63b6d33f9 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -22,7 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/libxpg4-ns/Makefile b/www/libxpg4-ns/Makefile
index ff56cc439107..3f69dc6af0b4 100644
--- a/www/libxpg4-ns/Makefile
+++ b/www/libxpg4-ns/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	libxpg4-3.3
 
 MAINTAINER=	sada@FreeBSD.ORG
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAKE_ENV+=	OBJFORMAT=aout SHLIB_MAJOR=2 SHLIB_MINOR=0
 PORTOBJFORMAT=	aout
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index 944fae231d79..86d4fde03af4 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS+=	mkttfdir:${PORTSDIR}/print/perlftlib
 VERSION=	1.3
 PATCHLEVEL=	0
 SERVER?=	common
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 .if !defined(USE_SHARED_WRKSRC) && defined(COMPILE_ALL_SERVERS_AT_ONCE)
 USE_SHARED_WRKSRC= YES
 .endif
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index ab9c32f28119..7230913030ea 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/xc/lib/Xaw3d
 USE_IMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 .if exists(${X11BASE}/bin/XFree86)
 PLIST=		${WRKDIR}/PLIST
 .endif
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index e1a4ebd49dd7..5396c3aa49b2 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/blt2.4s
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MANN=		BLT.n barchart.n beep.n bgexec.n bitmap.n \
 		bltdebug.n busy.n cutbuffer.n dragdrop.n eps.n \
diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 5bafeb8468ba..c2a10e8bd598 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
 
 VERSION=	1.0.7
 USE_BZIP2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared
 WRKSRC=		${WRKDIR}/${PKGNAME}
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index 6a85753fcff8..1acba9edfd95 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		GL.14:${PORTSDIR}/graphics/Mesa3
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-opengl=mesa --with-x
 .if defined(NO_SHM)
diff --git a/x11-toolkits/fox/Makefile b/x11-toolkits/fox/Makefile
index 6a85753fcff8..1acba9edfd95 100644
--- a/x11-toolkits/fox/Makefile
+++ b/x11-toolkits/fox/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		GL.14:${PORTSDIR}/graphics/Mesa3
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-opengl=mesa --with-x
 .if defined(NO_SHM)
diff --git a/x11-toolkits/fox10/Makefile b/x11-toolkits/fox10/Makefile
index 6a85753fcff8..1acba9edfd95 100644
--- a/x11-toolkits/fox10/Makefile
+++ b/x11-toolkits/fox10/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		GL.14:${PORTSDIR}/graphics/Mesa3
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-opengl=mesa --with-x
 .if defined(NO_SHM)
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 6a85753fcff8..1acba9edfd95 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		GL.14:${PORTSDIR}/graphics/Mesa3
 
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-opengl=mesa --with-x
 .if defined(NO_SHM)
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index bca8dffd0571..066a202efef4 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index bca8dffd0571..066a202efef4 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 846ebea5fb1f..40a76791f34c 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -23,7 +23,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index 846ebea5fb1f..40a76791f34c 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -23,7 +23,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 846ebea5fb1f..40a76791f34c 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -23,7 +23,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 846ebea5fb1f..40a76791f34c 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -23,7 +23,7 @@ GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 2703a205682c..09da0f535bb6 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 CONFIGURE_ARGS=	--with-lib-GL
 
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 2703a205682c..09da0f535bb6 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 CONFIGURE_ARGS=	--with-lib-GL
 
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index bca8dffd0571..066a202efef4 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index bca8dffd0571..066a202efef4 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index bca8dffd0571..066a202efef4 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index bca8dffd0571..066a202efef4 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
 		--without-gnome
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index a4e8d70397b9..eb80ac8ddb0e 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -23,7 +23,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-bonobo --without-gtkhtml --with-libglade
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 0c8a881f18be..c38985910bf9 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -21,7 +21,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index 9e1f3816a77b..929c7eebe36c 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
 		itcl30.1:${PORTSDIR}/lang/itcl
 
 WRKSRC=		${WRKDIR}/itcl3.0.1/itk/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2 --with-itcl=${PREFIX}/lib/itcl3.0 --with-tk=${PREFIX}/lib/tk8.2
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} ITK_LIB_FILE=${ITK_LIB_FILE}
diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index ffdbdbed7a80..ebcc11d96c87 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	tanimura@FreeBSD.org
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 DIST_SUBDIR=	iv
 WRKSRC=		${WRKDIR}/iv
diff --git a/x11-toolkits/jx/Makefile b/x11-toolkits/jx/Makefile
index 007c4ae46870..9daf6b608d7d 100644
--- a/x11-toolkits/jx/Makefile
+++ b/x11-toolkits/jx/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 MAKE_ENV+=	JX_INSTALL_ROOT="${PREFIX}/bin" \
diff --git a/x11-toolkits/kde-qt-addon/Makefile b/x11-toolkits/kde-qt-addon/Makefile
index 3a29f5ff0516..bcd43fcccd15 100644
--- a/x11-toolkits/kde-qt-addon/Makefile
+++ b/x11-toolkits/kde-qt-addon/Makefile
@@ -17,7 +17,7 @@ SOMAJOR=	4
 SOMINOR=	0
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 22c4100c6308..737aa4100fc7 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/automake:${PORTSDIR}/devel/automake
 MANUAL_PACKAGE_BUILD=	do not want to install during interactive build
 USE_AUTOCONF=	yes
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS+=--enable-static --enable-shared --disable-build-Xlt \
 		--enable-production --disable-debug --disable-build-Xbae
diff --git a/x11-toolkits/libjsearch/Makefile b/x11-toolkits/libjsearch/Makefile
index b17f778e434f..a8370a27c38b 100644
--- a/x11-toolkits/libjsearch/Makefile
+++ b/x11-toolkits/libjsearch/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	jx-1_5_3.1:${JXPORT}
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
 		JX_LIB_ROOT="${PREFIX}/lib" \
diff --git a/x11-toolkits/libjtoolbar/Makefile b/x11-toolkits/libjtoolbar/Makefile
index b5d46aecd539..95bda59224ca 100644
--- a/x11-toolkits/libjtoolbar/Makefile
+++ b/x11-toolkits/libjtoolbar/Makefile
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/JX-1.5.3
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
 		JX_LIB_ROOT="${PREFIX}/lib" \
 		X11PREFIX="${X11PREFIX}" \
diff --git a/x11-toolkits/libjtree/Makefile b/x11-toolkits/libjtree/Makefile
index a7a28f0bf228..0fa988b6379e 100644
--- a/x11-toolkits/libjtree/Makefile
+++ b/x11-toolkits/libjtree/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	jx-1_5_3.1:${JXPORT}
 WRKSRC=		${WRKDIR}/JX-1.5.3
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	JX_INSTALL_ROOT="${PREFIX}/bin" \
 		JX_LIB_ROOT="${PREFIX}/lib" \
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 3bb120aa0fad..9bf5b35c147c 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.inf.ufrgs.br/~casantos/neXtaw/
 MAINTAINER=	tg@FreeBSD.org
 
 USE_IMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN1=		neXtclock.1
 
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 212e95816421..460f57479e6b 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 MAINTAINER=	will@FreeBSD.org
 
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 MAKE_ENV+=	QTDIR=${WRKSRC} CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" CC="${CC}"
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index e2b3045d5fcd..86e07490d0d7 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index e2b3045d5fcd..86e07490d0d7 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index e2b3045d5fcd..86e07490d0d7 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index e2b3045d5fcd..86e07490d0d7 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index e2b3045d5fcd..86e07490d0d7 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index e2b3045d5fcd..86e07490d0d7 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index f9f78e530ec9..7917dc98cea4 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
 WRKSRC=		${WRKDIR}/sspkg2.1
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 MAKE_ENV=       OPENWINHOME=${X11BASE}
 
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index bfe73ce1a35d..88be7bc2daac 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	jmz@FreeBSD.org
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 WRKSRC=		${WRKDIR}/Tix4.1.0.007/unix/tk8.0
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-sam \
 		--with-tcl="${PREFIX}/include/tcl8.2" \
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index 5a068df18f3e..bce8cf46857c 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
 
 NO_LATEST_LINK=	yes
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/tk8.0.5/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 0fe9521135e3..59d4d871f527 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	jseger@FreeBSD.org
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index f6f337e1d360..30de426d058c 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	jseger@FreeBSD.org
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.3
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index f6f337e1d360..30de426d058c 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	jseger@FreeBSD.org
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.3
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index b6a475fb93ce..7287f77f9330 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -25,7 +25,7 @@ FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 FETCH_BEFORE_ARGS=	-b
 PATCH_DIST_ARGS=	-p1 -d ${WRKDIR}/tk8.0.4 -E --quiet
 WRKSRC=		${WRKDIR}/tk8.0.4/unix
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared --enable-xpm --enable-step --enable-dnd \
 		 --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include"
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 9b91ddfb3c41..34fbc258e9fb 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -18,7 +18,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_NEWGCC=	yes
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index b0078d7e8cde..7a2ed688bc1d 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -18,7 +18,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_NEWGCC=	yes
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 8165e7d8ccd6..755f995179fd 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -24,7 +24,7 @@ MAINTAINER=	nectar@FreeBSD.ORG
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index 8165e7d8ccd6..755f995179fd 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -24,7 +24,7 @@ MAINTAINER=	nectar@FreeBSD.ORG
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index 8165e7d8ccd6..755f995179fd 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -24,7 +24,7 @@ MAINTAINER=	nectar@FreeBSD.ORG
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_NEWGCC=	yes
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 52c66ee67547..f7b3eed6b380 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de
 
 REQUIRES_MOTIF= yes
 USE_IMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 MAN3=		XbaeCaption.3 XbaeMatrix.3
 
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 1ec4d2bf12d7..54c366486a4a 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics x11-toolkits
 EXTRACT_SUFX=	.tgz
 
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 5d57ed2eb474..e6718ce66f1f 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	xview3.2p1-X11R6
 MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 IMAKEINCLUDE=	"-I${X11BASE}/lib/X11/config -I${WRKSRC}/config"
 MAKE_ENV+=	IMAKEINCLUDE=${IMAKEINCLUDE}
 XMKMF=		${SETENV} IMAKEINCLUDE=${IMAKEINCLUDE} xmkmf -a
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index d8ee6ee22a43..affad5d4ec44 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 WRKSRC=		${WRKDIR}/Epplets-0.5
 
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 CONFIGURE_ENV=	EROOT=${X11BASE}/share/enlightenment \
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index cf54a5d274bc..88b6cfe57126 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -18,6 +18,6 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile
index 013bd32f3f0b..ca1bbeffa22f 100644
--- a/x11-wm/scwm/Makefile
+++ b/x11-wm/scwm/Makefile
@@ -22,7 +22,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS+=	--with-guile-prefix=${LOCALBASE}
 CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 0748fa643760..6d38508e32bf 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -28,7 +28,7 @@ USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}  LOCALBASE=${LOCALBASE} \
 		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 5dae101f3918..668320fd17fe 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE} LIBS=-L${LOCALBASE}/lib \
 		CPPFLAGS=-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index f361ed392366..222fc9b39435 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	taguchi@tohoku.iij.ad.jp
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
 
 PREFIX?=	${X11BASE}
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 8b02aaeaf1a3..bdfc9abb8ea8 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	taguchi@tohoku.iij.ad.jp
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
 
 PREFIX?=	${X11BASE}
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc
diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile
index c9bfaa3ec432..e6437405a39e 100644
--- a/x11/XFree86-aoutlibs/Makefile
+++ b/x11/XFree86-aoutlibs/Makefile
@@ -18,7 +18,7 @@ ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/lib
 NO_BUILD=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 PORTOBJFORMAT=	aout
 
 USE_X_PREFIX=	yes
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index c02c86483948..b0fcca22111d 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -26,7 +26,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${DIST_SUBDIR}
 IS_INTERACTIVE=	yes	# configure script asks questions
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 .if (${MACHINE} != "alpha")
 #NO_PACKAGE=	package available from XFree86
 .endif
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 01cfe61a1f30..7056db9f4317 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -24,7 +24,7 @@ GLIB_CONFIG=	${LOCALBASE}/bin/glib12-config
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	GLIB_CONFIG=${GLIB_CONFIG}
 MAKE_ENV=	INSTALL=${INSTALL}
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index b58854d77963..c73f0178521a 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		Eterm.1
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index a71e81e46d0e..7828dc1df516 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libart_lgpl/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 682deee48e15..5a9ce33009f4 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -23,7 +23,7 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--with-kde-datadir=${LOCALBASE}/share
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index a71e81e46d0e..7828dc1df516 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libart_lgpl/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 3631ae463be9..36e578fb5972 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \
 		--with-qt-dir=${X11BASE} \
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 3631ae463be9..36e578fb5972 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \
 		--with-qt-dir=${X11BASE} \
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 3631ae463be9..36e578fb5972 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \
 		--with-qt-dir=${X11BASE} \
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 3631ae463be9..36e578fb5972 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \
 		--with-qt-dir=${X11BASE} \
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 3631ae463be9..36e578fb5972 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \
 		--with-qt-dir=${X11BASE} \
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 3631ae463be9..36e578fb5972 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \
 		--with-qt-dir=${X11BASE} \
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 3631ae463be9..36e578fb5972 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \
 		--with-qt-dir=${X11BASE} \
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 3631ae463be9..36e578fb5972 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	kdeui.4:${PORTSDIR}/x11/kdelibs2 \
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+="--with-xdmdir=${X11BASE}/lib/X11/xdm" \
 		--with-qt-dir=${X11BASE} \
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 454d5483c01b..1db03f69a40d 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -25,7 +25,7 @@ MAKE_ENV+=	SOMAJOR="${LIBVER}" SOMINOR="0"
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_QT=		yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=
 CONFIGURE_ARGS=	--enable-shared --x-includes="$(X11BASE)/include" \
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 3c36057f163d..37cf27b99975 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -23,7 +23,7 @@ SOMAJOR=	4
 SOMINOR=	0
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 3c36057f163d..37cf27b99975 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -23,7 +23,7 @@ SOMAJOR=	4
 SOMINOR=	0
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 3c36057f163d..37cf27b99975 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -23,7 +23,7 @@ SOMAJOR=	4
 SOMINOR=	0
 USE_BZIP2=	yes
 USE_QT2=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} --enable-shared \
 		--with-qt-includes=${X11BASE}/include/qt2 \
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index f9f6b3bef12e..e9cf0d485ff4 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lukin@okbmei.msk.su
 
 USE_XLIB=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/DND/DNDlib
 GNU_CONFIGURE=	yes
 
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index a71e81e46d0e..7828dc1df516 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -26,7 +26,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIBS=	yes
+INSTALLS_SHLIB=	yes
 LIBTOOLFILES=	configure libart_lgpl/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
author	Satoshi Asami <asami@FreeBSD.org>	2000-06-16 21:52:40 +0000
committer	Satoshi Asami <asami@FreeBSD.org>	2000-06-16 21:52:40 +0000
commit	ffb21b5654e56c5c34ac39799d4746eb84c17ecc (patch)
tree	b1e4b6e4fe103d42cf22f4306aad320232380044
parent	6ee8c0d0843a0c7e67e60565ca3dd4dc2fdbcdcb (diff)
download	ports-ffb21b5654e56c5c34ac39799d4746eb84c17ecc.tar.gz ports-ffb21b5654e56c5c34ac39799d4746eb84c17ecc.zip