When linking a library libA with a library libB using libtool, if libB.la

exists, libtool will add all libraries libB.la refers to (dependency_libs field) to the linker command line and store them in the dependency_libs field of libA.la. So everything that subsequently links with libA will also link to these extra libraries. This causes too much overlinking. This commit modifies Mk/Uses/libtool.mk so it empties the dependency_libs field in .la libraries during staging. However, because .la libraries have very limited use when dependency_libs is empty it makes sense to completely remove them during staging. So with this commit USES=libtool is modified to remove .la libraries and a new form (USES=libtool:keepla) is introduced in case they need to be kept (dependency_libs is still emptied). PORTREVISION is bumped on all ports with USES=libtool that install .la libraries. Most ports are also changed to add :keepla because .la libraries have to be kept around as long as there are dependent ports with .la libraries that refer to them in their dependency_libs field. In most cases :keepla can be removed again as soon as all dependent ports that install .la libraries have some form of USES=libtool added to their Makefile. PR: ports/188759 Exp-run: bdrewery Approved by: portmgr (bdrewery)
svn path=/head/; revision=351936
2024-11-21 00:25:50 +00:00 · 2014-04-23 13:25:16 +00:00 · 2014-04-23 13:25:16 +00:00 · aad09bc5e2 · 2021-03-31 03:12:20 +00:00
commit aad09bc5e2
parent 5c818b158c
462 changed files with 727 additions and 722 deletions
--- a/12
+++ b/12
@ -10,6 +10,18 @@ in the release notes and/or placed into UPDATING.

 All ports committers are allowed to commit to this file.

+20140423:
+AUTHOR: tijl@FreeBSD.org
+
+  The semantics of USES=libtool have changed.  It now deletes .la libraries
+  from the staging area to reduce overlinking.  USES=libtool:keepla can be
+  used in case they need to be kept.  This form still modifies .la libraries
+  to remove references to other libraries to reduce overlinking.
+
+  Note that .la libraries have to kept around as long as there are .la
+  libraries from other ports that refer to them.  Those ports need to use
+  some form of USES=libtool first such that those references are removed.
+
 20140419:
 AUTHOR: bdrewery@FreeBSD.org

--- a/Mk/Uses/libtool.mk
+++ b/Mk/Uses/libtool.mk
@ -3,7 +3,13 @@
 # Bring libtool scripts up to date.
 #
 # Feature:	libtool
-# Usage:	USES=libtool
+# Usage:	USES=libtool or USES=libtool:args
+# Valid args:	keepla	Normally libtool libraries (*.la) are not installed.
+#			With this option they are.  This is needed as long
+#			as there are dependent ports with .la libraries that
+#			refer to .la libraries in this port.  As soon as all
+#			those dependent ports have some form of USES=libtool
+#			keepla can be removed.
 #
 # MAINTAINER:	autotools@FreeBSD.org

@ -54,4 +60,13 @@ patch-libtool:
 		    /versuffix=/s/=.*/="$$major.$$age.$$revision"/; }'
 .endif

+patch-lafiles:
+.if ${libtool_ARGS} == keepla || ${libtool_ARGS} == oldver
+	@${FIND} ${STAGEDIR} -type f -name '*.la' |			\
+		${XARGS} ${SED} -i '' -e "/dependency_libs=/s/=.*/=''/"
+.else
+	@${FIND} ${STAGEDIR} -type f -name '*.la' |			\
+		${XARGS} ${GREP} -l 'libtool library' | ${XARGS} ${RM}
+.endif
+
 .endif
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@ -6530,22 +6530,26 @@ _STAGE_DEP=		build
 _STAGE_SEQ=		stage-message stage-dir run-depends lib-depends apply-slist pre-install generate-plist \
 				pre-su-install
 .if defined(NEED_ROOT)
-_STAGE_SUSEQ=	create-users-groups do-install desktop-file-post-install kmod-post-install \
-				shared-mime-post-install webplugin-post-install \
-				post-install post-install-script move-uniquefiles post-stage compress-man \
+_STAGE_SUSEQ=	create-users-groups do-install desktop-file-post-install \
+				kmod-post-install shared-mime-post-install \
+				webplugin-post-install post-install post-install-script \
+				move-uniquefiles post-stage compress-man patch-lafiles \
 				install-rc-script install-ldconfig-file install-license \
-				install-desktop-entries add-plist-info add-plist-docs add-plist-examples \
-				add-plist-data add-plist-post move-uniquefiles-plist fix-plist-sequence
+				install-desktop-entries add-plist-info add-plist-docs \
+				add-plist-examples add-plist-data add-plist-post \
+				move-uniquefiles-plist fix-plist-sequence
 .if defined(DEVELOPER)
 _STAGE_SUSEQ+=	stage-qa
 .endif
 .else
-_STAGE_SEQ+=	create-users-groups do-install desktop-file-post-install kmod-post-install \
-				shared-mime-post-install webplugin-post-install post-install post-install-script \
-				move-uniquefiles post-stage compress-man install-rc-script install-ldconfig-file \
-				install-license install-desktop-entries add-plist-info add-plist-docs \
-				add-plist-examples add-plist-data add-plist-post move-uniquefiles-plist \
-				fix-plist-sequence
+_STAGE_SEQ+=	create-users-groups do-install desktop-file-post-install \
+				kmod-post-install shared-mime-post-install \
+				webplugin-post-install post-install post-install-script \
+				move-uniquefiles post-stage compress-man patch-lafiles \
+				install-rc-script install-ldconfig-file install-license \
+				install-desktop-entries add-plist-info add-plist-docs \
+				add-plist-examples add-plist-data add-plist-post \
+				move-uniquefiles-plist fix-plist-sequence
 .if defined(DEVELOPER)
 _STAGE_SEQ+=	stage-qa
 .endif
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@ -140,7 +140,7 @@ post-install:
 .endif

 . if ${XORG_CAT} == "lib"
-USES+=	pathfix libtool
+USES+=		pathfix libtool:keepla
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=--enable-malloc0returnsnull
 . endif
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libcomprex
 PORTVERSION=	0.3.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	archivers
 MASTER_SITES=	SF/gnupdate/${PORTNAME}/${PORTVERSION}

@ -16,7 +16,7 @@ OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes

 INSTALL_TARGET=	install-strip
-USES=		libtool pathfix pkgconfig
+USES=		libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

--- a/archivers/libdynamite/Makefile
+++ b/archivers/libdynamite/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libdynamite
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	SF/synce/Dynamite/${PORTVERSION}

@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Decompress data compressed with PKWARE Data Compression Library

 GNU_CONFIGURE=	yes
-USES=	libtool pathfix
+USES=		libtool:keepla pathfix
 USE_LDCONFIG=	yes

 .include <bsd.port.mk>
--- a/archivers/liborange/Makefile
+++ b/archivers/liborange/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	liborange
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SF/synce/Orange/${PORTVERSION}

@ -22,7 +23,7 @@ VISE_DESC=		Build with expermential VISE support
 MSI_DESC=		Build with expermential MSI support

 GNU_CONFIGURE=	yes
-USES=	iconv libtool pathfix pkgconfig
+USES=		iconv libtool:keepla pathfix pkgconfig
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
--- a/archivers/librtfcomp/Makefile
+++ b/archivers/librtfcomp/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	librtfcomp
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	SF/synce/SynCE/${PORTNAME}

@ -13,8 +13,8 @@ COMMENT?=	Library for handling compressed RTF documents
 LICENSE=	LGPL21

 GNU_CONFIGURE=	yes
+USES=		libtool:keepla
 USE_LDCONFIG=	yes
-USES=		libtool

 SLAVEDIRS=	archivers/py-librtfcomp

--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	lzo2
 PORTVERSION=	2.06
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers devel
 MASTER_SITES=	http://www.oberhumer.com/opensource/lzo/download/ \
 		LOCAL/mandree
@ -14,7 +14,7 @@ COMMENT=	Portable speedy, lossless data compression library

 LICENSE=	GPLv2

-USES=		libtool
+USES=		libtool:keepla
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --docdir=${DOCSDIR}
 USE_LDCONFIG=	yes
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ucl
 PORTVERSION=	1.03
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers devel
 MASTER_SITES=	http://www.oberhumer.com/opensource/ucl/download/

@ -14,7 +14,7 @@ LICENSE=	GPLv2

 OPTIONS_DEFINE=	DOCS

-USES=		libtool
+USES=		libtool:keepla
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
--- a/archivers/unshield/Makefile
+++ b/archivers/unshield/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	unshield
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	SF/synce/Unshield/${PORTVERSION}

@ -14,7 +14,7 @@ LICENSE=	MIT

 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		libtool pathfix
+USES=		libtool:keepla pathfix

 post-build:
 	@${STRIP_CMD} ${WRKSRC}/lib/.libs/libunshield.so.0.0.0
--- a/audio/gstreamer1-plugins-a52dec/Makefile
+++ b/audio/gstreamer1-plugins-a52dec/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
--- a/audio/gstreamer1-plugins-amrnb/Makefile
+++ b/audio/gstreamer1-plugins-amrnb/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer OpenCore based Adaptive Multi-Rate Narrow-Band plugin
--- a/audio/gstreamer1-plugins-amrwbdec/Makefile
+++ b/audio/gstreamer1-plugins-amrwbdec/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	1-plugins-amrwbdec

--- a/audio/gstreamer1-plugins-cdparanoia/Makefile
+++ b/audio/gstreamer1-plugins-cdparanoia/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer CDDA extraction (aka audio ripping) plugin
--- a/audio/gstreamer1-plugins-faac/Makefile
+++ b/audio/gstreamer1-plugins-faac/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin
--- a/audio/gstreamer1-plugins-faad/Makefile
+++ b/audio/gstreamer1-plugins-faad/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC decoder plugin
--- a/audio/gstreamer1-plugins-flac/Makefile
+++ b/audio/gstreamer1-plugins-flac/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer free lossless audio encoder/decoder plugin
--- a/audio/gstreamer1-plugins-flite/Makefile
+++ b/audio/gstreamer1-plugins-flite/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer flite run-time speech synthesis engine plugin
--- a/audio/gstreamer1-plugins-gme/Makefile
+++ b/audio/gstreamer1-plugins-gme/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer gme plugin
--- a/audio/gstreamer1-plugins-gsm/Makefile
+++ b/audio/gstreamer1-plugins-gsm/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer gsm encoding/decoding plugin
--- a/audio/gstreamer1-plugins-jack/Makefile
+++ b/audio/gstreamer1-plugins-jack/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer low-latency audio server plugin
--- a/audio/gstreamer1-plugins-lame/Makefile
+++ b/audio/gstreamer1-plugins-lame/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer mp3 encode plugin
--- a/audio/gstreamer1-plugins-mad/Makefile
+++ b/audio/gstreamer1-plugins-mad/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer mp3 decoder plugin
--- a/audio/gstreamer1-plugins-modplug/Makefile
+++ b/audio/gstreamer1-plugins-modplug/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer modplug plugin
--- a/audio/gstreamer1-plugins-ogg/Makefile
+++ b/audio/gstreamer1-plugins-ogg/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer Ogg bitstream plugin
--- a/audio/gstreamer1-plugins-opus/Makefile
+++ b/audio/gstreamer1-plugins-opus/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer Opus audio encoder/decoder plugin
--- a/audio/gstreamer1-plugins-shout2/Makefile
+++ b/audio/gstreamer1-plugins-shout2/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer icecast plugin
--- a/audio/gstreamer1-plugins-sidplay/Makefile
+++ b/audio/gstreamer1-plugins-sidplay/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer Commodore SID decoder plugin
--- a/audio/gstreamer1-plugins-soundtouch/Makefile
+++ b/audio/gstreamer1-plugins-soundtouch/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	GStreamer soundtouch plugin
--- a/audio/gstreamer1-plugins-speex/Makefile
+++ b/audio/gstreamer1-plugins-speex/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer speex voice plugin
--- a/audio/gstreamer1-plugins-taglib/Makefile
+++ b/audio/gstreamer1-plugins-taglib/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer taglib plugin
--- a/audio/gstreamer1-plugins-twolame/Makefile
+++ b/audio/gstreamer1-plugins-twolame/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer High-quality free MP2 encoder plugin
--- a/audio/gstreamer1-plugins-vorbis/Makefile
+++ b/audio/gstreamer1-plugins-vorbis/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer vorbis encoder/decoder plugin
--- a/audio/gstreamer1-plugins-wavpack/Makefile
+++ b/audio/gstreamer1-plugins-wavpack/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio

 COMMENT=	Gstreamer wavpack plugin
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	id3lib
 PORTVERSION=	3.8.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	SF

@ -11,7 +11,7 @@ MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags

 GNU_CONFIGURE=	yes
-USES=		iconv libtool
+USES=		iconv libtool:keepla
 USE_LDCONFIG=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libcddb
 PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF

--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libmad
 PORTVERSION=	0.15.1b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF/mad/${PORTNAME}/${PORTVERSION}

--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libmikmod
 PORTVERSION=	3.3.6
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF/mikmod/libmikmod/${PORTVERSION}/

@ -11,7 +12,7 @@ COMMENT=	MikMod Sound Library

 LICENSE=	LGPL21

-USES=		gmake libtool pkgconfig
+USES=		gmake libtool:keepla pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-esd
 USE_LDCONFIG=	yes
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libsamplerate
 PORTVERSION=	0.1.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/SRC/

@ -12,7 +12,7 @@ COMMENT=	Secret Rabbit Code: a Sample Rate Converter for audio

 LICENSE=	GPLv2

-USES=	pathfix pkgconfig libtool:oldver
+USES=		libtool:oldver pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

--- a/audio/libtremor/Makefile
+++ b/audio/libtremor/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libtremor
 PORTVERSION=	1.2.0.s20040213
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://members.chello.nl/~g.mast/distfiles/
 DISTNAME=	tremor_snapshot_${SNAP_DATE}
@ -13,7 +14,7 @@ COMMENT=	Integer-only fully Ogg Vorbis compliant decoder library

 SNAP_DATE=	02132004
 WRKSRC=		${WRKDIR}/Tremor
-USES=		libtool
+USES=		libtool:keepla
 USE_AUTOTOOLS=	aclocal automake autoconf libtoolize
 AUTOMAKE_ARGS=	-a -c
 LIBTOOLIZE_ARGS=-i -c
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	mpg123
 PORTVERSION=	1.19.0
+PORTREVISION=	1
 CATEGORIES=	audio ipv6
 MASTER_SITES=	SF \
 		http://www.mpg123.de/download/
@ -12,7 +13,7 @@ COMMENT=	Command-line player for MPEG Layer 1, 2, and 3 audio files

 LICENSE=	LGPL21

-USES=		libtool gmake pathfix
+USES=		gmake libtool:keepla pathfix
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	yes
--- a/audio/pd/Makefile
+++ b/audio/pd/Makefile
@ -4,6 +4,7 @@
 PORTNAME=	pd
 DISTVERSION=	0.45-4
 DISTVERSIONSUFFIX=	.src
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://msp.ucsd.edu/Software/

@ -20,7 +21,7 @@ OPTIONS_DEFAULT=FFTW

 WRKSRC=		${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}

-USES=		gettext gmake libtool pkgconfig shebangfix tk:wrapper
+USES=		gettext gmake libtool:keepla pkgconfig shebangfix tk:wrapper
 SHEBANG_FILES=	tcl/pkg_mkIndex.tcl
 SHEBANG_LANG=	tclsh
 tclsh_OLD_CMD=	/usr/bin/tclsh
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	rhythmbox
 PORTVERSION=	0.12.8
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -24,7 +24,8 @@ LIB_DEPENDS=	libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3 \

 CONFLICTS=	rhythmbox-2.[0-9]* rhythmbox-3.[0-9]*

-USES=		gettext gmake pathfix pkgconfig tar:bzip2 libtool desktop-file-utils
+USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+		pkgconfig tar:bzip2
 INSTALLS_OMF=	yes
 USE_GNOME=	intlhack gnomeprefix gtk20 nautilus2
 WANT_GNOME=	yes
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	speex
 DISTVERSION=	1.2rc1
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.us.xiph.org/releases/speex/
@ -13,7 +13,7 @@ COMMENT=	Open-source patent-free voice codec

 LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg

-USES=		libtool pathfix
+USES=		libtool:keepla pathfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogg-dir=${LOCALBASE}
--- a/benchmarks/iperf3/Makefile
+++ b/benchmarks/iperf3/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	iperf
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	benchmarks ipv6
 MASTER_SITES=	http://stats.es.net/software/
 PKGNAMESUFFIX=	3
@ -13,8 +14,8 @@ COMMENT=	Improved tool to measure TCP and UDP bandwidth
 LICENSE=	BSD3CLAUSE

 GNU_CONFIGURE=	yes
+USES=		libtool:keepla
 USE_LDCONFIG=	yes
-USES=		libtool

 # Set ${DOCSDIR} to avoid conflict with benchmarks/iperf ${DOCSDIR}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
--- a/comms/aldo/Makefile
+++ b/comms/aldo/Makefile
@ -16,10 +16,10 @@ BROKEN=		Does not build with modern compilers
 LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao

 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf automake libtool
+USE_AUTOTOOLS=	autoconf automake
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
 		--libdir="${LOCALBASE}/lib"
-USES=		gmake tar:bzip2 libtool
+USES=		gmake libtool tar:bzip2
 USE_GCC=	any

 PLIST_FILES=	bin/aldo \
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gsmlib
 PORTVERSION=	1.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms
 MASTER_SITES=	DEBIAN
 #TODO: examine the Debian patches, and changes in the Mandrake
@ -13,7 +13,7 @@ DISTFILES=	gsmlib_1.10.orig.tar.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to access GSM mobile phones through GSM modems

-USES=		gmake libtool
+USES=		gmake libtool:keepla
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

--- a/comms/gstreamer1-plugins-spandsp/Makefile
+++ b/comms/gstreamer1-plugins-spandsp/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	comms

 COMMENT=	Gstreamer DSP library and software FAX machine plugin
--- a/comms/hidapi/Makefile
+++ b/comms/hidapi/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	hidapi
 DISTVERSION=	0.8.0-rc1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms

 MAINTAINER=	tijl@FreeBSD.org
--- a/comms/hidapi/pkg-plist
+++ b/comms/hidapi/pkg-plist
@ -1,6 +1,5 @@
 include/hidapi/hidapi.h
 lib/libhidapi.a
-lib/libhidapi.la
 lib/libhidapi.so
 lib/libhidapi.so.0
 lib/libhidapi.so.0.0.0
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	recode
 PORTVERSION=	3.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	recode
@ -12,7 +12,7 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Converts files between character sets and usages

 GNU_CONFIGURE=	yes
-USES=		gettext iconv libtool perl5
+USES=		gettext iconv libtool:keepla perl5
 USE_PERL5=	run build
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--without-included-gettext
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	glom
 PORTVERSION=	1.12.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -29,8 +29,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		shared-mime-info
+USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+		pkgconfig shared-mime-info
 USE_GNOME=	gnomedocutils gnomeprefix pygnomeextras
 USE_LDCONFIG=	yes
 USE_PGSQL=	yes
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	libgdamm
 PORTVERSION=	3.99.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -16,7 +16,7 @@ COMMENT=	C++ wrapper for libgda4 library
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4

 USE_BZIP2=	yes
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	glibmm libgda4
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libiodbc
 PORTVERSION=	3.52.8
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF/iodbc/iodbc/${PORTVERSION}

--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libzdb
 PORTVERSION=	2.11.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.tildeslash.com/libzdb/dist/ \
 		http://www.c-s.li/ports/
@ -21,7 +21,7 @@ OPTIONS_DEFAULT=MYSQL SQLITE PGSQL

 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=	gmake libtool pathfix
+USES=		gmake libtool:keepla pathfix
 USE_LDCONFIG=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
--- a/databases/vsqlite/Makefile
+++ b/databases/vsqlite/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	vsqlite
 PORTVERSION=	0.3.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases

 MAINTAINER=	kwm@FreeBSD.org
@ -20,7 +20,7 @@ GH_TAGNAME=	3fa8d32
 GH_COMMIT=	3fa8d32

 USE_AUTOTOOLS=	libtoolize autoconf automake
-USES=		compiler:c++0x libtool
+USES=		compiler:c++0x libtool:keepla
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/deskutils/bitcollider/Makefile
+++ b/deskutils/bitcollider/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	bitcollider
 PORTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils multimedia
 MASTER_SITES=	SF/${PORTNAME}/Bitcollider/${PORTVERSION}

@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bitzi metadata generator

 GNU_CONFIGURE=	yes
-USES=		libtool
+USES=		libtool:keepla
 USE_LDCONFIG=	yes

 CFLAGS+=	-lm
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gtkjournal
 PORTVERSION=	0.3.5.b
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://sourcefiles.org/Productivity_Tools/Diary/ \
 		LOCAL/beech
@ -21,9 +21,9 @@ PLIST_FILES=	bin/gtkjournal man/man1/gtkjournal.1.gz \
 		lib/libsqlitemm.so lib/libsqlitemm.so.0 \
 		lib/libsqlitemm.so.0.0.1

+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix pkgconfig
 CONFIGURE_ARGS=	--enable-gtkspell
 USE_LDCONFIG=	yes

--- a/deskutils/notify-osd/Makefile
+++ b/deskutils/notify-osd/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	notify-osd
 PORTVERSION=	0.9.29
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpadlibrarian.net/43419242/ \
 		CRITICAL
@ -20,8 +20,11 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus

 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig
+USES=		gmake libtool pkgconfig
 USE_GNOME=	libwnck gconf2
+USE_XORG=	pixman
 USE_GCC=	yes

+LDFLAGS+=	-L${LOCALBASE}/lib -lpixman-1
+
 .include <bsd.port.mk>
--- a/devel/anjuta-extras/Makefile
+++ b/devel/anjuta-extras/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	anjuta-extras
 PORTVERSION=	2.32.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GNOME

@ -13,7 +13,7 @@ COMMENT=	Extra anjuta plugins

 LIB_DEPENDS=	libanjuta.so:${PORTSDIR}/devel/anjuta
 		
-USES=		gmake libtool tar:bzip2
+USES=		gmake libtool:keepla tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	anjuta
 PORTVERSION=	2.32.1.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -30,8 +30,8 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \

 CONFLICTS=	anjuta-3.[0-9]*

-USES=		desktop-file-utils gmake gettext libtool pathfix perl5 pkgconfig \
-		shebangfix shared-mime-info tar:bzip2
+USES=		desktop-file-utils gmake gettext libtool:keepla pathfix \
+		perl5 pkgconfig shared-mime-info shebangfix tar:bzip2
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	bug-buddy
 PORTVERSION=	2.32.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -15,7 +15,7 @@ COMMENT=	Bug reporting tool for GNOME 2
 LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup

-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool:keepla  pathfix pkgconfig tar:bzip2
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	dbus
 PORTVERSION=	1.6.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/

@ -16,7 +16,7 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 PORTSCOUT=	limitw:1,even

 USE_GNOME=	libxml2
-USES=		gmake libtool pathfix
+USES=		gmake libtool:keepla pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=--localstatedir=/var \
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	devhelp
 PORTVERSION=	2.32.0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@ -19,7 +19,7 @@ LIB_DEPENDS=	libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 \
 CONFLICTS=	devhelp-3.[0-9]*

 USE_XORG=	x11
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	intlhack gnomeprefix libgnomeui libwnck
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	eggdbus
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://hal.freedesktop.org/releases/

@ -14,7 +14,7 @@ COMMENT=	D-Bus bindings for GObject
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib

 USE_GNOME=	glib20
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 MAKE_JOBS_UNSAFE=yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	gconfmm
 PORTVERSION=	2.28.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -16,7 +16,7 @@ LIB_DEPENDS=	libglibmm-2.4.so:${PORTSDIR}/devel/glibmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		${LOCALBASE}/lib/libgtkmm-2.4.so.1:${PORTSDIR}/x11-toolkits/gtkmm24

-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_XORG=	x11
 USE_GNOME=	gconf2 referencehack
 GNU_CONFIGURE=	yes
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	glade3
 PORTVERSION=	3.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -17,7 +17,7 @@ PORTSCOUT=	ignore

 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk20 libxml2 gnomeprefix gnomedocutils
-USES=		gmake gettext libtool pathfix desktop-file-utils pkgconfig tar:xz
+USES=		gmake gettext libtool:keepla pathfix desktop-file-utils pkgconfig tar:xz
 INSTALLS_OMF=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	glibmm
 PORTVERSION=	2.36.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
@ -21,7 +21,7 @@ PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4

-USES=		gettext gmake libtool pathfix perl5 pkgconfig
+USES=		gettext gmake libtool:keepla pathfix perl5 pkgconfig
 USE_GNOME=	glib20 libsigc++20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/devel/gnome-vfs-monikers/Makefile
+++ b/devel/gnome-vfs-monikers/Makefile
@ -4,15 +4,15 @@

 PORTNAME=	gnome-vfs-monikers
 PORTVERSION=	2.15.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	devel
 MASTER_SITES=	GNOME

 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome-vfs monikers module

+USES=		gmake libtool:keepla pkgconfig
 USE_GNOME=	gnomevfs2 libbonobo
-USES=		gmake libtool pkgconfig
 INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	gnome-vfs
 PORTVERSION=	2.24.4
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -18,7 +18,7 @@ USES=		tar:bzip2

 RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info

-USES+=		libtool pathfix gettext gmake pkgconfig
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomemimedata gconf2 \
 		referencehack
 INSTALL_TARGET=	install-strip
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	gnome-vfsmm
 PORTVERSION=	2.26.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -14,7 +14,7 @@ COMMENT=	C++ wrapper for gnomevfs2 library

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4

-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	glibmm gnomevfs2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/devel/goffice010/Makefile
+++ b/devel/goffice010/Makefile
@ -4,6 +4,7 @@

 PORTNAME=	goffice
 PORTVERSION=	0.10.11
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	010
@ -16,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 USE_XZ=		yes
 USE_GNOME=	gnomeprefix gtk30 intlhack libgsf librsvg2
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/devel/gstreamer1-plugins-soup/Makefile
+++ b/devel/gstreamer1-plugins-soup/Makefile
@ -1,6 +1,6 @@
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel

 COMMENT=	Gstreamer soup http src plugin
--- a/devel/judy/Makefile
+++ b/devel/judy/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	Judy
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION}

@ -11,7 +12,7 @@ COMMENT=	General purpose dynamic array

 LICENSE=	LGPL21

-USES=	gmake libtool
+USES=		gmake libtool:keepla
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	YES
 MAKE_JOBS_UNSAFE=	yes
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	libIDL
 PORTVERSION=	0.8.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library for creating trees of CORBA IDL files

-USES=		gmake bison libtool pathfix pkgconfig gettext tar:bzip2
+USES=		bison gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	glib20
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
--- a/devel/libdaemon/Makefile
+++ b/devel/libdaemon/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libdaemon
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/

@ -10,8 +11,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight C library that eases the writing of UNIX daemons

 CONFIGURE_ARGS=	--disable-lynx
-USES=		libtool pathfix
 GNU_CONFIGURE=	yes
+USES=		libtool:keepla pathfix
 USE_LDCONFIG=	yes

 .include <bsd.port.mk>
--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libdnsres
 PORTVERSION=	0.1a
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/

@ -12,7 +12,7 @@ COMMENT=	Provides a non-blocking thread-safe API for resolving DNS names

 BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent

-USES=		libtool
+USES=		libtool:keepla
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=--with-libevent=${LOCALBASE}
--- a/devel/libevt/Makefile
+++ b/devel/libevt/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libevt
 DISTVERSION=	alpha-20140411
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://googledrive.com/host/0B3fBvzttpiiSYm01VnUtLXNUZ2M/ \
 		LOCAL/antoine
@ -14,7 +15,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES=		gettext iconv libtool pathfix
+USES=		gettext iconv libtool:keepla pathfix
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/libevtx/Makefile
+++ b/devel/libevtx/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libevtx
 DISTVERSION=	alpha-20140323
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://googledrive.com/host/0B3fBvzttpiiSRnQ0SExzX3JjdFE/ \
 		LOCAL/antoine
@ -14,7 +15,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES=		gettext iconv libtool pathfix
+USES=		gettext iconv libtool:keepla pathfix
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/libewf/Makefile
+++ b/devel/libewf/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libewf
 PORTVERSION=	20140406
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/ \
 		LOCAL/antoine
@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid

-USES=		fuse gettext iconv libtool pathfix pkgconfig
+USES=		fuse gettext iconv libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 USE_PYTHON=	2
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	libgdata
 PORTVERSION=	0.6.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME

@ -15,7 +15,7 @@ LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome

 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 intltool introspection:build
 CPPFLAGS+=	-I${LOCALBASE}/include 
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@ -4,6 +4,7 @@

 PORTNAME=	libgee
 PORTVERSION=	0.12.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME

@ -15,7 +16,7 @@ BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection=yes
 USE_XZ=		yes
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	glib20 gnomehier introspection:build
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/libghthash/Makefile
+++ b/devel/libghthash/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libghthash
 PORTVERSION=	0.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ipd.bth.se/ska/sim_home/filer/

@ -12,7 +12,7 @@ COMMENT=	Generic Hash Table

 OPTIONS_DEFINE=	DOCS EXAMPLES

-USES=		libtool
+USES=		libtool:keepla
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
 AUTOMAKE_ARGS=	-a -c -f
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	libglademm
 PORTVERSION=	2.6.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -18,7 +18,7 @@ LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4

 USE_XORG=	x11 ice
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	libglade2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/devel/liblnk/Makefile
+++ b/devel/liblnk/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	liblnk
 PORTVERSION=	20140323
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://googledrive.com/host/0B3fBvzttpiiSQmluVC1YeDVvZWM/ \
 		LOCAL/antoine
@ -15,7 +16,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES=		gettext iconv libtool pathfix
+USES=		gettext iconv libtool:keepla pathfix
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/liblogging/Makefile
+++ b/devel/liblogging/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	liblogging
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.rsyslog.com/liblogging/

@ -12,7 +13,7 @@ COMMENT=	Easy to use system logging library
 LICENSE=	BSD2CLAUSE

 GNU_CONFIGURE=	yes
-USES=	libtool pathfix
+USES=		libtool:keepla pathfix

 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblogging-stdlog.so.0.0.0
--- a/devel/libmimedir/Makefile
+++ b/devel/libmimedir/Makefile
@ -3,13 +3,14 @@

 PORTNAME=	libmimedir
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for parsing RFC2425 MIME Directory Profile information

-USES=		bison desthack libtool
+USES=		bison desthack libtool:keepla
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

--- a/devel/libmsiecf/Makefile
+++ b/devel/libmsiecf/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libmsiecf
 DISTVERSION=	alpha-20140323
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://googledrive.com/host/0B3fBvzttpiiSVm1MNkw5cU1mUG8/ \
 		LOCAL/antoine
@ -14,7 +15,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES=		gettext iconv libtool pathfix
+USES=		gettext iconv libtool:keepla pathfix
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/liboil/Makefile
+++ b/devel/liboil/Makefile
@ -4,6 +4,7 @@

 PORTNAME=	liboil
 PORTVERSION=	0.3.17
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://liboil.freedesktop.org/download/

@ -12,7 +13,7 @@ COMMENT=	Library of optimized inner loops

 LICENSE=	BSD2CLAUSE

-USES=		libtool pkgconfig
+USES=		libtool:keepla pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
--- a/devel/libolecf/Makefile
+++ b/devel/libolecf/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libolecf
 DISTVERSION=	alpha-20140329
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://googledrive.com/host/0B3fBvzttpiiSS0hEb0pjU2h6a2c/ \
 		LOCAL/antoine
@ -14,7 +15,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES=		fuse gettext iconv libtool pathfix pkgconfig
+USES=		fuse gettext iconv libtool:keepla pathfix pkgconfig
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	liboobs
 PORTVERSION=	2.32.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -17,7 +17,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
    		libhal.so:${PORTSDIR}/sysutils/hal
 RUN_DEPENDS=	${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackends.conf:${PORTSDIR}/sysutils/system-tools-backends

-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 INSTALL_TARGET=	install-strip
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libpciaccess
 PORTVERSION=	0.13.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel

 MAINTAINER=	x11@FreeBSD.org
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@ -4,6 +4,7 @@

 PORTNAME=	libpeas
 PORTVERSION=	1.8.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@ -16,7 +17,7 @@ BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 USE_XZ=		yes
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gtk30 introspection:build
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
--- a/devel/libregf/Makefile
+++ b/devel/libregf/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libregf
 DISTVERSION=	alpha-20140323
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://googledrive.com/host/0B3fBvzttpiiSSC1yUDZpb3l0UHM/ \
 		LOCAL/antoine
@ -14,7 +15,7 @@ LICENSE=	LGPL3

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} ${ICONV_CONFIGURE_ARG}
-USES=		fuse gettext iconv libtool pathfix pkgconfig
+USES=		fuse gettext iconv libtool:keepla pathfix pkgconfig
 USE_PYTHON=	2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
--- a/devel/libsigcx/Makefile
+++ b/devel/libsigcx/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libsigcx
 PORTVERSION=	0.6.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	SF

@ -15,7 +15,7 @@ LIB_DEPENDS=	libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12

 OPTIONS_DEFINE=	STATIC

-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_DOXYGEN=""
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	libsoup
 PORTVERSION=	2.40.3
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@ -20,7 +20,7 @@ USE_XZ=		yes

 .if !defined(REFERENCE_PORT)

-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gnomehier glib20 libxml2 referencehack intltool
 USE_SQLITE=	3
 USE_LDCONFIG=	yes
--- a/devel/libvshadow/Makefile
+++ b/devel/libvshadow/Makefile
@ -3,18 +3,19 @@

 PORTNAME=	libvshadow
 PORTVERSION=	20140323
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://googledrive.com/host/0B3fBvzttpiiSZDZXRFVMdnZCeHc/ \
 		LOCAL/antoine
 DISTNAME=	${PORTNAME}-alpha-${PORTVERSION}

 MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	A library to support the Volume Service Snapshot (VSS) format
+COMMENT=	Library to support the Volume Service Snapshot (VSS) format

 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING

-USES=		fuse gettext iconv libtool pathfix pkgconfig
+USES=		fuse gettext iconv libtool:keepla pathfix pkgconfig
 USE_PYTHON=	2
 USE_LDCONFIG=	yes

--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	log4cplus
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}

@ -11,7 +12,7 @@ COMMENT=	Logging library for C++

 OPTIONS_DEFINE=	DOCS

-USES=		libtool pathfix
+USES=		libtool:keepla pathfix
 USE_XZ=		yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
--- a/devel/mq4cpp/Makefile
+++ b/devel/mq4cpp/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	mq4cpp
 PORTVERSION=	1.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.sixtyfourbit.org/Download/

@ -13,7 +13,7 @@ COMMENT=	Message Queuing for C++
 OPTIONS_DEFINE=	DOCS

 USE_LDCONFIG=	yes
-USES=		dos2unix libtool pathfix pkgconfig
+USES=		dos2unix libtool:keepla pathfix pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes

--- a/Show More
+++ b/Show More