Sync with ports.

git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1439 058c260c-8361-11dd-a0ac-aa2bafec7d09

56 files changed, 110 insertions, 137 deletions

diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile
index 49ea651..c65ebb2 100644
--- a/devel/libpciaccess/Makefile
+++ b/devel/libpciaccess/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: head/devel/libpciaccess/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD$
 
 PORTNAME=	libpciaccess
 PORTVERSION=	0.13.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index 24eb365..59c26b5 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: head/x11-drivers/xf86-input-keyboard/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-drivers/xf86-input-keyboard/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 a2281ae..26a84c9 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-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile
index 868d7ed..f2502d7 100644
--- a/x11-drivers/xf86-input-mouse/Makefile
+++ b/x11-drivers/xf86-input-mouse/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: head/x11-drivers/xf86-input-mouse/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-drivers/xf86-input-mouse/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 b871c54..1df1af7 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-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile
index 5874922..8718ed5 100644
--- a/x11-drivers/xf86-input-synaptics/Makefile
+++ b/x11-drivers/xf86-input-synaptics/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/x11-drivers/xf86-input-synaptics/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	xf86-input-synaptics
 PORTVERSION=	${SYNAPTICS_VERSION}
@@ -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 d29caf2..10ce5a3 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-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index c520ac8..1321d25 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: head/x11-drivers/xf86-video-ati/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-drivers/xf86-video-ati/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	xf86-video-ati
 PORTVERSION=	${ATI_VERSION}
@@ -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 a244776..f64d9df 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-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile
index f09cf9f..3b3da33 100644
--- a/x11-drivers/xf86-video-fbdev/Makefile
+++ b/x11-drivers/xf86-video-fbdev/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: head/x11-drivers/xf86-video-fbdev/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-drivers/xf86-video-fbdev/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 e99ec71..3ea8aa7 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-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 229721e..5369e17 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -1,5 +1,5 @@
 # Created by: lesi@FreeBSD.org
-# $FreeBSD: head/x11-drivers/xf86-video-intel/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-drivers/xf86-video-intel/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	xf86-video-intel
 PORTVERSION=	${INTEL_VERSION}
@@ -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 9488767..a7c967e 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-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile
index 76e3eaf..5edcc15 100644
--- a/x11-drivers/xf86-video-vesa/Makefile
+++ b/x11-drivers/xf86-video-vesa/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: head/x11-drivers/xf86-video-vesa/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-drivers/xf86-video-vesa/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 1091e20..641d28f 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/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index 47c2910..f7a0ff0 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/x11-drivers/xorg-drivers/Makefile 352986 2014-05-05 09:45:36Z bapt $
 
 PORTNAME=	xorg-drivers
 PORTVERSION=	7.7
@@ -10,8 +10,6 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org drivers meta-port
 
-.MAKE.FreeBSD_UL=	yes
-
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
 
@@ -69,9 +67,9 @@ OPTIONS_DEFAULT=	MOUSE \
 			VESA
 
 .for type in input video
-. for a in ${${type:U}_DRIVERS}
-OPTIONS_DEFINE+=	${a:U}
-${a:U}_DESC=	Install ${a} ${type} driver
+. for a in ${${type:tu}_DRIVERS}
+OPTIONS_DEFINE+=	${a:tu}
+${a:tu}_DESC=	Install ${a} ${type} driver
 . endfor
 .endfor
 
@@ -106,12 +104,12 @@ VIDEO_DRIVERS+=	sunffb
 .endif
 
 .for type in input video
-. for i in ${${type:U}_DRIVERS}
-.  if ${PORT_OPTIONS:M${i:U}} != ""
+. for i in ${${type:tu}_DRIVERS}
+.  if ${PORT_OPTIONS:M${i:tu}} != ""
 .   if ${QUIRKS:M${i}\:*:C/.*://} != ""
-RUN_DEPENDS+=	${${type:U}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
+RUN_DEPENDS+=	${${type:tu}DIR}/${QUIRKS:M${i}\:*:C/.*://}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
 .   else
-RUN_DEPENDS+=	${${type:U}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
+RUN_DEPENDS+=	${${type:tu}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-${i}
 .   endif
 .  endif
 . endfor
diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile
index 85546a7..9299ed2 100644
--- a/x11-fonts/libFS/Makefile
+++ b/x11-fonts/libFS/Makefile
@@ -1,7 +1,8 @@
-# $FreeBSD: head/x11-fonts/libFS/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-fonts/libFS/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libFS
 PORTVERSION=	1.0.6
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile
index 3446168..e4447c0 100644
--- a/x11-fonts/libfontenc/Makefile
+++ b/x11-fonts/libfontenc/Makefile
@@ -1,9 +1,9 @@
 # Created by: Dejan Lesjak <lesi@FreeBSD.org>
-# $FreeBSD: head/x11-fonts/libfontenc/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-fonts/libfontenc/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libfontenc
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index f62b4b0..76f6a60 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: head/x11-servers/xephyr/Makefile 354175 2014-05-15 21:26:23Z kwm $
 
 PORTNAME=	xephyr
 
@@ -21,8 +21,6 @@ CONFIGURE_ARGS=	--enable-kdrive --enable-xephyr	--disable-dmx --disable-xvfb \
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xephyr man/man1/Xephyr.1.gz
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${STAGEDIR}${PREFIX}/bin/
 .if defined(WITH_NEW_XORG)
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 54d8470..2d6d212 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -51,8 +51,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-xace.c \
 		${FILESDIR}/extra-dix_dixfonts.c
 .endif
 
-USE_BZIP2=	yes
-USES=		gmake perl5
+USES=		gmake libtool:keepla perl5 tar:bzip2
 USE_PERL5=	build
 USE_GL=		gl
 USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
@@ -63,12 +62,12 @@ USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 		videoproto compositeproto trapproto recordproto xineramaproto \
 		xinerama evieproto xfont fontenc xkbui pixman pciaccess
 
-MAKE_JOBS_UNSAFE=	yes
 USE_OPENSSL=	yes
 CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
 		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace --disable-xephyr \
 		--enable-record=yes
+INSTALL_TARGET=	install-strip
 
 .if ${SLAVE_PORT} == "no"
 SUB_FILES=	pkg-install pkg-deinstall
@@ -109,13 +108,12 @@ CONFIGURE_ARGS+=	--enable-aiglx=yes
 CONFIGURE_ARGS+=	--enable-aiglx=no
 .endif
 
-# We handle Xorg setuid in the plist. This allows to build xorg-server as 
-# a user.
+# We handle Xorg setuid in the plist. This allows to build xorg-server as a user.
 CONFIGURE_ARGS+=--enable-install-setuid=no
 .if ${PORT_OPTIONS:MSUID}
 PLIST_SUB+=	SUID=""
 .else
-PLIST_SUB+=	SUID="@comment"
+PLIST_SUB+=	SUID="@comment "
 .endif
 
 .if ${ARCH} == i386
@@ -202,15 +200,10 @@ post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg
 	${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \
 		${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/*.so
-.if !defined(WITH_NEW_XORG)
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/*.so
-.endif
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/multimedia/*.so
 
 .if defined(WITH_NEW_XORG)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
 .endif
-.endif
+.endif # ! SLAVE_PORT
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile
index deb006c..dff19ce 100644
--- a/x11-toolkits/libXaw/Makefile
+++ b/x11-toolkits/libXaw/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11-toolkits/libXaw/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-toolkits/libXaw/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 5f574b0..a71e6d4 100644
--- a/x11-toolkits/libXmu/Makefile
+++ b/x11-toolkits/libXmu/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11-toolkits/libXmu/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-toolkits/libXmu/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 3f648b8..63c36a5 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11-toolkits/libXt/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11-toolkits/libXt/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libXt
 PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 
diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile
index 0f4d6e2..ebdf1f4 100644
--- a/x11/libICE/Makefile
+++ b/x11/libICE/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libICE/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libICE/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 2597f85..19c7707 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libSM/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libSM/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 e7008cb..367e3b9 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libX11/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libX11/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 875124b..e22bea0 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: head/x11/libXScrnSaver/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXScrnSaver/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 b54c61e..7310d43 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 e8d9c6a..4ce95ab 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXau/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXau/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libXau
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 6c81c9e..5a6699d 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 e68d7b5..7f8ff23 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXcursor/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXcursor/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 24c1dfc..bc61501 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 e1dfa90..334a413 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXdmcp/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXdmcp/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libXdmcp
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index cd52eda..4152c66 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXext/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXext/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 1032b70..c2a55cf 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXfixes/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXfixes/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 d771a7f..1eb93a5 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXi/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXi/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 afff7e1..532d7bc 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXinerama/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXinerama/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 92f8cfe..8c2c7d8 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXp/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXp/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 8f06609..8b67f33 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXpm/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXpm/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libXpm
 PORTVERSION=	3.5.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index ce779f4..46d3ece 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXrandr/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXrandr/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 96b5e1d..3769e12 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -1,9 +1,9 @@
 # Created by: Foxfair Hu <foxfair@FreeBSD.org>
-# $FreeBSD: head/x11/libXrender/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXrender/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 879ca1b..8dd4e90 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXres/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXres/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 3d30d5f..a0beff3 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXtst/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXtst/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 868211d..40d4347 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXv/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXv/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 ac57142..3117311 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXvMC/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXvMC/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 4acb2ff..d7f35bf 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXxf86dga/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXxf86dga/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libXxf86dga
 PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index 6f342eb..057d123 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libXxf86vm/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libXxf86vm/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 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 fc2211b..335c4f5 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libdmx/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libdmx/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libdmx
 PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 5dea64b..a718925 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -1,8 +1,9 @@
 # Created by: Ashish Shukla <wahjava@gmail.com>
-# $FreeBSD: head/x11/libxcb/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libxcb/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libxcb
 PORTVERSION=	1.10
+PORTREVISION=	2
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
@@ -23,7 +24,7 @@ XORG_CAT=	lib
 USES=		gmake
 USE_GNOME=	libxslt:build
 USE_XORG=	xau xdmcp
-USE_PYTHON_BUILD=YES
+USE_PYTHON_BUILD=2
 
 .for f in XPROTO_CFLAGS XPROTO_LIBS XDMCP_CFLAGS XDMCP_LIBS NEEDED_CFLAGS NEEDED_LIBS
 CONFIGURE_ARGS+=${f}="${${f}}"
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index 14814cb..4da9dd5 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -1,9 +1,9 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/x11/libxkbfile/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/libxkbfile/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	libxkbfile
 PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
index 3acdac9..c6c3e17 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/libxshmfence/files/patch-src__xshmfence_futex.h b/x11/libxshmfence/files/patch-src__xshmfence_futex.h
index df93d77..253d9d5 100644
--- a/x11/libxshmfence/files/patch-src__xshmfence_futex.h
+++ b/x11/libxshmfence/files/patch-src__xshmfence_futex.h
@@ -1,5 +1,5 @@
---- src/xshmfence_futex.h	2013-11-20 17:13:08.000000000 -0500
-+++ src/xshmfence_futex.h	2014-04-15 14:20:27.000000000 -0400
+--- src/xshmfence_futex.h
++++ src/xshmfence_futex.h
 @@ -1,5 +1,6 @@
  /*
   * Copyright © 2013 Keith Packard
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 2bc75c6..4c95f92 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD: head/x11/pixman/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/pixman/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	pixman
 PORTVERSION=	0.32.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 1a364c9..abf6226 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -1,8 +1,9 @@
 # Created by: Ashish Shukla <wahjava@gmail.com>
-# $FreeBSD: head/x11/xcb-proto/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/xcb-proto/Makefile 351589 2014-04-19 10:16:56Z zeising $
 
 PORTNAME=	xcb-proto
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	x11 python
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
@@ -12,7 +13,7 @@ COMMENT=	The X protocol C-language Binding (XCB) protocol
 BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
 
 XORG_CAT=	proto
-USE_PYTHON=	2.5+
+USE_PYTHON=	2
 
 DATADIR=	${PREFIX}/share/xcb
 
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index 77be001..b0f1c05 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: head/x11/xorg-apps/Makefile 317162 2013-05-02 22:10:11Z bapt $
+# $FreeBSD: head/x11/xorg-apps/Makefile 352986 2014-05-05 09:45:36Z bapt $
 
 PORTNAME=	xorg-apps
 PORTVERSION=	7.7
@@ -10,8 +10,6 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org apps meta-port
 
-.MAKE.FreeBSD_UL=	yes
-
 COMPONENTS=	appres bitmap xf86dga:dga iceauth luit \
 		x11-fonts/mkfontdir:mkfontdir \
 		x11-fonts/mkfontscale:mkfontscale sessreg \
@@ -32,15 +30,15 @@ do-install:
 		${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/apps
 
 .for comp in ${COMPONENTS}
-OPTIONS_DEFINE+=	${comp:C/:.*//:C/.*\///:U}
-OPTIONS_DEFAULT+=	${comp:C/:.*//:C/.*\///:U}
-${comp:C/:.*//:C/.*\///:U}_DESC=	Install ${comp:C/:.*//:C/.*\///} application
+OPTIONS_DEFINE+=	${comp:C/:.*//:C/.*\///:tu}
+OPTIONS_DEFAULT+=	${comp:C/:.*//:C/.*\///:tu}
+${comp:C/:.*//:C/.*\///:tu}_DESC=	Install ${comp:C/:.*//:C/.*\///} application
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for comp in ${COMPONENTS}
-. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:U}}
+. if ${PORT_OPTIONS:M${comp:C/:.*//:C/.*\///:tu}}
 .  if ${comp:M*\:*}==""
 port=${comp}
 check=${comp:C/.*\///} # doesn't work
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index ba1f2cd..c9162f3 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -1,8 +1,9 @@
 # Created by: Dejan Lesjak <lesi@FreeBSD.org>
-# $FreeBSD: head/x11/xtrans/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD: head/x11/xtrans/Makefile 351936 2014-04-23 13:25:16Z tijl $
 
 PORTNAME=	xtrans
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org