summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-04-23 13:25:16 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-04-23 13:25:16 +0000
commitaad09bc5e23eb75a7a865a8b0002fbc6e13d4659 (patch)
tree69c07cdc4812f0f8be0cc44c38513f540c058778 /x11
parent- Update to 20140423 snapshot (diff)
When linking a library libA with a library libB using libtool, if libB.la
exists, libtool will add all libraries libB.la refers to (dependency_libs field) to the linker command line and store them in the dependency_libs field of libA.la. So everything that subsequently links with libA will also link to these extra libraries. This causes too much overlinking. This commit modifies Mk/Uses/libtool.mk so it empties the dependency_libs field in .la libraries during staging. However, because .la libraries have very limited use when dependency_libs is empty it makes sense to completely remove them during staging. So with this commit USES=libtool is modified to remove .la libraries and a new form (USES=libtool:keepla) is introduced in case they need to be kept (dependency_libs is still emptied). PORTREVISION is bumped on all ports with USES=libtool that install .la libraries. Most ports are also changed to add :keepla because .la libraries have to be kept around as long as there are dependent ports with .la libraries that refer to them in their dependency_libs field. In most cases :keepla can be removed again as soon as all dependent ports that install .la libraries have some form of USES=libtool added to their Makefile. PR: ports/188759 Exp-run: bdrewery Approved by: portmgr (bdrewery)
Notes
Notes: svn path=/head/; revision=351936
Diffstat (limited to 'x11')
-rw-r--r--x11/dgs/Makefile4
-rw-r--r--x11/gnome-desktop/Makefile6
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gstreamer1-plugins-x/Makefile2
-rw-r--r--x11/gstreamer1-plugins-ximagesrc/Makefile2
-rw-r--r--x11/libICE/Makefile2
-rw-r--r--x11/libSM/Makefile2
-rw-r--r--x11/libX11/Makefile2
-rw-r--r--x11/libXScrnSaver/Makefile2
-rw-r--r--x11/libXTrap/Makefile2
-rw-r--r--x11/libXau/Makefile2
-rw-r--r--x11/libXcm/Makefile2
-rw-r--r--x11/libXcomposite/Makefile2
-rw-r--r--x11/libXcursor/Makefile2
-rw-r--r--x11/libXdamage/Makefile2
-rw-r--r--x11/libXdmcp/Makefile2
-rw-r--r--x11/libXevie/Makefile2
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXfixes/Makefile2
-rw-r--r--x11/libXi/Makefile2
-rw-r--r--x11/libXinerama/Makefile2
-rw-r--r--x11/libXp/Makefile2
-rw-r--r--x11/libXpm/Makefile2
-rw-r--r--x11/libXprintAppUtil/Makefile2
-rw-r--r--x11/libXprintUtil/Makefile2
-rw-r--r--x11/libXrandr/Makefile2
-rw-r--r--x11/libXrender/Makefile2
-rw-r--r--x11/libXres/Makefile2
-rw-r--r--x11/libXtst/Makefile2
-rw-r--r--x11/libXv/Makefile2
-rw-r--r--x11/libXvMC/Makefile2
-rw-r--r--x11/libXxf86dga/Makefile2
-rw-r--r--x11/libXxf86misc/Makefile2
-rw-r--r--x11/libXxf86vm/Makefile2
-rw-r--r--x11/libdmx/Makefile2
-rw-r--r--x11/libgnome/Makefile4
-rw-r--r--x11/libgnomekbd/Makefile4
-rw-r--r--x11/libgnomemm26/Makefile4
-rw-r--r--x11/libmatekbd/Makefile4
-rw-r--r--x11/liboldX/Makefile2
-rw-r--r--x11/libxcb/Makefile2
-rw-r--r--x11/libxkbcommon/Makefile1
-rw-r--r--x11/libxkbfile/Makefile2
-rw-r--r--x11/libxkbui/Makefile2
-rw-r--r--x11/libxklavier/Makefile4
-rw-r--r--x11/libxshmfence/Makefile2
-rw-r--r--x11/pixman/Makefile2
-rw-r--r--x11/xcb-util-cursor/Makefile2
-rw-r--r--x11/xcb-util-image/Makefile2
-rw-r--r--x11/xcb-util-keysyms/Makefile2
-rw-r--r--x11/xcb-util-renderutil/Makefile2
-rw-r--r--x11/xcb-util-wm/Makefile2
-rw-r--r--x11/xcb-util/Makefile2
-rw-r--r--x11/xrx/Makefile4
-rw-r--r--x11/xtrans/Makefile1
55 files changed, 65 insertions, 63 deletions
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index f56b5663d370..81f596cf55f4 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -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
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index b62addebd736..2e67e767e33c 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -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
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 045735b5062c..a2238176fb0c 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -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
diff --git a/x11/gstreamer1-plugins-x/Makefile b/x11/gstreamer1-plugins-x/Makefile
index 1dbe602c8921..4f4b5cd07aaf 100644
--- a/x11/gstreamer1-plugins-x/Makefile
+++ b/x11/gstreamer1-plugins-x/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
COMMENT= Gstreamer X and Xvideo output plugins
diff --git a/x11/gstreamer1-plugins-ximagesrc/Makefile b/x11/gstreamer1-plugins-ximagesrc/Makefile
index 6518baadabba..4839f931f618 100644
--- a/x11/gstreamer1-plugins-ximagesrc/Makefile
+++ b/x11/gstreamer1-plugins-ximagesrc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
PKGNAMESUFFIX= 1-plugins-ximagesrc
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 5120976ed560..3e6ec341c19a 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libICE
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 01233f126c6b..caf24c7a7d55 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libSM
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 3df2bb763367..cdda1df86b94 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libX11
PORTVERSION= 1.6.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index be2f48a4f9ea..62ad47ce731d 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXScrnSaver
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index b54c61e0d9ec..7310d43d3054 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXTrap
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index addf5113b98f..68cc026b063c 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXau
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXcm/Makefile b/x11/libXcm/Makefile
index 2638fb10ae87..57a430964e77 100644
--- a/x11/libXcm/Makefile
+++ b/x11/libXcm/Makefile
@@ -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|}
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 6c81c9edb856..5a6699d3c8cd 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXcomposite
PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index 63f4ab49b915..caa96349fb0d 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXcursor
PORTVERSION= 1.1.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index 24c1dfcd849f..bc61501e5550 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXdamage
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 602ff5685d9f..fb4a51a2dff6 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXdmcp
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index 9e1b46677b8d..5f3b2abcaaae 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXevie
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index adf905fbc0e3..29a8f8ee8e8d 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXext
PORTVERSION= 1.3.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index f08c43afa749..14365d9d2c7c 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXfixes
PORTVERSION= 5.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 6a6e2ec8a085..7a85e91fb509 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXi
PORTVERSION= 1.7.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index c8d3f33cdd34..e82781c7f495 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXinerama
PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 4aaa1a51af44..1cee8c8073c9 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXp
PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index b522c7f368a7..6fc4dd8f4859 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXpm
PORTVERSION= 3.5.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
index d659d4e77555..9ff7451e9626 100644
--- a/x11/libXprintAppUtil/Makefile
+++ b/x11/libXprintAppUtil/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXprintAppUtil
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile
index 5f9c05d3ecc5..6021a9e4df72 100644
--- a/x11/libXprintUtil/Makefile
+++ b/x11/libXprintUtil/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXprintUtil
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 976773363c1b..99e610abb452 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXrandr
PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index a7aaf8d08b9c..ddb2ed1f82bd 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXrender
PORTVERSION= 0.9.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 0eef9908dea5..a4f0a9fd7612 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXres
PORTVERSION= 1.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index ac4c59a13478..154ca97dd7f8 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXtst
PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index 1555c8dcf3f0..a3a2a9f7dbb6 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXv
PORTVERSION= 1.0.10
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index 407966ee772e..9d3ff4ae0cb7 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXvMC
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index cb6fe45a8b72..316a86feeffa 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXxf86dga
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index 5031242190ab..dffd60f7ff8f 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXxf86misc
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index acd2f95c14f1..6a66742271ba 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXxf86vm
PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 4ffb3ebe4806..568f57ce74ec 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libdmx
PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 4f41c29e2857..6da4de96b583 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -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}/textproc/rarian
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
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index f806186d29c7..ea7a604dd7df 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -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
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 295a9c990856..8aa5feb42658 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnomemm
PORTVERSION= 2.30.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,7 @@ COMMENT= C++ wrapper for libgnome library
LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= xext
USE_GNOME= libgnome
GNU_CONFIGURE= yes
diff --git a/x11/libmatekbd/Makefile b/x11/libmatekbd/Makefile
index 0f7e01742e14..c4bbb73dd016 100644
--- a/x11/libmatekbd/Makefile
+++ b/x11/libmatekbd/Makefile
@@ -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}/x11/libxklavier
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
diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile
index f1b615773d38..ba70b3c08ab3 100644
--- a/x11/liboldX/Makefile
+++ b/x11/liboldX/Makefile
@@ -2,7 +2,7 @@
PORTNAME= liboldX
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 2f43a501b944..ce6c01d3a590 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxcb
PORTVERSION= 1.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index 9abb9a67f072..de10e096a200 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libxkbcommon
PORTVERSION= 0.4.1
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xkbcommon.org/download/
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index 99c4946809b0..e76f09f86ab7 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxkbfile
PORTVERSION= 1.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile
index a928f8162a95..d0c33ec0c9a3 100644
--- a/x11/libxkbui/Makefile
+++ b/x11/libxkbui/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxkbui
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 2d1602d77ade..677e6c4c264e 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -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/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
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
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index 3acdac95ad63..c6c3e1705f9e 100644
--- a/x11/libxshmfence/Makefile
+++ b/x11/libxshmfence/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxshmfence
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 43d7a1cf1203..14d07ef98643 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pixman
PORTVERSION= 0.32.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile
index 82ba070f8f9c..7bf13f1b6d3d 100644
--- a/x11/xcb-util-cursor/Makefile
+++ b/x11/xcb-util-cursor/Makefile
@@ -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/
diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile
index 2649b6b0d425..74a9bbd781b8 100644
--- a/x11/xcb-util-image/Makefile
+++ b/x11/xcb-util-image/Makefile
@@ -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/
diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile
index 3bc01bd46222..7cb54901d9b5 100644
--- a/x11/xcb-util-keysyms/Makefile
+++ b/x11/xcb-util-keysyms/Makefile
@@ -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/
diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile
index 98c3d78b671a..f82de0a6da46 100644
--- a/x11/xcb-util-renderutil/Makefile
+++ b/x11/xcb-util-renderutil/Makefile
@@ -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/
diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile
index eaed5195ed06..21b9f3d3f1c9 100644
--- a/x11/xcb-util-wm/Makefile
+++ b/x11/xcb-util-wm/Makefile
@@ -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/
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index cf6bd9a38942..afa9c1ccd9ba 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -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/
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index 7c8a3907493a..1d6fc8907c7a 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -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:
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index ccfde005795f..8573356dde9e 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xtrans
PORTVERSION= 1.3.4
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org