Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Apr 2014 15:02:05 +0200 (CEST)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/188759: [exp-run]: Reduce overlinking caused by libtool
Message-ID:  <201404181302.s3ID25Ia001651@kalimero.tijl.coosemans.org>
Resent-Message-ID: <201404181310.s3IDA0PL043838@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         188759
>Category:       ports
>Synopsis:       [exp-run]: Reduce overlinking caused by libtool
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 18 13:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Tijl Coosemans
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
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.

The attached patch modifies USES=libtool so it empties the dependency_libs
field in .la files during staging.  However, because .la files have very
limited use when dependency_libs is empty it makes sense to completely
remove them during staging.

So with this patch USES=libtool is modified to remove .la files and a new
form (USES=libtool:keepla) is introduced in case .la files need to be kept
(dependency_libs is still emptied).

The patch bumps PORTREVISION on all ports with USES=libtool that install
.la files.  Most ports are also changed to add :keepla because .la files
have to be kept around as long as there are dependent ports with .la files
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
files have some form of USES=libtool added to their Makefile.
>How-To-Repeat:
>Fix:

--- keepla.patch begins here ---
Index: Mk/Uses/libtool.mk
===================================================================
--- Mk/Uses/libtool.mk	(revision 351527)
+++ Mk/Uses/libtool.mk	(working copy)
@@ -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 files that
+#			refer to *.la files 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
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk	(revision 351527)
+++ Mk/bsd.port.mk	(working copy)
@@ -6529,22 +6529,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
Index: Mk/bsd.xorg.mk
===================================================================
--- Mk/bsd.xorg.mk	(revision 351527)
+++ Mk/bsd.xorg.mk	(working copy)
@@ -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
Index: archivers/libcomprex/Makefile
===================================================================
--- archivers/libcomprex/Makefile	(revision 351527)
+++ archivers/libcomprex/Makefile	(working copy)
@@ -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
 
Index: archivers/libdynamite/Makefile
===================================================================
--- archivers/libdynamite/Makefile	(revision 351527)
+++ archivers/libdynamite/Makefile	(working copy)
@@ -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>
Index: archivers/liborange/Makefile
===================================================================
--- archivers/liborange/Makefile	(revision 351527)
+++ archivers/liborange/Makefile	(working copy)
@@ -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
 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
Index: archivers/librtfcomp/Makefile
===================================================================
--- archivers/librtfcomp/Makefile	(revision 351527)
+++ archivers/librtfcomp/Makefile	(working copy)
@@ -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 compresse
 LICENSE=	LGPL21
 
 GNU_CONFIGURE=	yes
+USES=		libtool:keepla
 USE_LDCONFIG=	yes
-USES=		libtool
 
 SLAVEDIRS=	archivers/py-librtfcomp
 
Index: archivers/lzo2/Makefile
===================================================================
--- archivers/lzo2/Makefile	(revision 351527)
+++ archivers/lzo2/Makefile	(working copy)
@@ -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 
 
 LICENSE=	GPLv2
 
-USES=		libtool
+USES=		libtool:keepla
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --docdir=${DOCSDIR}
 USE_LDCONFIG=	yes
Index: archivers/ucl/Makefile
===================================================================
--- archivers/ucl/Makefile	(revision 351527)
+++ archivers/ucl/Makefile	(working copy)
@@ -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
Index: archivers/unshield/Makefile
===================================================================
--- archivers/unshield/Makefile	(revision 351527)
+++ archivers/unshield/Makefile	(working copy)
@@ -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
Index: audio/gstreamer1-plugins-a52dec/Makefile
===================================================================
--- audio/gstreamer1-plugins-a52dec/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-a52dec/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
Index: audio/gstreamer1-plugins-amrnb/Makefile
===================================================================
--- audio/gstreamer1-plugins-amrnb/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-amrnb/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer OpenCore based Adaptive Multi-Rate Narrow-Band plugin
Index: audio/gstreamer1-plugins-amrwbdec/Makefile
===================================================================
--- audio/gstreamer1-plugins-amrwbdec/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-amrwbdec/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	1-plugins-amrwbdec
 
Index: audio/gstreamer1-plugins-cdparanoia/Makefile
===================================================================
--- audio/gstreamer1-plugins-cdparanoia/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-cdparanoia/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer CDDA extraction (aka audio ripping) plugin
Index: audio/gstreamer1-plugins-faac/Makefile
===================================================================
--- audio/gstreamer1-plugins-faac/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-faac/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin
Index: audio/gstreamer1-plugins-faad/Makefile
===================================================================
--- audio/gstreamer1-plugins-faad/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-faad/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC decoder plugin
Index: audio/gstreamer1-plugins-flac/Makefile
===================================================================
--- audio/gstreamer1-plugins-flac/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-flac/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer free lossless audio encoder/decoder plugin
Index: audio/gstreamer1-plugins-flite/Makefile
===================================================================
--- audio/gstreamer1-plugins-flite/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-flite/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer flite run-time speech synthesis engine plugin
Index: audio/gstreamer1-plugins-gme/Makefile
===================================================================
--- audio/gstreamer1-plugins-gme/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-gme/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer gme plugin
Index: audio/gstreamer1-plugins-gsm/Makefile
===================================================================
--- audio/gstreamer1-plugins-gsm/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-gsm/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer gsm encoding/decoding plugin
Index: audio/gstreamer1-plugins-jack/Makefile
===================================================================
--- audio/gstreamer1-plugins-jack/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-jack/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer low-latency audio server plugin
Index: audio/gstreamer1-plugins-lame/Makefile
===================================================================
--- audio/gstreamer1-plugins-lame/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-lame/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mp3 encode plugin
Index: audio/gstreamer1-plugins-mad/Makefile
===================================================================
--- audio/gstreamer1-plugins-mad/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-mad/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer mp3 decoder plugin
Index: audio/gstreamer1-plugins-modplug/Makefile
===================================================================
--- audio/gstreamer1-plugins-modplug/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-modplug/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer modplug plugin
Index: audio/gstreamer1-plugins-ogg/Makefile
===================================================================
--- audio/gstreamer1-plugins-ogg/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-ogg/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Ogg bitstream plugin
Index: audio/gstreamer1-plugins-opus/Makefile
===================================================================
--- audio/gstreamer1-plugins-opus/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-opus/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Opus audio encoder/decoder plugin
Index: audio/gstreamer1-plugins-shout2/Makefile
===================================================================
--- audio/gstreamer1-plugins-shout2/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-shout2/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer icecast plugin
Index: audio/gstreamer1-plugins-sidplay/Makefile
===================================================================
--- audio/gstreamer1-plugins-sidplay/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-sidplay/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer Commodore SID decoder plugin
Index: audio/gstreamer1-plugins-soundtouch/Makefile
===================================================================
--- audio/gstreamer1-plugins-soundtouch/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-soundtouch/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	GStreamer soundtouch plugin
Index: audio/gstreamer1-plugins-speex/Makefile
===================================================================
--- audio/gstreamer1-plugins-speex/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-speex/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer speex voice plugin
Index: audio/gstreamer1-plugins-taglib/Makefile
===================================================================
--- audio/gstreamer1-plugins-taglib/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-taglib/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer taglib plugin
Index: audio/gstreamer1-plugins-twolame/Makefile
===================================================================
--- audio/gstreamer1-plugins-twolame/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-twolame/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer High-quality free MP2 encoder plugin
Index: audio/gstreamer1-plugins-vorbis/Makefile
===================================================================
--- audio/gstreamer1-plugins-vorbis/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-vorbis/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer vorbis encoder/decoder plugin
Index: audio/gstreamer1-plugins-wavpack/Makefile
===================================================================
--- audio/gstreamer1-plugins-wavpack/Makefile	(revision 351527)
+++ audio/gstreamer1-plugins-wavpack/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 COMMENT=	Gstreamer wavpack plugin
Index: audio/id3lib/Makefile
===================================================================
--- audio/id3lib/Makefile	(revision 351527)
+++ audio/id3lib/Makefile	(working copy)
@@ -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
Index: audio/libcddb/Makefile
===================================================================
--- audio/libcddb/Makefile	(revision 351527)
+++ audio/libcddb/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libcddb
 PORTVERSION=	1.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
Index: audio/libmad/Makefile
===================================================================
--- audio/libmad/Makefile	(revision 351527)
+++ audio/libmad/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libmad
 PORTVERSION=	0.15.1b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF/mad/${PORTNAME}/${PORTVERSION}
 
Index: audio/libmikmod/Makefile
===================================================================
--- audio/libmikmod/Makefile	(revision 351527)
+++ audio/libmikmod/Makefile	(working copy)
@@ -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
Index: audio/libsamplerate/Makefile
===================================================================
--- audio/libsamplerate/Makefile	(revision 351527)
+++ audio/libsamplerate/Makefile	(working copy)
@@ -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 Ra
 
 LICENSE=	GPLv2
 
-USES=	pathfix pkgconfig libtool:oldver
+USES=		libtool:oldver pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
Index: audio/libtremor/Makefile
===================================================================
--- audio/libtremor/Makefile	(revision 351527)
+++ audio/libtremor/Makefile	(working copy)
@@ -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 c
 
 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
Index: audio/mpg123/Makefile
===================================================================
--- audio/mpg123/Makefile	(revision 351527)
+++ audio/mpg123/Makefile	(working copy)
@@ -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 La
 
 LICENSE=	LGPL21
 
-USES=		libtool gmake pathfix
+USES=		gmake libtool:keepla pathfix
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	yes
Index: audio/pd/Makefile
===================================================================
--- audio/pd/Makefile	(revision 351527)
+++ audio/pd/Makefile	(working copy)
@@ -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
Index: audio/rhythmbox/Makefile
===================================================================
--- audio/rhythmbox/Makefile	(revision 351527)
+++ audio/rhythmbox/Makefile	(working copy)
@@ -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:${PORTSD
 
 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
Index: audio/speex/Makefile
===================================================================
--- audio/speex/Makefile	(revision 351527)
+++ audio/speex/Makefile	(working copy)
@@ -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 c
 
 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}
Index: benchmarks/iperf3/Makefile
===================================================================
--- benchmarks/iperf3/Makefile	(revision 351527)
+++ benchmarks/iperf3/Makefile	(working copy)
@@ -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 an
 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}
Index: comms/aldo/Makefile
===================================================================
--- comms/aldo/Makefile	(revision 351527)
+++ comms/aldo/Makefile	(working copy)
@@ -16,10 +16,10 @@ BROKEN=		Does not build with modern comp
 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 \
Index: comms/gstreamer1-plugins-spandsp/Makefile
===================================================================
--- comms/gstreamer1-plugins-spandsp/Makefile	(revision 351527)
+++ comms/gstreamer1-plugins-spandsp/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	comms
 
 COMMENT=	Gstreamer DSP library and software FAX machine plugin
Index: comms/hidapi/Makefile
===================================================================
--- comms/hidapi/Makefile	(revision 351527)
+++ comms/hidapi/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	hidapi
 DISTVERSION=	0.8.0-rc1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms
 
 MAINTAINER=	tijl@FreeBSD.org
Index: comms/hidapi/pkg-plist
===================================================================
--- comms/hidapi/pkg-plist	(revision 351527)
+++ comms/hidapi/pkg-plist	(working copy)
@@ -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
Index: converters/recode/Makefile
===================================================================
--- converters/recode/Makefile	(revision 351527)
+++ converters/recode/Makefile	(working copy)
@@ -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
Index: databases/glom/Makefile
===================================================================
--- databases/glom/Makefile	(revision 351527)
+++ databases/glom/Makefile	(working copy)
@@ -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/pkgcon
 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
Index: databases/libgdamm/Makefile
===================================================================
--- databases/libgdamm/Makefile	(revision 351527)
+++ databases/libgdamm/Makefile	(working copy)
@@ -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
Index: databases/libiodbc/Makefile
===================================================================
--- databases/libiodbc/Makefile	(revision 351527)
+++ databases/libiodbc/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libiodbc
 PORTVERSION=	3.52.8
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF/iodbc/iodbc/${PORTVERSION}
 
Index: databases/vsqlite/Makefile
===================================================================
--- databases/vsqlite/Makefile	(revision 351527)
+++ databases/vsqlite/Makefile	(working copy)
@@ -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
Index: deskutils/bitcollider/Makefile
===================================================================
--- deskutils/bitcollider/Makefile	(revision 351527)
+++ deskutils/bitcollider/Makefile	(working copy)
@@ -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
Index: devel/anjuta/Makefile
===================================================================
--- devel/anjuta/Makefile	(revision 351527)
+++ devel/anjuta/Makefile	(working copy)
@@ -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/bas
 
 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
Index: devel/anjuta-extras/Makefile
===================================================================
--- devel/anjuta-extras/Makefile	(revision 351527)
+++ devel/anjuta-extras/Makefile	(working copy)
@@ -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
Index: devel/bug-buddy/Makefile
===================================================================
--- devel/bug-buddy/Makefile	(revision 351527)
+++ devel/bug-buddy/Makefile	(working copy)
@@ -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
Index: devel/dbus/Makefile
===================================================================
--- devel/dbus/Makefile	(revision 351527)
+++ devel/dbus/Makefile	(working copy)
@@ -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}/tex
 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 \
Index: devel/devhelp/Makefile
===================================================================
--- devel/devhelp/Makefile	(revision 351527)
+++ devel/devhelp/Makefile	(working copy)
@@ -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:${PORTS
 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
Index: devel/eggdbus/Makefile
===================================================================
--- devel/eggdbus/Makefile	(revision 351527)
+++ devel/eggdbus/Makefile	(working copy)
@@ -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
Index: devel/glade3/Makefile
===================================================================
--- devel/glade3/Makefile	(revision 351527)
+++ devel/glade3/Makefile	(working copy)
@@ -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
Index: devel/glibmm/Makefile
===================================================================
--- devel/glibmm/Makefile	(revision 351527)
+++ devel/glibmm/Makefile	(working copy)
@@ -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.
 
 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
Index: devel/gnome-vfs/Makefile
===================================================================
--- devel/gnome-vfs/Makefile	(revision 351527)
+++ devel/gnome-vfs/Makefile	(working copy)
@@ -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
Index: devel/gnome-vfs-monikers/Makefile
===================================================================
--- devel/gnome-vfs-monikers/Makefile	(revision 351527)
+++ devel/gnome-vfs-monikers/Makefile	(working copy)
@@ -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
Index: devel/gnome-vfsmm/Makefile
===================================================================
--- devel/gnome-vfsmm/Makefile	(revision 351527)
+++ devel/gnome-vfsmm/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-vfsmm
 PORTVERSION=	2.26.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,7 +15,7 @@ COMMENT=	C++ wrapper for gnomevfs2 libra
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	glibmm gnomevfs2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: devel/goffice010/Makefile
===================================================================
--- devel/goffice010/Makefile	(revision 351527)
+++ devel/goffice010/Makefile	(working copy)
@@ -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
Index: devel/gstreamer1-plugins-soup/Makefile
===================================================================
--- devel/gstreamer1-plugins-soup/Makefile	(revision 351527)
+++ devel/gstreamer1-plugins-soup/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 COMMENT=	Gstreamer soup http src plugin
Index: devel/judy/Makefile
===================================================================
--- devel/judy/Makefile	(revision 351527)
+++ devel/judy/Makefile	(working copy)
@@ -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
Index: devel/libIDL/Makefile
===================================================================
--- devel/libIDL/Makefile	(revision 351527)
+++ devel/libIDL/Makefile	(working copy)
@@ -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
Index: devel/libdaemon/Makefile
===================================================================
--- devel/libdaemon/Makefile	(revision 351527)
+++ devel/libdaemon/Makefile	(working copy)
@@ -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>
Index: devel/libdnsres/Makefile
===================================================================
--- devel/libdnsres/Makefile	(revision 351527)
+++ devel/libdnsres/Makefile	(working copy)
@@ -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-
 
 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}
Index: devel/libevt/Makefile
===================================================================
--- devel/libevt/Makefile	(revision 351527)
+++ devel/libevt/Makefile	(working copy)
@@ -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
Index: devel/libevtx/Makefile
===================================================================
--- devel/libevtx/Makefile	(revision 351527)
+++ devel/libevtx/Makefile	(working copy)
@@ -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
Index: devel/libewf/Makefile
===================================================================
--- devel/libewf/Makefile	(revision 351527)
+++ devel/libewf/Makefile	(working copy)
@@ -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
Index: devel/libgdata/Makefile
===================================================================
--- devel/libgdata/Makefile	(revision 351527)
+++ devel/libgdata/Makefile	(working copy)
@@ -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:${PORT
 
 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 
Index: devel/libgee/Makefile
===================================================================
--- devel/libgee/Makefile	(revision 351527)
+++ devel/libgee/Makefile	(working copy)
@@ -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/va
 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
Index: devel/libghthash/Makefile
===================================================================
--- devel/libghthash/Makefile	(revision 351527)
+++ devel/libghthash/Makefile	(working copy)
@@ -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
Index: devel/liblnk/Makefile
===================================================================
--- devel/liblnk/Makefile	(revision 351527)
+++ devel/liblnk/Makefile	(working copy)
@@ -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
Index: devel/liblogging/Makefile
===================================================================
--- devel/liblogging/Makefile	(revision 351527)
+++ devel/liblogging/Makefile	(working copy)
@@ -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 libr
 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
Index: devel/libmimedir/Makefile
===================================================================
--- devel/libmimedir/Makefile	(revision 351527)
+++ devel/libmimedir/Makefile	(working copy)
@@ -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
 
Index: devel/libmsiecf/Makefile
===================================================================
--- devel/libmsiecf/Makefile	(revision 351527)
+++ devel/libmsiecf/Makefile	(working copy)
@@ -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
Index: devel/liboil/Makefile
===================================================================
--- devel/liboil/Makefile	(revision 351527)
+++ devel/liboil/Makefile	(working copy)
@@ -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 loop
 
 LICENSE=	BSD2CLAUSE
 
-USES=		libtool pkgconfig
+USES=		libtool:keepla pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
Index: devel/libolecf/Makefile
===================================================================
--- devel/libolecf/Makefile	(revision 351527)
+++ devel/libolecf/Makefile	(working copy)
@@ -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
Index: devel/liboobs/Makefile
===================================================================
--- devel/liboobs/Makefile	(revision 351527)
+++ devel/liboobs/Makefile	(working copy)
@@ -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:${PORTSDI
     		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
Index: devel/libpciaccess/Makefile
===================================================================
--- devel/libpciaccess/Makefile	(revision 351527)
+++ devel/libpciaccess/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libpciaccess
 PORTVERSION=	0.13.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	x11@FreeBSD.org
Index: devel/libpeas/Makefile
===================================================================
--- devel/libpeas/Makefile	(revision 351527)
+++ devel/libpeas/Makefile	(working copy)
@@ -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/va
 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
Index: devel/libregf/Makefile
===================================================================
--- devel/libregf/Makefile	(revision 351527)
+++ devel/libregf/Makefile	(working copy)
@@ -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
Index: devel/libsigcx/Makefile
===================================================================
--- devel/libsigcx/Makefile	(revision 351527)
+++ devel/libsigcx/Makefile	(working copy)
@@ -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}/
 
 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=""
Index: devel/libsoup/Makefile
===================================================================
--- devel/libsoup/Makefile	(revision 351527)
+++ devel/libsoup/Makefile	(working copy)
@@ -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
Index: devel/libvshadow/Makefile
===================================================================
--- devel/libvshadow/Makefile	(revision 351527)
+++ devel/libvshadow/Makefile	(working copy)
@@ -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
 
Index: devel/log4cplus/Makefile
===================================================================
--- devel/log4cplus/Makefile	(revision 351527)
+++ devel/log4cplus/Makefile	(working copy)
@@ -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
Index: devel/mq4cpp/Makefile
===================================================================
--- devel/mq4cpp/Makefile	(revision 351527)
+++ devel/mq4cpp/Makefile	(working copy)
@@ -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
 
Index: devel/protobuf-c/Makefile
===================================================================
--- devel/protobuf-c/Makefile	(revision 351527)
+++ devel/protobuf-c/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	protobuf-c
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -12,7 +12,7 @@ COMMENT=	This package provides a code ge
 
 LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
 
-USES=		gmake pathfix pkgconfig libtool
+USES=		gmake libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
Index: devel/py-notify/Makefile
===================================================================
--- devel/py-notify/Makefile	(revision 351527)
+++ devel/py-notify/Makefile	(working copy)
@@ -3,7 +3,7 @@
 PORTNAME=	notify
 PORTVERSION=	0.1.1
 DISTVERSIONPREFIX=python-
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/notify-python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ OPTIONS_DEFINE=	DOCS
 
 LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	pygtk2
 INSTALL_TARGET=	install-strip
 USE_PYTHON=	2
Index: devel/rudiments/Makefile
===================================================================
--- devel/rudiments/Makefile	(revision 351527)
+++ devel/rudiments/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rudiments
 PORTVERSION=	0.46
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -11,7 +12,7 @@ COMMENT=	C++ class library for daemons, 
 
 LICENSE=	LGPL20
 
-USES=		libtool pkgconfig shebangfix
+USES=		libtool:keepla pkgconfig shebangfix
 SHEBANG_FILES=	doc/programming/insert.pl
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
Index: devel/sdl_console/Makefile
===================================================================
--- devel/sdl_console/Makefile	(revision 351527)
+++ devel/sdl_console/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdl_console
 PORTVERSION=	2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	SF/sdlconsole/sdlconsole-source/sdlconsole-${PORTVERSION}
 DISTNAME=	sdlconsole-${PORTVERSION}
@@ -11,7 +11,7 @@ DISTNAME=	sdlconsole-${PORTVERSION}
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	Drop down console that can be easily added to any SDL application
 
-USES=		libtool
+USES=		libtool:keepla
 USE_SDL=	sdl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: devel/seed/Makefile
===================================================================
--- devel/seed/Makefile	(revision 351527)
+++ devel/seed/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	seed
 PORTVERSION=	2.31.91
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel
 CONFLICTS=	seed-3.[0-9]*
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gtk20 intltool libxml2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
Index: devel/seed3/Makefile
===================================================================
--- devel/seed3/Makefile	(revision 351527)
+++ devel/seed3/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	seed
 PORTVERSION=	3.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	3
@@ -25,7 +25,7 @@ LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel
 CONFLICTS=	seed-2.[0-9]*
 
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix gettext gmake pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 INSTALL_TARGET=	install-strip
 USE_GNOME=	gtk30 intltool libxml2
 USE_LDCONFIG=	yes
Index: devel/stringencoders/Makefile
===================================================================
--- devel/stringencoders/Makefile	(revision 351527)
+++ devel/stringencoders/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	stringencoders
 PORTVERSION=	3.10.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Collection of high performance c-string transformations
 
-USES=		perl5 libtool
+USES=		libtool:keepla perl5
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
Index: devel/sysfsutils/Makefile
===================================================================
--- devel/sysfsutils/Makefile	(revision 351527)
+++ devel/sysfsutils/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sysfsutils
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/linux-diag/${PORTNAME}/${PORTVERSION}
 
@@ -11,7 +11,7 @@ MAINTAINER=	gslin@gslin.org
 COMMENT=	System Utilities Based on Sysfs
 
 GNU_CONFIGURE=	yes
-USES=		libtool
+USES=		libtool:keepla
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
Index: devel/udis86/Makefile
===================================================================
--- devel/udis86/Makefile	(revision 351527)
+++ devel/udis86/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	udis86
 PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION:R}
@@ -13,7 +13,7 @@ COMMENT=	Minimalistic x86 and x86-64 dis
 
 LICENSE=	BSD2CLAUSE
 
-USES=		libtool gmake
+USES=		gmake libtool:keepla
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
Index: devel/umem/Makefile
===================================================================
--- devel/umem/Makefile	(revision 351527)
+++ devel/umem/Makefile	(working copy)
@@ -3,14 +3,14 @@
 
 PORTNAME=	umem
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://labs.omniti.com/portableumem/releases/${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Port of the Solaris memory allocator
 
-USES=		libtool
+USES=		libtool:keepla
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: devel/varconf/Makefile
===================================================================
--- devel/varconf/Makefile	(revision 351527)
+++ devel/varconf/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	varconf
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28config%20lib%29/${PORTVERSION}
 
@@ -16,7 +16,7 @@ OPTIONS_DEFINE=	DOCS
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		libtool pathfix pkgconfig compiler:c++11-lib
+USES=		compiler:c++11-lib libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
Index: editors/gedit/Makefile
===================================================================
--- editors/gedit/Makefile	(revision 351527)
+++ editors/gedit/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gedit
 PORTVERSION=	2.30.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,8 +17,9 @@ LIB_DEPENDS=	libenchant.so:${PORTSDIR}/t
 		libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
+USES=		desktop-file-utils gettext gmake libtool:keepla  pathfix \
+		pkgconfig tar:bzip2
 USE_XORG=	sm
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:bzip2
 INSTALLS_OMF=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
Index: editors/gedit-plugins/Makefile
===================================================================
--- editors/gedit-plugins/Makefile	(revision 351527)
+++ editors/gedit-plugins/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	2.32.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,7 +21,7 @@ CONFLICTS=	gedit-plugins-3.[0-9]*
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix gettext gmake pkgconfig tar:bzip2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix intlhack gnomevfs2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: editors/ghex/Makefile
===================================================================
--- editors/ghex/Makefile	(revision 351527)
+++ editors/ghex/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	ghex
 PORTVERSION=	2.24.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,8 +12,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 hex editor
 
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix intlhack libgnomeprintui libgnomeui gnomedocutils
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 INSTALLS_ICONS=	yes
Index: editors/nvi-devel/Makefile
===================================================================
--- editors/nvi-devel/Makefile	(revision 351527)
+++ editors/nvi-devel/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nvi
 PORTVERSION=	1.81.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	editors
 MASTER_SITES=	http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/ \
 		http://www.kotnet.org/~skimo/nvi/devel/
@@ -21,7 +21,7 @@ USE_BZIP2=		yes
 WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
-USES=			iconv libtool pkgconfig
+USES=			iconv libtool:keepla pkgconfig
 USE_BDB=		42+
 CONFIGURE_ARGS+=	--with-db-prefix=${LOCALBASE} \
 			--program-prefix=n
Index: french/med/Makefile
===================================================================
--- french/med/Makefile	(revision 351527)
+++ french/med/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	med
 DISTVERSION=	3.0.7
+PORTREVISION=	1
 CATEGORIES=	french science
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -16,7 +17,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		fortran gmake libtool tk
+USES=		fortran gmake libtool:keepla tk
 CONFIGURE_ARGS=	--disable-python --with-hdf5=${LOCALBASE}
 CONFIGURE_ENV=	WISH=${WISH}
 GNU_CONFIGURE=	yes
Index: ftp/gstreamer1-plugins-curl/Makefile
===================================================================
--- ftp/gstreamer1-plugins-curl/Makefile	(revision 351527)
+++ ftp/gstreamer1-plugins-curl/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	ftp
 
 COMMENT=	Gstreamer curl plugin
Index: games/ggz-client-libs/Makefile
===================================================================
--- games/ggz-client-libs/Makefile	(revision 351527)
+++ games/ggz-client-libs/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ggz-client-libs
 PORTVERSION=	${GGZ_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
Index: games/ggz-gtk-client/Makefile
===================================================================
--- games/ggz-gtk-client/Makefile	(revision 351527)
+++ games/ggz-gtk-client/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ggz-gtk-client
 PORTVERSION=	${GGZ_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
Index: games/libggz/Makefile
===================================================================
--- games/libggz/Makefile	(revision 351527)
+++ games/libggz/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libggz
 PORTVERSION=	${GGZ_VERSION}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
Index: games/pinball/Makefile
===================================================================
--- games/pinball/Makefile	(revision 351527)
+++ games/pinball/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pinball
 PORTVERSION=	0.3.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -12,7 +12,7 @@ COMMENT=	Emilia Pinball is a free pinbal
 
 LICENSE=	GPLv2
 
-USES=		gmake libtool
+USES=		gmake libtool:keepla
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: graphics/OpenEXR/Makefile
===================================================================
--- graphics/OpenEXR/Makefile	(revision 351527)
+++ graphics/OpenEXR/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	OpenEXR
 PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics devel
 MASTER_SITES=	SAVANNAH/openexr/
 DISTNAME=	openexr-${DISTVERSION}
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libImath.so:${PORTSDIR}/gra
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-ilmbasetest --enable-imfexamples
 USE_LDCONFIG=	yes
Index: graphics/aalib/Makefile
===================================================================
--- graphics/aalib/Makefile	(revision 351527)
+++ graphics/aalib/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	aalib
 PORTVERSION=	1.4.r5
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	SF/aa-project/aa-lib/1.4rc5
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	X11
 
-USES=		ncurses libtool
+USES=		libtool:keepla ncurses
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: graphics/cairo/Makefile
===================================================================
--- graphics/cairo/Makefile	(revision 351527)
+++ graphics/cairo/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.10.2
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-directfb \
 		--enable-tee
-USES=		libtool pathfix pkgconfig
+USES=		libtool:keepla pathfix pkgconfig
 USE_XORG=	pixman
 USE_GNOME=	referencehack
 USE_LDCONFIG=	yes
Index: graphics/cairomm/Makefile
===================================================================
--- graphics/cairomm/Makefile	(revision 351527)
+++ graphics/cairomm/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	cairomm
 PORTVERSION=	1.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	cairo libxml++26
 CONFIGURE_ENV=	AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}"
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: graphics/clutter-box2d/Makefile
===================================================================
--- graphics/clutter-box2d/Makefile	(revision 351527)
+++ graphics/clutter-box2d/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	clutter-box2d
 PORTVERSION=	0.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://source.clutter-project.org/sources/${PORTNAME}/0.10/
 
@@ -12,7 +12,7 @@ COMMENT=	Clutter Box2D integration libra
 
 LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter
 
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gnomeprefix
 USE_GL=		gl
 USE_XORG=	xp x11
Index: graphics/clutter-gtk/Makefile
===================================================================
--- graphics/clutter-gtk/Makefile	(revision 351527)
+++ graphics/clutter-gtk/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	clutter-gtk
 PORTVERSION=	0.10.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libclutter-glx-1.0.so:${POR
 
 USE_BZIP2=	yes
 USE_GL=		gl
-USES=		gettext libtool pathfix gmake pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 gnomeprefix
 USE_XORG=	xp x11
Index: graphics/dia/Makefile
===================================================================
--- graphics/dia/Makefile	(revision 351527)
+++ graphics/dia/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	dia
 DISTVERSION=	0.97.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
@@ -18,7 +18,8 @@ OPTIONS_DEFINE=	DOCS
 LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		libpng15.so:${PORTSDIR}/graphics/png
 
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+		pkgconfig tar:xz
 USE_GNOME=	gtk20 gnomeprefix libxslt libartlgpl2 intlhack
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
Index: graphics/eog/Makefile
===================================================================
--- graphics/eog/Makefile	(revision 351527)
+++ graphics/eog/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	eog
 PORTVERSION=	2.32.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,10 +15,11 @@ COMMENT=	The Eye Of Gnome image viewer
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
 
+USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+		pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix intlhack librsvg2 gconf2 gnomedesktop
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:bzip2
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 GNOME_DESKTOP_VERSION=2
Index: graphics/eog-plugins/Makefile
===================================================================
--- graphics/eog-plugins/Makefile	(revision 351527)
+++ graphics/eog-plugins/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	eog-plugins
 PORTVERSION=	2.30.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,9 +16,9 @@ BUILD_DEPENDS=	eog:${PORTSDIR}/graphics/
 LIB_DEPENDS=	libgdata.so:${PORTSDIR}/devel/libgdata
 RUN_DEPENDS=	eog:${PORTSDIR}/graphics/eog
 
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GL=		gl
 USE_GNOME=	gnomeprefix intlhack gtk20
-USES=		gettext pathfix libtool gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: graphics/evince/Makefile
===================================================================
--- graphics/evince/Makefile	(revision 351527)
+++ graphics/evince/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	evince
 PORTVERSION=	2.32.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -25,7 +25,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
-USES=		desktop-file-utils gettext pathfix gmake pkgconfig libtool tar:bzip2
+USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+		pkgconfig tar:bzip2
 USE_GNOME=	intlhack gnomeprefix gnomedocutils gconf2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: graphics/exiv2/Makefile
===================================================================
--- graphics/exiv2/Makefile	(revision 351527)
+++ graphics/exiv2/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	exiv2
 PORTVERSION=	0.24
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.exiv2.org/
@@ -14,8 +15,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
-USES=		gettext gmake iconv libtool
 GNU_CONFIGURE=	yes
+USES=		gettext gmake iconv libtool:keepla
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: graphics/freeglut/Makefile
===================================================================
--- graphics/freeglut/Makefile	(revision 351527)
+++ graphics/freeglut/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freeglut
 PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -14,7 +14,7 @@ LICENSE=	MIT
 
 CONFLICTS=	libglut-[0-9].*
 
-USES=		libtool
+USES=		libtool:keepla
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	ice xi xxf86vm xrandr
Index: graphics/gegl/Makefile
===================================================================
--- graphics/gegl/Makefile	(revision 351527)
+++ graphics/gegl/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gegl
 PORTVERSION=	0.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gegl/0.2/
 
@@ -21,7 +21,7 @@ ENSCRIPT_DESC=	Enscript support
 SPIRO_DESC=	Spiro support
 #UMFPACK_DESC=	UMFpack support
 
-USES=		gettext gmake libtool pathfix pkgconfig shebangfix tar:bzip2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig shebangfix tar:bzip2
 USE_GNOME=	glib20 intltool
 USE_LDCONFIG=	${PREFIX}/lib/gegl-0.2
 GNU_CONFIGURE=	yes
Index: graphics/glitz/Makefile
===================================================================
--- graphics/glitz/Makefile	(revision 351527)
+++ graphics/glitz/Makefile	(working copy)
@@ -4,16 +4,16 @@
 
 PORTNAME=	glitz
 PORTVERSION=	0.5.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	OpenGL image compositing library
 
+USES=		libtool:keepla pathfix
 USE_GL=		yes
 USE_XORG=	xt
-USES=	pathfix libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
Index: graphics/goocanvas/Makefile
===================================================================
--- graphics/goocanvas/Makefile	(revision 351527)
+++ graphics/goocanvas/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	goocanvas
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -13,7 +13,7 @@ COMMENT=	Canvas widget for GTK+
 
 PORTSCOUT=	ignore:1
 
-USES=		libtool pathfix pkgconfig tar:bzip2
+USES=		libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: graphics/goocanvasmm/Makefile
===================================================================
--- graphics/goocanvasmm/Makefile	(revision 351527)
+++ graphics/goocanvasmm/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	goocanvasmm
 PORTVERSION=	0.15.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libgoocanvas.so:${PORTSDIR}
 
 PORTSCOUT=	ignore:1
 
-USES=		libtool gmake pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gtkmm24
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: graphics/goocanvasmm2/Makefile
===================================================================
--- graphics/goocanvasmm2/Makefile	(revision 351527)
+++ graphics/goocanvasmm2/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	goocanvasmm
 PORTVERSION=	1.90.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2
@@ -14,7 +14,7 @@ COMMENT=	C++ bindings for the goocanvas 
 
 LIB_DEPENDS=	libgoocanvas-2.0.so:${PORTSDIR}/graphics/goocanvas2
 
-USES=		libtool gmake pathfix pkgconfig tar:xz
+USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
 USE_GNOME=	gtkmm30
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: graphics/gstreamer1-plugins-aalib/Makefile
===================================================================
--- graphics/gstreamer1-plugins-aalib/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-aalib/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer ASCII art plugin
Index: graphics/gstreamer1-plugins-cairo/Makefile
===================================================================
--- graphics/gstreamer1-plugins-cairo/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-cairo/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer vector graphics plugin
Index: graphics/gstreamer1-plugins-gdkpixbuf/Makefile
===================================================================
--- graphics/gstreamer1-plugins-gdkpixbuf/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-gdkpixbuf/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	1-plugins-gdkpixbuf
 
Index: graphics/gstreamer1-plugins-jpeg/Makefile
===================================================================
--- graphics/gstreamer1-plugins-jpeg/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-jpeg/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer jpeg encoder/decoder plugin
Index: graphics/gstreamer1-plugins-libcaca/Makefile
===================================================================
--- graphics/gstreamer1-plugins-libcaca/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-libcaca/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer color ASCII art plugin
Index: graphics/gstreamer1-plugins-libvisual/Makefile
===================================================================
--- graphics/gstreamer1-plugins-libvisual/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-libvisual/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer libvisual plugin
Index: graphics/gstreamer1-plugins-opencv/Makefile
===================================================================
--- graphics/gstreamer1-plugins-opencv/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-opencv/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer opencv real time computer vision plugin
Index: graphics/gstreamer1-plugins-openjpeg/Makefile
===================================================================
--- graphics/gstreamer1-plugins-openjpeg/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-openjpeg/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer jpeg2000 decoder plugin
Index: graphics/gstreamer1-plugins-png/Makefile
===================================================================
--- graphics/gstreamer1-plugins-png/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-png/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	1-plugins-png
 
Index: graphics/gstreamer1-plugins-webp/Makefile
===================================================================
--- graphics/gstreamer1-plugins-webp/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-webp/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer webp image decoder plugin
Index: graphics/gstreamer1-plugins-zbar/Makefile
===================================================================
--- graphics/gstreamer1-plugins-zbar/Makefile	(revision 351527)
+++ graphics/gstreamer1-plugins-zbar/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	Gstreamer ZBar barcode detector plugin
Index: graphics/lcms/Makefile
===================================================================
--- graphics/lcms/Makefile	(revision 351527)
+++ graphics/lcms/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	lcms
 PORTVERSION=	1.19
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
@@ -24,7 +24,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USES=		libtool pathfix
+USES=		libtool:keepla pathfix
 
 PORTDOCS=	*
 
Index: graphics/lcms2/Makefile
===================================================================
--- graphics/lcms2/Makefile	(revision 351527)
+++ graphics/lcms2/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	lcms2
 PORTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lcms/lcms/${PORTVERSION} \
 		http://www.littlecms.com/
@@ -22,7 +23,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USES=		libtool pathfix
+USES=		libtool:keepla pathfix
 
 PORTDOCS=	*
 
Index: graphics/libcaca/Makefile
===================================================================
--- graphics/libcaca/Makefile	(revision 351527)
+++ graphics/libcaca/Makefile	(working copy)
@@ -3,14 +3,14 @@
 
 PORTNAME=	libcaca
 DISTVERSION=	0.99.beta18
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://caca.zoy.org/raw-attachment/wiki/libcaca/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Graphics library that outputs text instead of pixels
 
-USES=		libtool pathfix pkgconfig
+USES=		libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-doc \
Index: graphics/libchamplain/Makefile
===================================================================
--- graphics/libchamplain/Makefile	(revision 351527)
+++ graphics/libchamplain/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	libchamplain
 PORTVERSION=	0.8.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libclutter-gtk-0.10.so:${PO
 		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
 RUN_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix gtk20
 USE_SQLITE=	3
 USE_GL=		gl
Index: graphics/libetonyek/Makefile
===================================================================
--- graphics/libetonyek/Makefile	(revision 351527)
+++ graphics/libetonyek/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libetonyek
 PORTVERSION=	0.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://dev-www.libreoffice.org/src/
 
@@ -22,10 +22,10 @@ OPTIONS_DEFINE=	DOCS TEST
 CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+USES=		gmake libtool:keepla pathfix pkgconfig
+USE_LDCONFIG=	yes
 USE_XZ=		yes
-USES=		gmake libtool pkgconfig pathfix
 
 PORTDOCS=	*
 DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
Index: graphics/libexif/Makefile
===================================================================
--- graphics/libexif/Makefile	(revision 351527)
+++ graphics/libexif/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libexif
 PORTVERSION=	0.6.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -14,7 +14,7 @@ LICENSE=	LGPL21
 
 OPTIONS_DEFINE=	DOCS NLS
 
-USES=		libtool gmake pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_BZIP2=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: graphics/libopenraw/Makefile
===================================================================
--- graphics/libopenraw/Makefile	(revision 351527)
+++ graphics/libopenraw/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libopenraw
 PORTVERSION=	0.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://libopenraw.freedesktop.org/download/
 
@@ -13,7 +13,7 @@ COMMENT=	Library for camera RAW files de
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg
 
-USES=		compiler:c++11-lang libtool pkgconfig tar:bzip2
+USES=		compiler:c++11-lang libtool:keepla pkgconfig tar:bzip2
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: graphics/libwpg/Makefile
===================================================================
--- graphics/libwpg/Makefile	(revision 351527)
+++ graphics/libwpg/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libwpg
 PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -14,7 +14,7 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libwpd-0.9.so:${PORTSDIR}/textproc/libwpd
 
-USES=		libtool pkgconfig perl5 pathfix
+USES=		libtool:keepla pathfix perl5 pkgconfig
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: graphics/poppler/Makefile
===================================================================
--- graphics/poppler/Makefile	(revision 351527)
+++ graphics/poppler/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	0.24.5
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/grap
 RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
 
 USE_XZ=		yes
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: graphics/poppler-glib/Makefile
===================================================================
--- graphics/poppler-glib/Makefile	(revision 351527)
+++ graphics/poppler-glib/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-glib
 
 MAINTAINER=	gnome@FreeBSD.org
Index: graphics/poppler-qt4/Makefile
===================================================================
--- graphics/poppler-qt4/Makefile	(revision 351527)
+++ graphics/poppler-qt4/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/graphics/poppler-qt4/Makefile,v 1.18 2012/10/14 23:04:21 kwm Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-qt4
 
 MAINTAINER=	gnome@FreeBSD.org
Index: graphics/poppler-utils/Makefile
===================================================================
--- graphics/poppler-utils/Makefile	(revision 351527)
+++ graphics/poppler-utils/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/graphics/poppler-utils/Makefile,v 1.8 2012/10/14 23:04:21 kwm Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-utils
 
 MAINTAINER=	gnome@FreeBSD.org
Index: japanese/FreeWnn-lib/Makefile
===================================================================
--- japanese/FreeWnn-lib/Makefile	(revision 351527)
+++ japanese/FreeWnn-lib/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	FreeWnn
 PORTVERSION=	1.1.1.a021
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES?=	japanese
 MASTER_SITES=	ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_SOURCEFORGE_JP}
Index: japanese/FreeWnn-lib/Makefile.common
===================================================================
--- japanese/FreeWnn-lib/Makefile.common	(revision 351527)
+++ japanese/FreeWnn-lib/Makefile.common	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 GNU_CONFIGURE=	yes
-USES=		libtool
+USES=		libtool:keepla
 USE_AUTOTOOLS=	aclocal autoheader autoconf libtoolize
 LIBTOOLIZE_ARGS=-i -c -f
 USE_BZIP2=	yes
Index: japanese/FreeWnn-server/Makefile
===================================================================
--- japanese/FreeWnn-server/Makefile	(revision 351527)
+++ japanese/FreeWnn-server/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	FreeWnn
 PORTVERSION=	1.1.1.a021
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES?=	japanese
 MASTER_SITES=	ftp://ftp.freewnn.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_SOURCEFORGE_JP}
Index: japanese/kakasi/Makefile
===================================================================
--- japanese/kakasi/Makefile	(revision 351527)
+++ japanese/kakasi/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	kakasi
 PORTVERSION=	2.3.5
+PORTREVISION=	1
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://kakasi.namazu.org/stable/
 
Index: lang/gjs/Makefile
===================================================================
--- lang/gjs/Makefile	(revision 351527)
+++ lang/gjs/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gjs
 PORTVERSION=	1.34.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDI
 
 CONFLICTS_BUILD=spidermonkey17-1.7.*
 
-USES=		gettext gmake libtool pathfix pkgconfig shebangfix tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig shebangfix tar:xz
 USE_PYTHON_BUILD=2
 USE_GNOME=	cairo glib20 gnomeprefix introspection:build intlhack
 USE_LDCONFIG=	yes
Index: lang/vala/Makefile
===================================================================
--- lang/vala/Makefile	(revision 351527)
+++ lang/vala/Makefile	(working copy)
@@ -4,6 +4,7 @@
 
 PORTNAME=	vala
 PORTVERSION=	0.20.1
+PORTREVISION=	1
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 
@@ -12,7 +13,7 @@ COMMENT=	Programming language and compil
 
 LICENSE=	LGPL21
 
-USES=		bison gettext gmake libtool pathfix pkgconfig
+USES=		bison gettext gmake libtool:keepla pathfix pkgconfig
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomeprefix libxslt introspection:build
 GNU_CONFIGURE=	yes
Index: mail/evolution/Makefile
===================================================================
--- mail/evolution/Makefile	(revision 351527)
+++ mail/evolution/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	2.32.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -19,8 +19,8 @@ RUN_DEPENDS=	${LOCALBASE}/lib/gnome-spel
 
 CONFLICTS=	evolution-3.[0-9]*
 
-USES=		bison desktop-file-utils gettext pathfix gmake libtool pkgconfig tar:bzip2 \
-		perl5
+USES=		bison desktop-file-utils gettext gmake libtool:keepla pathfix \
+		perl5 pkgconfig tar:bzip2
 USE_PERL5=	run
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver gtkhtml3 \
 		gnomedocutils gnomedesktop
Index: mail/evolution-exchange/Makefile
===================================================================
--- mail/evolution-exchange/Makefile	(revision 351527)
+++ mail/evolution-exchange/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	evolution-exchange
 PORTVERSION=	2.32.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${EVO_PC_FILE}:${PORTSDIR}/
 
 CONFLICTS=	evolution-exchange-3.[0-9]*
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_BDB=	41+
 USE_OPENLDAP=	yes
 USE_GNOME=	gnomeprefix intlhack
Index: math/fftw/Makefile
===================================================================
--- math/fftw/Makefile	(revision 351527)
+++ math/fftw/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fftw
 PORTVERSION=	2.1.5
-PORTREVISION?=	9
+PORTREVISION?=	10
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/ 		\
 		ftp://ftp.fftw.org/pub/fftw/old/ 	\
@@ -22,7 +22,7 @@ FFTW_FLAVOR?=	default
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
-USES=		fortran gmake libtool
+USES=		fortran gmake libtool:keepla
 USE_LDCONFIG=	yes
 
 BROKEN_sparc64=	does not build
Index: math/fityk/Makefile
===================================================================
--- math/fityk/Makefile	(revision 351527)
+++ math/fityk/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fityk
 PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/xylib:xylib
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boos
 		gnuplot:${PORTSDIR}/math/gnuplot
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot
 
-USES=		gmake libtool tar:bzip2 desktop-file-utils shared-mime-info
+USES=		desktop-file-utils gmake libtool:keepla shared-mime-info tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LDFLAGS+=	-lbz2 -lz
 USE_GITHUB=	yes
Index: math/gmp/Makefile
===================================================================
--- math/gmp/Makefile	(revision 351527)
+++ math/gmp/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmp
 PORTVERSION=	5.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gmp
@@ -16,8 +16,8 @@ LICENSE=	LGPL3
 OPTIONS_DEFINE=	CPU_OPTS
 CPU_OPTS_DESC=	Enable assembly optimizations for your CPU
 
+USES=		libtool:keepla
 USE_XZ=		yes
-USES=		libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
Index: math/matio/Makefile
===================================================================
--- math/matio/Makefile	(revision 351527)
+++ math/matio/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	matio
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF
 
@@ -12,7 +13,7 @@ COMMENT=	Library for reading and writing
 LICENSE=	BSD2CLAUSE
 
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix
+USES=		libtool:keepla pathfix
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
Index: math/mpfr/Makefile
===================================================================
--- math/mpfr/Makefile	(revision 351527)
+++ math/mpfr/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpfr
 PORTVERSION=	3.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.mpfr.org/mpfr-current/
 DIST_SUBDIR=	${DISTNAME}
@@ -23,8 +23,7 @@ LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/
 #PATCHFILES!=	/usr/bin/jot -s " " -w patch%02d ${PATCHLEVEL} 1 ${PATCHLEVEL}
 #PATCH=		${LOCALBASE}/bin/gpatch
 
-USES=		libtool
-
+USES=		libtool:keepla
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE}
Index: misc/libisocodes/Makefile
===================================================================
--- misc/libisocodes/Makefile	(revision 351527)
+++ misc/libisocodes/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libisocodes
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://pkg-isocodes.alioth.debian.org/downloads/
 
@@ -16,10 +16,9 @@ BUILD_DEPENDS=	valac:${PORTSDIR}/lang/va
 LIB_DEPENDS=	libgee.so:${PORTSDIR}/devel/libgee06
 RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes
 
-USE_XZ=		yes
-USES=		gettext gmake libtool pathfix pkgconfig
-USE_GNOME=	glib20 gnomehier introspection:build libxml2
 GNU_CONFIGURE=	yes
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+USE_GNOME=	glib20 gnomehier introspection:build libxml2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/xml/|${LOCALBASE}/share/xml/|g' \
Index: misc/xdelta/Makefile
===================================================================
--- misc/xdelta/Makefile	(revision 351527)
+++ misc/xdelta/Makefile	(working copy)
@@ -3,14 +3,14 @@
 
 PORTNAME=	xdelta
 PORTVERSION=	1.1.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	eadler@FreeBSD.org
 COMMENT=	Diff/patch utility for binary files
 
-USES=		pkgconfig libtool
+USES=		libtool:keepla pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: multimedia/cheese/Makefile
===================================================================
--- multimedia/cheese/Makefile	(revision 351527)
+++ multimedia/cheese/Makefile	(working copy)
@@ -4,22 +4,22 @@
 
 PORTNAME=	cheese
 PORTVERSION=	2.32.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A Photobooth-inspired app for taking pictures and videos from webcam
+COMMENT=	Photobooth-inspired app for taking pictures and videos from webcam
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS=	libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra \
 		libhal.so:${PORTSDIR}/sysutils/hal
 
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_XORG=	xxf86vm
 USE_GNOME=	gnomeprefix intlhack evolutiondataserver librsvg2 \
 		gnomedocutils gnomedesktop
-USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_GSTREAMER=	gconf good ogg theora v4l2 vorbis
 INSTALLS_OMF=	yes
 INSTALL_TARGET=	install-strip
Index: multimedia/gstreamer1/Makefile
===================================================================
--- multimedia/gstreamer1/Makefile	(revision 351527)
+++ multimedia/gstreamer1/Makefile	(working copy)
@@ -4,6 +4,7 @@
 
 PORTNAME=	gstreamer1
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gstreamer/
 DISTNAME=	${PORTNAME:S/1//}-${PORTVERSION}
@@ -16,7 +17,7 @@ LICENSE=	LGPL20
 PORTSCOUT=	limitw:1,even
 
 CFLAGS:=	${CFLAGS} -O2 -Wno-format
-USES=		bison gettext gmake libtool pathfix pkgconfig
+USES=		bison gettext gmake libtool:keepla pathfix pkgconfig
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomehier introspection:build
 GNU_CONFIGURE=	yes
Index: multimedia/gstreamer1-plugins/Makefile
===================================================================
--- multimedia/gstreamer1-plugins/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins/Makefile	(working copy)
@@ -6,7 +6,7 @@ PORTNAME=	gstreamer
 PORTVERSION?=	${BASE_PORTVERSION}
 # When chasing a shared library for a plug-in bump the PORTREVISION in the
 # plug-in port instead, like ${category}/gstreamer1-plugin-${PLUGIN}.
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
 		http://gstreamer.freedesktop.org/src/gst-plugins-bad/:bad \
@@ -41,7 +41,7 @@ UGLY_DISTNAME=		gst-plugins-ugly-${UGLY_
 UGLY_DISTFILE=		${UGLY_DISTNAME}${EXTRACT_SUFX}
 DIST?=		base
 
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 WANT_GSTREAMER=	yes
 USE_XZ=		yes
 USE_GNOME+=	glib20 gnomehier introspection:build libxml2
Index: multimedia/gstreamer1-plugins-assrender/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-assrender/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-assrender/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer ASS/SSA text renderer plugin
Index: multimedia/gstreamer1-plugins-bad/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-bad/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-bad/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #    $MCom: ports/multimedia/gstreamer1-plugins-bad/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Bad gstreamer-plugins
Index: multimedia/gstreamer1-plugins-dts/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-dts/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-dts/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dts plugin
Index: multimedia/gstreamer1-plugins-dv/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-dv/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-dv/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	1-plugins-dv
 
Index: multimedia/gstreamer1-plugins-dvdread/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-dvdread/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-dvdread/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer dvdread plugin
Index: multimedia/gstreamer1-plugins-good/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-good/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-good/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #    $MCom: ports/multimedia/gstreamer1-plugins-good/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Good gstreamer-plugins
Index: multimedia/gstreamer1-plugins-kate/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-kate/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-kate/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer kate codec plugin
Index: multimedia/gstreamer1-plugins-mpeg2dec/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-mpeg2dec/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-mpeg2dec/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer mpeg decode plugin
Index: multimedia/gstreamer1-plugins-mpeg2enc/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-mpeg2enc/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-mpeg2enc/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer mpeg encoder plugin
Index: multimedia/gstreamer1-plugins-resindvd/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-resindvd/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-resindvd/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer resindvd plugin
Index: multimedia/gstreamer1-plugins-rtmp/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-rtmp/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-rtmp/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer rtmp plugin
Index: multimedia/gstreamer1-plugins-schroedinger/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-schroedinger/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-schroedinger/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	1-plugins-schroedinger
 
Index: multimedia/gstreamer1-plugins-theora/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-theora/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-theora/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer theora plugin
Index: multimedia/gstreamer1-plugins-ugly/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-ugly/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-ugly/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #    $MCom: ports/multimedia/gstreamer1-plugins-ugly/Makefile,v 1.3 2013/01/15 21:43:46 kwm Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Ugly gstreamer-plugins
Index: multimedia/gstreamer1-plugins-v4l2/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-v4l2/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-v4l2/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMESUFFIX=	1-plugins-v4l2
 
Index: multimedia/gstreamer1-plugins-vpx/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-vpx/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-vpx/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer vp8 codec plugin
Index: multimedia/gstreamer1-plugins-x264/Makefile
===================================================================
--- multimedia/gstreamer1-plugins-x264/Makefile	(revision 351527)
+++ multimedia/gstreamer1-plugins-x264/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer x264 plugin
Index: multimedia/gxine/Makefile
===================================================================
--- multimedia/gxine/Makefile	(revision 351527)
+++ multimedia/gxine/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gxine
 PORTVERSION=	0.5.907
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/xine/${PORTNAME}/${PORTVERSION}
 
@@ -19,10 +19,9 @@ LIB_DEPENDS=	libnspr4.so:${PORTSDIR}/dev
 OPTIONS_DEFINE=	MOZILLA_PLUGIN GNOME LIRC
 MOZILLA_PLUGIN_DESC=	Mozilla plugin
 
-USES=		gmake libtool pathfix pkgconfig tar:xz
+USES=		gmake libtool:keepla pathfix pkgconfig tar:xz
 USE_GNOME=	gtk20
-USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	MKDIR_P="${MKDIR}"
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-hal --with-libintl-prefix=${LOCALBASE}
 INSTALLS_ICONS=	yes
 
Index: multimedia/libmpeg2/Makefile
===================================================================
--- multimedia/libmpeg2/Makefile	(revision 351527)
+++ multimedia/libmpeg2/Makefile	(working copy)
@@ -3,14 +3,14 @@
 
 PORTNAME=	libmpeg2
 PORTVERSION=	0.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://libmpeg2.sourceforge.net/files/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Free library for decoding MPEG-2 and MPEG-1 video streams
 
-USES=		libtool pathfix
+USES=		libtool:keepla pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
Index: multimedia/libtheora/Makefile
===================================================================
--- multimedia/libtheora/Makefile	(revision 351527)
+++ multimedia/libtheora/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libtheora
 PORTVERSION=	1.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xiph.org/releases/theora/ \
 		http://distfiles.master.finkmirrors.net/
@@ -13,8 +13,8 @@ COMMENT=	Theora video codec for the Ogg 
 
 LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USES=		libtool
 GNU_CONFIGURE=	yes
+USES=		libtool:keepla
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LIBS="${PTHEAD_LIBS}"
Index: multimedia/totem/Makefile
===================================================================
--- multimedia/totem/Makefile	(revision 351527)
+++ multimedia/totem/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	totem
 PORTVERSION=	2.32.0
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -24,11 +24,10 @@ CONFLICTS=	totem-3.[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
-USES=		pathfix gettext gmake desktop-file-utils libtool pkgconfig tar:bzip2 \
-		shebangfix
+USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+		pkgconfig shebangfix tar:bzip2
 SHEBANG_FILES=	data/totem-bugreport.py
-USE_GNOME=	gnomeprefix intlhack nautilus2 \
-		pygtk2 gnomehier
+USE_GNOME=	gnomehier gnomeprefix intlhack nautilus2 pygtk2
 USE_GSTREAMER=	core gconf hal good mpeg2dec soup ugly python gio
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
Index: multimedia/totem-pl-parser/Makefile
===================================================================
--- multimedia/totem-pl-parser/Makefile	(revision 351527)
+++ multimedia/totem-pl-parser/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	totem-pl-parser
 PORTVERSION=	2.32.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libgmime-2.4.so:${PORTSDIR}
 		libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
 RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
 
-USES=		pathfix gettext pkgconfig gmake libtool tar:bzip2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix glib20 libxml2 intlhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: net/glib-networking/Makefile
===================================================================
--- net/glib-networking/Makefile	(revision 351527)
+++ net/glib-networking/Makefile	(working copy)
@@ -4,6 +4,7 @@
 
 PORTNAME=	glib-networking
 PORTVERSION=	2.36.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,8 +22,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
 GNU_CONFIGURE=	yes
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 intltool
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: net/gstreamer1-plugins-libmms/Makefile
===================================================================
--- net/gstreamer1-plugins-libmms/Makefile	(revision 351527)
+++ net/gstreamer1-plugins-libmms/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 
 COMMENT=	Gstreamer mms:// and mmsh:// plugin
Index: net/libmms/Makefile
===================================================================
--- net/libmms/Makefile	(revision 351527)
+++ net/libmms/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libmms
 PORTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
 
@@ -11,7 +12,7 @@ COMMENT=	Library for parsing mms:// and 
 
 LICENSE=	LGPL21
 
-USES=		gettext libtool pathfix pkgconfig
+USES=		gettext libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: net/libsocket++/Makefile
===================================================================
--- net/libsocket++/Makefile	(revision 351527)
+++ net/libsocket++/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libsocket++
 PORTVERSION=	1.12.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://src.linuxhacker.at/socket++/
 DISTNAME=	socket++-${PORTVERSION}
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	DOCS
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		libtool
+USES=		libtool:keepla
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
 AUTOMAKE_ARGS=	-a -c
 LIBTOOLIZE_ARGS=-i -c
Index: net/mpich/Makefile
===================================================================
--- net/mpich/Makefile	(revision 351527)
+++ net/mpich/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	mpich
 DISTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.mpich.org/static/downloads/${DISTVERSION}/
 
Index: net/mpich/pkg-plist
===================================================================
--- net/mpich/pkg-plist	(revision 351527)
+++ net/mpich/pkg-plist	(working copy)
@@ -39,32 +39,26 @@ include/primitives/opa_nt_intrinsics.h
 include/primitives/opa_sun_atomic_ops.h
 include/primitives/opa_unsafe.h
 %%FORTRAN%%lib/libfmpich.a
-%%FORTRAN%%lib/libfmpich.la
 %%FORTRAN%%lib/libfmpich.so
 %%FORTRAN%%lib/libfmpich.so.12
 %%FORTRAN%%lib/libfmpich.so.12.0.0
 lib/libmpich.a
-lib/libmpich.la
 lib/libmpich.so
 lib/libmpich.so.12
 lib/libmpich.so.12.0.0
 lib/libmpichcxx.a
-lib/libmpichcxx.la
 lib/libmpichcxx.so
 lib/libmpichcxx.so.12
 lib/libmpichcxx.so.12.0.0
 %%FORTRAN%%lib/libmpichf90.a
-%%FORTRAN%%lib/libmpichf90.la
 %%FORTRAN%%lib/libmpichf90.so
 %%FORTRAN%%lib/libmpichf90.so.12
 %%FORTRAN%%lib/libmpichf90.so.12.0.0
 lib/libmpl.a
-lib/libmpl.la
 lib/libmpl.so
 lib/libmpl.so.1
 lib/libmpl.so.1.0.0
 lib/libopa.a
-lib/libopa.la
 lib/libopa.so
 lib/libopa.so.1
 lib/libopa.so.1.0.0
Index: net/xmlrpc-epi/Makefile
===================================================================
--- net/xmlrpc-epi/Makefile	(revision 351527)
+++ net/xmlrpc-epi/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmlrpc-epi
 PORTVERSION=	0.54.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-base/${PORTVERSION}/
 
@@ -14,7 +14,7 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
-USES=		gmake iconv libtool
+USES=		gmake iconv libtool:keepla
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: net-im/folks04/Makefile
===================================================================
--- net-im/folks04/Makefile	(revision 351527)
+++ net-im/folks04/Makefile	(working copy)
@@ -4,12 +4,13 @@
 
 PORTNAME=	folks
 PORTVERSION=	0.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX=	04
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	library to aggregates people from multiple sources
+COMMENT=	Library to aggregate people from multiple sources
 
 BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/vala-vapigen \
 		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
@@ -18,9 +19,8 @@ LIB_DEPENDS=	libgee.so:${PORTSDIR}/devel
 
 CONFLICTS=	folks-0.[6-9].[0-9]*
 
-PKGNAMESUFFIX=	04
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
-USES=		pathfix gettext gmake pkgconfig tar:bzip2 libtool
 USE_GNOME=	intlhack gnomehier
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: net-im/gloox/Makefile
===================================================================
--- net-im/gloox/Makefile	(revision 351527)
+++ net-im/gloox/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gloox
 PORTVERSION=	1.0.9
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://camaya.net/download/
 
@@ -14,8 +15,8 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
 		libgnutls.so:${PORTSDIR}/security/gnutls
 
+USES=		compiler:c++11-lang libtool:keepla pathfix pkgconfig
 USE_BZIP2=	yes
-USES=		compiler:c++11-lang libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
Index: net-mgmt/cflowd/Makefile
===================================================================
--- net-mgmt/cflowd/Makefile	(revision 351527)
+++ net-mgmt/cflowd/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cflowd
 PORTVERSION=	2.1.b1
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.caida.org/tools/measurement/cflowd/download/
@@ -15,7 +15,7 @@ COMMENT=	Flow analysis tool used for ana
 LIB_DEPENDS=	Arts:${PORTSDIR}/net-mgmt/arts++
 
 GNU_CONFIGURE=	yes
-USES=		bison gmake libtool
+USES=		bison gmake libtool:keepla
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--enable-shared --with-artspp=${LOCALBASE}
Index: ports-mgmt/pkg-devel/Makefile
===================================================================
--- ports-mgmt/pkg-devel/Makefile	(revision 351527)
+++ ports-mgmt/pkg-devel/Makefile	(working copy)
@@ -21,7 +21,7 @@ NO_CCACHE=	yes
 WITH_DEBUG=	yes
 CFLAGS+=	-O0 -g
 USE_LDCONFIG=	yes
-USES=		tar:xz libtool
+USES=		libtool tar:xz
 GNU_CONFIGURE=	yes
 
 # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD
@@ -92,7 +92,6 @@ PKG_BIN=	${WRKSRC}/src/pkg-static
 .endif
 
 post-install:
-	@${RM} -f ${STAGEDIR}${PREFIX}/lib/*.la
 	@${MV} ${STAGEDIR}${PREFIX}/lib/libpkg_static.a \
 		${STAGEDIR}${PREFIX}/lib/libpkg.a
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpkg.so.2
Index: print/freetype2/Makefile
===================================================================
--- print/freetype2/Makefile	(revision 351527)
+++ print/freetype2/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	freetype2
 PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
 		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
@@ -18,8 +18,7 @@ DISTNAME=	${PORTNAME:S/2//}-${PORTVERSIO
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Free and portable TrueType font rendering engine
 
-USE_BZIP2=	yes
-USES=		gmake libtool
+USES=		gmake libtool:keepla tar:bzip2
 MAKE_ENV=	TOP=""
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: science/gchemutils/Makefile
===================================================================
--- science/gchemutils/Makefile	(revision 351527)
+++ science/gchemutils/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gchemutils
 PORTVERSION=	0.14.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION:R}
@@ -24,8 +24,8 @@ PORTSCOUT=	limitw:1,even
 
 USE_XORG=	x11
 USE_GNOME=	gnomedocutils gtk30 intlhack libgsf libxml2
-USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		shared-mime-info tar:xz
+USES=		desktop-file-utils gettext gmake libtool:keepla pathfix \
+		pkgconfig shared-mime-info tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: science/hdf5-18/Makefile
===================================================================
--- science/hdf5-18/Makefile	(revision 351527)
+++ science/hdf5-18/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	hdf5
 PORTVERSION=	1.8.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science archivers graphics
 MASTER_SITES=	http://www.hdfgroup.org/ftp/HDF5/current/src/ \
 		ftp://ftp.hdfgroup.org/HDF5/current/src/ \
@@ -19,7 +19,7 @@ OPTIONS_DEFINE=	DEBUG EXAMPLES FORTRAN S
 
 CONFLICTS_INSTALL=	hdf-4.[0-9]* hdf5-1.6.[0-9]*
 
-USES=		libtool tar:bzip2
+USES=		libtool:keepla tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-cxx \
Index: science/netcdf/Makefile
===================================================================
--- science/netcdf/Makefile	(revision 351527)
+++ science/netcdf/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	netcdf
 PORTVERSION=	3.6.3
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	science
 MASTER_SITES=	http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
 		ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
@@ -19,7 +19,7 @@ PORTSCOUT=	limit:^3\.
 CONFIGURE_ARGS=	--enable-shared
 CPPFLAGS+=	-I${LOCALBASE}/include -fPIC -DPIC
 GNU_CONFIGURE=	yes
-USES=		gmake libtool
+USES=		gmake libtool:keepla
 USE_LDCONFIG=	yes
 
 INFO=		netcdf netcdf-c netcdf-cxx netcdf-f77 netcdf-f90 \
Index: security/ipsec-tools/Makefile
===================================================================
--- security/ipsec-tools/Makefile	(revision 351527)
+++ security/ipsec-tools/Makefile	(working copy)
@@ -8,7 +8,7 @@
 
 PORTNAME=	ipsec-tools
 PORTVERSION=	0.8.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -23,7 +23,7 @@ USE_BZIP2=	yes
 
 INSTALL_TARGET=	install-strip
 
-USES=		libtool
+USES=		libtool:keepla
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-shared --sysconfdir=${PREFIX}/etc/racoon \
Index: security/libgcrypt/Makefile
===================================================================
--- security/libgcrypt/Makefile	(revision 351527)
+++ security/libgcrypt/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
Index: security/libident/Makefile
===================================================================
--- security/libident/Makefile	(revision 351527)
+++ security/libident/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libident
 PORTVERSION=	0.32
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	http://www.remlab.net/files/libident/
 
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small library to interface the ident protocol server (rfc1413)
 
 OPTIONS_DEFINE=	DOCS
-USES=		libtool
+USES=		libtool:keepla
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
Index: security/libpwquality/Makefile
===================================================================
--- security/libpwquality/Makefile	(revision 351527)
+++ security/libpwquality/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libpwquality
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://fedorahosted.org/releases/l/i/libpwquality/
 
@@ -10,7 +11,7 @@ COMMENT=	Library for generating random p
 
 LIB_DEPENDS=	libcrack.so:${PORTSDIR}/security/cracklib
 
-USES=		gettext gmake libtool pathfix
+USES=		gettext gmake libtool:keepla pathfix
 USE_BZIP2=	yes
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
Index: security/libsecret/Makefile
===================================================================
--- security/libsecret/Makefile	(revision 351527)
+++ security/libsecret/Makefile	(working copy)
@@ -4,6 +4,7 @@
 
 PORTNAME=	libsecret
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 
@@ -15,7 +16,7 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/se
 
 USE_XZ=		yes
 USE_GNOME=	gnomehier glib20 libxslt:build intltool introspection:build
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-introspection --disable-vala
Index: security/opencdk/Makefile
===================================================================
--- security/opencdk/Makefile	(revision 351527)
+++ security/opencdk/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencdk
 PORTVERSION=	0.6.6
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	http://josefsson.org/gnutls/releases/opencdk/
@@ -16,9 +16,9 @@ OPTIONS_DEFINE=	DOCS
 
 LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix pkgconfig
+USES=		libtool:keepla pathfix pkgconfig
+USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-libgcrypt-prefix=${LOCALBASE}
 
Index: security/p11-kit/Makefile
===================================================================
--- security/p11-kit/Makefile	(revision 351527)
+++ security/p11-kit/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	p11-kit
 PORTVERSION=	0.20.2
+PORTREVISION=	1
 CATEGORIES=	security devel
 MASTER_SITES=	http://p11-glue.freedesktop.org/releases/
 
@@ -20,7 +21,7 @@ CONFIGURE_ARGS=	--disable-nls --enable-d
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 MAKE_ENV=	exampledir=${STAGEDIR}${EXAMPLESDIR}
 
-USES=		gmake pkgconfig pathfix libtool
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 pre-configure:
Index: security/pam-mysql/Makefile
===================================================================
--- security/pam-mysql/Makefile	(revision 351527)
+++ security/pam-mysql/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pam_mysql
 PORTVERSION=	0.7.r1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security databases
 MASTER_SITES=	SF/pam-mysql/pam-mysql/0.7RC1
 DISTNAME=	${PORTNAME}-0.7RC1${DISTVERSIONSUFFIX}
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-0.7RC1${DISTVERSIO
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Pam module for authenticating with MySQL
 
-USES=		libtool
+USES=		libtool:keepla
 USE_MYSQL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --with-pam-mods-dir=${PREFIX}/lib --with-pam=/usr
Index: security/pkcs11-helper/Makefile
===================================================================
--- security/pkcs11-helper/Makefile	(revision 351527)
+++ security/pkcs11-helper/Makefile	(working copy)
@@ -3,12 +3,12 @@
 
 PORTNAME=	pkcs11-helper
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security devel
 MASTER_SITES=	SF/opensc/pkcs11-helper/
 
 MAINTAINER=	ale@FreeBSD.org
-COMMENT=	A helper library for multiple PKCS\#11 providers
+COMMENT=	Helper library for multiple PKCS\#11 providers
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	dual
@@ -18,7 +18,7 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GP
 
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix pkgconfig tar:bzip2
+USES=		libtool:keepla pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
Index: sysutils/fusefs-encfs/Makefile
===================================================================
--- sysutils/fusefs-encfs/Makefile	(revision 351527)
+++ sysutils/fusefs-encfs/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	encfs
 PORTVERSION=	1.7.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	fusefs-
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--with-boost-serializati
 		--with-boost-filesystem=boost_filesystem
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		fuse gmake libtool pkgconfig
+USES=		fuse gmake libtool:keepla pkgconfig
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
Index: sysutils/gstreamer1-plugins-cdio/Makefile
===================================================================
--- sysutils/gstreamer1-plugins-cdio/Makefile	(revision 351527)
+++ sysutils/gstreamer1-plugins-cdio/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 COMMENT=	Gstreamer compact disc input and control library
Index: sysutils/hal/Makefile
===================================================================
--- sysutils/hal/Makefile	(revision 351527)
+++ sysutils/hal/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	hal
 DISTVERSION=	0.5.14
-PORTREVISION=	25
+PORTREVISION=	26
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libpolkit.so.2:${PORTSDIR}/
 RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids \
 		bash:${PORTSDIR}/shells/bash
 
-USES=		pathfix gettext gmake libtool pkgconfig shebangfix
+USES=		gettext gmake libtool:keepla pathfix pkgconfig shebangfix
 USE_GNOME=	intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: sysutils/policykit/Makefile
===================================================================
--- sysutils/policykit/Makefile	(revision 351527)
+++ sysutils/policykit/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	policykit
 PORTVERSION=	0.9
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 DISTNAME=	PolicyKit-${PORTVERSION}
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDI
 USERS=		polkit
 GROUPS=		polkit
 
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	glib20 intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: sysutils/polkit/Makefile
===================================================================
--- sysutils/polkit/Makefile	(revision 351527)
+++ sysutils/polkit/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	polkit
 PORTVERSION=	0.105
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.freedesktop.org/software/polkit/releases/
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/tex
 RUN_DEPENDS=	dbus-launch:${PORTSDIR}/devel/dbus
 
 USE_GNOME=	glib20 intlhack gnomehier introspection
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
Index: sysutils/sleuthkit/Makefile
===================================================================
--- sysutils/sleuthkit/Makefile	(revision 351527)
+++ sysutils/sleuthkit/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sleuthkit
 PORTVERSION=	4.1.3
+PORTREVISION=	1
 CATEGORIES=	sysutils security
 MASTER_SITES=	SF
 
@@ -25,7 +26,7 @@ CONFLICTS=	ja-ls-[0-9]* icat-[0-9]*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_PERL="${PERL}"
-USES=		libtool perl5
+USES=		libtool:keepla perl5
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/share/tsk
 
Index: textproc/gtkspell3/Makefile
===================================================================
--- textproc/gtkspell3/Makefile	(revision 351527)
+++ textproc/gtkspell3/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gtkspell3
 PORTVERSION=	3.0.4
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	SF/gtkspell/${PORTVERSION}
 
@@ -13,7 +14,7 @@ BUILD_DEPENDS=	vapigen:${PORTSDIR}/lang/
 LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant
 
 USE_GNOME=	gnomehier gnomeprefix gtk30 intlhack introspection:build
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: textproc/libmwaw/Makefile
===================================================================
--- textproc/libmwaw/Makefile	(revision 351527)
+++ textproc/libmwaw/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libmwaw
 PORTVERSION=	0.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -20,8 +20,8 @@ CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 GNU_CONFIGURE=	yes
+USES=		compiler:features libtool:keepla pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
-USES=		libtool pkgconfig pathfix tar:xz compiler:features
 
 PORTDOCS=	*
 DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
Index: textproc/libodfgen/Makefile
===================================================================
--- textproc/libodfgen/Makefile	(revision 351527)
+++ textproc/libodfgen/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libodfgen
 PORTVERSION=	0.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/libwpd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -23,9 +23,9 @@ CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 GNU_CONFIGURE=	yes
+USES=		libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_XZ=		yes
-USES=		libtool pkgconfig pathfix
 
 PORTDOCS=	*
 DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
Index: textproc/libwps/Makefile
===================================================================
--- textproc/libwps/Makefile	(revision 351527)
+++ textproc/libwps/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libwps
 PORTVERSION=	0.2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -20,7 +20,7 @@ OPTIONS_DEFINE=	DOCS
 CONFIGURE_ARGS=	--disable-werror
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-USES=		libtool pkgconfig pathfix compiler:features
+USES=		compiler:features libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 PORTDOCS=	*
 DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
Index: textproc/libxml2/Makefile
===================================================================
--- textproc/libxml2/Makefile	(revision 351527)
+++ textproc/libxml2/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.8.0
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
 		http://xmlsoft.org/sources/ \
@@ -17,7 +17,7 @@ COMMENT?=	XML parser library for GNOME
 .if !defined(REFERENCE_PORT)
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
-USES=		gmake iconv libtool pathfix pkgconfig
+USES=		gmake iconv libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
 		--with-html-dir=${PREFIX}/share/doc \
Index: textproc/raptor2/Makefile
===================================================================
--- textproc/raptor2/Makefile	(revision 351527)
+++ textproc/raptor2/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	raptor2
 PORTVERSION=	2.0.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.librdf.org/source/ \
 		SF/librdf/${PORTNAME}/${PORTVERSION}
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/
 CONFLICTS=	raptor-1.4.1[0-9]* raptor-1.4.21
 
 USE_GNOME=	libxml2 libxslt
-USES=		pathfix pkgconfig libtool
+USES=		libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
Index: textproc/sablotron/Makefile
===================================================================
--- textproc/sablotron/Makefile	(revision 351527)
+++ textproc/sablotron/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Sablot
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/sablotron/sablotron-${PORTVERSION}
 
@@ -33,7 +33,7 @@ DOM_CONFIGURE_ENABLE=		dom
 DOCUMENT_ERRORS_CONFIGURE_ENABLE=	document-errors
 
 GNU_CONFIGURE=	yes
-USES=		gmake iconv libtool
+USES=		gmake iconv libtool:keepla
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lexpat ${ICONV_LIB}
Index: textproc/scim-table-imengine/Makefile
===================================================================
--- textproc/scim-table-imengine/Makefile	(revision 351527)
+++ textproc/scim-table-imengine/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	scim-table-imengine
 PORTVERSION=	0.5.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/scim/scim-tables/${PORTVERSION}
 DISTNAME=	scim-tables-${PORTVERSION}
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc
 RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pkgconfig
+USES=		gettext gmake libtool:keepla pkgconfig
 
 CONFIGURE_ARGS=	--disable-skim-support
 CPPFLAGS+=	-I${LOCALBASE}/include -D__STDC_ISO_10646__
Index: www/flickcurl/Makefile
===================================================================
--- www/flickcurl/Makefile	(revision 351527)
+++ www/flickcurl/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	flickcurl
 PORTVERSION=	1.25
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://download.dajobe.org/flickcurl/
 
@@ -23,7 +23,7 @@ RAPTOR_DESC=	Use Raptor to serialize to 
 OFFLINE_DESC=	Offline use of captured XML web service responses
 CAPTURE_DESC=	Capturing web service responses
 
-USES=		libtool pathfix pkgconfig
+USES=		libtool:keepla pathfix pkgconfig
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
Index: www/gstreamer1-plugins-neon/Makefile
===================================================================
--- www/gstreamer1-plugins-neon/Makefile	(revision 351527)
+++ www/gstreamer1-plugins-neon/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www
 
 COMMENT=	Gstreamer neon http source plugin
Index: www/libecap/Makefile
===================================================================
--- www/libecap/Makefile	(revision 351527)
+++ www/libecap/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libecap
 PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www security
 MASTER_SITES=	http://www.measurement-factory.com/tmp/ecap/
 
@@ -14,7 +14,7 @@ LICENSE=	BSD2CLAUSE
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		libtool
+USES=		libtool:keepla
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
Index: www/swfdec-plugin/Makefile
===================================================================
--- www/swfdec-plugin/Makefile	(revision 351527)
+++ www/swfdec-plugin/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	swfdec-plugin
 PORTVERSION=	0.8.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/
 DISTNAME=	swfdec-mozilla-${PORTVERSION}
@@ -13,7 +13,7 @@ COMMENT=	Flash rendering plugin
 
 LIB_DEPENDS=	libswfdec-0.8.so:${PORTSDIR}/graphics/swfdec
 
-USES=		pkgconfig webplugin:gecko libtool
+USES=		libtool:keepla pkgconfig webplugin:gecko
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
Index: x11/dgs/Makefile
===================================================================
--- x11/dgs/Makefile	(revision 351527)
+++ x11/dgs/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dgs
 PORTVERSION=	0.5.9.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	../old-gnu/dgs
@@ -20,7 +20,7 @@ MAKE_JOBS_UNSAFE=	yes
 USE_GHOSTSCRIPT_RUN=	yes
 USE_XORG=	xt sm ice xext x11
 USE_GNOME=	glib12
-USES=		gmake libtool
+USES=		gmake libtool:keepla
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.5.9
Index: x11/gnome-desktop/Makefile
===================================================================
--- x11/gnome-desktop/Makefile	(revision 351527)
+++ x11/gnome-desktop/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	2.32.1
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,14 +12,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Additional UI API for GNOME 2
 
-USES=	tar:bzip2
+USES=		tar:bzip2
 
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 
+USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig
 USE_XORG=	xpm
-USES+=		bison pathfix gettext libtool pkgconfig gmake
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2 pygtk2 \
 		referencehack
 USE_PYTHON=	2
Index: x11/gnome-panel/Makefile
===================================================================
--- x11/gnome-panel/Makefile	(revision 351527)
+++ x11/gnome-panel/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.32.1
-PORTREVISION?=	5
+PORTREVISION?=	6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -28,7 +28,7 @@ INSTALLS_OMF=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USES+=		pathfix libtool gettext gmake pkgconfig
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	gnomeprefix intlhack gnomedesktop libwnck gnomemenus \
 		gnomedocutils referencehack librsvg2
 GNU_CONFIGURE=	yes
Index: x11/gstreamer1-plugins-x/Makefile
===================================================================
--- x11/gstreamer1-plugins-x/Makefile	(revision 351527)
+++ x11/gstreamer1-plugins-x/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 
 COMMENT=	Gstreamer X and Xvideo output plugins
Index: x11/gstreamer1-plugins-ximagesrc/Makefile
===================================================================
--- x11/gstreamer1-plugins-ximagesrc/Makefile	(revision 351527)
+++ x11/gstreamer1-plugins-ximagesrc/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 PKGNAMESUFFIX=	1-plugins-ximagesrc
 
Index: x11/libICE/Makefile
===================================================================
--- x11/libICE/Makefile	(revision 351527)
+++ x11/libICE/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libICE
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libSM/Makefile
===================================================================
--- x11/libSM/Makefile	(revision 351527)
+++ x11/libSM/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libSM
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libX11/Makefile
===================================================================
--- x11/libX11/Makefile	(revision 351527)
+++ x11/libX11/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libX11
 PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXScrnSaver/Makefile
===================================================================
--- x11/libXScrnSaver/Makefile	(revision 351527)
+++ x11/libXScrnSaver/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXScrnSaver
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXTrap/Makefile
===================================================================
--- x11/libXTrap/Makefile	(revision 351527)
+++ x11/libXTrap/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXTrap
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXau/Makefile
===================================================================
--- x11/libXau/Makefile	(revision 351527)
+++ x11/libXau/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXau
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXcm/Makefile
===================================================================
--- x11/libXcm/Makefile	(revision 351527)
+++ x11/libXcm/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXcm
 PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	SF/oyranos/${PORTNAME}/${PORTNAME}-${PORTVERSION:C|(.*)\.[0-9]*$|\1|}
 
Index: x11/libXcomposite/Makefile
===================================================================
--- x11/libXcomposite/Makefile	(revision 351527)
+++ x11/libXcomposite/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXcomposite
 PORTVERSION=	0.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXcursor/Makefile
===================================================================
--- x11/libXcursor/Makefile	(revision 351527)
+++ x11/libXcursor/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXcursor
 PORTVERSION=	1.1.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXdamage/Makefile
===================================================================
--- x11/libXdamage/Makefile	(revision 351527)
+++ x11/libXdamage/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXdamage
 PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXdmcp/Makefile
===================================================================
--- x11/libXdmcp/Makefile	(revision 351527)
+++ x11/libXdmcp/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXdmcp
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXevie/Makefile
===================================================================
--- x11/libXevie/Makefile	(revision 351527)
+++ x11/libXevie/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXevie
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXext/Makefile
===================================================================
--- x11/libXext/Makefile	(revision 351527)
+++ x11/libXext/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXext
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXfixes/Makefile
===================================================================
--- x11/libXfixes/Makefile	(revision 351527)
+++ x11/libXfixes/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXfixes
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXi/Makefile
===================================================================
--- x11/libXi/Makefile	(revision 351527)
+++ x11/libXi/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXi
 PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXinerama/Makefile
===================================================================
--- x11/libXinerama/Makefile	(revision 351527)
+++ x11/libXinerama/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXinerama
 PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXp/Makefile
===================================================================
--- x11/libXp/Makefile	(revision 351527)
+++ x11/libXp/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXp
 PORTVERSION=	1.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXpm/Makefile
===================================================================
--- x11/libXpm/Makefile	(revision 351527)
+++ x11/libXpm/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXpm
 PORTVERSION=	3.5.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXprintAppUtil/Makefile
===================================================================
--- x11/libXprintAppUtil/Makefile	(revision 351527)
+++ x11/libXprintAppUtil/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXprintAppUtil
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXprintUtil/Makefile
===================================================================
--- x11/libXprintUtil/Makefile	(revision 351527)
+++ x11/libXprintUtil/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXprintUtil
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXrandr/Makefile
===================================================================
--- x11/libXrandr/Makefile	(revision 351527)
+++ x11/libXrandr/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXrandr
 PORTVERSION=	1.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXrender/Makefile
===================================================================
--- x11/libXrender/Makefile	(revision 351527)
+++ x11/libXrender/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXrender
 PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXres/Makefile
===================================================================
--- x11/libXres/Makefile	(revision 351527)
+++ x11/libXres/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXres
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXtst/Makefile
===================================================================
--- x11/libXtst/Makefile	(revision 351527)
+++ x11/libXtst/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXtst
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXv/Makefile
===================================================================
--- x11/libXv/Makefile	(revision 351527)
+++ x11/libXv/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXv
 PORTVERSION=	1.0.10
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 
Index: x11/libXvMC/Makefile
===================================================================
--- x11/libXvMC/Makefile	(revision 351527)
+++ x11/libXvMC/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXvMC
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXxf86dga/Makefile
===================================================================
--- x11/libXxf86dga/Makefile	(revision 351527)
+++ x11/libXxf86dga/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXxf86dga
 PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXxf86misc/Makefile
===================================================================
--- x11/libXxf86misc/Makefile	(revision 351527)
+++ x11/libXxf86misc/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXxf86misc
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libXxf86vm/Makefile
===================================================================
--- x11/libXxf86vm/Makefile	(revision 351527)
+++ x11/libXxf86vm/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXxf86vm
 PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libdmx/Makefile
===================================================================
--- x11/libdmx/Makefile	(revision 351527)
+++ x11/libdmx/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libdmx
 PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libgnome/Makefile
===================================================================
--- x11/libgnome/Makefile	(revision 351527)
+++ x11/libgnome/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	libgnome
 PORTVERSION=	2.32.0
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -23,7 +23,7 @@ RUN_DEPENDS=	rarian-sk-config:${PORTSDIR
 INSTALL_TARGET=	install-strip
 USE_GNOME=	gnomeprefix intlhack esound libbonobo \
 		gnomevfs2 referencehack
-USES+=		bison libtool pathfix gettext gmake pkgconfig
+USES+=		bison gettext gmake libtool:keepla pathfix pkgconfig
 USE_XORG=	xpm
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: x11/libgnomekbd/Makefile
===================================================================
--- x11/libgnomekbd/Makefile	(revision 351527)
+++ x11/libgnomekbd/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	libgnomekbd
 PORTVERSION=	2.32.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gconf2
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
-USES=		gettext libtool pathfix pkgconfig gmake tar:bzip2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: x11/libmatekbd/Makefile
===================================================================
--- x11/libmatekbd/Makefile	(revision 351527)
+++ x11/libmatekbd/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libmatekbd
 PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libxklavier.so:${PORTSDIR}/
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
 USE_GNOME=	gnomehier glib20 gtk20 intlhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: x11/liboldX/Makefile
===================================================================
--- x11/liboldX/Makefile	(revision 351527)
+++ x11/liboldX/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	liboldX
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libxcb/Makefile
===================================================================
--- x11/libxcb/Makefile	(revision 351527)
+++ x11/libxcb/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libxcb
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
Index: x11/libxkbcommon/Makefile
===================================================================
--- x11/libxkbcommon/Makefile	(revision 351527)
+++ x11/libxkbcommon/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libxkbcommon
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xkbcommon.org/download/
 
Index: x11/libxkbfile/Makefile
===================================================================
--- x11/libxkbfile/Makefile	(revision 351527)
+++ x11/libxkbfile/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libxkbfile
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libxkbui/Makefile
===================================================================
--- x11/libxkbui/Makefile	(revision 351527)
+++ x11/libxkbui/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libxkbui
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/libxklavier/Makefile
===================================================================
--- x11/libxklavier/Makefile	(revision 351527)
+++ x11/libxklavier/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	libxklavier
 PORTVERSION=	5.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgc
 RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
     		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
-USES=		libtool pathfix gmake pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_XORG=	x11 xi xkbfile
 USE_GNOME=	libxml2 glib20
 USE_LDCONFIG=	yes
Index: x11/libxshmfence/Makefile
===================================================================
--- x11/libxshmfence/Makefile	(revision 351527)
+++ x11/libxshmfence/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libxshmfence
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/pixman/Makefile
===================================================================
--- x11/pixman/Makefile	(revision 351527)
+++ x11/pixman/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pixman
 PORTVERSION=	0.32.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/xcb-util/Makefile
===================================================================
--- x11/xcb-util/Makefile	(revision 351527)
+++ x11/xcb-util/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xcb-util
 PORTVERSION=	0.3.9
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
Index: x11/xcb-util-cursor/Makefile
===================================================================
--- x11/xcb-util-cursor/Makefile	(revision 351527)
+++ x11/xcb-util-cursor/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xcb-util-cursor
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
Index: x11/xcb-util-image/Makefile
===================================================================
--- x11/xcb-util-image/Makefile	(revision 351527)
+++ x11/xcb-util-image/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xcb-util-image
 PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
Index: x11/xcb-util-keysyms/Makefile
===================================================================
--- x11/xcb-util-keysyms/Makefile	(revision 351527)
+++ x11/xcb-util-keysyms/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xcb-util-keysyms
 PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
Index: x11/xcb-util-renderutil/Makefile
===================================================================
--- x11/xcb-util-renderutil/Makefile	(revision 351527)
+++ x11/xcb-util-renderutil/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xcb-util-renderutil
 PORTVERSION=	0.3.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
Index: x11/xcb-util-wm/Makefile
===================================================================
--- x11/xcb-util-wm/Makefile	(revision 351527)
+++ x11/xcb-util-wm/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xcb-util-wm
 PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
Index: x11/xrx/Makefile
===================================================================
--- x11/xrx/Makefile	(revision 351527)
+++ x11/xrx/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xrx
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT=	RX helper program
 
 XORG_CAT=	app
 USE_XORG=	x11 xt xext xtrans xproxymngproto xau xaw ice
-USES=		libtool
+USES=		libtool:keepla
 USE_LDCONFIG=	yes
 
 post-patch:
Index: x11/xtrans/Makefile
===================================================================
--- x11/xtrans/Makefile	(revision 351527)
+++ x11/xtrans/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xtrans
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-input-acecad/Makefile
===================================================================
--- x11-drivers/xf86-input-acecad/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-acecad
 PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-input-acecad/pkg-plist
===================================================================
--- x11-drivers/xf86-input-acecad/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-acecad/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/acecad_drv.la
 lib/xorg/modules/input/acecad_drv.so
 man/man4/acecad.4x.gz
 @dirrmtry lib/xorg/modules/input
Index: x11-drivers/xf86-input-egalax/Makefile
===================================================================
--- x11-drivers/xf86-input-egalax/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-egalax/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xf86-input-egalax
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 MASTER_SITES=	LOCAL/glebius
 
Index: x11-drivers/xf86-input-egalax/pkg-plist
===================================================================
--- x11-drivers/xf86-input-egalax/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-egalax/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/egalax_drv.la
 lib/xorg/modules/input/egalax_drv.so
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
Index: x11-drivers/xf86-input-elographics/Makefile
===================================================================
--- x11-drivers/xf86-input-elographics/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .if defined(WITH_NEW_XORG)
 ELO_VERSION=	1.4.1
-ELO_REVISION=	0
+ELO_REVISION=	1
 .else
 ELO_VERSION=	1.2.4
-ELO_REVISION=	0
+ELO_REVISION=	1
 .endif
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-elographics/pkg-plist
===================================================================
--- x11-drivers/xf86-input-elographics/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-elographics/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/elographics_drv.la
 lib/xorg/modules/input/elographics_drv.so
 man/man4/elographics.4x.gz
 @dirrmtry lib/xorg/modules/input
Index: x11-drivers/xf86-input-fpit/Makefile
===================================================================
--- x11-drivers/xf86-input-fpit/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-fpit
 PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-input-fpit/pkg-plist
===================================================================
--- x11-drivers/xf86-input-fpit/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-fpit/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/fpit_drv.la
 lib/xorg/modules/input/fpit_drv.so
 share/X11/xorg.conf.d/50-fpit.conf
 man/man4/fpit.4x.gz
Index: x11-drivers/xf86-input-hyperpen/Makefile
===================================================================
--- x11-drivers/xf86-input-hyperpen/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .if defined(WITH_NEW_XORG)
 HYPERVER=	1.4.1
-HYPERREVISION=	0
+HYPERREVISION=	1
 .else
 HYPERVER=	1.3.0
-HYPERREVISION=	6
+HYPERREVISION=	7
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 .endif
 
Index: x11-drivers/xf86-input-hyperpen/pkg-plist
===================================================================
--- x11-drivers/xf86-input-hyperpen/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-hyperpen/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/hyperpen_drv.la
 lib/xorg/modules/input/hyperpen_drv.so
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
Index: x11-drivers/xf86-input-joystick/Makefile
===================================================================
--- x11-drivers/xf86-input-joystick/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .if defined(WITH_NEW_XORG)
 JOYVER=		1.6.2
-JOYREVISION=	0
+JOYREVISION=	1
 .else
 JOYVER=		1.5.0
-JOYREVISION=	1
+JOYREVISION=	2
 .endif
 
 post-patch:
Index: x11-drivers/xf86-input-joystick/pkg-plist
===================================================================
--- x11-drivers/xf86-input-joystick/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-joystick/pkg-plist	(working copy)
@@ -1,5 +1,4 @@
 include/xorg/joystick-properties.h
-lib/xorg/modules/input/joystick_drv.la
 lib/xorg/modules/input/joystick_drv.so
 libdata/pkgconfig/xorg-joystick.pc
 man/man4/joystick.4x.gz
Index: x11-drivers/xf86-input-keyboard/Makefile
===================================================================
--- x11-drivers/xf86-input-keyboard/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-keyboard
 PORTVERSION=	1.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-input-keyboard/pkg-plist
===================================================================
--- x11-drivers/xf86-input-keyboard/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-keyboard/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/kbd_drv.la
 lib/xorg/modules/input/kbd_drv.so
 man/man4/kbd.4x.gz
 @dirrmtry lib/xorg/modules/input
Index: x11-drivers/xf86-input-magictouch/Makefile
===================================================================
--- x11-drivers/xf86-input-magictouch/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-magictouch
 PORTVERSION=	1.0.0.5
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -19,6 +19,5 @@ IGNORE=		needs xf86_ansic.h which doesn'
 .endif
 
 XORG_CAT=	driver
-USES=		libtool
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-magictouch/pkg-plist
===================================================================
--- x11-drivers/xf86-input-magictouch/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-magictouch/pkg-plist	(working copy)
@@ -1,5 +1,4 @@
 lib/xorg/modules/input/magictouch_drv.a
-lib/xorg/modules/input/magictouch_drv.la
 lib/xorg/modules/input/magictouch_drv.so
 man/man4/magictouch.4x.gz
 @dirrmtry lib/xorg/modules/input
Index: x11-drivers/xf86-input-mouse/Makefile
===================================================================
--- x11-drivers/xf86-input-mouse/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-input-mouse
 PORTVERSION=	1.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-input-mouse/pkg-plist
===================================================================
--- x11-drivers/xf86-input-mouse/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
@@ -1,5 +1,4 @@
 include/xorg/xf86-mouse-properties.h
-lib/xorg/modules/input/mouse_drv.la
 lib/xorg/modules/input/mouse_drv.so
 libdata/pkgconfig/xorg-mouse.pc
 man/man4/mousedrv.4x.gz
Index: x11-drivers/xf86-input-mutouch/Makefile
===================================================================
--- x11-drivers/xf86-input-mutouch/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-mutouch
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-input-mutouch/pkg-plist
===================================================================
--- x11-drivers/xf86-input-mutouch/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-mutouch/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/mutouch_drv.la
 lib/xorg/modules/input/mutouch_drv.so
 man/man4/mutouch.4x.gz
 @dirrmtry lib/xorg/modules/input
Index: x11-drivers/xf86-input-penmount/Makefile
===================================================================
--- x11-drivers/xf86-input-penmount/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .if defined(WITH_NEW_XORG)
 PEN_VERSION=	1.5.0
-PEN_REVISION=	0
+PEN_REVISION=	1
 .else
 PEN_VERSION=	1.4.1
-PEN_REVISION=	1
+PEN_REVISION=	2
 .endif
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-penmount/pkg-plist
===================================================================
--- x11-drivers/xf86-input-penmount/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-penmount/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/penmount_drv.la
 lib/xorg/modules/input/penmount_drv.so
 man/man4/penmount.4x.gz
 @dirrmtry lib/xorg/modules/input
Index: x11-drivers/xf86-input-synaptics/Makefile
===================================================================
--- x11-drivers/xf86-input-synaptics/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
@@ -18,11 +18,11 @@ XORG_CAT=	driver
 
 .if defined(WITH_NEW_XORG)
 SYNAPTICS_VERSION=	1.7.4
-SYNAPTICS_REVISION=	0
+SYNAPTICS_REVISION=	1
 PLIST_SUB+=	NEW="" OLD="@comment "
 .else
 SYNAPTICS_VERSION=	1.6.4
-SYNAPTICS_REVISION=	0
+SYNAPTICS_REVISION=	1
 PLIST_SUB+=	NEW="@comment " OLD=""
 EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
 .endif
Index: x11-drivers/xf86-input-synaptics/pkg-plist
===================================================================
--- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
@@ -2,7 +2,6 @@ bin/synclient
 bin/syndaemon
 include/xorg/synaptics-properties.h
 %%OLD%%include/xorg/synaptics.h
-lib/xorg/modules/input/synaptics_drv.la
 lib/xorg/modules/input/synaptics_drv.so
 libdata/pkgconfig/xorg-synaptics.pc
 man/man1/synclient.1.gz
Index: x11-drivers/xf86-input-vmmouse/Makefile
===================================================================
--- x11-drivers/xf86-input-vmmouse/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-input-vmmouse
 PORTVERSION=	13.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-input-vmmouse/pkg-plist
===================================================================
--- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
@@ -1,6 +1,5 @@
 bin/vmmouse_detect
 libexec/hal/scripts/hal-probe-vmmouse
-lib/xorg/modules/input/vmmouse_drv.la
 lib/xorg/modules/input/vmmouse_drv.so
 man/man1/vmmouse_detect.1.gz
 man/man4/vmmouse.4x.gz
Index: x11-drivers/xf86-input-void/Makefile
===================================================================
--- x11-drivers/xf86-input-void/Makefile	(revision 351527)
+++ x11-drivers/xf86-input-void/Makefile	(working copy)
@@ -14,10 +14,10 @@ XORG_CAT=	driver
 
 .if defined(WITH_NEW_XORG)
 VOID_VERSION=	1.4.0
-VOID_REVISION=	0
+VOID_REVISION=	1
 .else
 VOID_VERSION=	1.3.1
-VOID_REVISION=	0
+VOID_REVISION=	1
 .endif
 
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-void/pkg-plist
===================================================================
--- x11-drivers/xf86-input-void/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-input-void/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/input/void_drv.la
 lib/xorg/modules/input/void_drv.so
 man/man4/void.4x.gz
 @dirrmtry lib/xorg/modules/input
Index: x11-drivers/xf86-video-apm/Makefile
===================================================================
--- x11-drivers/xf86-video-apm/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-apm/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-apm
 PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-apm/pkg-plist
===================================================================
--- x11-drivers/xf86-video-apm/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-apm/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/apm_drv.la
 lib/xorg/modules/drivers/apm_drv.so
 man/man4/apm.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-ark/Makefile
===================================================================
--- x11-drivers/xf86-video-ark/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-ark/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-ark
 PORTVERSION=	0.7.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-ark/pkg-plist
===================================================================
--- x11-drivers/xf86-video-ark/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-ark/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/ark_drv.la
 lib/xorg/modules/drivers/ark_drv.so
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
Index: x11-drivers/xf86-video-ati/Makefile
===================================================================
--- x11-drivers/xf86-video-ati/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-ati/Makefile	(working copy)
@@ -16,12 +16,12 @@ USE_XORG=	xf86driproto xineramaproto xf8
 
 .if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG)
 ATI_VERSION=	6.14.6
-ATI_REVISION=	2
+ATI_REVISION=	3
 CONFIGURE_ARGS+=--disable-kms
 PLIST_SUB+=	OLD=""
 .else
 ATI_VERSION=	7.2.0
-ATI_REVISION=	2
+ATI_REVISION=	3
 CONFIGURE_ARGS+=--disable-udev
 CONFIGURE_ARGS+=--disable-glamor
 EXTRA_PATCHES+=	${FILESDIR}/extra-src__radeon_kms.c
Index: x11-drivers/xf86-video-ati/pkg-plist
===================================================================
--- x11-drivers/xf86-video-ati/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-ati/pkg-plist	(working copy)
@@ -1,12 +1,7 @@
-lib/xorg/modules/drivers/ati_drv.la
 lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/radeon_drv.la
 lib/xorg/modules/drivers/radeon_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.la
 %%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.la
 %%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_drv.la
 %%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
 man/man4/ati.4x.gz
 man/man4/radeon.4x.gz
Index: x11-drivers/xf86-video-chips/Makefile
===================================================================
--- x11-drivers/xf86-video-chips/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-chips/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-chips
 PORTVERSION=	1.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-chips/pkg-plist
===================================================================
--- x11-drivers/xf86-video-chips/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-chips/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/chips_drv.la
 lib/xorg/modules/drivers/chips_drv.so
 man/man4/chips.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-cirrus/Makefile
===================================================================
--- x11-drivers/xf86-video-cirrus/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-cirrus
 PORTVERSION=	1.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-cirrus/pkg-plist
===================================================================
--- x11-drivers/xf86-video-cirrus/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-cirrus/pkg-plist	(working copy)
@@ -1,8 +1,5 @@
-lib/xorg/modules/drivers/cirrus_alpine.la
 lib/xorg/modules/drivers/cirrus_alpine.so
-lib/xorg/modules/drivers/cirrus_drv.la
 lib/xorg/modules/drivers/cirrus_drv.so
-lib/xorg/modules/drivers/cirrus_laguna.la
 lib/xorg/modules/drivers/cirrus_laguna.so
 man/man4/cirrus.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-cyrix/Makefile
===================================================================
--- x11-drivers/xf86-video-cyrix/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-cyrix
 PORTVERSION=	1.1.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-cyrix/pkg-plist
===================================================================
--- x11-drivers/xf86-video-cyrix/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-cyrix/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/cyrix_drv.la
 lib/xorg/modules/drivers/cyrix_drv.so
 man/man4/cyrix.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-dummy/Makefile
===================================================================
--- x11-drivers/xf86-video-dummy/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-dummy
 PORTVERSION=	0.3.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-dummy/pkg-plist
===================================================================
--- x11-drivers/xf86-video-dummy/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-dummy/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/dummy_drv.la
 lib/xorg/modules/drivers/dummy_drv.so
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
Index: x11-drivers/xf86-video-fbdev/Makefile
===================================================================
--- x11-drivers/xf86-video-fbdev/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-fbdev
 PORTVERSION=	0.4.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-fbdev/pkg-plist
===================================================================
--- x11-drivers/xf86-video-fbdev/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-fbdev/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/fbdev_drv.la
 lib/xorg/modules/drivers/fbdev_drv.so
 man/man4/fbdev.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-glint/Makefile
===================================================================
--- x11-drivers/xf86-video-glint/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-glint/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-glint
 PORTVERSION=	1.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-glint/pkg-plist
===================================================================
--- x11-drivers/xf86-video-glint/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-glint/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/glint_drv.la
 lib/xorg/modules/drivers/glint_drv.so
 man/man4/glint.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-i128/Makefile
===================================================================
--- x11-drivers/xf86-video-i128/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-i128/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-i128
 PORTVERSION=	1.3.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-i128/pkg-plist
===================================================================
--- x11-drivers/xf86-video-i128/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-i128/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/i128_drv.la
 lib/xorg/modules/drivers/i128_drv.so
 man/man4/i128.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-i740/Makefile
===================================================================
--- x11-drivers/xf86-video-i740/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-i740/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-i740
 PORTVERSION=	1.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-i740/pkg-plist
===================================================================
--- x11-drivers/xf86-video-i740/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-i740/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/i740_drv.la
 lib/xorg/modules/drivers/i740_drv.so
 man/man4/i740.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-intel/Makefile
===================================================================
--- x11-drivers/xf86-video-intel/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-intel/Makefile	(working copy)
@@ -27,7 +27,7 @@ USE_XORG=	glproto \
 
 .if defined(WITH_NEW_XORG)
 INTEL_VERSION=	2.21.15
-INTEL_REVISION=	2
+INTEL_REVISION=	3
 CONFIGURE_ENV+=	xorg_cv_cc_flag__Wno_maybe_uninitialized=no
 CONFIGURE_ARGS+=	--enable-sna
 CONFIGURE_ARGS+=	--disable-glamor
@@ -39,7 +39,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-src__s
 LIB_DEPENDS+=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=	2.7.1
-INTEL_REVISION=	7
+INTEL_REVISION=	8
 PLIST_SUB+=	OLD=""
 
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src_ch7017_ch7017.c \
Index: x11-drivers/xf86-video-intel/pkg-plist
===================================================================
--- x11-drivers/xf86-video-intel/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-intel/pkg-plist	(working copy)
@@ -1,22 +1,14 @@
-lib/libI810XvMC.la
 lib/libI810XvMC.so
 lib/libI810XvMC.so.1
 lib/libI810XvMC.so.1.0.0
-lib/libIntelXvMC.la
 lib/libIntelXvMC.so.1
 lib/libIntelXvMC.so
 lib/libIntelXvMC.so.1.0.0
-%%OLD%%lib/xorg/modules/drivers/ch7017.la
 %%OLD%%lib/xorg/modules/drivers/ch7017.so
-%%OLD%%lib/xorg/modules/drivers/ch7xxx.la
 %%OLD%%lib/xorg/modules/drivers/ch7xxx.so
-lib/xorg/modules/drivers/intel_drv.la
 lib/xorg/modules/drivers/intel_drv.so
-%%OLD%%lib/xorg/modules/drivers/ivch.la
 %%OLD%%lib/xorg/modules/drivers/ivch.so
-%%OLD%%lib/xorg/modules/drivers/sil164.la
 %%OLD%%lib/xorg/modules/drivers/sil164.so
-%%OLD%%lib/xorg/modules/drivers/tfp410.la
 %%OLD%%lib/xorg/modules/drivers/tfp410.so
 man/man4/intel.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-mach64/Makefile
===================================================================
--- x11-drivers/xf86-video-mach64/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-mach64
 PORTVERSION=	6.9.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-mach64/pkg-plist
===================================================================
--- x11-drivers/xf86-video-mach64/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-mach64/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/mach64_drv.la
 lib/xorg/modules/drivers/mach64_drv.so
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
Index: x11-drivers/xf86-video-mga/Makefile
===================================================================
--- x11-drivers/xf86-video-mga/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-mga/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-mga
 PORTVERSION=	1.6.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	x11-drivers
 
Index: x11-drivers/xf86-video-mga/pkg-plist
===================================================================
--- x11-drivers/xf86-video-mga/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-mga/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/mga_drv.la
 lib/xorg/modules/drivers/mga_drv.so
 man/man4/mga.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-neomagic/Makefile
===================================================================
--- x11-drivers/xf86-video-neomagic/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-neomagic
 PORTVERSION=	1.2.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-neomagic/pkg-plist
===================================================================
--- x11-drivers/xf86-video-neomagic/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-neomagic/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/neomagic_drv.la
 lib/xorg/modules/drivers/neomagic_drv.so
 man/man4/neomagic.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-newport/Makefile
===================================================================
--- x11-drivers/xf86-video-newport/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-newport/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-newport
 PORTVERSION=	0.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-newport/pkg-plist
===================================================================
--- x11-drivers/xf86-video-newport/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-newport/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/newport_drv.la
 lib/xorg/modules/drivers/newport_drv.so
 man/man4/newport.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-nv/Makefile
===================================================================
--- x11-drivers/xf86-video-nv/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-nv/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-nv
 PORTVERSION=	2.1.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-nv/pkg-plist
===================================================================
--- x11-drivers/xf86-video-nv/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-nv/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/nv_drv.la
 lib/xorg/modules/drivers/nv_drv.so
 man/man4/nv.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-openchrome/Makefile
===================================================================
--- x11-drivers/xf86-video-openchrome/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-openchrome
 PORTVERSION=	0.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-openchrome/pkg-plist
===================================================================
--- x11-drivers/xf86-video-openchrome/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-openchrome/pkg-plist	(working copy)
@@ -1,12 +1,9 @@
-lib/libchromeXvMC.la
 lib/libchromeXvMC.so
 lib/libchromeXvMC.so.1
 lib/libchromeXvMC.so.1.0.0
-lib/libchromeXvMCPro.la
 lib/libchromeXvMCPro.so
 lib/libchromeXvMCPro.so.1
 lib/libchromeXvMCPro.so.1.0.0
-lib/xorg/modules/drivers/openchrome_drv.la
 lib/xorg/modules/drivers/openchrome_drv.so
 man/man4/openchrome.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-r128/Makefile
===================================================================
--- x11-drivers/xf86-video-r128/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-r128/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-r128
 PORTVERSION=	6.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-r128/pkg-plist
===================================================================
--- x11-drivers/xf86-video-r128/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-r128/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/r128_drv.la
 lib/xorg/modules/drivers/r128_drv.so
 man/man4/r128.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-rdc/Makefile
===================================================================
--- x11-drivers/xf86-video-rdc/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-rdc/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-rdc
 PORTVERSION=	0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://www.SpringDaemons.com/stas/
 
Index: x11-drivers/xf86-video-rendition/Makefile
===================================================================
--- x11-drivers/xf86-video-rendition/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-rendition
 PORTVERSION=	4.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-rendition/pkg-plist
===================================================================
--- x11-drivers/xf86-video-rendition/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-rendition/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/rendition_drv.la
 lib/xorg/modules/drivers/rendition_drv.so
 lib/xorg/modules/v10002d.uc
 lib/xorg/modules/v20002d.uc
Index: x11-drivers/xf86-video-s3/Makefile
===================================================================
--- x11-drivers/xf86-video-s3/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-s3/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-s3
 PORTVERSION=	0.6.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-s3/pkg-plist
===================================================================
--- x11-drivers/xf86-video-s3/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-s3/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/s3_drv.la
 lib/xorg/modules/drivers/s3_drv.so
 man/man4/s3.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-s3virge/Makefile
===================================================================
--- x11-drivers/xf86-video-s3virge/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-s3virge
 PORTVERSION=	1.10.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-s3virge/pkg-plist
===================================================================
--- x11-drivers/xf86-video-s3virge/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-s3virge/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/s3virge_drv.la
 lib/xorg/modules/drivers/s3virge_drv.so
 man/man4/s3virge.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-savage/Makefile
===================================================================
--- x11-drivers/xf86-video-savage/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-savage/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-savage
 PORTVERSION=	2.3.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-savage/pkg-plist
===================================================================
--- x11-drivers/xf86-video-savage/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-savage/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/savage_drv.la
 lib/xorg/modules/drivers/savage_drv.so
 man/man4/savage.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-scfb/Makefile
===================================================================
--- x11-drivers/xf86-video-scfb/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-scfb/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-scfb
 PORTVERSION=	0.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 MASTER_SITES=	ftp://rene-ladan.nl/pub/distfiles/ \
 		LOCAL/rene 
Index: x11-drivers/xf86-video-scfb/pkg-plist
===================================================================
--- x11-drivers/xf86-video-scfb/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-scfb/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/scfb_drv.la
 lib/xorg/modules/drivers/scfb_drv.so
 man/man4/scfb.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-siliconmotion/Makefile
===================================================================
--- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-siliconmotion
 PORTVERSION=	1.7.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-siliconmotion/pkg-plist
===================================================================
--- x11-drivers/xf86-video-siliconmotion/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-siliconmotion/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/siliconmotion_drv.la
 lib/xorg/modules/drivers/siliconmotion_drv.so
 man/man4/siliconmotion.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-sis/Makefile
===================================================================
--- x11-drivers/xf86-video-sis/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-sis/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-sis
 PORTVERSION=	0.10.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-sis/pkg-plist
===================================================================
--- x11-drivers/xf86-video-sis/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-sis/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/sis_drv.la
 lib/xorg/modules/drivers/sis_drv.so
 man/man4/sis.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-sis-intel/Makefile
===================================================================
--- x11-drivers/xf86-video-sis-intel/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-sis-intel/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-sis-intel
 PORTVERSION=	300407
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://downloadmirror.intel.com/15443/eng/
 DISTNAME=	sis_drv_src_300407
Index: x11-drivers/xf86-video-sis-intel/pkg-plist
===================================================================
--- x11-drivers/xf86-video-sis-intel/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-sis-intel/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/sis_drv.la
 lib/xorg/modules/drivers/sis_drv.so
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
Index: x11-drivers/xf86-video-sunffb/Makefile
===================================================================
--- x11-drivers/xf86-video-sunffb/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-sunffb
 PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-sunffb/pkg-plist
===================================================================
--- x11-drivers/xf86-video-sunffb/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-sunffb/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/sunffb_drv.la
 lib/xorg/modules/drivers/sunffb_drv.so
 man/man4/sunffb.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-tdfx/Makefile
===================================================================
--- x11-drivers/xf86-video-tdfx/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-tdfx
 PORTVERSION=	1.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-tdfx/pkg-plist
===================================================================
--- x11-drivers/xf86-video-tdfx/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-tdfx/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/tdfx_drv.la
 lib/xorg/modules/drivers/tdfx_drv.so
 man/man4/tdfx.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-tga/Makefile
===================================================================
--- x11-drivers/xf86-video-tga/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-tga/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-tga
 PORTVERSION=	1.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-tga/pkg-plist
===================================================================
--- x11-drivers/xf86-video-tga/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-tga/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/tga_drv.la
 lib/xorg/modules/drivers/tga_drv.so
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
Index: x11-drivers/xf86-video-trident/Makefile
===================================================================
--- x11-drivers/xf86-video-trident/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-trident/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-trident
 PORTVERSION=	1.3.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-trident/pkg-plist
===================================================================
--- x11-drivers/xf86-video-trident/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-trident/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/trident_drv.la
 lib/xorg/modules/drivers/trident_drv.so
 man/man4/trident.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-tseng/Makefile
===================================================================
--- x11-drivers/xf86-video-tseng/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-tseng
 PORTVERSION=	1.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-tseng/pkg-plist
===================================================================
--- x11-drivers/xf86-video-tseng/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-tseng/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/tseng_drv.la
 lib/xorg/modules/drivers/tseng_drv.so
 man/man4/tseng.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-vesa/Makefile
===================================================================
--- x11-drivers/xf86-video-vesa/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-vesa
 PORTVERSION=	2.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-vesa/pkg-plist
===================================================================
--- x11-drivers/xf86-video-vesa/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-vesa/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/vesa_drv.la
 lib/xorg/modules/drivers/vesa_drv.so
 man/man4/vesa.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-vmware/Makefile
===================================================================
--- x11-drivers/xf86-video-vmware/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-vmware
 PORTVERSION=	13.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-vmware/pkg-plist
===================================================================
--- x11-drivers/xf86-video-vmware/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-vmware/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/vmware_drv.la
 lib/xorg/modules/drivers/vmware_drv.so
 man/man4/vmware.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-voodoo/Makefile
===================================================================
--- x11-drivers/xf86-video-voodoo/Makefile	(revision 351527)
+++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-voodoo
 PORTVERSION=	1.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-voodoo/pkg-plist
===================================================================
--- x11-drivers/xf86-video-voodoo/pkg-plist	(revision 351527)
+++ x11-drivers/xf86-video-voodoo/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-lib/xorg/modules/drivers/voodoo_drv.la
 lib/xorg/modules/drivers/voodoo_drv.so
 man/man4/voodoo.4x.gz
 @dirrmtry lib/xorg/modules/drivers
Index: x11-fonts/libFS/Makefile
===================================================================
--- x11-fonts/libFS/Makefile	(revision 351527)
+++ x11-fonts/libFS/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libFS
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-fonts/libXfont/Makefile
===================================================================
--- x11-fonts/libXfont/Makefile	(revision 351527)
+++ x11-fonts/libXfont/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXfont
 PORTVERSION=	1.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
Index: x11-fonts/libXfontcache/Makefile
===================================================================
--- x11-fonts/libXfontcache/Makefile	(revision 351527)
+++ x11-fonts/libXfontcache/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXfontcache
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-fonts/libXft/Makefile
===================================================================
--- x11-fonts/libXft/Makefile	(revision 351527)
+++ x11-fonts/libXft/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXft
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	gnome@FreeBSD.org
Index: x11-fonts/libfontenc/Makefile
===================================================================
--- x11-fonts/libfontenc/Makefile	(revision 351527)
+++ x11-fonts/libfontenc/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libfontenc
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-servers/xorg-server/Makefile
===================================================================
--- x11-servers/xorg-server/Makefile	(revision 351527)
+++ x11-servers/xorg-server/Makefile	(working copy)
@@ -35,14 +35,14 @@ OPTIONS_EXCLUDE_sparc64=	HAL
 
 .if defined(WITH_NEW_XORG)
 XORG_VERSION=	1.12.4
-XORG_REVISION=	5
+XORG_REVISION=	6
 PLIST_SUB+=	OLD="@comment " NEW=""
 EXTRA_PATCHES+=	${FILESDIR}/extra-clang \
 		${FILESDIR}/extra-configure \
 		${FILESDIR}/extra-new-dix_dixfonts.c
 .else
 XORG_VERSION=	1.7.7
-XORG_REVISION=	12
+XORG_REVISION=	13
 PLIST_SUB+=	OLD="" NEW="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-xace.c \
 		${FILESDIR}/extra-Xserver-os-xprintf.c \
@@ -53,8 +53,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-x
 		${FILESDIR}/extra-old-dix_dixfonts.c
 .endif
 
-USE_BZIP2=	yes
-USES=		gmake perl5 libtool
+USES=		gmake libtool:keepla perl5 tar:bzip2
 USE_PERL5=	build
 USE_GL=		gl
 USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
Index: x11-themes/gtk-blueprint-engine/Makefile
===================================================================
--- x11-themes/gtk-blueprint-engine/Makefile	(revision 351527)
+++ x11-themes/gtk-blueprint-engine/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	blueprint
 PORTVERSION=	0.9.20
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://dlc.sun.com/osol/jds/downloads/extras/
 PKGNAMEPREFIX=	gtk-
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	icon-naming-utils>=0.8.90
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=	pkgconfig gmake libtool perl5
+USES=		gmake libtool:keepla perl5 pkgconfig
 USE_GNOME=	glib20 gtk20 intltool intlhack
 INSTALLS_ICONS=	yes
 
Index: x11-toolkits/fox14/Makefile
===================================================================
--- x11-toolkits/fox14/Makefile	(revision 351527)
+++ x11-toolkits/fox14/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.4.35
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
@@ -21,7 +21,7 @@ MAJORVER=	${PORTVERSION:R}
 SHVER=		${PORTVERSION:S/${MAJORVER}.//}
 PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
-USES=		libtool
+USES=		libtool:keepla
 USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl=yes \
Index: x11-toolkits/fox16/Makefile
===================================================================
--- x11-toolkits/fox16/Makefile	(revision 351527)
+++ x11-toolkits/fox16/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.6.49
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.fox-toolkit.org/pub/ \
     		http://ftp.fox-toolkit.org/pub/
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/grap
 MAJORVER=	${PORTVERSION:R}
 PLIST_SUB+=	MAJORVER=${MAJORVER}
 
-USES+=		libtool pathfix
+USES=		libtool:keepla pathfix
 USE_GL=		yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: x11-toolkits/fox17/Makefile
===================================================================
--- x11-toolkits/fox17/Makefile	(revision 351527)
+++ x11-toolkits/fox17/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fox
 PORTVERSION=	1.7.46
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.fox-toolkit.org/pub/ \
    		ftp://ftp.fox-toolkit.org/pub/
@@ -19,8 +19,8 @@ MAJORVER=	${PORTVERSION:R}
 PLIST_SUB+=	MAJORVER=${MAJORVER}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${MAJORVER}
 
-USES+=		libtool pathfix
 GNU_CONFIGURE=	yes
+USES=		libtool:keepla pathfix
 USE_GL=		glut
 USE_XORG=	sm xft
 USE_LDCONFIG=	yes
Index: x11-toolkits/gstreamer1-plugins-pango/Makefile
===================================================================
--- x11-toolkits/gstreamer1-plugins-pango/Makefile	(revision 351527)
+++ x11-toolkits/gstreamer1-plugins-pango/Makefile	(working copy)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 
 COMMENT=	Gstreamer pango textoverlay plugin
Index: x11-toolkits/libXaw/Makefile
===================================================================
--- x11-toolkits/libXaw/Makefile	(revision 351527)
+++ x11-toolkits/libXaw/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXaw
 PORTVERSION=	1.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits
 
Index: x11-toolkits/libXmu/Makefile
===================================================================
--- x11-toolkits/libXmu/Makefile	(revision 351527)
+++ x11-toolkits/libXmu/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXmu
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
Index: x11-toolkits/libXt/Makefile
===================================================================
--- x11-toolkits/libXt/Makefile	(revision 351527)
+++ x11-toolkits/libXt/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libXt
 PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
Index: x11-toolkits/libgdiplus/Makefile
===================================================================
--- x11-toolkits/libgdiplus/Makefile	(revision 351527)
+++ x11-toolkits/libgdiplus/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgdiplus
 PORTVERSION=	2.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libtiff.so:${PORTSDIR}/grap
 		libcairo.so:${PORTSDIR}/graphics/cairo
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_XORG=	x11
Index: x11-toolkits/libunique3/Makefile
===================================================================
--- x11-toolkits/libunique3/Makefile	(revision 351527)
+++ x11-toolkits/libunique3/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libunique
 PORTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 
@@ -13,7 +14,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDI
 
 USE_XORG=	ice x11
 USE_XZ=		yes
-USES=		gettext gmake libtool pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_GNOME=	gtk30 gnomeprefix
 GNU_CONFIGURE=	yes
Index: x11-toolkits/pango/Makefile
===================================================================
--- x11-toolkits/pango/Makefile	(revision 351527)
+++ x11-toolkits/pango/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	pango
 PORTVERSION=	1.34.1
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/
 RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
 
-USES+=		gettext gmake libtool pathfix pkgconfig
+USES+=		gettext gmake libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	cairo glib20 introspection:build referencehack
Index: x11-toolkits/vte/Makefile
===================================================================
--- x11-toolkits/vte/Makefile	(revision 351527)
+++ x11-toolkits/vte/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	vte
 PORTVERSION=	0.28.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,7 +18,7 @@ USE_XZ=		yes
 
 RUN_DEPENDS+=	${LOCALBASE}/libexec/gnome-pty-helper:${PORTSDIR}/x11-toolkits/gnome-pty-helper
 
-USES=		bison gettext gmake libtool pathfix pkgconfig
+USES=		bison gettext gmake libtool:keepla pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME?=	gnomeprefix gtk20 introspection:build referencehack
Index: x11-wm/libcompizconfig/Makefile
===================================================================
--- x11-wm/libcompizconfig/Makefile	(revision 351527)
+++ x11-wm/libcompizconfig/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libcompizconfig
 PORTVERSION=	0.8.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
@@ -16,7 +16,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	intltool libxml2
 
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: x11-wm/libdockapp/Makefile
===================================================================
--- x11-wm/libdockapp/Makefile	(revision 351527)
+++ x11-wm/libdockapp/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libdockapp
 PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	xride
@@ -14,12 +14,12 @@ COMMENT=	Standard library for Window Mak
 OPTIONS_DEFINE=	EXAMPLES
 OPTIONS_SUB=	yes
 
-USES=		libtool
+USES=		libtool:keepla
 USE_BZIP2=	yes
+USE_LDCONFIG=	yes
 USE_XORG=	xext xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-font --without-examples
-USE_LDCONFIG=	yes
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/fonts/dockapp
Index: x11-wm/openbox/Makefile
===================================================================
--- x11-wm/openbox/Makefile	(revision 351527)
+++ x11-wm/openbox/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openbox
 PORTVERSION=	3.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://openbox.org/dist/openbox/
 
@@ -13,7 +13,7 @@ COMMENT=	Small, fast, standards complian
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
-USES=		libtool gmake pathfix pkgconfig
+USES=		gmake libtool:keepla pathfix pkgconfig
 USE_GNOME=	glib20 libxml2
 USE_XORG=	xft
 USE_LDCONFIG=	yes
--- keepla.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404181302.s3ID25Ia001651>