aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/3ddesktop/Makefile6
-rw-r--r--x11/Makefile3
-rw-r--r--x11/beforelight/Makefile3
-rw-r--r--x11/beforelight/distinfo6
-rw-r--r--x11/bitmap/Makefile1
-rw-r--r--x11/bricons/Makefile2
-rw-r--r--x11/dri2proto/Makefile17
-rw-r--r--x11/dri2proto/distinfo3
-rw-r--r--x11/dri2proto/pkg-descr4
-rw-r--r--x11/dri2proto/pkg-plist3
-rw-r--r--x11/editres/Makefile1
-rw-r--r--x11/fstobdf/Makefile2
-rw-r--r--x11/fstobdf/distinfo6
-rw-r--r--x11/glproto/Makefile2
-rw-r--r--x11/glproto/distinfo6
-rw-r--r--x11/gsynaptics/Makefile4
-rw-r--r--x11/inputproto/Makefile2
-rw-r--r--x11/inputproto/distinfo6
-rw-r--r--x11/kde4-runtime/Makefile3
-rw-r--r--x11/kdebase4-runtime/Makefile3
-rw-r--r--x11/libSM/Makefile6
-rw-r--r--x11/libSM/distinfo6
-rw-r--r--x11/libX11/Makefile9
-rw-r--r--x11/libX11/distinfo6
-rw-r--r--x11/libX11/pkg-plist4
-rw-r--r--x11/libXScrnSaver/Makefile2
-rw-r--r--x11/libXScrnSaver/distinfo6
-rw-r--r--x11/libXau/Makefile3
-rw-r--r--x11/libXau/distinfo6
-rw-r--r--x11/libXext/Makefile2
-rw-r--r--x11/libXext/distinfo6
-rw-r--r--x11/libXi/Makefile6
-rw-r--r--x11/libXi/distinfo6
-rw-r--r--x11/libXinerama/Makefile2
-rw-r--r--x11/libXinerama/distinfo6
-rw-r--r--x11/libXrandr/Makefile5
-rw-r--r--x11/libXrandr/distinfo6
-rw-r--r--x11/libXv/Makefile3
-rw-r--r--x11/libXv/distinfo6
-rw-r--r--x11/libXxf86vm/Makefile2
-rw-r--r--x11/libXxf86vm/distinfo6
-rw-r--r--x11/libdnd/Makefile2
-rw-r--r--x11/libxcb/Makefile2
-rw-r--r--x11/libxcb/distinfo6
-rw-r--r--x11/libxcb/pkg-plist8
-rw-r--r--x11/libxkbfile/Makefile2
-rw-r--r--x11/libxkbfile/distinfo6
-rw-r--r--x11/listres/Makefile1
-rw-r--r--x11/luit/Makefile3
-rw-r--r--x11/luit/distinfo6
-rw-r--r--x11/pixman/Makefile2
-rw-r--r--x11/pixman/distinfo6
-rw-r--r--x11/printproto/Makefile2
-rw-r--r--x11/printproto/distinfo6
-rw-r--r--x11/sessreg/Makefile2
-rw-r--r--x11/sessreg/distinfo6
-rw-r--r--x11/tycoon/Makefile2
-rw-r--r--x11/viewres/Makefile1
-rw-r--r--x11/x11perf/Makefile2
-rw-r--r--x11/x11perf/distinfo6
-rw-r--r--x11/xauth/Makefile2
-rw-r--r--x11/xauth/distinfo6
-rw-r--r--x11/xballoon/Makefile2
-rw-r--r--x11/xbiff/Makefile1
-rw-r--r--x11/xcalc/Makefile1
-rw-r--r--x11/xcb-proto/Makefile2
-rw-r--r--x11/xcb-proto/distinfo6
-rw-r--r--x11/xcb-util/Makefile4
-rw-r--r--x11/xcb-util/distinfo6
-rw-r--r--x11/xclipboard/Makefile1
-rw-r--r--x11/xclock/Makefile1
-rw-r--r--x11/xcolors/Makefile2
-rw-r--r--x11/xconsole/Makefile1
-rw-r--r--x11/xditview/Makefile1
-rw-r--r--x11/xdm/Makefile5
-rw-r--r--x11/xdm/distinfo6
-rw-r--r--x11/xdm/files/patch-config_Xresources.cpp21
-rw-r--r--x11/xdpyinfo/Makefile3
-rw-r--r--x11/xdpyinfo/distinfo6
-rw-r--r--x11/xdtm/Makefile2
-rw-r--r--x11/xedit/Makefile4
-rw-r--r--x11/xedit/distinfo6
-rw-r--r--x11/xedit/pkg-plist3
-rw-r--r--x11/xev/Makefile2
-rw-r--r--x11/xev/distinfo6
-rw-r--r--x11/xextproto/Makefile2
-rw-r--r--x11/xextproto/distinfo6
-rw-r--r--x11/xextproto/pkg-plist4
-rw-r--r--x11/xf86dga/Makefile1
-rw-r--r--x11/xf86driproto/Makefile2
-rw-r--r--x11/xf86driproto/distinfo6
-rw-r--r--x11/xf86driproto/pkg-plist1
-rw-r--r--x11/xfd/Makefile1
-rw-r--r--x11/xgc/Makefile1
-rw-r--r--x11/xinit/Makefile2
-rw-r--r--x11/xinit/distinfo6
-rw-r--r--x11/xinput/Makefile13
-rw-r--r--x11/xinput/distinfo6
-rw-r--r--x11/xkbcomp/Makefile2
-rw-r--r--x11/xkbcomp/distinfo6
-rw-r--r--x11/xkbutils/Makefile2
-rw-r--r--x11/xkeycaps/Makefile2
-rw-r--r--x11/xload/Makefile1
-rw-r--r--x11/xlockmore/Makefile1
-rw-r--r--x11/xlogo/Makefile1
-rw-r--r--x11/xlupe/Makefile2
-rw-r--r--x11/xmag/Makefile1
-rw-r--r--x11/xman/Makefile1
-rw-r--r--x11/xmangekyou/Makefile2
-rw-r--r--x11/xmessage/Makefile1
-rw-r--r--x11/xmh/Makefile1
-rw-r--r--x11/xmore/Makefile1
-rw-r--r--x11/xorg-apps/Makefile129
-rw-r--r--x11/xorg-cf-files/Makefile6
-rw-r--r--x11/xorg-libraries/Makefile38
-rw-r--r--x11/xorg-minimal/Makefile2
-rw-r--r--x11/xorg-protos/Makefile56
-rw-r--r--x11/xorg-protos/pkg-descr6
-rw-r--r--x11/xorg-protos/pkg-plist2
-rw-r--r--x11/xorg/Makefile8
-rw-r--r--x11/xphelloworld/Makefile37
-rw-r--r--x11/xphelloworld/distinfo3
-rw-r--r--x11/xphelloworld/pkg-descr5
-rw-r--r--x11/xprop/Makefile2
-rw-r--r--x11/xprop/distinfo6
-rw-r--r--x11/xproto/Makefile3
-rw-r--r--x11/xproto/distinfo6
-rw-r--r--x11/xpyb/Makefile5
-rw-r--r--x11/xrandr/Makefile2
-rw-r--r--x11/xrandr/distinfo6
-rw-r--r--x11/xrdb/Makefile2
-rw-r--r--x11/xrdb/distinfo6
-rw-r--r--x11/xrx/Makefile2
-rw-r--r--x11/xsel/Makefile2
-rw-r--r--x11/xset/Makefile2
-rw-r--r--x11/xset/distinfo6
-rw-r--r--x11/xsm/Makefile1
-rw-r--r--x11/xstarroll/Makefile2
-rw-r--r--x11/xstroke/Makefile4
-rw-r--r--x11/xterm/Makefile1
-rw-r--r--x11/xtrans/Makefile2
-rw-r--r--x11/xtrans/distinfo6
-rw-r--r--x11/xtrans/pkg-plist2
-rw-r--r--x11/xvidtune/Makefile1
-rw-r--r--x11/xwd/Makefile2
-rw-r--r--x11/xwd/distinfo6
-rw-r--r--x11/xwininfo/Makefile2
-rw-r--r--x11/xwininfo/distinfo6
148 files changed, 332 insertions, 478 deletions
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index b1601ff969cb..509c815b36f9 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= 3ddesktop
PORTVERSION= 0.2.9
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= desk3d
@@ -15,9 +15,7 @@ MASTER_SITE_SUBDIR= desk3d
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D Virtual Desktop Switcher
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-
-USE_GL= yes
+USE_GL= glut
USE_EFL= imlib2
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11/Makefile b/x11/Makefile
index 4cda51ce71c3..7da34271a3d3 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -35,6 +35,7 @@
SUBDIR += dgs
SUBDIR += dmenu
SUBDIR += dmxproto
+ SUBDIR += dri2proto
SUBDIR += docker
SUBDIR += dxpc
SUBDIR += dynamag
@@ -423,8 +424,6 @@
SUBDIR += xorg-edit
SUBDIR += xorg-libraries
SUBDIR += xorg-minimal
- SUBDIR += xorg-protos
- SUBDIR += xphelloworld
SUBDIR += xplsprinters
SUBDIR += xpr
SUBDIR += xprehashprinterlist
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
index f79b5def73d5..67e9593b9548 100644
--- a/x11/beforelight/Makefile
+++ b/x11/beforelight/Makefile
@@ -6,7 +6,8 @@
#
PORTNAME= beforelight
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/beforelight/distinfo b/x11/beforelight/distinfo
index 06c9a62d2edd..358c03298561 100644
--- a/x11/beforelight/distinfo
+++ b/x11/beforelight/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/beforelight-1.0.2.tar.bz2) = 8bc2e35cdcd2e6a80eab1b77c41f2a46
-SHA256 (xorg/app/beforelight-1.0.2.tar.bz2) = 00e217559c93779fe04fd948017820af118a3981d6b4371ace95107cb3b047a7
-SIZE (xorg/app/beforelight-1.0.2.tar.bz2) = 85526
+MD5 (xorg/app/beforelight-1.0.3.tar.bz2) = d55b0e7196dafcfeb4db3886af2e1969
+SHA256 (xorg/app/beforelight-1.0.3.tar.bz2) = cae9427fa083a0ec3f2d1a3a6391508b31a2cf0220cb8d732c5d473a8c995c4e
+SIZE (xorg/app/beforelight-1.0.3.tar.bz2) = 85067
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 5e750fc2ffc0..e88e35318ec6 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bitmap
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 7056be518050..f430fbe72262 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bricons
PORTVERSION= 3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ftp://ftp.x.org/R5contrib/
DISTNAME= ${PORTNAME}
diff --git a/x11/dri2proto/Makefile b/x11/dri2proto/Makefile
new file mode 100644
index 000000000000..d8e961c26601
--- /dev/null
+++ b/x11/dri2proto/Makefile
@@ -0,0 +1,17 @@
+# New ports collection makefile for: dri2proto
+# Date Created: Jul 28 2008
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= dri2proto
+PORTVERSION= 1.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= DRI2 prototype headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/dri2proto/distinfo b/x11/dri2proto/distinfo
new file mode 100644
index 000000000000..becfbaddec43
--- /dev/null
+++ b/x11/dri2proto/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/proto/dri2proto-1.1.tar.bz2) = 1d70f0653b0b3a837853262dc5d34da4
+SHA256 (xorg/proto/dri2proto-1.1.tar.bz2) = 69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
+SIZE (xorg/proto/dri2proto-1.1.tar.bz2) = 40610
diff --git a/x11/dri2proto/pkg-descr b/x11/dri2proto/pkg-descr
new file mode 100644
index 000000000000..1e57ddbf8fb2
--- /dev/null
+++ b/x11/dri2proto/pkg-descr
@@ -0,0 +1,4 @@
+This package contains X.Org DRI2 prototype headers.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11/dri2proto/pkg-plist b/x11/dri2proto/pkg-plist
new file mode 100644
index 000000000000..830f3f03f108
--- /dev/null
+++ b/x11/dri2proto/pkg-plist
@@ -0,0 +1,3 @@
+include/X11/extensions/dri2proto.h
+libdata/pkgconfig/dri2proto.pc
+@dirrmtry include/X11/extensions
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index e1306e904635..389b9c9f9b74 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -7,6 +7,7 @@
PORTNAME= editres
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
index 868ad2b5c237..a265ea6075ce 100644
--- a/x11/fstobdf/Makefile
+++ b/x11/fstobdf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fstobdf
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/fstobdf/distinfo b/x11/fstobdf/distinfo
index 56ea2a179e6d..9216579332e9 100644
--- a/x11/fstobdf/distinfo
+++ b/x11/fstobdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/fstobdf-1.0.2.tar.bz2) = 99144743ab3cbb9cf37090fdc9e747db
-SHA256 (xorg/app/fstobdf-1.0.2.tar.bz2) = 690e45b252cd96036dd9b89af8624eb423e16d4bd662b07d264a3f876ce7ac22
-SIZE (xorg/app/fstobdf-1.0.2.tar.bz2) = 82861
+MD5 (xorg/app/fstobdf-1.0.3.tar.bz2) = 49a6225380f6c18fff664a043cd569b1
+SHA256 (xorg/app/fstobdf-1.0.3.tar.bz2) = f2242720045c69f69dc9e18320a1c6402e92234d40c237367560fae3d210f7b0
+SIZE (xorg/app/fstobdf-1.0.3.tar.bz2) = 90507
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index 14edaf1fda84..6dba4d673f91 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= glproto
-PORTVERSION= 1.4.8
+PORTVERSION= 1.4.9
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
index e35b268fe67f..d26a42f41e14 100644
--- a/x11/glproto/distinfo
+++ b/x11/glproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/glproto-1.4.8.tar.bz2) = 3dfbd17203c0c88b94b6f579f24c11cc
-SHA256 (xorg/proto/glproto-1.4.8.tar.bz2) = 2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c
-SIZE (xorg/proto/glproto-1.4.8.tar.bz2) = 53852
+MD5 (xorg/proto/glproto-1.4.9.tar.bz2) = e60951628422663e60faeb400f27bac1
+SHA256 (xorg/proto/glproto-1.4.9.tar.bz2) = 69d7fb7be4f0f56bd3a67b6c8c88dc677892eb99fd1b13e166b43b39d64764a3
+SIZE (xorg/proto/glproto-1.4.9.tar.bz2) = 57658
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index a2ae14285c3e..1302b406f20c 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsynaptics
PORTVERSION= 0.9.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
MASTER_SITE_SUBDIR= gsynaptics/21527
@@ -33,6 +33,6 @@ post-install:
.include <bsd.port.pre.mk>
-RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/synaptics
+RUN_DEPENDS+= ${LOCALBASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/xf86-input-synaptics
.include <bsd.port.post.mk>
diff --git a/x11/inputproto/Makefile b/x11/inputproto/Makefile
index b21dc4d9d485..4f9336765ec2 100644
--- a/x11/inputproto/Makefile
+++ b/x11/inputproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= inputproto
-PORTVERSION= 1.4.2.1
+PORTVERSION= 1.5.0
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/inputproto/distinfo b/x11/inputproto/distinfo
index f3852aa8b815..2488042f8d40 100644
--- a/x11/inputproto/distinfo
+++ b/x11/inputproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/inputproto-1.4.2.1.tar.bz2) = aa948a7469168ddd9c33f11c5dff55ac
-SHA256 (xorg/proto/inputproto-1.4.2.1.tar.bz2) = 9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed
-SIZE (xorg/proto/inputproto-1.4.2.1.tar.bz2) = 47663
+MD5 (xorg/proto/inputproto-1.5.0.tar.bz2) = dcc36554aea1338b3813943daf1e9988
+SHA256 (xorg/proto/inputproto-1.5.0.tar.bz2) = ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461
+SIZE (xorg/proto/inputproto-1.5.0.tar.bz2) = 57358
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 37e9ce10b601..9c9b84157b75 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb \
- xcb.1:${PORTSDIR}/x11/libxcb \
+ xcb.2:${PORTSDIR}/x11/libxcb \
xine.1:${PORTSDIR}/multimedia/libxine \
xklavier.12:${PORTSDIR}/x11/libxklavier
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 37e9ce10b601..9c9b84157b75 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -17,7 +18,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Basic applications for the KDE system
LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb \
- xcb.1:${PORTSDIR}/x11/libxcb \
+ xcb.2:${PORTSDIR}/x11/libxcb \
xine.1:${PORTSDIR}/multimedia/libxine \
xklavier.12:${PORTSDIR}/x11/libxklavier
RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 6bc29012c235..9a2d8965412c 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -6,14 +6,16 @@
#
PORTNAME= libSM
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.1.0
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Session Management library for X11
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid
+
XORG_CAT= lib
USE_XORG= ice xproto:both xtrans
diff --git a/x11/libSM/distinfo b/x11/libSM/distinfo
index 459be289bb37..fdaef1635659 100644
--- a/x11/libSM/distinfo
+++ b/x11/libSM/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libSM-1.0.3.tar.bz2) = 184cbf502b3cd5d7ba5f9d1290a99606
-SHA256 (xorg/lib/libSM-1.0.3.tar.bz2) = 57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04
-SIZE (xorg/lib/libSM-1.0.3.tar.bz2) = 223906
+MD5 (xorg/lib/libSM-1.1.0.tar.bz2) = 05a04c2b6382fb0054f6c70494e22733
+SHA256 (xorg/lib/libSM-1.1.0.tar.bz2) = 7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82
+SIZE (xorg/lib/libSM-1.1.0.tar.bz2) = 252599
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 4d7cfb970daa..b6121cefb694 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -6,15 +6,14 @@
#
PORTNAME= libX11
-PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTVERSION= 1.1.99.2
PORTEPOCH= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 library
-OPTIONS= XCB "use XCB for low-level protocol implementation" off
+OPTIONS= XCB "use XCB for low-level protocol implementation" on
XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
@@ -25,8 +24,8 @@ CONFIGURE_ARGS+= --enable-xdmauth --datadir=${PREFIX}/lib
.include <bsd.port.pre.mk>
.if defined(WITH_XCB)
-BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb
-RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
CONFIGURE_ARGS+= --with-xcb=yes
PLIST_SUB+= XCB=""
.else
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 9fb62bb72a68..f6c92131de8d 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libX11-1.1.3.tar.bz2) = 4d43d3e472c552d2f191ecdd4e75112c
-SHA256 (xorg/lib/libX11-1.1.3.tar.bz2) = 4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a
-SIZE (xorg/lib/libX11-1.1.3.tar.bz2) = 1526958
+MD5 (xorg/lib/libX11-1.1.99.2.tar.bz2) = 2450f861d39939e46f8a4ced1abc3504
+SHA256 (xorg/lib/libX11-1.1.99.2.tar.bz2) = b910fa3ce9fd6c571ce13ab536284d5e532ec022e247da5f553eae4c0b5c25b1
+SIZE (xorg/lib/libX11-1.1.99.2.tar.bz2) = 1567842
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index 8244c232c2a6..7f6547521c5d 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -23,6 +23,9 @@ libdata/pkgconfig/x11.pc
%%XCB%%libdata/pkgconfig/x11-xcb.pc
lib/X11/XErrorDB
lib/X11/XKeysymDB
+lib/X11/locale/am_ET.UTF-8/XI18N_OBJS
+lib/X11/locale/am_ET.UTF-8/XLC_LOCALE
+lib/X11/locale/am_ET.UTF-8/Compose
lib/X11/locale/armscii-8/XI18N_OBJS
lib/X11/locale/armscii-8/XLC_LOCALE
lib/X11/locale/armscii-8/Compose
@@ -254,4 +257,5 @@ lib/X11/locale/compose.dir
@dirrm lib/X11/locale/el_GR.UTF-8
@dirrm lib/X11/locale/C
@dirrm lib/X11/locale/armscii-8
+@dirrm lib/X11/locale/am_ET.UTF-8
@dirrm lib/X11/locale
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index d0bf8314a38b..4a8704ce1f86 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXScrnSaver
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXScrnSaver/distinfo b/x11/libXScrnSaver/distinfo
index ee971b219267..401b30f193b1 100644
--- a/x11/libXScrnSaver/distinfo
+++ b/x11/libXScrnSaver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = ac2d697dd02f51e5c15f7104f4be5328
-SHA256 (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67
-SIZE (xorg/lib/libXScrnSaver-1.1.2.tar.bz2) = 219728
+MD5 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 93f84b6797f2f29cae1ce23b0355d00d
+SHA256 (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988
+SIZE (xorg/lib/libXScrnSaver-1.1.3.tar.bz2) = 219568
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 03efb67c84a6..f7494c8bd50f 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXau
-PORTVERSION= 1.0.3
-PORTREVISION= 2
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXau/distinfo b/x11/libXau/distinfo
index bc2977594ca8..9f908d675730 100644
--- a/x11/libXau/distinfo
+++ b/x11/libXau/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXau-1.0.3.tar.bz2) = 75a9f2b85cd1617b5ca98c9095323853
-SHA256 (xorg/lib/libXau-1.0.3.tar.bz2) = d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b
-SIZE (xorg/lib/libXau-1.0.3.tar.bz2) = 229619
+MD5 (xorg/lib/libXau-1.0.4.tar.bz2) = 0f2b88d857e0a3f5898e4759c541af46
+SHA256 (xorg/lib/libXau-1.0.4.tar.bz2) = 10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c
+SIZE (xorg/lib/libXau-1.0.4.tar.bz2) = 227753
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index eae965a1947f..fb858946836c 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXext
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXext/distinfo b/x11/libXext/distinfo
index 5f63d025110a..a219911a0efb 100644
--- a/x11/libXext/distinfo
+++ b/x11/libXext/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXext-1.0.3.tar.bz2) = 1bf6fa1c26f9957d7cc0bd90b038dfa6
-SHA256 (xorg/lib/libXext-1.0.3.tar.bz2) = 2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0
-SIZE (xorg/lib/libXext-1.0.3.tar.bz2) = 262116
+MD5 (xorg/lib/libXext-1.0.4.tar.bz2) = a91f1f722ac80c597cf0b75dcb8b48c0
+SHA256 (xorg/lib/libXext-1.0.4.tar.bz2) = 2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f
+SIZE (xorg/lib/libXext-1.0.4.tar.bz2) = 264491
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index 0b0615b4ce1e..0e5bb2a7d3f5 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXi
-PORTVERSION= 1.1.3
+PORTVERSION= 1.2.0
PORTEPOCH= 1
CATEGORIES= x11
@@ -20,10 +20,12 @@ MAN3= XAllowDeviceEvents.3 \
XChangeDeviceControl.3 \
XChangeDeviceDontPropagateList.3 \
XChangeDeviceKeyMapping.3 \
+ XChangeDeviceProperty.3 \
XChangeFeedbackControl.3 \
XChangeKeyboardDevice.3 \
XChangePointerDevice.3 \
XCloseDevice.3 \
+ XDeleteDeviceProperty.3 \
XDeviceBell.3 \
XDeviceTimeCoord.3 \
XFreeDeviceList.3 \
@@ -31,6 +33,7 @@ MAN3= XAllowDeviceEvents.3 \
XGetDeviceKeyMapping.3 \
XGetDeviceModifierMapping.3 \
XGetDeviceMotionEvents.3 \
+ XGetDeviceProperty.3 \
XGetExtensionVersion.3 \
XGetFeedbackControl.3 \
XGetDeviceButtonMapping.3 \
@@ -40,6 +43,7 @@ MAN3= XAllowDeviceEvents.3 \
XGrabDevice.3 \
XGrabDeviceButton.3 \
XGrabDeviceKey.3 \
+ XListDeviceProperties.3 \
XListInputDevices.3 \
XOpenDevice.3 \
XQueryDeviceState.3 \
diff --git a/x11/libXi/distinfo b/x11/libXi/distinfo
index 82a7ca5a9395..5e121f0b9f3e 100644
--- a/x11/libXi/distinfo
+++ b/x11/libXi/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXi-1.1.3.tar.bz2) = 7c510abb0cad8dc20493fb27ff7859d8
-SHA256 (xorg/lib/libXi-1.1.3.tar.bz2) = c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
-SIZE (xorg/lib/libXi-1.1.3.tar.bz2) = 248007
+MD5 (xorg/lib/libXi-1.2.0.tar.bz2) = 4b88e07d7dd77ca1e786f09066b58c02
+SHA256 (xorg/lib/libXi-1.2.0.tar.bz2) = 7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a
+SIZE (xorg/lib/libXi-1.2.0.tar.bz2) = 278230
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 225afe5c4ae6..60e3f47df1f0 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXinerama
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXinerama/distinfo b/x11/libXinerama/distinfo
index 43db74100cfb..0955c5e2ae1c 100644
--- a/x11/libXinerama/distinfo
+++ b/x11/libXinerama/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXinerama-1.0.2.tar.bz2) = f6fb08eafd3c2909d515f1a07bfca8fd
-SHA256 (xorg/lib/libXinerama-1.0.2.tar.bz2) = d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d
-SIZE (xorg/lib/libXinerama-1.0.2.tar.bz2) = 214046
+MD5 (xorg/lib/libXinerama-1.0.3.tar.bz2) = cd9f7c46439ac40e0517a302d2434d2c
+SHA256 (xorg/lib/libXinerama-1.0.3.tar.bz2) = 07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219
+SIZE (xorg/lib/libXinerama-1.0.3.tar.bz2) = 236386
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 5f3b30fcd96b..43fb571bf9ab 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXrandr
-PORTVERSION= 1.2.2
-PORTREVISION= 1
+PORTVERSION= 1.2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -17,7 +16,6 @@ XORG_CAT= lib
USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both
MAN3= Xrandr.3 \
- XRRConfig.3 \
XRRConfigCurrentConfiguration.3 \
XRRConfigCurrentRate.3 \
XRRConfigRates.3 \
@@ -29,7 +27,6 @@ MAN3= Xrandr.3 \
XRRQueryExtension.3 \
XRRQueryVersion.3 \
XRRRootToScreen.3 \
- XRRScreenConfig.3 \
XRRSelectInput.3 \
XRRSetScreenConfig.3 \
XRRSetScreenConfigAndRate.3
diff --git a/x11/libXrandr/distinfo b/x11/libXrandr/distinfo
index d9f575f08bb5..3744d06f7c72 100644
--- a/x11/libXrandr/distinfo
+++ b/x11/libXrandr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXrandr-1.2.2.tar.bz2) = 1b244b5d19f0ccab01d7083436cd3558
-SHA256 (xorg/lib/libXrandr-1.2.2.tar.bz2) = 206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98
-SIZE (xorg/lib/libXrandr-1.2.2.tar.bz2) = 224302
+MD5 (xorg/lib/libXrandr-1.2.3.tar.bz2) = 5cd67cc02a50c9644ba0a1846ea3b08e
+SHA256 (xorg/lib/libXrandr-1.2.3.tar.bz2) = f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267
+SIZE (xorg/lib/libXrandr-1.2.3.tar.bz2) = 251814
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index ca1050811ca3..6924e39ca93d 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libXv
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
PORTEPOCH= 1
CATEGORIES= x11
diff --git a/x11/libXv/distinfo b/x11/libXv/distinfo
index dee2747c6299..839e7857cf8b 100644
--- a/x11/libXv/distinfo
+++ b/x11/libXv/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXv-1.0.3.tar.bz2) = f1c4109fa804aeaf7188b66c5cdd9f57
-SHA256 (xorg/lib/libXv-1.0.3.tar.bz2) = f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b
-SIZE (xorg/lib/libXv-1.0.3.tar.bz2) = 231715
+MD5 (xorg/lib/libXv-1.0.4.tar.bz2) = 723a0275227165383e967a1ca8899b52
+SHA256 (xorg/lib/libXv-1.0.4.tar.bz2) = 4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8
+SIZE (xorg/lib/libXv-1.0.4.tar.bz2) = 229227
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index fc9f3e02e720..f164840f92e2 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libXxf86vm
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libXxf86vm/distinfo b/x11/libXxf86vm/distinfo
index 852a685b3d3a..5f6d92ebe9ea 100644
--- a/x11/libXxf86vm/distinfo
+++ b/x11/libXxf86vm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 8de1ca6c55aaad7d8cae19b4f0b3da32
-SHA256 (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a
-SIZE (xorg/lib/libXxf86vm-1.0.1.tar.bz2) = 227928
+MD5 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 304d37bd0a10d9b58aa9b64469ad73e5
+SHA256 (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de
+SIZE (xorg/lib/libXxf86vm-1.0.2.tar.bz2) = 240637
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index c8ad43156626..8b6dcb63a79f 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libdnd
PORTVERSION= 1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= http://leb.net/offix/
DISTNAME= dnd.${PORTVERSION}
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index 59089c2d17a2..011af27421a4 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxcb
-PORTVERSION= 1.1.90.1
+PORTVERSION= 1.1.93
CATEGORIES= x11 python
#MASTER_SITES= XORG/current/src/extras
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index 2a9d0a3a2d35..a007b6596693 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxcb-1.1.90.1.tar.bz2) = c4b67c5576ed58e2fd4a2855c0b21aa6
-SHA256 (libxcb-1.1.90.1.tar.bz2) = 7ccd862a295562412e9fe75cb83cc593db5c88d162b3ce1f7a326dd116381e88
-SIZE (libxcb-1.1.90.1.tar.bz2) = 475250
+MD5 (libxcb-1.1.93.tar.bz2) = 1e401dd361c38ccaa97a3a835da4caa3
+SHA256 (libxcb-1.1.93.tar.bz2) = b675393e2a0a54b9ccb147826042a4016f158788b2f7c47067832b125059e9f4
+SIZE (libxcb-1.1.93.tar.bz2) = 463825
diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist
index b35b552c9b1f..53f423c6eecf 100644
--- a/x11/libxcb/pkg-plist
+++ b/x11/libxcb/pkg-plist
@@ -14,7 +14,6 @@ include/xcb/sync.h
include/xcb/xc_misc.h
include/xcb/xcb.h
include/xcb/xcbext.h
-include/xcb/xcbxlib.h
include/xcb/xevie.h
include/xcb/xf86dri.h
include/xcb/xfixes.h
@@ -90,10 +89,6 @@ lib/libxcb-xinerama.a
lib/libxcb-xinerama.la
lib/libxcb-xinerama.so
lib/libxcb-xinerama.so.0
-lib/libxcb-xlib.a
-lib/libxcb-xlib.la
-lib/libxcb-xlib.so
-lib/libxcb-xlib.so.0
lib/libxcb-xprint.a
lib/libxcb-xprint.la
lib/libxcb-xprint.so
@@ -113,7 +108,7 @@ lib/libxcb-xvmc.so.0
lib/libxcb.a
lib/libxcb.la
lib/libxcb.so
-lib/libxcb.so.1
+lib/libxcb.so.2
libdata/pkgconfig/xcb-composite.pc
libdata/pkgconfig/xcb-damage.pc
libdata/pkgconfig/xcb-dpms.pc
@@ -130,7 +125,6 @@ libdata/pkgconfig/xcb-xevie.pc
libdata/pkgconfig/xcb-xf86dri.pc
libdata/pkgconfig/xcb-xfixes.pc
libdata/pkgconfig/xcb-xinerama.pc
-libdata/pkgconfig/xcb-xlib.pc
libdata/pkgconfig/xcb-xprint.pc
libdata/pkgconfig/xcb-xtest.pc
libdata/pkgconfig/xcb-xv.pc
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index edee2b77ac5e..a51273a6dfc8 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxkbfile
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/libxkbfile/distinfo b/x11/libxkbfile/distinfo
index a1594e5cb3b1..106e9f45c522 100644
--- a/x11/libxkbfile/distinfo
+++ b/x11/libxkbfile/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 12b4ceb5d42b520228b5fb40a96ae6c5
-SHA256 (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae
-SIZE (xorg/lib/libxkbfile-1.0.4.tar.bz2) = 273537
+MD5 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0726a845fe5a56551de2718c9f6b0e35
+SHA256 (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f
+SIZE (xorg/lib/libxkbfile-1.0.5.tar.bz2) = 259790
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
index 782af42a2bca..a2722836ff4f 100644
--- a/x11/listres/Makefile
+++ b/x11/listres/Makefile
@@ -7,6 +7,7 @@
PORTNAME= listres
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/luit/Makefile b/x11/luit/Makefile
index cec83e4da244..40610108ecb4 100644
--- a/x11/luit/Makefile
+++ b/x11/luit/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= luit
-PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/luit/distinfo b/x11/luit/distinfo
index 092103b77a7f..054a7b31af39 100644
--- a/x11/luit/distinfo
+++ b/x11/luit/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/luit-1.0.2.tar.bz2) = aacda46598ce3af8ca16e2a8132db1b2
-SHA256 (xorg/app/luit-1.0.2.tar.bz2) = c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c
-SIZE (xorg/app/luit-1.0.2.tar.bz2) = 99235
+MD5 (xorg/app/luit-1.0.3.tar.bz2) = b01e4f71c20fc1c79ed727759c1df40c
+SHA256 (xorg/app/luit-1.0.3.tar.bz2) = 2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7
+SIZE (xorg/app/luit-1.0.3.tar.bz2) = 104642
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index d86ce102c670..59881a79ddb1 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= pixman
-PORTVERSION= 0.12.0
+PORTVERSION= 0.13.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index e45e92f7d5db..8a5f7519320f 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/pixman-0.12.0.tar.bz2) = 494af78c1c7d825c9ad6815d7b91f17d
-SHA256 (xorg/lib/pixman-0.12.0.tar.bz2) = a82b54382a82c2fb42f7ad2c8f363e945602a5183f6df685b69a584d3b25b228
-SIZE (xorg/lib/pixman-0.12.0.tar.bz2) = 364262
+MD5 (xorg/lib/pixman-0.13.2.tar.bz2) = 4b03b556bb0da245eedf74437c3a6158
+SHA256 (xorg/lib/pixman-0.13.2.tar.bz2) = 7b6b9fdd2104c7fed450a0d0da26fa906cb49544c25c53377084eea8fefb7cdc
+SIZE (xorg/lib/pixman-0.13.2.tar.bz2) = 337769
diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile
index 82049577ad59..bce224c8253c 100644
--- a/x11/printproto/Makefile
+++ b/x11/printproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= printproto
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/printproto/distinfo b/x11/printproto/distinfo
index 638a4e42bbc3..ad847aa6c35d 100644
--- a/x11/printproto/distinfo
+++ b/x11/printproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/printproto-1.0.3.tar.bz2) = 0f4e7982c6d4ec3b2cf38502dd1293a3
-SHA256 (xorg/proto/printproto-1.0.3.tar.bz2) = 8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235
-SIZE (xorg/proto/printproto-1.0.3.tar.bz2) = 43560
+MD5 (xorg/proto/printproto-1.0.4.tar.bz2) = 7321847a60748b4d2f1fa16db4b6ede8
+SHA256 (xorg/proto/printproto-1.0.4.tar.bz2) = f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be
+SIZE (xorg/proto/printproto-1.0.4.tar.bz2) = 49579
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index b20546b36df7..b82f9894233d 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= sessreg
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/sessreg/distinfo b/x11/sessreg/distinfo
index 15eadc003898..d300de9c3d59 100644
--- a/x11/sessreg/distinfo
+++ b/x11/sessreg/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/sessreg-1.0.3.tar.bz2) = 07665816f2623ec82e665fb7d31c6cef
-SHA256 (xorg/app/sessreg-1.0.3.tar.bz2) = 7d0c145d53246ddf09fc749f91324897ed9a3da0064808f99b789c37470080dc
-SIZE (xorg/app/sessreg-1.0.3.tar.bz2) = 94690
+MD5 (xorg/app/sessreg-1.0.4.tar.bz2) = 839e968d7197b9563f0fd8a5a3aac2e3
+SHA256 (xorg/app/sessreg-1.0.4.tar.bz2) = 23e163502e208ac16f04a12b15f7f8dcd9919f0149c714353b7f92539b7e9802
+SIZE (xorg/app/sessreg-1.0.4.tar.bz2) = 96209
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index ec1a363e5873..181527e808b4 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tycoon
PORTVERSION= 1.07o
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/desktop
diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile
index ef09510911c0..abcd108d8eab 100644
--- a/x11/viewres/Makefile
+++ b/x11/viewres/Makefile
@@ -7,6 +7,7 @@
PORTNAME= viewres
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index 627fd24d7605..3137317a9e43 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= x11perf
-PORTVERSION= 1.4.1
+PORTVERSION= 1.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/x11perf/distinfo b/x11/x11perf/distinfo
index 62ad1a0226d0..2ad476a138e3 100644
--- a/x11/x11perf/distinfo
+++ b/x11/x11perf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/x11perf-1.4.1.tar.bz2) = fd06c8b8e3572a0e14af65a49e0dd7d1
-SHA256 (xorg/app/x11perf-1.4.1.tar.bz2) = c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064
-SIZE (xorg/app/x11perf-1.4.1.tar.bz2) = 126784
+MD5 (xorg/app/x11perf-1.5.tar.bz2) = 31283bfc3c78718ac1bd71e510d4e774
+SHA256 (xorg/app/x11perf-1.5.tar.bz2) = 4729da53dde0b7e1748db4bb771f9b7aaf2e2b1e67293a3a5b96d54043ce1233
+SIZE (xorg/app/x11perf-1.5.tar.bz2) = 142378
diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile
index 65007f16644b..29702575169f 100644
--- a/x11/xauth/Makefile
+++ b/x11/xauth/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xauth
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xauth/distinfo b/x11/xauth/distinfo
index 9573c12bf938..14a99ab151a0 100644
--- a/x11/xauth/distinfo
+++ b/x11/xauth/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xauth-1.0.2.tar.bz2) = 31b956edaeb453ddaa640420e97b25b2
-SHA256 (xorg/app/xauth-1.0.2.tar.bz2) = 569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17
-SIZE (xorg/app/xauth-1.0.2.tar.bz2) = 110215
+MD5 (xorg/app/xauth-1.0.3.tar.bz2) = e91e10ace1df0d5f2cbc74ead256407a
+SHA256 (xorg/app/xauth-1.0.3.tar.bz2) = 1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c
+SIZE (xorg/app/xauth-1.0.3.tar.bz2) = 112331
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index 47fd7111109e..f09d8f5e75e4 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xballoon
PORTVERSION= 1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile
index 5199eee6e1fe..463d3b17e0df 100644
--- a/x11/xbiff/Makefile
+++ b/x11/xbiff/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xbiff
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index 72b23a14478f..b55debe03f1c 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xcalc
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 6cb3a16082cf..a637df92bf61 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xcb-proto
-PORTVERSION= 1.2
+PORTVERSION= 1.3
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index 08460e2efffb..c258313abbcc 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xcb-proto-1.2.tar.bz2) = 09f912486d8a2353bb4b99ddc28ba3c7
-SHA256 (xcb-proto-1.2.tar.bz2) = 54252e3543064b1b263b8880c5a549404486c95daa5da8656f5286c80e006be5
-SIZE (xcb-proto-1.2.tar.bz2) = 86506
+MD5 (xcb-proto-1.3.tar.bz2) = d9275a714e83ab9c1f9b260c6eff1609
+SHA256 (xcb-proto-1.3.tar.bz2) = 3f09fd80360316f5282e8062d09457370e4c1e25c161e07aaa928a074ce8d1ac
+SIZE (xcb-proto-1.3.tar.bz2) = 87190
diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index bfa7f940eab9..e67ee04c3df3 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= xcb-util
-PORTVERSION= 0.3.0
+PORTVERSION= 0.3.2
CATEGORIES= x11
MASTER_SITES= http://xcb.freedesktop.org/dist/
MAINTAINER= ntarmos@ceid.upatras.gr
COMMENT= A module with libxcb/libX11 extension/replacement libraries
-LIB_DEPENDS= xcb.1:${PORTSDIR}/x11/libxcb
+LIB_DEPENDS= xcb.2:${PORTSDIR}/x11/libxcb
BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
USE_BZIP2= yes
diff --git a/x11/xcb-util/distinfo b/x11/xcb-util/distinfo
index 40073d03f3b8..db2fa6d592f5 100644
--- a/x11/xcb-util/distinfo
+++ b/x11/xcb-util/distinfo
@@ -1,3 +1,3 @@
-MD5 (xcb-util-0.3.0.tar.bz2) = 5f2188492a7d12142d83f73cf0054c59
-SHA256 (xcb-util-0.3.0.tar.bz2) = f85adfc10e4540fb294fe14806f8d711a7ac30ea4a5661b68225e7fdaa1708ab
-SIZE (xcb-util-0.3.0.tar.bz2) = 264896
+MD5 (xcb-util-0.3.2.tar.bz2) = fa41a147f5a63b01207cfd975fecc45c
+SHA256 (xcb-util-0.3.2.tar.bz2) = c72bd0df78778698720a19382a38d12b4943d023d27f9106a510c7dfd17438fd
+SIZE (xcb-util-0.3.2.tar.bz2) = 271223
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
index 83492f24b0d6..809edc066678 100644
--- a/x11/xclipboard/Makefile
+++ b/x11/xclipboard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xclipboard
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xclock/Makefile b/x11/xclock/Makefile
index e7861d5d94bd..2e9e950548d6 100644
--- a/x11/xclock/Makefile
+++ b/x11/xclock/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xclock
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index f86cbf8345b9..5b77edf07551 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcolors
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= markp
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index 02a2731c2036..9be64372edb3 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xconsole
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile
index fbf4b6d49182..232e9c6d7b9c 100644
--- a/x11/xditview/Makefile
+++ b/x11/xditview/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xditview
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index ae0f04ae16ea..d79721f2e824 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= xdm
-PORTVERSION= 1.1.6
-PORTREVISION= 3
+PORTVERSION= 1.1.8
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -29,6 +29,7 @@ post-patch:
${WRKSRC}/config/xdm-config.cpp \
${WRKSRC}/config/Xstartup.cpp \
${WRKSRC}/config/Xreset.cpp
+ @${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in
post-configure:
@${REINPLACE_CMD} -e "s|${EXAMPLESDIR}|${PREFIX}/lib/X11/xdm|" \
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
index e689ef94eb86..b4d588de261c 100644
--- a/x11/xdm/distinfo
+++ b/x11/xdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xdm-1.1.6.tar.bz2) = c89f8bc74fda4d19e5f374f59c88810f
-SHA256 (xorg/app/xdm-1.1.6.tar.bz2) = c41ac89d9da5c3f5424e9c4871d363ff17acf0fd2a46830931c447ba0b5a8bcd
-SIZE (xorg/app/xdm-1.1.6.tar.bz2) = 394175
+MD5 (xorg/app/xdm-1.1.8.tar.bz2) = cc1816bc62a3722ad509373b0b7f30fe
+SHA256 (xorg/app/xdm-1.1.8.tar.bz2) = e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9
+SIZE (xorg/app/xdm-1.1.8.tar.bz2) = 401712
diff --git a/x11/xdm/files/patch-config_Xresources.cpp b/x11/xdm/files/patch-config_Xresources.cpp
deleted file mode 100644
index 79f43ad08150..000000000000
--- a/x11/xdm/files/patch-config_Xresources.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/config/Xresources.cpp b/config/Xresources.cpp
-index a98287b..8c04efc 100644
---- config/Xresources.cpp.orig
-+++ config/Xresources.cpp
-@@ -36,6 +36,16 @@ xlogin*greetFace: Serif-24:bold:italic
- xlogin*face: Helvetica-18
- xlogin*promptFace: Helvetica-18:bold
- xlogin*failFace: Helvetica-18:bold
-+XHASHelse
-+xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
-+xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
-+xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
-+xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
-+xlogin*greetFace: Serif-18:bold:italic
-+xlogin*face: Helvetica-12
-+xlogin*promptFace: Helvetica-12:bold
-+xlogin*failFace: Helvetica-14:bold
-+XHASHendif
-
- XHASHifdef COLOR
- xlogin*borderWidth: 1
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index c5ceaeb343c3..b01fd1ad6821 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xdpyinfo
-PORTVERSION= 1.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xdpyinfo/distinfo b/x11/xdpyinfo/distinfo
index c514e41cc9a8..53dd02d960b2 100644
--- a/x11/xdpyinfo/distinfo
+++ b/x11/xdpyinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xdpyinfo-1.0.2.tar.bz2) = c9ee60ae52c97c51d4ca327e53f0cb61
-SHA256 (xorg/app/xdpyinfo-1.0.2.tar.bz2) = c9927fc33e8a4422d74b1ebee0d19dd5a16d9ebc435e8f47f0aa546501ccfed3
-SIZE (xorg/app/xdpyinfo-1.0.2.tar.bz2) = 100024
+MD5 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = b7cbab6cbcd12bf7ad65dbc12d86e104
+SHA256 (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 4294768751bd4ffb47e5ebacfc7b5b9f95a1a2f4d221d8af64474382473e1962
+SIZE (xorg/app/xdpyinfo-1.0.3.tar.bz2) = 103116
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index bee1f199c387..c6b3dd5f37b9 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xdtm
PORTVERSION= 2.5.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
index afffb6232202..784daadd393a 100644
--- a/x11/xedit/Makefile
+++ b/x11/xedit/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= xedit
-PORTVERSION= 1.0.2
+PORTVERSION= 1.1.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= Simple text editor for X
XORG_CAT= app
-USE_XORG= xt xaw xp xprintutil
+USE_XORG= xt xaw7
MAN1= xedit.1
diff --git a/x11/xedit/distinfo b/x11/xedit/distinfo
index c99bb879f4cc..f73ad9bcdea3 100644
--- a/x11/xedit/distinfo
+++ b/x11/xedit/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xedit-1.0.2.tar.bz2) = c56160e93c24ddf17e69891ed50deb72
-SHA256 (xorg/app/xedit-1.0.2.tar.bz2) = 2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df
-SIZE (xorg/app/xedit-1.0.2.tar.bz2) = 455400
+MD5 (xorg/app/xedit-1.1.2.tar.bz2) = 67193be728414d45a1922911e6437991
+SHA256 (xorg/app/xedit-1.1.2.tar.bz2) = a38823a8b7919e2efa689bc4c279e12314e45b41131c39ce9ca523e54f42fa1f
+SIZE (xorg/app/xedit-1.1.2.tar.bz2) = 484563
diff --git a/x11/xedit/pkg-plist b/x11/xedit/pkg-plist
index 22caffb89358..1bd6252ee24b 100644
--- a/x11/xedit/pkg-plist
+++ b/x11/xedit/pkg-plist
@@ -1,4 +1,5 @@
bin/xedit
+lib/X11/xedit/lisp/progmodes/auto.lsp
lib/X11/xedit/lisp/progmodes/c.lsp
lib/X11/xedit/lisp/progmodes/html.lsp
lib/X11/xedit/lisp/progmodes/imake.lsp
@@ -6,6 +7,8 @@ lib/X11/xedit/lisp/progmodes/lisp.lsp
lib/X11/xedit/lisp/progmodes/make.lsp
lib/X11/xedit/lisp/progmodes/man.lsp
lib/X11/xedit/lisp/progmodes/patch.lsp
+lib/X11/xedit/lisp/progmodes/perl.lsp
+lib/X11/xedit/lisp/progmodes/python.lsp
lib/X11/xedit/lisp/progmodes/rpm.lsp
lib/X11/xedit/lisp/progmodes/sgml.lsp
lib/X11/xedit/lisp/progmodes/sh.lsp
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
index 1f265b8c37e0..09bb49017558 100644
--- a/x11/xev/Makefile
+++ b/x11/xev/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xev
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xev/distinfo b/x11/xev/distinfo
index 0d51b68173fa..bd2ca1d458f3 100644
--- a/x11/xev/distinfo
+++ b/x11/xev/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xev-1.0.2.tar.bz2) = e3008eb0655da3026c162a5597d70869
-SHA256 (xorg/app/xev-1.0.2.tar.bz2) = cac2771b67942d9a00b46532176feb18b2f82c434e0f6ece578d95953ef33053
-SIZE (xorg/app/xev-1.0.2.tar.bz2) = 84097
+MD5 (xorg/app/xev-1.0.3.tar.bz2) = a9532c3d1683c99bb5df1895cb3a60b1
+SHA256 (xorg/app/xev-1.0.3.tar.bz2) = d4ac7ae154ee9733be27a5f55586abb9362c768f5fb8a4fc7fd2645100a9313a
+SIZE (xorg/app/xev-1.0.3.tar.bz2) = 92292
diff --git a/x11/xextproto/Makefile b/x11/xextproto/Makefile
index fcf8b6a457a3..1ed6eded2c44 100644
--- a/x11/xextproto/Makefile
+++ b/x11/xextproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xextproto
-PORTVERSION= 7.0.2
+PORTVERSION= 7.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xextproto/distinfo b/x11/xextproto/distinfo
index 3be185fe3d90..d3cfc7681330 100644
--- a/x11/xextproto/distinfo
+++ b/x11/xextproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xextproto-7.0.2.tar.bz2) = 242388ab65dde3a3dd313eeee265e429
-SHA256 (xorg/proto/xextproto-7.0.2.tar.bz2) = 53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9
-SIZE (xorg/proto/xextproto-7.0.2.tar.bz2) = 68323
+MD5 (xorg/proto/xextproto-7.0.4.tar.bz2) = 64c19cbf368f053cfc689609589dacfe
+SHA256 (xorg/proto/xextproto-7.0.4.tar.bz2) = e27f723f4218908be96c28a8e0e740e9b31a00c97dad6aaa9a57b79fc0295614
+SIZE (xorg/proto/xextproto-7.0.4.tar.bz2) = 79268
diff --git a/x11/xextproto/pkg-plist b/x11/xextproto/pkg-plist
index e997f23be10d..30e106267b84 100644
--- a/x11/xextproto/pkg-plist
+++ b/x11/xextproto/pkg-plist
@@ -5,16 +5,18 @@ include/X11/extensions/XLbx.h
include/X11/extensions/XShm.h
include/X11/extensions/XTest.h
include/X11/extensions/Xag.h
-include/X11/extensions/Xagsrv.h
include/X11/extensions/Xagstr.h
include/X11/extensions/Xcup.h
include/X11/extensions/Xcupstr.h
include/X11/extensions/Xdbe.h
include/X11/extensions/Xdbeproto.h
include/X11/extensions/Xext.h
+include/X11/extensions/Xge.h
include/X11/extensions/dpms.h
include/X11/extensions/dpmsstr.h
include/X11/extensions/extutil.h
+include/X11/extensions/ge.h
+include/X11/extensions/geproto.h
include/X11/extensions/lbxbuf.h
include/X11/extensions/lbxbufstr.h
include/X11/extensions/lbxdeltastr.h
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
index 3ee9a942aff2..ed9b8150777d 100644
--- a/x11/xf86dga/Makefile
+++ b/x11/xf86dga/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xf86dga
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86driproto/Makefile b/x11/xf86driproto/Makefile
index 5050dc0d49f8..1104a6b57f89 100644
--- a/x11/xf86driproto/Makefile
+++ b/x11/xf86driproto/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xf86driproto
-PORTVERSION= 2.0.3
+PORTVERSION= 2.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xf86driproto/distinfo b/x11/xf86driproto/distinfo
index 8bc28ed9ccc2..e32be9fa367d 100644
--- a/x11/xf86driproto/distinfo
+++ b/x11/xf86driproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = e4a282cfd708b8892fca4425fee9cd7b
-SHA256 (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6
-SIZE (xorg/proto/xf86driproto-2.0.3.tar.bz2) = 42828
+MD5 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 01470d088da3a8a3deefa8e1f45d69cb
+SHA256 (xorg/proto/xf86driproto-2.0.4.tar.bz2) = f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da
+SIZE (xorg/proto/xf86driproto-2.0.4.tar.bz2) = 43814
diff --git a/x11/xf86driproto/pkg-plist b/x11/xf86driproto/pkg-plist
index ad29f350c9d3..93dac2da7258 100644
--- a/x11/xf86driproto/pkg-plist
+++ b/x11/xf86driproto/pkg-plist
@@ -1,4 +1,3 @@
-include/GL/internal/dri_interface.h
include/X11/dri/xf86dri.h
include/X11/dri/xf86dristr.h
libdata/pkgconfig/xf86driproto.pc
diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile
index 9dae7d24052f..10122494509b 100644
--- a/x11/xfd/Makefile
+++ b/x11/xfd/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfd
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile
index fd106632376c..b4dec16e2638 100644
--- a/x11/xgc/Makefile
+++ b/x11/xgc/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xgc
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index f64a7f709e52..cadb0200ca19 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xinit
-PORTVERSION= 1.0.7
+PORTVERSION= 1.1.1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo
index fc2450087aeb..1d65aebe28e7 100644
--- a/x11/xinit/distinfo
+++ b/x11/xinit/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xinit-1.0.7.tar.bz2) = 8b882d9e2deed9d85469a3beaec566a3
-SHA256 (xorg/app/xinit-1.0.7.tar.bz2) = 15781cf2b15af8a2535ecc49acce77cc16573571344a71dcbe198ec12e5bb774
-SIZE (xorg/app/xinit-1.0.7.tar.bz2) = 110908
+MD5 (xorg/app/xinit-1.1.1.tar.bz2) = 93c73705ed9eb1e1a6b6938405672f2b
+SHA256 (xorg/app/xinit-1.1.1.tar.bz2) = b103d2cf9e1cd8b049e28bb1109f3da3a14287bbce3ab8b2f427d55a6e5f4785
+SIZE (xorg/app/xinit-1.1.1.tar.bz2) = 129365
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index bcf6ece6fcc9..b68044f7c544 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -6,18 +6,17 @@
#
PORTNAME= xinput
-PORTVERSION= 1.2
-PORTREVISION= 1
+PORTVERSION= 1.4.0
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=utilities
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= x11@FreeBSD.org
COMMENT= Very useful utility for configuring and testing XInput devices
-USE_IMAKE= yes
+XORG_CAT= app
+USE_XORG= inputproto x11 xi xext
-MAN1= xinput.1
PLIST_FILES= bin/xinput
+MAN1= xinput.1
+
.include <bsd.port.mk>
diff --git a/x11/xinput/distinfo b/x11/xinput/distinfo
index f12b6f7e0d3e..b277b77da684 100644
--- a/x11/xinput/distinfo
+++ b/x11/xinput/distinfo
@@ -1,3 +1,3 @@
-MD5 (xinput-1.2.tar.gz) = 0ee7ad8dca7a3add2b63b1c96bc87399
-SHA256 (xinput-1.2.tar.gz) = 4529443553a50f8508b0c63555bd8405e49f7648f60fd41b16176ada2420b223
-SIZE (xinput-1.2.tar.gz) = 8354
+MD5 (xorg/app/xinput-1.4.0.tar.bz2) = ef43538bb3b445d2d69d5adbf76c149e
+SHA256 (xorg/app/xinput-1.4.0.tar.bz2) = 503e73d10482496af57226454c09f44afe63ee5dd4240deb81f5ca27337cf119
+SIZE (xorg/app/xinput-1.4.0.tar.bz2) = 103854
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 14882d8276f5..58ce09c89e75 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xkbcomp
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkbcomp/distinfo b/x11/xkbcomp/distinfo
index 89f85b369efc..db401baa9923 100644
--- a/x11/xkbcomp/distinfo
+++ b/x11/xkbcomp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 2fbcae1323c266edf5b6c61751f2e343
-SHA256 (xorg/app/xkbcomp-1.0.3.tar.bz2) = 0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716
-SIZE (xorg/app/xkbcomp-1.0.3.tar.bz2) = 189992
+MD5 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 6cc96c3e4ed5d9802fe717beac008f19
+SHA256 (xorg/app/xkbcomp-1.0.5.tar.bz2) = 204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1
+SIZE (xorg/app/xkbcomp-1.0.5.tar.bz2) = 201382
diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile
index 47166b1708e6..c622f3f9e182 100644
--- a/x11/xkbutils/Makefile
+++ b/x11/xkbutils/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xkbutils
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xkeycaps/Makefile b/x11/xkeycaps/Makefile
index baf49f86ba5f..a81ca4057327 100644
--- a/x11/xkeycaps/Makefile
+++ b/x11/xkeycaps/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xkeycaps
PORTVERSION= 2.46
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xkeycaps/
EXTRACT_SUFX= .tar.Z
diff --git a/x11/xload/Makefile b/x11/xload/Makefile
index 91539c322247..d84d61d5b2da 100644
--- a/x11/xload/Makefile
+++ b/x11/xload/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xload
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 5862088b0449..dbe640e72615 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xlockmore
PORTVERSION= 5.27
+PORTREVISION= 1
CATEGORIES?= x11
MASTER_SITES= ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
CRITICAL
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index c599b449df1a..0704a6d8a089 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xlogo
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 23487937c628..b4ab13338a55 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xlupe
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 accessibility
MASTER_SITES= http://www.core.de/~coto/projects/xlupe/
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index 64c47ea40b81..b6fa26726734 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmag
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
index 069964b6bbb9..b44407a9b1d1 100644
--- a/x11/xman/Makefile
+++ b/x11/xman/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xman
PORTVERSION= 1.0.3
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index 901d6dc4c7d9..fa56fe1d1414 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmangekyou
PORTVERSION= 2.0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/ \
ftp://ftp.vector.co.jp/pack/unix/art/anime/
diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
index 61f40ff22dae..d31818d631e2 100644
--- a/x11/xmessage/Makefile
+++ b/x11/xmessage/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmessage
PORTVERSION= 1.0.2
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile
index 803fe7b177a0..ad97b1bff38d 100644
--- a/x11/xmh/Makefile
+++ b/x11/xmh/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmh
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11 mail
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
index 9bd0d42e3336..34199cc2900e 100644
--- a/x11/xmore/Makefile
+++ b/x11/xmore/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xmore
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index ec91aac278fe..1db73a3ec15f 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-apps
-PORTVERSION= 7.3
+PORTVERSION= 7.4
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
@@ -15,100 +15,15 @@ EXTRACT_ONLY= # none
MAINTAINER= x11@FreeBSD.org
COMMENT= X.org apps meta-port
-RUN_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
- mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
- appres:${PORTSDIR}/x11/appres \
- beforelight:${PORTSDIR}/x11/beforelight \
- bitmap:${PORTSDIR}/x11/bitmap \
- editres:${PORTSDIR}/x11/editres \
- fonttosfnt:${PORTSDIR}/x11-fonts/fonttosfnt \
- fslsfonts:${PORTSDIR}/x11-fonts/fslsfonts \
- fstobdf:${PORTSDIR}/x11/fstobdf \
- iceauth:${PORTSDIR}/x11/iceauth \
- ico:${PORTSDIR}/x11/ico \
- listres:${PORTSDIR}/x11/listres \
- luit:${PORTSDIR}/x11/luit \
- ${PREFIX}/sbin/mkcomposecache:${PORTSDIR}/x11/mkcomposecache \
- oclock:${PORTSDIR}/x11/oclock \
- showrgb:${PORTSDIR}/x11/rgb \
- rstart:${PORTSDIR}/x11/rstart \
- xon:${PORTSDIR}/x11/scripts \
- sessreg:${PORTSDIR}/x11/sessreg \
- setxkbmap:${PORTSDIR}/x11/setxkbmap \
- showfont:${PORTSDIR}/x11-fonts/showfont \
- smproxy:${PORTSDIR}/x11/smproxy \
- twm:${PORTSDIR}/x11-wm/twm \
- viewres:${PORTSDIR}/x11/viewres \
- x11perf:${PORTSDIR}/x11/x11perf \
- xauth:${PORTSDIR}/x11/xauth \
- xbacklight:${PORTSDIR}/x11/xbacklight \
- xbiff:${PORTSDIR}/x11/xbiff \
- xcalc:${PORTSDIR}/x11/xcalc \
- xclipboard:${PORTSDIR}/x11/xclipboard \
- xclock:${PORTSDIR}/x11/xclock \
- xcmsdb:${PORTSDIR}/x11/xcmsdb \
- xconsole:${PORTSDIR}/x11/xconsole \
- xcursorgen:${PORTSDIR}/x11/xcursorgen \
- xdbedizzy:${PORTSDIR}/x11/xdbedizzy \
- xditview:${PORTSDIR}/x11/xditview \
- xdm:${PORTSDIR}/x11/xdm \
- xdpyinfo:${PORTSDIR}/x11/xdpyinfo \
- xdriinfo:${PORTSDIR}/x11/xdriinfo \
- xedit:${PORTSDIR}/x11/xedit \
- xev:${PORTSDIR}/x11/xev \
- xeyes:${PORTSDIR}/x11/xeyes \
- dga:${PORTSDIR}/x11/xf86dga \
- xfd:${PORTSDIR}/x11/xfd \
- xfindproxy:${PORTSDIR}/x11/xfindproxy \
- xfontsel:${PORTSDIR}/x11-fonts/xfontsel \
- xfs:${PORTSDIR}/x11-fonts/xfs \
- xfsinfo:${PORTSDIR}/x11-fonts/xfsinfo \
- xfwp:${PORTSDIR}/x11/xfwp \
- xgamma:${PORTSDIR}/x11/xgamma \
- xgc:${PORTSDIR}/x11/xgc \
- xhost:${PORTSDIR}/x11/xhost \
- xinit:${PORTSDIR}/x11/xinit \
- xkbcomp:${PORTSDIR}/x11/xkbcomp \
- xkbevd:${PORTSDIR}/x11/xkbevd \
- xkbprint:${PORTSDIR}/x11/xkbprint \
- xkbvleds:${PORTSDIR}/x11/xkbutils \
- xkill:${PORTSDIR}/x11/xkill \
- xload:${PORTSDIR}/x11/xload \
- xlogo:${PORTSDIR}/x11/xlogo \
- xlsatoms:${PORTSDIR}/x11/xlsatoms \
- xlsclients:${PORTSDIR}/x11/xlsclients \
- xlsfonts:${PORTSDIR}/x11-fonts/xlsfonts \
- xmag:${PORTSDIR}/x11/xmag \
- xman:${PORTSDIR}/x11/xman \
- xmessage:${PORTSDIR}/x11/xmessage \
- xmodmap:${PORTSDIR}/x11/xmodmap \
- xmore:${PORTSDIR}/x11/xmore \
- xphelloworld:${PORTSDIR}/x11/xphelloworld \
- xplsprinters:${PORTSDIR}/x11/xplsprinters \
- xpr:${PORTSDIR}/x11/xpr \
- xprehashprinterlist:${PORTSDIR}/x11/xprehashprinterlist \
- xprop:${PORTSDIR}/x11/xprop \
- xrandr:${PORTSDIR}/x11/xrandr \
- xrdb:${PORTSDIR}/x11/xrdb \
- xrefresh:${PORTSDIR}/x11/xrefresh \
- xrx:${PORTSDIR}/x11/xrx \
- xset:${PORTSDIR}/x11/xset \
- xsetmode:${PORTSDIR}/x11/xsetmode \
- xsetpointer:${PORTSDIR}/x11/xsetpointer \
- xsetroot:${PORTSDIR}/x11/xsetroot \
- xstdcmap:${PORTSDIR}/x11/xstdcmap \
- xtrapchar:${PORTSDIR}/x11/xtrap \
- xvidtune:${PORTSDIR}/x11/xvidtune \
- xvinfo:${PORTSDIR}/x11/xvinfo \
- xwd:${PORTSDIR}/x11/xwd \
- xwininfo:${PORTSDIR}/x11/xwininfo \
- xwud:${PORTSDIR}/x11/xwud \
- xterm:${PORTSDIR}/x11/xterm
-
-.if exists(/usr/bin/rsh)
-RUN_DEPENDS+= xsm:${PORTSDIR}/x11/xsm
-.endif
+COMPONENTS= appres bitmap xf86dga:dga iceauth luit \
+ x11-fonts/mkfontdir:mkfontdir \
+ x11-fonts/mkfontscale:mkfontscale sessreg \
+ setxkbmap smproxy x11perf xauth xbacklight xcalc \
+ xcmsdb xcursorgen xdpyinfo xdriinfo xev xgamma xgc \
+ xhost xinput xkbcomp xkbevd xkbutils:xkbvleds xkill \
+ xlsatoms xlsclients xmodmap xpr xprop xrandr xrdb \
+ xrefresh xset xsetmode xsetroot xvinfo xwd xwininfo \
+ xwud
NO_BUILD= yes
@@ -116,4 +31,26 @@ do-install:
${MKDIR} ${PREFIX}/libdata/xorg
${TOUCH} ${PREFIX}/libdata/xorg/apps
-.include <bsd.port.mk>
+.for comp in ${COMPONENTS}
+OPTIONS+= ${comp:C/:.*//:C/.*\///:U} "Install ${comp:C/:.*//:C/.*\///} application" on
+.endfor
+
+.include <bsd.port.pre.mk>
+
+.for comp in ${COMPONENTS}
+. if !defined(WITHOUT_${comp:C/:.*//:C/.*\///:U})
+. if ${comp:M:}==""
+port=${comp}
+check=${comp:C/.*\///} # doesn't work
+. else
+port=${comp:C/:.*//}
+check=${comp:C/.*://}
+. endif
+. if ${port:M*/*}==""
+port:=x11/${port}
+. endif
+RUN_DEPENDS:= ${RUN_DEPENDS} ${check}:${PORTSDIR}/${port}
+. endif
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index cd59bc22f74e..27d30b73587a 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-cf-files
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -15,4 +15,8 @@ COMMENT= X.org cf files for use with imake builds
XORG_CAT= util
+post-patch:
+ @${REINPLACE_CMD} 's|\(define ExtraXaw[^ ]*\) [$$].*|\1 /**/|' \
+ ${WRKSRC}/X11.tmpl
+
.include <bsd.port.mk>
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index d791a81da42b..1bf7d561b2a4 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-libraries
-PORTVERSION= 7.3
-PORTREVISION= 2
+PORTVERSION= 7.4
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
@@ -18,15 +17,16 @@ COMMENT= X.org libraries meta-port
NO_BUILD= yes
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
- ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
- ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
+ ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \
${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \
+ ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \
+ ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \
+ ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman \
${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \
- ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \
- ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \
+ ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \
- ${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \
+ ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw \
${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \
${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \
${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \
@@ -35,32 +35,28 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \
${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
+ ${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
+ ${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \
+ ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \
${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \
${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \
+ ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
+ ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \
${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \
- ${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \
${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \
${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \
${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \
+ ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \
${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \
${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \
+ ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \
+ ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \
${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \
${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \
${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \
${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \
${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \
- ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \
- ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
- ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \
- ${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \
- ${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \
- ${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \
- ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \
- ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
- ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \
- ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \
- ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \
- ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
+ ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm
.if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6)
pre-everything::
diff --git a/x11/xorg-minimal/Makefile b/x11/xorg-minimal/Makefile
index 51dbb257c19b..36e45bdc5df9 100644
--- a/x11/xorg-minimal/Makefile
+++ b/x11/xorg-minimal/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg
-PORTVERSION= 7.3
+PORTVERSION= 7.4
CATEGORIES= x11 x11-servers
MASTER_SITES= # none
PKGNAMESUFFIX= -minimal
diff --git a/x11/xorg-protos/Makefile b/x11/xorg-protos/Makefile
deleted file mode 100644
index 9cd01dcae685..000000000000
--- a/x11/xorg-protos/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# New ports collection makefile for: xorg-protos
-# Date created: Sep 29 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xorg-protos
-PORTVERSION= 7.3
-PORTREVISION= 2
-CATEGORIES= x11
-MASTER_SITES= # none
-DISTFILES= # none
-EXTRACT_ONLY= # none
-
-MAINTAINER= x11@FreeBSD.org
-COMMENT= X.org protos meta-port
-
-BUILD_DEPENDS= ${PREFIX}/include/X11/extensions/bigreqstr.h:${PORTSDIR}/x11/bigreqsproto \
- ${PREFIX}/include/X11/extensions/composite.h:${PORTSDIR}/x11/compositeproto \
- ${PREFIX}/include/X11/extensions/damageproto.h:${PORTSDIR}/x11/damageproto \
- ${PREFIX}/include/X11/extensions/dmxproto.h:${PORTSDIR}/x11/dmxproto \
- ${PREFIX}/include/X11/extensions/xfixesproto.h:${PORTSDIR}/x11/fixesproto \
- ${PREFIX}/include/X11/extensions/fontcache.h:${PORTSDIR}/x11-fonts/fontcacheproto \
- ${PREFIX}/include/X11/fonts/FS.h:${PORTSDIR}/x11-fonts/fontsproto \
- ${PREFIX}/include/GL/glxproto.h:${PORTSDIR}/x11/glproto \
- ${PREFIX}/include/X11/extensions/XIproto.h:${PORTSDIR}/x11/inputproto \
- ${PREFIX}/include/X11/extensions/XKB.h:${PORTSDIR}/x11/kbproto \
- ${PREFIX}/include/X11/extensions/Print.h:${PORTSDIR}/x11/printproto \
- ${PREFIX}/include/X11/extensions/randr.h:${PORTSDIR}/x11/randrproto \
- ${PREFIX}/include/X11/extensions/recordstr.h:${PORTSDIR}/x11/recordproto \
- ${PREFIX}/include/X11/extensions/render.h:${PORTSDIR}/x11/renderproto \
- ${PREFIX}/include/X11/extensions/XResproto.h:${PORTSDIR}/x11/resourceproto \
- ${PREFIX}/include/X11/extensions/saver.h:${PORTSDIR}/x11/scrnsaverproto \
- ${PREFIX}/include/X11/extensions/xtrapproto.h:${PORTSDIR}/x11/trapproto \
- ${PREFIX}/include/X11/extensions/Xv.h:${PORTSDIR}/x11/videoproto \
- ${PREFIX}/include/X11/extensions/xcmiscstr.h:${PORTSDIR}/x11/xcmiscproto \
- ${PREFIX}/include/X11/extensions/MITMisc.h:${PORTSDIR}/x11/xextproto \
- ${PREFIX}/include/X11/extensions/xf86bigfont.h:${PORTSDIR}/x11-fonts/xf86bigfontproto \
- ${PREFIX}/include/X11/extensions/xf86dga.h:${PORTSDIR}/x11/xf86dgaproto \
- ${PREFIX}/include/GL/internal/dri_interface.h:${PORTSDIR}/x11/xf86driproto \
- ${PREFIX}/include/X11/extensions/xf86misc.h:${PORTSDIR}/x11/xf86miscproto \
- ${PREFIX}/include/X11/extensions/xf86rush.h:${PORTSDIR}/x11/xf86rushproto \
- ${PREFIX}/include/X11/extensions/xf86vmode.h:${PORTSDIR}/x11/xf86vidmodeproto \
- ${PREFIX}/include/X11/extensions/panoramiXproto.h:${PORTSDIR}/x11/xineramaproto \
- ${PREFIX}/include/X11/DECkeysym.h:${PORTSDIR}/x11/xproto \
- ${PREFIX}/include/X11/PM/PM.h:${PORTSDIR}/x11/xproxymanagementprotocol
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
-NO_BUILD= yes
-
-do-install:
- ${MKDIR} ${PREFIX}/libdata/xorg
- ${TOUCH} ${PREFIX}/libdata/xorg/protos
-
-.include <bsd.port.mk>
diff --git a/x11/xorg-protos/pkg-descr b/x11/xorg-protos/pkg-descr
deleted file mode 100644
index 4c499da5f573..000000000000
--- a/x11/xorg-protos/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This meta-package installs all X.Org protocol headers.
-
-WWW: http://www.x.org/
-
-- Florent Thoumie
-flz@FreeBSD.org
diff --git a/x11/xorg-protos/pkg-plist b/x11/xorg-protos/pkg-plist
deleted file mode 100644
index 9bd1d3f01034..000000000000
--- a/x11/xorg-protos/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-libdata/xorg/protos
-@dirrmtry libdata/xorg
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index e074397e7cc3..db63a0e488d1 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg
-PORTVERSION= 7.3
-PORTREVISION= 2
+PORTVERSION= 7.4
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
@@ -29,12 +28,11 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmap
RUN_DEPENDS+= ${LOCALBASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs
.endif
-# app, lib, font, driver, proto
+# app, lib, font, driver
RUN_DEPENDS+= ${LOCALBASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \
${LOCALBASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \
- ${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \
- ${LOCALBASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos
+ ${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers
.if defined(XORG_COMPLETE)
RUN_DEPENDS+= Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
diff --git a/x11/xphelloworld/Makefile b/x11/xphelloworld/Makefile
deleted file mode 100644
index f3ca2bfb588f..000000000000
--- a/x11/xphelloworld/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for: xphelloworld
-# Date Created: 17 Feb 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xphelloworld
-PORTVERSION= 1.0.1
-PORTREVISION= 1
-CATEGORIES= x11
-
-MAINTAINER= x11@FreeBSD.org
-COMMENT= Sends a test page to an Xprint printer
-
-XORG_CAT= app
-USE_XORG= x11 xaw8 xprintutil xp xprintapputil xt
-
-PLIST_FILES= bin/xphelloworld \
- bin/xpsimplehelloworld \
- bin/xpxthelloworld
-
-MAN1= xphelloworld.1 \
- xpsimplehelloworld.1 \
- xpxthelloworld.1
-
-post-build:
- ${REINPLACE_CMD} \
- -e "s/__appmansuffix__/1/g" \
- -e "s/__miscmansuffix__/7/g" \
- -e "s/__libmansuffix__/3Xp/g" \
- ${WRKSRC}/xphelloworld/xphelloworld.man \
- ${WRKSRC}/xpsimplehelloworld/xpsimplehelloworld.man \
- ${WRKSRC}/xpxmhelloworld/xpxmhelloworld.man \
- ${WRKSRC}/xpxthelloworld/xpxthelloworld.man
-
-.include <bsd.port.mk>
diff --git a/x11/xphelloworld/distinfo b/x11/xphelloworld/distinfo
deleted file mode 100644
index 86bca85f8672..000000000000
--- a/x11/xphelloworld/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/app/xphelloworld-1.0.1.tar.bz2) = 5c7fd1e35dd63089229e357c46e4f407
-SHA256 (xorg/app/xphelloworld-1.0.1.tar.bz2) = b1ca08e3ba4e5b135ee9d8675e717a6f88eafa53b031b2b821d2760897e35426
-SIZE (xorg/app/xphelloworld-1.0.1.tar.bz2) = 73111
diff --git a/x11/xphelloworld/pkg-descr b/x11/xphelloworld/pkg-descr
deleted file mode 100644
index 4a69cd4b1984..000000000000
--- a/x11/xphelloworld/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package contains xphelloworld, an utility that sends a test page to
-an Xprint printer.
-
-- Joel Dahl
-joel@FreeBSD.org
diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile
index 65912f744dba..ce521badd5c9 100644
--- a/x11/xprop/Makefile
+++ b/x11/xprop/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xprop
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xprop/distinfo b/x11/xprop/distinfo
index d134e1589102..4db994cbd5ee 100644
--- a/x11/xprop/distinfo
+++ b/x11/xprop/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xprop-1.0.3.tar.bz2) = e7b16eeb4bab974e3592d62f415aa6a5
-SHA256 (xorg/app/xprop-1.0.3.tar.bz2) = ddda23b888a3b4cf96a508af7ae07e3b2f1e9f2f2f0d5f6b2684cfa162337fa6
-SIZE (xorg/app/xprop-1.0.3.tar.bz2) = 106686
+MD5 (xorg/app/xprop-1.0.4.tar.bz2) = 48aa8fd78802f477dcbf9ef0dfd9f783
+SHA256 (xorg/app/xprop-1.0.4.tar.bz2) = daa47cba7d5a919ca1bd053d8a8b6af4904f77eded4bdb055cd915aa5f5cd772
+SIZE (xorg/app/xprop-1.0.4.tar.bz2) = 109102
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index a6ede19eda32..73ef13ca02a3 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xproto
-PORTVERSION= 7.0.10
-PORTREVISION= 1
+PORTVERSION= 7.0.14
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index 02bf99a09908..ab4b41ef66c4 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/proto/xproto-7.0.10.tar.bz2) = 2ed80e90992e7455eaac4c3e977ebd01
-SHA256 (xorg/proto/xproto-7.0.10.tar.bz2) = 6d659920262d41e48714184f94ff9cd2608515e0f3d2f074892fe0c048784df4
-SIZE (xorg/proto/xproto-7.0.10.tar.bz2) = 142954
+MD5 (xorg/proto/xproto-7.0.14.tar.bz2) = 5bbf47f4ad6eb3b3f3a119231abe8e5e
+SHA256 (xorg/proto/xproto-7.0.14.tar.bz2) = 24274af4e800fd32702c5258dabe16eccf96f50a4b4feb4a14780c85f3e786df
+SIZE (xorg/proto/xproto-7.0.14.tar.bz2) = 152503
diff --git a/x11/xpyb/Makefile b/x11/xpyb/Makefile
index 2994a17bb82b..7f8c5cfc6106 100644
--- a/x11/xpyb/Makefile
+++ b/x11/xpyb/Makefile
@@ -6,7 +6,8 @@
#
PORTNAME= xpyb
-PORTVERSION= 1.0
+PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/%SUBDIR%/
MASTER_SITE_SUBDIR= dist
@@ -16,7 +17,7 @@ MAINTAINER= wahjava@gmail.com
COMMENT= Python bindings to access X Window System protocol via libxcb
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:${PORTSDIR}/x11/xcb-proto
-LIB_DEPENDS= xcb.1:${PORTSDIR}/x11/libxcb
+LIB_DEPENDS= xcb.2:${PORTSDIR}/x11/libxcb
USE_BZIP2= yes
USE_PYTHON= 2.5+
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index c289a5bf1de6..d66f68ee095a 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrandr
-PORTVERSION= 1.2.2
+PORTVERSION= 1.2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrandr/distinfo b/x11/xrandr/distinfo
index bf733e1702dd..2c2fd69b7dea 100644
--- a/x11/xrandr/distinfo
+++ b/x11/xrandr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrandr-1.2.2.tar.bz2) = c6ec9dc42396e3b3a2da932f3feca6ec
-SHA256 (xorg/app/xrandr-1.2.2.tar.bz2) = 632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303
-SIZE (xorg/app/xrandr-1.2.2.tar.bz2) = 96462
+MD5 (xorg/app/xrandr-1.2.3.tar.bz2) = 41a9d0cc073fa6165a31fbf9e85f68a6
+SHA256 (xorg/app/xrandr-1.2.3.tar.bz2) = ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207
+SIZE (xorg/app/xrandr-1.2.3.tar.bz2) = 111121
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index e0d38abe4dbf..bbd25bc386fd 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xrdb
-PORTVERSION= 1.0.4
+PORTVERSION= 1.0.5
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xrdb/distinfo b/x11/xrdb/distinfo
index edc775def489..a0467d148b27 100644
--- a/x11/xrdb/distinfo
+++ b/x11/xrdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xrdb-1.0.4.tar.bz2) = 34eb2311a0c5279e7b4f492e826f63d1
-SHA256 (xorg/app/xrdb-1.0.4.tar.bz2) = 3f8cde77e8cbeb6d0a5f232b7a2ee51dd49b677916d52ab0986d320a5f9e8000
-SIZE (xorg/app/xrdb-1.0.4.tar.bz2) = 100792
+MD5 (xorg/app/xrdb-1.0.5.tar.bz2) = 9c30b8e1709d5367beb7706146640c07
+SHA256 (xorg/app/xrdb-1.0.5.tar.bz2) = c24d08939250f10238fd1b984707bfa0901ba9c55fa36b67d91eb12b500500aa
+SIZE (xorg/app/xrdb-1.0.5.tar.bz2) = 101484
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index e6116c9af12c..b64bb6925d3c 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xrx
PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xsel/Makefile b/x11/xsel/Makefile
index 40675f576b24..428c3eb45c61 100644
--- a/x11/xsel/Makefile
+++ b/x11/xsel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xsel
PORTVERSION= 0.04.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= CENKES
#http://www.niksula.cs.hut.fi/~vherva/xsel/xsel.{c,man}
diff --git a/x11/xset/Makefile b/x11/xset/Makefile
index e6f03e2782fd..b0f144e6ac24 100644
--- a/x11/xset/Makefile
+++ b/x11/xset/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xset
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xset/distinfo b/x11/xset/distinfo
index accb4a2412eb..0202548cfcb1 100644
--- a/x11/xset/distinfo
+++ b/x11/xset/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xset-1.0.3.tar.bz2) = 657bbb43ce5470c33665d187c1740566
-SHA256 (xorg/app/xset-1.0.3.tar.bz2) = 0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11
-SIZE (xorg/app/xset-1.0.3.tar.bz2) = 102742
+MD5 (xorg/app/xset-1.0.4.tar.bz2) = 2f41fd983ba4d89419204854936025e2
+SHA256 (xorg/app/xset-1.0.4.tar.bz2) = 6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad
+SIZE (xorg/app/xset-1.0.4.tar.bz2) = 103613
diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile
index ef4ac255f415..90b2328abd5c 100644
--- a/x11/xsm/Makefile
+++ b/x11/xsm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xsm
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile
index a90a8d1ccf82..1a9134c6f178 100644
--- a/x11/xstarroll/Makefile
+++ b/x11/xstarroll/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xstarroll
PORTVERSION= 1.1b
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index 24b937cc61c5..16b1d3f62c07 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xstroke
PORTVERSION= 0.5.12
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11
MASTER_SITES= ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \
http://www.handhelds.org/download/projects/xstroke/release-0.5/
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Fullscreen gesture recognition
USE_BISON= build
-USE_XORG= xft x11
+USE_XORG= xft x11 xext xi
USE_IMAKE= yes
CFLAGS+= ${PTHREAD_CFLAGS}
CPPFLAGS= -I${LOCALBASE}/include -I.
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index 9e46715b6b15..d69fe5773780 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xterm
PORTVERSION= 238
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
http://voodoo.bawue.com/download/
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index d351b70d8340..598e49e6ffe4 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xtrans
-PORTVERSION= 1.0.4
+PORTVERSION= 1.2.3
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
index bc5bfd6f7588..4a936d325253 100644
--- a/x11/xtrans/distinfo
+++ b/x11/xtrans/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/xtrans-1.0.4.tar.bz2) = 8b36cdf08df12be96615e3d550236626
-SHA256 (xorg/lib/xtrans-1.0.4.tar.bz2) = 765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c
-SIZE (xorg/lib/xtrans-1.0.4.tar.bz2) = 103761
+MD5 (xorg/lib/xtrans-1.2.3.tar.bz2) = f9cf791dfad59cf044e276aab3a71e1d
+SHA256 (xorg/lib/xtrans-1.2.3.tar.bz2) = a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0
+SIZE (xorg/lib/xtrans-1.2.3.tar.bz2) = 104280
diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist
index 55608d359f26..e0184a46f275 100644
--- a/x11/xtrans/pkg-plist
+++ b/x11/xtrans/pkg-plist
@@ -1,9 +1,7 @@
include/X11/Xtrans/Xtrans.c
include/X11/Xtrans/Xtrans.h
-include/X11/Xtrans/Xtransdnet.c
include/X11/Xtrans/Xtransint.h
include/X11/Xtrans/Xtranslcl.c
-include/X11/Xtrans/Xtransos2.c
include/X11/Xtrans/Xtranssock.c
include/X11/Xtrans/Xtranstli.c
include/X11/Xtrans/Xtransutil.c
diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile
index 6dee29c6e96f..776e444287eb 100644
--- a/x11/xvidtune/Makefile
+++ b/x11/xvidtune/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xvidtune
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile
index f210903a732b..b909d9460c29 100644
--- a/x11/xwd/Makefile
+++ b/x11/xwd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xwd
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwd/distinfo b/x11/xwd/distinfo
index 450cba2ddf56..0ba03d387318 100644
--- a/x11/xwd/distinfo
+++ b/x11/xwd/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xwd-1.0.1.tar.bz2) = 911addfb7fa402217ddac63e5c1d97c7
-SHA256 (xorg/app/xwd-1.0.1.tar.bz2) = c8bd9bcd64df439c2cd09eaa3e83a1297fbfed5c7d3dd8117342b3a25eeae131
-SIZE (xorg/app/xwd-1.0.1.tar.bz2) = 97079
+MD5 (xorg/app/xwd-1.0.2.tar.bz2) = 0a6ef08a2ac08ad5c4dd1522eb3788a3
+SHA256 (xorg/app/xwd-1.0.2.tar.bz2) = ab8974e010c1957a9a65a54656215463dea324adcaa9954147ecdcc6e9307f61
+SIZE (xorg/app/xwd-1.0.2.tar.bz2) = 111673
diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile
index 9c2760db07d0..0ac45befdcd4 100644
--- a/x11/xwininfo/Makefile
+++ b/x11/xwininfo/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xwininfo
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xwininfo/distinfo b/x11/xwininfo/distinfo
index e419fc49aec8..ddf5cfda9e93 100644
--- a/x11/xwininfo/distinfo
+++ b/x11/xwininfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/xwininfo-1.0.3.tar.bz2) = 721f84332c98c33152460bb22ba9ded6
-SHA256 (xorg/app/xwininfo-1.0.3.tar.bz2) = fbe3a1aafbc6fa113e58971ff2a82605a7e106af8b810eea4b7512de58a5478a
-SIZE (xorg/app/xwininfo-1.0.3.tar.bz2) = 98632
+MD5 (xorg/app/xwininfo-1.0.4.tar.bz2) = e2a9bf5ab7f2a0866700a3b49dd8c6bf
+SHA256 (xorg/app/xwininfo-1.0.4.tar.bz2) = df9a52788632cd3338e7bd7107ac732b11b8e2c367d4600578cd77e350428ee4
+SIZE (xorg/app/xwininfo-1.0.4.tar.bz2) = 101541