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 '')
-rw-r--r--x11-drivers/xf86-input-acecad/Makefile2
-rw-r--r--x11-drivers/xf86-input-acecad/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-egalax/Makefile1
-rw-r--r--x11-drivers/xf86-input-egalax/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-elographics/Makefile4
-rw-r--r--x11-drivers/xf86-input-elographics/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-fpit/Makefile2
-rw-r--r--x11-drivers/xf86-input-fpit/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-hyperpen/Makefile4
-rw-r--r--x11-drivers/xf86-input-hyperpen/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-joystick/Makefile4
-rw-r--r--x11-drivers/xf86-input-joystick/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-keyboard/Makefile2
-rw-r--r--x11-drivers/xf86-input-keyboard/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-magictouch/Makefile3
-rw-r--r--x11-drivers/xf86-input-magictouch/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-mouse/Makefile2
-rw-r--r--x11-drivers/xf86-input-mouse/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-mutouch/Makefile1
-rw-r--r--x11-drivers/xf86-input-mutouch/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-penmount/Makefile4
-rw-r--r--x11-drivers/xf86-input-penmount/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-synaptics/Makefile4
-rw-r--r--x11-drivers/xf86-input-synaptics/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-vmmouse/Makefile2
-rw-r--r--x11-drivers/xf86-input-vmmouse/pkg-plist1
-rw-r--r--x11-drivers/xf86-input-void/Makefile4
-rw-r--r--x11-drivers/xf86-input-void/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-apm/Makefile2
-rw-r--r--x11-drivers/xf86-video-apm/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-ark/Makefile2
-rw-r--r--x11-drivers/xf86-video-ark/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-ati/Makefile4
-rw-r--r--x11-drivers/xf86-video-ati/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-chips/Makefile2
-rw-r--r--x11-drivers/xf86-video-chips/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-cirrus/Makefile2
-rw-r--r--x11-drivers/xf86-video-cirrus/pkg-plist3
-rw-r--r--x11-drivers/xf86-video-cyrix/Makefile2
-rw-r--r--x11-drivers/xf86-video-cyrix/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-dummy/Makefile2
-rw-r--r--x11-drivers/xf86-video-dummy/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-fbdev/Makefile2
-rw-r--r--x11-drivers/xf86-video-fbdev/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-glint/Makefile2
-rw-r--r--x11-drivers/xf86-video-glint/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-i128/Makefile2
-rw-r--r--x11-drivers/xf86-video-i128/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-i740/Makefile2
-rw-r--r--x11-drivers/xf86-video-i740/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-intel/Makefile4
-rw-r--r--x11-drivers/xf86-video-intel/pkg-plist8
-rw-r--r--x11-drivers/xf86-video-mach64/Makefile2
-rw-r--r--x11-drivers/xf86-video-mach64/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-mga/Makefile2
-rw-r--r--x11-drivers/xf86-video-mga/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-neomagic/Makefile2
-rw-r--r--x11-drivers/xf86-video-neomagic/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-newport/Makefile2
-rw-r--r--x11-drivers/xf86-video-newport/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-nv/Makefile2
-rw-r--r--x11-drivers/xf86-video-nv/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-openchrome/Makefile2
-rw-r--r--x11-drivers/xf86-video-openchrome/pkg-plist3
-rw-r--r--x11-drivers/xf86-video-r128/Makefile2
-rw-r--r--x11-drivers/xf86-video-r128/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-rdc/Makefile2
-rw-r--r--x11-drivers/xf86-video-rendition/Makefile2
-rw-r--r--x11-drivers/xf86-video-rendition/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-s3/Makefile2
-rw-r--r--x11-drivers/xf86-video-s3/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-s3virge/Makefile2
-rw-r--r--x11-drivers/xf86-video-s3virge/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-savage/Makefile2
-rw-r--r--x11-drivers/xf86-video-savage/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-scfb/Makefile2
-rw-r--r--x11-drivers/xf86-video-scfb/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-siliconmotion/Makefile2
-rw-r--r--x11-drivers/xf86-video-siliconmotion/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-sis-intel/Makefile2
-rw-r--r--x11-drivers/xf86-video-sis-intel/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-sis/Makefile2
-rw-r--r--x11-drivers/xf86-video-sis/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-sunffb/Makefile2
-rw-r--r--x11-drivers/xf86-video-sunffb/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-tdfx/Makefile2
-rw-r--r--x11-drivers/xf86-video-tdfx/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-tga/Makefile2
-rw-r--r--x11-drivers/xf86-video-tga/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-trident/Makefile2
-rw-r--r--x11-drivers/xf86-video-trident/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-tseng/Makefile2
-rw-r--r--x11-drivers/xf86-video-tseng/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-vesa/Makefile2
-rw-r--r--x11-drivers/xf86-video-vesa/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-vmware/Makefile2
-rw-r--r--x11-drivers/xf86-video-vmware/pkg-plist1
-rw-r--r--x11-drivers/xf86-video-voodoo/Makefile2
-rw-r--r--x11-drivers/xf86-video-voodoo/pkg-plist1
-rw-r--r--x11-fm/nautilus/Makefile6
-rw-r--r--x11-fm/rodent/Makefile4
-rw-r--r--x11-fonts/libFS/Makefile1
-rw-r--r--x11-fonts/libXfont/Makefile2
-rw-r--r--x11-fonts/libXfontcache/Makefile2
-rw-r--r--x11-fonts/libXft/Makefile2
-rw-r--r--x11-fonts/libfontenc/Makefile2
-rw-r--r--x11-servers/xorg-server/Makefile7
-rw-r--r--x11-themes/gtk-blueprint-engine/Makefile3
-rw-r--r--x11-toolkits/SoXt/Makefile4
-rw-r--r--x11-toolkits/bakery/Makefile6
-rw-r--r--x11-toolkits/eel/Makefile4
-rw-r--r--x11-toolkits/fox14/Makefile4
-rw-r--r--x11-toolkits/fox16/Makefile4
-rw-r--r--x11-toolkits/fox17/Makefile4
-rw-r--r--x11-toolkits/fxscintilla/Makefile4
-rw-r--r--x11-toolkits/gal2/Makefile6
-rw-r--r--x11-toolkits/gdl/Makefile4
-rw-r--r--x11-toolkits/gnome-sharp20/Makefile4
-rw-r--r--x11-toolkits/gstreamer1-plugins-pango/Makefile2
-rw-r--r--x11-toolkits/gtkdatabox/Makefile4
-rw-r--r--x11-toolkits/gtkextra2/Makefile4
-rw-r--r--x11-toolkits/gtkglarea2/Makefile8
-rw-r--r--x11-toolkits/gtkmm20/Makefile4
-rw-r--r--x11-toolkits/gtkmm30/Makefile4
-rw-r--r--x11-toolkits/gtksourceview/Makefile6
-rw-r--r--x11-toolkits/gtksourceview2/Makefile6
-rw-r--r--x11-toolkits/gtksourceview3/Makefile6
-rw-r--r--x11-toolkits/gtksourceviewmm3/Makefile4
-rw-r--r--x11-toolkits/libXaw/Makefile2
-rw-r--r--x11-toolkits/libXmu/Makefile2
-rw-r--r--x11-toolkits/libXt/Makefile2
-rw-r--r--x11-toolkits/libbonoboui/Makefile4
-rw-r--r--x11-toolkits/libgdiplus/Makefile4
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile4
-rw-r--r--x11-toolkits/libgnomeprintuimm/Makefile4
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile4
-rw-r--r--x11-toolkits/libpanelappletmm/Makefile4
-rw-r--r--x11-toolkits/libunique3/Makefile3
-rw-r--r--x11-toolkits/libzvt/Makefile4
-rw-r--r--x11-toolkits/mowitz/Makefile4
-rw-r--r--x11-toolkits/pango/Makefile4
-rw-r--r--x11-toolkits/py-gnome-desktop/Makefile6
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile6
-rw-r--r--x11-toolkits/py-gnome2/Makefile6
-rw-r--r--x11-toolkits/py-gtksourceview/Makefile4
-rw-r--r--x11-toolkits/vdk/Makefile4
-rw-r--r--x11-toolkits/vte/Makefile4
-rw-r--r--x11-wm/compiz-plugins-extra/Makefile4
-rw-r--r--x11-wm/compiz-plugins-main/Makefile4
-rw-r--r--x11-wm/compiz-plugins-unsupported/Makefile4
-rw-r--r--x11-wm/compiz/Makefile4
-rw-r--r--x11-wm/compizconfig-backend-gconf/Makefile4
-rw-r--r--x11-wm/emerald/Makefile6
-rw-r--r--x11-wm/libcompizconfig/Makefile4
-rw-r--r--x11-wm/libdockapp/Makefile6
-rw-r--r--x11-wm/metacity/Makefile4
-rw-r--r--x11-wm/mutter/Makefile4
-rw-r--r--x11-wm/openbox/Makefile4
-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
213 files changed, 244 insertions, 307 deletions
diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile
index bda9d5b8c815..a355a9f96cd2 100644
--- a/x11-drivers/xf86-input-acecad/Makefile
+++ b/x11-drivers/xf86-input-acecad/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-input-acecad
PORTVERSION= 1.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist
index eb4b093f30e2..1374270cd522 100644
--- a/x11-drivers/xf86-input-acecad/pkg-plist
+++ b/x11-drivers/xf86-input-acecad/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile
index 2d5bf585504e..f87176a0972e 100644
--- a/x11-drivers/xf86-input-egalax/Makefile
+++ b/x11-drivers/xf86-input-egalax/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xf86-input-egalax
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= x11-drivers
MASTER_SITES= LOCAL/glebius
diff --git a/x11-drivers/xf86-input-egalax/pkg-plist b/x11-drivers/xf86-input-egalax/pkg-plist
index 6849aac7ac46..bd6166cf79d7 100644
--- a/x11-drivers/xf86-input-egalax/pkg-plist
+++ b/x11-drivers/xf86-input-egalax/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile
index 50eb5511e396..8ac9aef2e873 100644
--- a/x11-drivers/xf86-input-elographics/Makefile
+++ b/x11-drivers/xf86-input-elographics/Makefile
@@ -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>
diff --git a/x11-drivers/xf86-input-elographics/pkg-plist b/x11-drivers/xf86-input-elographics/pkg-plist
index 04b774da2de4..743dc1bb411d 100644
--- a/x11-drivers/xf86-input-elographics/pkg-plist
+++ b/x11-drivers/xf86-input-elographics/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile
index 3857aa01074c..313086f960d4 100644
--- a/x11-drivers/xf86-input-fpit/Makefile
+++ b/x11-drivers/xf86-input-fpit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-input-fpit
PORTVERSION= 1.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-fpit/pkg-plist b/x11-drivers/xf86-input-fpit/pkg-plist
index 9a8ba176754b..2d84806b8210 100644
--- a/x11-drivers/xf86-input-fpit/pkg-plist
+++ b/x11-drivers/xf86-input-fpit/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile
index ba6a1a37f438..c7325167f070 100644
--- a/x11-drivers/xf86-input-hyperpen/Makefile
+++ b/x11-drivers/xf86-input-hyperpen/Makefile
@@ -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
diff --git a/x11-drivers/xf86-input-hyperpen/pkg-plist b/x11-drivers/xf86-input-hyperpen/pkg-plist
index 59dc01716933..ac8638a0057b 100644
--- a/x11-drivers/xf86-input-hyperpen/pkg-plist
+++ b/x11-drivers/xf86-input-hyperpen/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile
index 372d0e436389..3ee62281110d 100644
--- a/x11-drivers/xf86-input-joystick/Makefile
+++ b/x11-drivers/xf86-input-joystick/Makefile
@@ -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:
diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist
index dba9b4c7ef03..f51b6910cd91 100644
--- a/x11-drivers/xf86-input-joystick/pkg-plist
+++ b/x11-drivers/xf86-input-joystick/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 3518e1752747..346ac4d17aaa 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-input-keyboard
PORTVERSION= 1.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist
index a2281aefc6f9..26a84c9a47a2 100644
--- a/x11-drivers/xf86-input-keyboard/pkg-plist
+++ b/x11-drivers/xf86-input-keyboard/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile
index 4ef2b129dad3..a240996010da 100644
--- a/x11-drivers/xf86-input-magictouch/Makefile
+++ b/x11-drivers/xf86-input-magictouch/Makefile
@@ -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't exist with recent xserver
.endif
XORG_CAT= driver
-USES= libtool
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-input-magictouch/pkg-plist b/x11-drivers/xf86-input-magictouch/pkg-plist
index 18cb36565da1..3a718e056dda 100644
--- a/x11-drivers/xf86-input-magictouch/pkg-plist
+++ b/x11-drivers/xf86-input-magictouch/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 4c28509c2c6b..7b697a7ba6ba 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-input-mouse
PORTVERSION= 1.9.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist
index b871c54a7a66..1df1af7ff66d 100644
--- a/x11-drivers/xf86-input-mouse/pkg-plist
+++ b/x11-drivers/xf86-input-mouse/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile
index aab8ea3f0a73..5a3fca4a240c 100644
--- a/x11-drivers/xf86-input-mutouch/Makefile
+++ b/x11-drivers/xf86-input-mutouch/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xf86-input-mutouch
PORTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist
index 595ac731d28a..d4311049f17d 100644
--- a/x11-drivers/xf86-input-mutouch/pkg-plist
+++ b/x11-drivers/xf86-input-mutouch/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile
index 9b7cbe39583c..f91263aa715d 100644
--- a/x11-drivers/xf86-input-penmount/Makefile
+++ b/x11-drivers/xf86-input-penmount/Makefile
@@ -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>
diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist
index 46a7a8ac267d..154995f9ca20 100644
--- a/x11-drivers/xf86-input-penmount/pkg-plist
+++ b/x11-drivers/xf86-input-penmount/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index 5874922b4f8a..c8e32453989f 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -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
diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist
index d29caf256087..10ce5a3a27a0 100644
--- a/x11-drivers/xf86-input-synaptics/pkg-plist
+++ b/x11-drivers/xf86-input-synaptics/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile
index d84420ad8379..90aca8440b08 100644
--- a/x11-drivers/xf86-input-vmmouse/Makefile
+++ b/x11-drivers/xf86-input-vmmouse/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xf86-input-vmmouse
PORTVERSION= 13.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist
index 6d3a44183402..b9caa4664669 100644
--- a/x11-drivers/xf86-input-vmmouse/pkg-plist
+++ b/x11-drivers/xf86-input-vmmouse/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile
index b2bf5ef78add..6857f6146b59 100644
--- a/x11-drivers/xf86-input-void/Makefile
+++ b/x11-drivers/xf86-input-void/Makefile
@@ -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>
diff --git a/x11-drivers/xf86-input-void/pkg-plist b/x11-drivers/xf86-input-void/pkg-plist
index e63ae58bbc28..5ce860fd080d 100644
--- a/x11-drivers/xf86-input-void/pkg-plist
+++ b/x11-drivers/xf86-input-void/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile
index e4a5bc41873e..e92a06cb4f5b 100644
--- a/x11-drivers/xf86-video-apm/Makefile
+++ b/x11-drivers/xf86-video-apm/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-apm
PORTVERSION= 1.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-apm/pkg-plist b/x11-drivers/xf86-video-apm/pkg-plist
index 3f8be66a23a4..de5ff78e429c 100644
--- a/x11-drivers/xf86-video-apm/pkg-plist
+++ b/x11-drivers/xf86-video-apm/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile
index 1e9a526f6c30..38cf201c27b1 100644
--- a/x11-drivers/xf86-video-ark/Makefile
+++ b/x11-drivers/xf86-video-ark/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-ark
PORTVERSION= 0.7.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-ark/pkg-plist b/x11-drivers/xf86-video-ark/pkg-plist
index ce3a4e949570..db7f65e4de81 100644
--- a/x11-drivers/xf86-video-ark/pkg-plist
+++ b/x11-drivers/xf86-video-ark/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index be942d399d45..6bf515860539 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -16,12 +16,12 @@ USE_XORG= xf86driproto xineramaproto xf86miscproto glproto
.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
diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist
index a244776f38d1..f64d9df88ad3 100644
--- a/x11-drivers/xf86-video-ati/pkg-plist
+++ b/x11-drivers/xf86-video-ati/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile
index 4874a28863bf..90464281e798 100644
--- a/x11-drivers/xf86-video-chips/Makefile
+++ b/x11-drivers/xf86-video-chips/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-chips
PORTVERSION= 1.2.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-chips/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist
index 7204691323b3..0a6b95fbc89a 100644
--- a/x11-drivers/xf86-video-chips/pkg-plist
+++ b/x11-drivers/xf86-video-chips/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile
index 854ab4718a20..a2a0db68bf08 100644
--- a/x11-drivers/xf86-video-cirrus/Makefile
+++ b/x11-drivers/xf86-video-cirrus/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-cirrus
PORTVERSION= 1.5.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cirrus/pkg-plist b/x11-drivers/xf86-video-cirrus/pkg-plist
index b47e0b8d149b..386a9bbcb73a 100644
--- a/x11-drivers/xf86-video-cirrus/pkg-plist
+++ b/x11-drivers/xf86-video-cirrus/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile
index 9ac0270fef4f..64f416a6972d 100644
--- a/x11-drivers/xf86-video-cyrix/Makefile
+++ b/x11-drivers/xf86-video-cyrix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-cyrix
PORTVERSION= 1.1.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-cyrix/pkg-plist b/x11-drivers/xf86-video-cyrix/pkg-plist
index 531bfe7b56a1..4bb76298e681 100644
--- a/x11-drivers/xf86-video-cyrix/pkg-plist
+++ b/x11-drivers/xf86-video-cyrix/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile
index 7028fafe5e38..8430a1b23cea 100644
--- a/x11-drivers/xf86-video-dummy/Makefile
+++ b/x11-drivers/xf86-video-dummy/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-dummy
PORTVERSION= 0.3.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-dummy/pkg-plist b/x11-drivers/xf86-video-dummy/pkg-plist
index d9b858d452de..120c414e7ef0 100644
--- a/x11-drivers/xf86-video-dummy/pkg-plist
+++ b/x11-drivers/xf86-video-dummy/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index 6110bb766780..df4a14796ca9 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-fbdev
PORTVERSION= 0.4.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-fbdev/pkg-plist b/x11-drivers/xf86-video-fbdev/pkg-plist
index e99ec711f3b1..3ea8aa73913b 100644
--- a/x11-drivers/xf86-video-fbdev/pkg-plist
+++ b/x11-drivers/xf86-video-fbdev/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile
index a4e70b1eff56..7ee494b48ad3 100644
--- a/x11-drivers/xf86-video-glint/Makefile
+++ b/x11-drivers/xf86-video-glint/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-glint
PORTVERSION= 1.2.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist
index 4943f96c01cd..06e0ad980d7a 100644
--- a/x11-drivers/xf86-video-glint/pkg-plist
+++ b/x11-drivers/xf86-video-glint/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile
index fdfcf2114ae9..8eb5f41cc2e9 100644
--- a/x11-drivers/xf86-video-i128/Makefile
+++ b/x11-drivers/xf86-video-i128/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-i128
PORTVERSION= 1.3.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i128/pkg-plist b/x11-drivers/xf86-video-i128/pkg-plist
index 8231266fd2b6..bf6f0d1d8360 100644
--- a/x11-drivers/xf86-video-i128/pkg-plist
+++ b/x11-drivers/xf86-video-i128/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile
index f80256232791..86b90974ccf6 100644
--- a/x11-drivers/xf86-video-i740/Makefile
+++ b/x11-drivers/xf86-video-i740/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-i740
PORTVERSION= 1.3.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-i740/pkg-plist b/x11-drivers/xf86-video-i740/pkg-plist
index 6a6250b12f2a..34ff62b237bd 100644
--- a/x11-drivers/xf86-video-i740/pkg-plist
+++ b/x11-drivers/xf86-video-i740/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 5b343e12265b..afd712611072 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -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__sna__sna_threads.c \
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 \
diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist
index 948876757621..a7c967e55356 100644
--- a/x11-drivers/xf86-video-intel/pkg-plist
+++ b/x11-drivers/xf86-video-intel/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
index 327c98796b87..38f8f0c747e7 100644
--- a/x11-drivers/xf86-video-mach64/Makefile
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-mach64
PORTVERSION= 6.9.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/pkg-plist b/x11-drivers/xf86-video-mach64/pkg-plist
index 32f0985ef3f9..8e47d690180e 100644
--- a/x11-drivers/xf86-video-mach64/pkg-plist
+++ b/x11-drivers/xf86-video-mach64/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile
index 48c872b7e7c4..028a1593b52d 100644
--- a/x11-drivers/xf86-video-mga/Makefile
+++ b/x11-drivers/xf86-video-mga/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-mga
PORTVERSION= 1.6.3
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 3
CATEGORIES= x11-drivers
diff --git a/x11-drivers/xf86-video-mga/pkg-plist b/x11-drivers/xf86-video-mga/pkg-plist
index c8135fa96373..341b183eef1a 100644
--- a/x11-drivers/xf86-video-mga/pkg-plist
+++ b/x11-drivers/xf86-video-mga/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile
index 2a86d787c41a..482f5b9eeffc 100644
--- a/x11-drivers/xf86-video-neomagic/Makefile
+++ b/x11-drivers/xf86-video-neomagic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-neomagic
PORTVERSION= 1.2.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-neomagic/pkg-plist b/x11-drivers/xf86-video-neomagic/pkg-plist
index b8fb593fa62a..b2949bc6941c 100644
--- a/x11-drivers/xf86-video-neomagic/pkg-plist
+++ b/x11-drivers/xf86-video-neomagic/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile
index 60197b5a582d..1e50102c3b3a 100644
--- a/x11-drivers/xf86-video-newport/Makefile
+++ b/x11-drivers/xf86-video-newport/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-newport
PORTVERSION= 0.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-newport/pkg-plist b/x11-drivers/xf86-video-newport/pkg-plist
index 088860fca3da..4686d58e930b 100644
--- a/x11-drivers/xf86-video-newport/pkg-plist
+++ b/x11-drivers/xf86-video-newport/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile
index 1bec3944ca77..f4fd932997f2 100644
--- a/x11-drivers/xf86-video-nv/Makefile
+++ b/x11-drivers/xf86-video-nv/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-nv
PORTVERSION= 2.1.20
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-nv/pkg-plist b/x11-drivers/xf86-video-nv/pkg-plist
index f77c367a4212..780e08346435 100644
--- a/x11-drivers/xf86-video-nv/pkg-plist
+++ b/x11-drivers/xf86-video-nv/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index 0cb95f2ed4ed..b07c5186085b 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-openchrome
PORTVERSION= 0.3.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-openchrome/pkg-plist b/x11-drivers/xf86-video-openchrome/pkg-plist
index 8cfd05855e10..03b706985538 100644
--- a/x11-drivers/xf86-video-openchrome/pkg-plist
+++ b/x11-drivers/xf86-video-openchrome/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
index 53ad516a7f35..e6edd647e1dc 100644
--- a/x11-drivers/xf86-video-r128/Makefile
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-r128
PORTVERSION= 6.9.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-r128/pkg-plist b/x11-drivers/xf86-video-r128/pkg-plist
index 9efb845952d1..a931d1fe828c 100644
--- a/x11-drivers/xf86-video-r128/pkg-plist
+++ b/x11-drivers/xf86-video-r128/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile
index eb4a887a5f5b..76589bd5cd51 100644
--- a/x11-drivers/xf86-video-rdc/Makefile
+++ b/x11-drivers/xf86-video-rdc/Makefile
@@ -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/
diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile
index 18de975902e2..47d05544b2dd 100644
--- a/x11-drivers/xf86-video-rendition/Makefile
+++ b/x11-drivers/xf86-video-rendition/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-rendition
PORTVERSION= 4.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-rendition/pkg-plist b/x11-drivers/xf86-video-rendition/pkg-plist
index 59aa530f8505..04e6d8aaa4a7 100644
--- a/x11-drivers/xf86-video-rendition/pkg-plist
+++ b/x11-drivers/xf86-video-rendition/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile
index 40867810c832..7abaf1502110 100644
--- a/x11-drivers/xf86-video-s3/Makefile
+++ b/x11-drivers/xf86-video-s3/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-s3
PORTVERSION= 0.6.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3/pkg-plist b/x11-drivers/xf86-video-s3/pkg-plist
index 735f2aa01158..a6aa703ba991 100644
--- a/x11-drivers/xf86-video-s3/pkg-plist
+++ b/x11-drivers/xf86-video-s3/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile
index 1f5e1136fbbf..02cf6b9e292d 100644
--- a/x11-drivers/xf86-video-s3virge/Makefile
+++ b/x11-drivers/xf86-video-s3virge/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-s3virge
PORTVERSION= 1.10.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-s3virge/pkg-plist b/x11-drivers/xf86-video-s3virge/pkg-plist
index 85fbb681accf..b9b28e42531d 100644
--- a/x11-drivers/xf86-video-s3virge/pkg-plist
+++ b/x11-drivers/xf86-video-s3virge/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile
index 7faa59529cbe..22ff9974afdb 100644
--- a/x11-drivers/xf86-video-savage/Makefile
+++ b/x11-drivers/xf86-video-savage/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-savage
PORTVERSION= 2.3.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-savage/pkg-plist b/x11-drivers/xf86-video-savage/pkg-plist
index fab3aeb4cc8a..23de1c31fc80 100644
--- a/x11-drivers/xf86-video-savage/pkg-plist
+++ b/x11-drivers/xf86-video-savage/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-scfb/Makefile b/x11-drivers/xf86-video-scfb/Makefile
index 65ef88a888c2..b5d7e3a5fe7a 100644
--- a/x11-drivers/xf86-video-scfb/Makefile
+++ b/x11-drivers/xf86-video-scfb/Makefile
@@ -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
diff --git a/x11-drivers/xf86-video-scfb/pkg-plist b/x11-drivers/xf86-video-scfb/pkg-plist
index 5ada8ae7361d..7423c79910bf 100644
--- a/x11-drivers/xf86-video-scfb/pkg-plist
+++ b/x11-drivers/xf86-video-scfb/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile
index 66665ea8b072..3f992320f67c 100644
--- a/x11-drivers/xf86-video-siliconmotion/Makefile
+++ b/x11-drivers/xf86-video-siliconmotion/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-siliconmotion
PORTVERSION= 1.7.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-plist b/x11-drivers/xf86-video-siliconmotion/pkg-plist
index 7f27c3c38015..8471fb6e0b09 100644
--- a/x11-drivers/xf86-video-siliconmotion/pkg-plist
+++ b/x11-drivers/xf86-video-siliconmotion/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile
index 4f07b9e425fd..9fadf6ebe13e 100644
--- a/x11-drivers/xf86-video-sis-intel/Makefile
+++ b/x11-drivers/xf86-video-sis-intel/Makefile
@@ -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
diff --git a/x11-drivers/xf86-video-sis-intel/pkg-plist b/x11-drivers/xf86-video-sis-intel/pkg-plist
index e1daba86088a..c4fda3a35443 100644
--- a/x11-drivers/xf86-video-sis-intel/pkg-plist
+++ b/x11-drivers/xf86-video-sis-intel/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile
index 27adeeb6fa94..8d44f9d22312 100644
--- a/x11-drivers/xf86-video-sis/Makefile
+++ b/x11-drivers/xf86-video-sis/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-sis
PORTVERSION= 0.10.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sis/pkg-plist b/x11-drivers/xf86-video-sis/pkg-plist
index efcedbc0f6db..4563cbf4223a 100644
--- a/x11-drivers/xf86-video-sis/pkg-plist
+++ b/x11-drivers/xf86-video-sis/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile
index 0504641a9ae7..14a9ce4abe33 100644
--- a/x11-drivers/xf86-video-sunffb/Makefile
+++ b/x11-drivers/xf86-video-sunffb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-sunffb
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-sunffb/pkg-plist b/x11-drivers/xf86-video-sunffb/pkg-plist
index 29c4cb560c60..8aa33693837c 100644
--- a/x11-drivers/xf86-video-sunffb/pkg-plist
+++ b/x11-drivers/xf86-video-sunffb/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile
index 7ac894d0ee45..e32260d26e51 100644
--- a/x11-drivers/xf86-video-tdfx/Makefile
+++ b/x11-drivers/xf86-video-tdfx/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-tdfx
PORTVERSION= 1.4.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tdfx/pkg-plist b/x11-drivers/xf86-video-tdfx/pkg-plist
index fa4d8b44a61b..d104d44c3047 100644
--- a/x11-drivers/xf86-video-tdfx/pkg-plist
+++ b/x11-drivers/xf86-video-tdfx/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile
index 2a33d01aa08a..75624fd7584c 100644
--- a/x11-drivers/xf86-video-tga/Makefile
+++ b/x11-drivers/xf86-video-tga/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-tga
PORTVERSION= 1.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tga/pkg-plist b/x11-drivers/xf86-video-tga/pkg-plist
index 342702c9fbab..41eacf6749f9 100644
--- a/x11-drivers/xf86-video-tga/pkg-plist
+++ b/x11-drivers/xf86-video-tga/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile
index a6db3d6c9d8c..d06fd63cc791 100644
--- a/x11-drivers/xf86-video-trident/Makefile
+++ b/x11-drivers/xf86-video-trident/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-trident
PORTVERSION= 1.3.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-trident/pkg-plist b/x11-drivers/xf86-video-trident/pkg-plist
index f2b5b0de9faa..4f60a8fb760b 100644
--- a/x11-drivers/xf86-video-trident/pkg-plist
+++ b/x11-drivers/xf86-video-trident/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile
index c6afdadc9e36..54820509e1aa 100644
--- a/x11-drivers/xf86-video-tseng/Makefile
+++ b/x11-drivers/xf86-video-tseng/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-tseng
PORTVERSION= 1.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-tseng/pkg-plist b/x11-drivers/xf86-video-tseng/pkg-plist
index 3eba34ace5b6..803640d8aedc 100644
--- a/x11-drivers/xf86-video-tseng/pkg-plist
+++ b/x11-drivers/xf86-video-tseng/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index b9785b8a7865..488fc1701e6f 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-vesa
PORTVERSION= 2.3.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vesa/pkg-plist b/x11-drivers/xf86-video-vesa/pkg-plist
index 1091e20a3eeb..641d28f8041f 100644
--- a/x11-drivers/xf86-video-vesa/pkg-plist
+++ b/x11-drivers/xf86-video-vesa/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile
index 31dbda7d42c7..de0bb0c35778 100644
--- a/x11-drivers/xf86-video-vmware/Makefile
+++ b/x11-drivers/xf86-video-vmware/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-vmware
PORTVERSION= 13.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-vmware/pkg-plist b/x11-drivers/xf86-video-vmware/pkg-plist
index 5b79c8f3e2de..727f3bae92f9 100644
--- a/x11-drivers/xf86-video-vmware/pkg-plist
+++ b/x11-drivers/xf86-video-vmware/pkg-plist
@@ -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
diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile
index 81ad6d1a4e2c..af36deeba18f 100644
--- a/x11-drivers/xf86-video-voodoo/Makefile
+++ b/x11-drivers/xf86-video-voodoo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xf86-video-voodoo
PORTVERSION= 1.2.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-drivers/xf86-video-voodoo/pkg-plist b/x11-drivers/xf86-video-voodoo/pkg-plist
index d4ef86aed783..12fa28b9abba 100644
--- a/x11-drivers/xf86-video-voodoo/pkg-plist
+++ b/x11-drivers/xf86-video-voodoo/pkg-plist
@@ -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
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index d4441657abf2..240975efe782 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -4,7 +4,7 @@
PORTNAME= nautilus
PORTVERSION= 2.32.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-fm gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -20,8 +20,8 @@ LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \
CONFLICTS= nautilus-3.[0-9]*
INSTALLS_ICONS= yes
-USES= gettext desktop-file-utils shared-mime-info gmake pkgconfig \
- tar:bzip2 libtool pathfix
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig shared-mime-info tar:bzip2
USE_GNOME= gnomeprefix intlhack gnomedesktop \
librsvg2 gvfs
INSTALL_TARGET= install-strip
diff --git a/x11-fm/rodent/Makefile b/x11-fm/rodent/Makefile
index 9e8334bfe777..bb6fdc686bfc 100644
--- a/x11-fm/rodent/Makefile
+++ b/x11-fm/rodent/Makefile
@@ -3,7 +3,7 @@
PORTNAME= rodent
PORTVERSION= 4.8.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fm
MASTER_SITES= SF/xffm/${PORTVERSION}/
@@ -18,7 +18,7 @@ BUILD_DEPENDS= gawk:${PORTSDIR}/japanese/gawk \
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
libmagic.so:${PORTSDIR}/sysutils/file
-USES= gmake libtool pkgconfig desktop-file-utils
+USES= desktop-file-utils gmake libtool:keepla pkgconfig
USE_GNOME= glib20 gtk20 librsvg2 libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--docdir=${DOCSDIR}
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index 5f70f23b6e52..d21770c2b8f7 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libFS
PORTVERSION= 1.0.6
+PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index 44ad884decce..6a6660da05b8 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXfont
PORTVERSION= 1.4.7
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-fonts
diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile
index dde13cc62c68..63de4fa32ceb 100644
--- a/x11-fonts/libXfontcache/Makefile
+++ b/x11-fonts/libXfontcache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXfontcache
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 32b9d0bb0a3c..66a847c2cbae 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libXft
PORTVERSION= 2.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index bde12d7c2b59..e1e831233188 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libfontenc
PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index aecc5442cc9e..34a82f0b9d8e 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -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-xace.c \
${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 \
diff --git a/x11-themes/gtk-blueprint-engine/Makefile b/x11-themes/gtk-blueprint-engine/Makefile
index 316c80a1e7e1..446f5e9603a0 100644
--- a/x11-themes/gtk-blueprint-engine/Makefile
+++ b/x11-themes/gtk-blueprint-engine/Makefile
@@ -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:${PORTSDIR}/x11-themes/icon-naming-util
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
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 54d6ef5f7bc0..7e5f5e286f19 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= SoXt
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= http://ftp.coin3d.org/coin/src/all/
@@ -12,7 +12,7 @@ COMMENT= GUI binding for using Open Inventor with Xt/Motif
LIB_DEPENDS= libCoin.so:${PORTSDIR}/graphics/Coin
-USES= libtool motif pathfix perl5
+USES= libtool:keepla motif pathfix perl5
USE_GL= yes
USE_PERL5= build
USE_XORG= xi
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index c7bad2fe28fb..c818ee474021 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -4,20 +4,20 @@
PORTNAME= bakery
PORTVERSION= 2.6.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A C++ Application Framework for use with Gtkmm
+COMMENT= C++ Application Framework for use with Gtkmm
LIB_DEPENDS= libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26 \
libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm \
libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix intlhack
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index 3c59958e9e0a..f45eb5120a00 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -4,7 +4,7 @@
PORTNAME= eel
PORTVERSION= 2.26.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -12,7 +12,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Generally useful classes and extensions to GNOME
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= xrender
GNOME_DESKTOP_VERSION=2
USE_GNOME= gnomeprefix gnomedesktop intlhack
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index 8ea3a3ad21ae..c5a8c0143bdf 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -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 \
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 0cde01add3b9..e852c83fd925 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -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}/graphics/jpeg \
MAJORVER= ${PORTVERSION:R}
PLIST_SUB+= MAJORVER=${MAJORVER}
-USES+= libtool pathfix
+USES= libtool:keepla pathfix
USE_GL= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index afbee6c6ca89..4e07eff95316 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -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
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 973b02705057..63a5d85ed756 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fxscintilla
PORTVERSION= 2.28.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-toolkits
MASTER_SITES= SAVANNAH
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 306644eded11..104b6d902d8c 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gal2
PORTVERSION= 2.5.3
-PORTREVISION?= 11
+PORTREVISION?= 12
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5
@@ -12,13 +12,13 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A collection of widgets taken from GNOME 2 gnumeric
+COMMENT= Collection of widgets taken from GNOME 2 gnumeric
USES+= tar:bzip2
.if !defined(REFERENCE_PORT)
-USES+= pathfix gettext perl5 gmake pkgconfig libtool
+USES+= gettext gmake libtool:keepla pathfix perl5 pkgconfig
USE_GNOME= gnomeprefix intlhack libgnomeui libgnomeprintui
USE_XORG= x11
USE_LDCONFIG= yes
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index a9e38f8fe4cf..fe51f85de348 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -4,15 +4,15 @@
PORTNAME= gdl
PORTVERSION= 2.30.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Components intended to be shared between GNOME development tools
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix gtk20
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/gnome-sharp20/Makefile b/x11-toolkits/gnome-sharp20/Makefile
index f6b384b40bde..54394acc3067 100644
--- a/x11-toolkits/gnome-sharp20/Makefile
+++ b/x11-toolkits/gnome-sharp20/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-sharp
PORTVERSION= 2.24.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
@@ -12,7 +12,7 @@ COMMENT= GNOME interfaces for the .NET runtime
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES= gmake libtool pathfix perl5 pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix perl5 pkgconfig tar:bzip2
USE_PERL5= run
USE_GNOME= gnomepanel gtksharp20 librsvg2 vte libgnomeprintui libgnomeui
MAKE_JOBS_UNSAFE= yes
diff --git a/x11-toolkits/gstreamer1-plugins-pango/Makefile b/x11-toolkits/gstreamer1-plugins-pango/Makefile
index ce7fd500bfb6..b2950e795aaf 100644
--- a/x11-toolkits/gstreamer1-plugins-pango/Makefile
+++ b/x11-toolkits/gstreamer1-plugins-pango/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
COMMENT= Gstreamer pango textoverlay plugin
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 676b584c2c8b..42e4457f1074 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkdatabox
PORTVERSION= 0.9.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= SF
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ OPTIONS_DEFINE= GLADE GLADEUI DOCS EXAMPLES
GLADE_DESC= Enable libglade2 support
GLADEUI_DESC= Enable glade3 support
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --includedir="${PREFIX}/include/${PORTNAME}" \
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index e6be90876966..425f4fcfa7ae 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtkextra
PORTVERSION= 2.1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Useful widget set complementary to GTK+ 2.0
-USES= libtool pathfix pkgconfig gmake
+USES= gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_CSTD= gnu89
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 60200526c820..867d9dce4f1a 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -4,18 +4,18 @@
PORTNAME= gtkglarea
PORTVERSION= 2.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
DISTNAME= gtkglarea-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= An OpenGL widget for the GTK+2 GUI toolkit
+COMMENT= OpenGL widget for the GTK+2 GUI toolkit
-USE_GNOME= gtk20
+USES= libtool:keepla pathfix pkgconfig tar:bzip2
+USE_GNOME= gtk20
USE_GL= yes
-USES= libtool pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-lib-GL
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index f6ffa2cf0e2d..e8dc0d67f1a7 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtkmm
PORTVERSION= 2.2.12
-PORTREVISION?= 14
+PORTREVISION?= 15
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME/sources/${PORTNAME}/2.2
PKGNAMESUFFIX= 20
@@ -20,7 +20,7 @@ USES+= tar:bzip2
LIB_DEPENDS= libsigc-1.2.so:${PORTSDIR}/devel/libsigc++12
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES+= pathfix gmake libtool pkgconfig
+USES+= gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gtk20
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 95e58c12effa..b7c7af252758 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtkmm
PORTVERSION= 3.8.1
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits
MASTER_SITES= GNOME
PKGNAMESUFFIX= 30
@@ -21,7 +21,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USES+= gettext gmake libtool pathfix pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_GNOME= gtk30 glibmm cairomm atkmm pangomm
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index b8798a82a363..462bc48f0c34 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -4,19 +4,19 @@
PORTNAME= gtksourceview
PORTVERSION= 1.8.5
-PORTREVISION?= 9
+PORTREVISION?= 10
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
+COMMENT= Widget that adds syntax highlighting to GtkTextView
USES+= tar:bzip2
.if !defined(REFERENCE_PORT)
-USES+= gettext gmake libtool pathfix pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix libgnome libgnomeprintui intlhack referencehack
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index 8bfebaf26407..f0e0ea60eca8 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtksourceview2
PORTVERSION= 2.10.5
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -12,13 +12,13 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
+COMMENT= Widget that adds syntax highlighting to GtkTextView
USES= tar:bzip2
.if !defined(REFERENCE_PORT)
-USES+= gettext gmake pathfix libtool pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gtk20 gconf2 libxml2 intlhack referencehack
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index 4974e4dcccfa..dae93e80f0f0 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -4,21 +4,21 @@
PORTNAME= gtksourceview
PORTVERSION= 3.4.2
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A text widget that adds syntax highlighting to the GtkTextView widget
+COMMENT= Widget that adds syntax highlighting to GtkTextView
USES= tar:xz
.if !defined(REFERENCE_PORT)
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
USE_LDCONFIG= yes
-USES+= libtool pathfix gettext gmake pkgconfig
USE_GNOME= gnomeprefix gtk30 libxml2 intlhack referencehack
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-compile-warnings=no --enable-glade-catalog=no \
diff --git a/x11-toolkits/gtksourceviewmm3/Makefile b/x11-toolkits/gtksourceviewmm3/Makefile
index 12711a42dced..a8b425d34d7b 100644
--- a/x11-toolkits/gtksourceviewmm3/Makefile
+++ b/x11-toolkits/gtksourceviewmm3/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gtksourceviewmm
PORTVERSION= 3.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
@@ -12,8 +12,8 @@ PKGNAMESUFFIX= 3
MAINTAINER= gnome@FreeBSD.org
COMMENT= C++ binding of GtkSourceView3
+USES= gmake libtool:keepla pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
-USES= pathfix gmake pkgconfig tar:xz libtool
USE_GNOME= gtksourceview3 gnomeprefix gtkmm30
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index 24f4e9d75eec..3da042767ade 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXaw
PORTVERSION= 1.0.12
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 2
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile
index 6463fa5537ab..edc3cf1d6889 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXmu
PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 5fe8f304528d..786efb51d8e5 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libXt
PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= x11-toolkits
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index fa96d3b9cc13..0af60edbb4dc 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libbonoboui
PORTVERSION= 2.24.4
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -16,7 +16,7 @@ USES+= tar:bzip2
.if !defined(REFERENCE_PORT)
-USES+= gettext gmake libtool pathfix pkgconfig
+USES+= gettext gmake libtool:keepla pathfix pkgconfig
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehier intlhack \
libgnomecanvas libgnome referencehack
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index edf064efc774..edfd4c7c9277 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -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}/graphics/tiff \
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
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 43fb730c506b..5e6e14891dbc 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnomeprintui
PORTVERSION= 2.18.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,8 +15,8 @@ COMMENT= Gnome print support library
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+USES= bison gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= x11 xpm
-USES= bison pathfix gettext gmake pkgconfig libtool tar:bzip2
USE_GNOME= gnomeprefix libgnomeprint libgnomecanvas \
intlhack
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index 64dade5fbe7a..3a13b68ec7ee 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libgnomeprintuimm
PORTVERSION= 2.5.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,7 @@ LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
libgnomeprintmm-2.5.so:${PORTSDIR}/print/libgnomeprintmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix libgnomeprintui
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 75469cf540c6..5780c1d0c689 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgnomeuimm
PORTVERSION= 2.28.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,8 +19,8 @@ LIB_DEPENDS= libgnomemm-2.6.so:${PORTSDIR}/x11/libgnomemm26 \
libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= x11
-USES= gmake libtool pathfix pkgconfig tar:bzip2
USE_GNOME= libgnomeui
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index d3c70b266ef8..37d8c87f6b59 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libpanelappletmm
PORTVERSION= 2.26.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,7 +15,7 @@ LIB_DEPENDS= libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomepanel
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/libunique3/Makefile b/x11-toolkits/libunique3/Makefile
index 92758e2306fe..af60176afe78 100644
--- a/x11-toolkits/libunique3/Makefile
+++ b/x11-toolkits/libunique3/Makefile
@@ -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:${PORTSDIR}/devel/dbus-glib
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
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index edfffadb06e6..5535889ea47e 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libzvt
PORTVERSION= 2.0.1
-PORTREVISION= 22
+PORTREVISION= 23
CATEGORIES= x11-toolkits gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -11,8 +11,8 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library components for Zed's Virtual Terminal
+USES= bison gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_XORG= x11
-USES= bison libtool pathfix gmake pkgconfig tar:bzip2
USE_LDCONFIG= yes
USE_GNOME= gnomeprefix gtk20 libartlgpl2
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 02a17aa2e732..061ab3654f03 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -19,8 +19,4 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xawm=Xaw3d
INSTALL_TARGET= install-strip
-post-install:
- ${RM} ${STAGEDIR}${PREFIX}/lib/libMowitz.la
-# Anyone knows a better way?
-
.include <bsd.port.mk>
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 2f4961dc972d..35f1bedef29a 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -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}/print/freetype2 \
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
diff --git a/x11-toolkits/py-gnome-desktop/Makefile b/x11-toolkits/py-gnome-desktop/Makefile
index 655dad501118..c6c5424b96a6 100644
--- a/x11-toolkits/py-gnome-desktop/Makefile
+++ b/x11-toolkits/py-gnome-desktop/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-desktop
PORTVERSION= 2.32.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -13,7 +13,7 @@ DISTNAME= gnome-python-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A set of Python bindings used by modules in the GNOME Desktop
+COMMENT= Python bindings used by modules in the GNOME Desktop
OPTIONS_DEFINE= DOCS EXAMPLES
OPTIONS_SUB= yes
@@ -28,7 +28,7 @@ LIB_DEPENDS= libgtop-2.0.so:${PORTSDIR}/devel/libgtop \
libevdocument.so:${PORTSDIR}/graphics/evince
RUN_DEPENDS= bug-buddy:${PORTSDIR}/devel/bug-buddy
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_PYTHON= 2
USE_GNOME= libgnomeprintui gnomepanel gnomedesktop \
gtksourceview libwnck nautilus2 pygnome2 metacity \
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index 0f05161b7105..e4f212dc29e3 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-extras
PORTVERSION= 2.25.3
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -13,7 +13,7 @@ DISTNAME= gnome-python-extras-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A set of Python bindings for GNOME 2
+COMMENT= Python bindings for GNOME 2
OPTIONS_DEFINE= EXAMPLES
OPTIONS_SUB= yes
@@ -22,7 +22,7 @@ LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
libgksu2.so:${PORTSDIR}/sysutils/libgksu \
# gdl-1.2:${PORTSDIR}/x11-toolkits/gdl
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_PYTHON= yes
USE_GNOME= libgtkhtml pygnome2 libgda4
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 1f6e0a1913dd..598e88a6f811 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome
PORTVERSION= 2.28.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -13,7 +13,7 @@ DISTNAME= gnome-python-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A set of Python bindings for GNOME 2
+COMMENT= Python bindings for GNOME 2
OPTIONS_DEFINE= EXAMPLES
@@ -22,9 +22,9 @@ OPTIONS_SUB= yes
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:${PORTSDIR}/devel/py-orbit
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_PYTHON= 2
USE_LDCONFIG= yes
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
USE_GNOME= libgnomeui pygtk2
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
diff --git a/x11-toolkits/py-gtksourceview/Makefile b/x11-toolkits/py-gtksourceview/Makefile
index ecc4436c7e9e..a217594a58fa 100644
--- a/x11-toolkits/py-gtksourceview/Makefile
+++ b/x11-toolkits/py-gtksourceview/Makefile
@@ -11,9 +11,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pygtksourceview-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-COMMENT= A python bindings for the version 2 of the GtkSourceView library
+COMMENT= Python bindings for GtkSourceView 2
-USES= gmake libtool pathfix pkgconfig tar:bzip2
+USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= gnomeprefix gtksourceview2 pygtk2
USE_PYTHON= yes
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 02af51825542..916162517570 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vdk
PORTVERSION= 2.5.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-toolkits
MASTER_SITES= SF/${PORTNAME}lib/VDK%20for%20both%20Linux%20and%20Windows%20%28this%20is%20the%20new%20version%29/VDKLIB%20%28C%2B%2B%20wrapper%20for%20GTK%2B%29
@@ -13,7 +13,7 @@ COMMENT= C++ wrapper for GTK+ toolkit
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= libtool pathfix pkgconfig
+USES= libtool:keepla pathfix pkgconfig
USE_GNOME= gtk20
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-opt=no --enable-doc-html=no --enable-testvdk=no
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index ebd0a06521dd..2e258c1b0aae 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -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 @@ USES+= tar:xz
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
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index 3aef67ebb3b6..858c0b6fbbb1 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -3,7 +3,7 @@
PORTNAME= compiz-plugins-extra
PORTVERSION= 0.8.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -19,7 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
USE_GL= yes
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_GNOME= intltool
USE_XORG= glproto
USE_LDCONFIG= yes
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 249865005623..755f7973aa85 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -3,7 +3,7 @@
PORTNAME= compiz-plugins-main
PORTVERSION= 0.8.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -19,7 +19,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_GL= yes
-USES= gettext gmake pathfix pkgconfig libtool tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
USE_CSTD= gnu89
USE_GNOME= intltool
USE_XORG= glproto
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 254cd38deb66..6c1a95c28d1c 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -3,7 +3,7 @@
PORTNAME= compiz-plugins-unsupported
PORTVERSION= 0.8.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -20,7 +20,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_GL= yes
-USES= pathfix gettext gmake pkgconfig libtool tar:bzip2
+USES= pathfix gettext gmake libtool:keepla pkgconfig tar:bzip2
USE_GNOME= intltool
USE_XORG= glproto
USE_LDCONFIG= yes
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index f36c2126d111..288391db0dcd 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -2,7 +2,7 @@
PORTNAME= compiz
PORTVERSION= 0.8.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -18,7 +18,7 @@ RUN_DEPENDS= glxinfo:${PORTSDIR}/graphics/mesa-demos \
XORG_CAT= app
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-USES= gettext pathfix gmake libtool tar:bzip2
+USES= gettext gmake libtool:keepla pathfix tar:bzip2
USE_GL= glu
USE_GNOME= gconf2 libxslt
USE_XORG= xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index 614ba8d46550..8159eaa129b3 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= compizconfig-backend-gconf
PORTVERSION= 0.8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
-USES= libtool pathfix pkgconfig gmake tar:bzip2
+USES= libtool:keepla pathfix pkgconfig gmake tar:bzip2
USE_GNOME= glib20 gconf2
post-patch:
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index f181fb8d47de..f03051a99953 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -2,7 +2,7 @@
PORTNAME= emerald
PORTVERSION= 0.8.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-wm
MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/
@@ -15,8 +15,8 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
INSTALLS_ICONS= yes
GNU_CONFIGURE= yes
USE_GL= gl
-USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
- shared-mime-info tar:bzip2
+USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+ pkgconfig shared-mime-info tar:bzip2
USE_GNOME= gtk20 libwnck pango
USE_XORG= xrender
USE_LDCONFIG= yes
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 6c4462ff6b70..dac0f243509f 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -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
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 946237bd2789..97da296afec8 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -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 Maker dock apps
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
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 2e46a1fef258..462af5e089d0 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -4,7 +4,7 @@
PORTNAME= metacity
PORTVERSION= 2.30.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -18,7 +18,7 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_XORG= x11 xcomposite xdamage
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix intlhack gconf2 gtk20
diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile
index d9717cc1c693..40142d6c161d 100644
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mutter
PORTVERSION= 2.31.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-wm
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,7 +19,7 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity
USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USE_GNOME= gnomeprefix intlhack gtk20 gconf2
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 8dbcef447b3e..ba6c52a2fa53 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -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 compliant, extensible window manager
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
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