aboutsummaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorNiclas Zeising <zeising@FreeBSD.org>2013-12-16 11:11:09 +0000
committerNiclas Zeising <zeising@FreeBSD.org>2013-12-16 11:11:09 +0000
commit47be7a61c97731aa5fe34c56767ad5e10bb5c5d2 (patch)
tree2df88f8b6e2af92b78ac24eb382268b7c290efab /x11
parent7b9110d87c22c27df1baa93f8cb4cf30e205efc7 (diff)
downloadports-47be7a61c97731aa5fe34c56767ad5e10bb5c5d2.tar.gz
ports-47be7a61c97731aa5fe34c56767ad5e10bb5c5d2.zip
Switch FreeBSD CURRENT to use the new xorg stack (WITH_NEW_XORG=) [0]
If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG= to /etc/make.conf to get the old version. Update several xorg related ports, including: x11/libxcb 1.9.1 -> 1.9.3 graphics/libdrm 2.4.46 -> 2.4.50 x11/pixman 0.30.2 -> 0.32.4 x11/xkeyboard-config 2.9 -> 2.10.1 x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0 Fix dissapearing cursor in xf86-video-vmware [2] Stagify all x11@-owned ports Bump portrevisions for xf86-* ports due to xserver version change. Fix fallout from updates where needed. Thanks to: all testersi, bdrewery and the FreeBSD x11@ team exp-run by: bdrewery [1] PR: ports/184684 [1], ports/181385 [2] Submitted by: Douglas Carmichael <dcarmich@dcarmichael.net> [2] Approved by: portmgr (bdrewery), core (jhb) [0]
Notes
Notes: svn path=/head/; revision=336621
Diffstat (limited to 'x11')
-rw-r--r--x11/Makefile3
-rw-r--r--x11/beforelight/Makefile3
-rw-r--r--x11/beforelight/pkg-plist1
-rw-r--r--x11/bitmap/Makefile2
-rw-r--r--x11/bitmap/pkg-plist3
-rw-r--r--x11/dri3proto/Makefile12
-rw-r--r--x11/dri3proto/distinfo2
-rw-r--r--x11/dri3proto/pkg-descr3
-rw-r--r--x11/dri3proto/pkg-plist5
-rw-r--r--x11/editres/Makefile3
-rw-r--r--x11/editres/pkg-plist1
-rw-r--r--x11/fstobdf/Makefile5
-rw-r--r--x11/glproto/Makefile2
-rw-r--r--x11/glproto/distinfo4
-rw-r--r--x11/iceauth/Makefile5
-rw-r--r--x11/ico/Makefile5
-rw-r--r--x11/libXScrnSaver/Makefile14
-rw-r--r--x11/libXScrnSaver/pkg-plist12
-rw-r--r--x11/libXTrap/Makefile1
-rw-r--r--x11/libXau/Makefile7
-rw-r--r--x11/libXau/pkg-plist9
-rw-r--r--x11/libXcomposite/Makefile13
-rw-r--r--x11/libXcomposite/pkg-plist12
-rw-r--r--x11/libXcursor/Makefile34
-rw-r--r--x11/libXcursor/pkg-plist32
-rw-r--r--x11/libXdamage/Makefile1
-rw-r--r--x11/libXevie/Makefile8
-rw-r--r--x11/libXevie/pkg-plist6
-rw-r--r--x11/libXext/Makefile63
-rw-r--r--x11/libXext/pkg-plist61
-rw-r--r--x11/libXfixes/Makefile3
-rw-r--r--x11/libXfixes/pkg-plist1
-rw-r--r--x11/libXi/Makefile75
-rw-r--r--x11/libXi/pkg-plist73
-rw-r--r--x11/libXinerama/Makefile7
-rw-r--r--x11/libXinerama/pkg-plist5
-rw-r--r--x11/libXp/Makefile36
-rw-r--r--x11/libXp/pkg-plist34
-rw-r--r--x11/libXpm/Makefile3
-rw-r--r--x11/libXpm/pkg-plist2
-rw-r--r--x11/libXrandr/Makefile17
-rw-r--r--x11/libXrandr/pkg-plist15
-rw-r--r--x11/libXrender/Makefile1
-rw-r--r--x11/libXres/Makefile8
-rw-r--r--x11/libXres/pkg-plist6
-rw-r--r--x11/libXtst/Makefile13
-rw-r--r--x11/libXtst/pkg-plist11
-rw-r--r--x11/libXv/Makefile28
-rw-r--r--x11/libXv/pkg-plist26
-rw-r--r--x11/libXvMC/Makefile1
-rw-r--r--x11/libXxf86dga/Makefile23
-rw-r--r--x11/libXxf86dga/pkg-plist21
-rw-r--r--x11/libXxf86misc/Makefile11
-rw-r--r--x11/libXxf86misc/pkg-plist10
-rw-r--r--x11/libXxf86vm/Makefile24
-rw-r--r--x11/libXxf86vm/pkg-plist22
-rw-r--r--x11/libdmx/Makefile19
-rw-r--r--x11/libdmx/pkg-plist17
-rw-r--r--x11/libxcb/Makefile8
-rw-r--r--x11/libxcb/distinfo4
-rw-r--r--x11/libxcb/files/patch-Makefile.in11
-rw-r--r--x11/libxcb/files/patch-src__c_client.py34
-rw-r--r--x11/libxcb/pkg-plist239
-rw-r--r--x11/libxkbfile/Makefile1
-rw-r--r--x11/libxshmfence/Makefile18
-rw-r--r--x11/libxshmfence/distinfo2
-rw-r--r--x11/libxshmfence/files/patch-config.h.in22
-rw-r--r--x11/libxshmfence/files/patch-configure45
-rw-r--r--x11/libxshmfence/files/patch-src__xshmfence_alloc.c20
-rw-r--r--x11/libxshmfence/files/patch-src__xshmfence_futex.h46
-rw-r--r--x11/libxshmfence/files/patch-src__xshmfenceint.h10
-rw-r--r--x11/libxshmfence/pkg-descr5
-rw-r--r--x11/libxshmfence/pkg-plist6
-rw-r--r--x11/listres/Makefile5
-rw-r--r--x11/luit/Makefile5
-rw-r--r--x11/mkcomposecache/Makefile5
-rw-r--r--x11/pixman/Makefile3
-rw-r--r--x11/pixman/distinfo4
-rw-r--r--x11/presentproto/Makefile12
-rw-r--r--x11/presentproto/distinfo2
-rw-r--r--x11/presentproto/pkg-descr1
-rw-r--r--x11/presentproto/pkg-plist6
-rw-r--r--x11/printproto/Makefile3
-rw-r--r--x11/printproto/pkg-plist1
-rw-r--r--x11/rstart/Makefile3
-rw-r--r--x11/rstart/pkg-plist2
-rw-r--r--x11/scripts/Makefile3
-rw-r--r--x11/scripts/pkg-plist1
-rw-r--r--x11/sessreg/Makefile5
-rw-r--r--x11/setxkbmap/Makefile5
-rw-r--r--x11/smproxy/Makefile5
-rw-r--r--x11/trapproto/Makefile1
-rw-r--r--x11/viewres/Makefile4
-rw-r--r--x11/x11perf/Makefile5
-rw-r--r--x11/x11perf/pkg-plist3
-rw-r--r--x11/xcalc/Makefile9
-rw-r--r--x11/xcalc/pkg-plist1
-rw-r--r--x11/xcb-proto/Makefile3
-rw-r--r--x11/xcb-proto/distinfo4
-rw-r--r--x11/xcb-proto/files/patch-src_sync.xml50
-rw-r--r--x11/xcb-proto/pkg-plist2
-rw-r--r--x11/xclipboard/Makefile3
-rw-r--r--x11/xclipboard/pkg-plist2
-rw-r--r--x11/xcmsdb/Makefile5
-rw-r--r--x11/xconsole/Makefile3
-rw-r--r--x11/xconsole/pkg-plist1
-rw-r--r--x11/xdbedizzy/Makefile5
-rw-r--r--x11/xditview/Makefile3
-rw-r--r--x11/xditview/pkg-plist1
-rw-r--r--x11/xdm/Makefile8
-rw-r--r--x11/xdm/pkg-plist2
-rw-r--r--x11/xdpyinfo/Makefile5
-rw-r--r--x11/xdriinfo/Makefile4
-rw-r--r--x11/xedit/Makefile3
-rw-r--r--x11/xedit/pkg-plist1
-rw-r--r--x11/xev/Makefile5
-rw-r--r--x11/xeyes/Makefile5
-rw-r--r--x11/xf86dga/Makefile5
-rw-r--r--x11/xfindproxy/Makefile5
-rw-r--r--x11/xfwp/Makefile5
-rw-r--r--x11/xgamma/Makefile5
-rw-r--r--x11/xgc/Makefile3
-rw-r--r--x11/xgc/pkg-plist1
-rw-r--r--x11/xhost/Makefile5
-rw-r--r--x11/xinit/Makefile3
-rw-r--r--x11/xinit/pkg-plist2
-rw-r--r--x11/xinput/Makefile5
-rw-r--r--x11/xkbcomp/Makefile6
-rw-r--r--x11/xkbevd/Makefile5
-rw-r--r--x11/xkbprint/Makefile5
-rw-r--r--x11/xkbutils/Makefile3
-rw-r--r--x11/xkbutils/pkg-plist3
-rw-r--r--x11/xkeyboard-config/Makefile19
-rw-r--r--x11/xkeyboard-config/distinfo4
-rw-r--r--x11/xkeyboard-config/files/etersoft-patch-symbols-typo26
-rw-r--r--x11/xkeyboard-config/pkg-plist1
-rw-r--r--x11/xkill/Makefile5
-rw-r--r--x11/xload/Makefile3
-rw-r--r--x11/xload/pkg-plist1
-rw-r--r--x11/xlogo/Makefile3
-rw-r--r--x11/xlogo/pkg-plist1
-rw-r--r--x11/xlsatoms/Makefile5
-rw-r--r--x11/xlsclients/Makefile5
-rw-r--r--x11/xmag/Makefile3
-rw-r--r--x11/xmag/pkg-plist1
-rw-r--r--x11/xman/Makefile3
-rw-r--r--x11/xman/pkg-plist1
-rw-r--r--x11/xmessage/Makefile3
-rw-r--r--x11/xmessage/pkg-plist1
-rw-r--r--x11/xmh/Makefile3
-rw-r--r--x11/xmh/pkg-plist1
-rw-r--r--x11/xmodmap/Makefile5
-rw-r--r--x11/xmore/Makefile3
-rw-r--r--x11/xmore/pkg-plist1
-rw-r--r--x11/xorg-apps/Makefile5
-rw-r--r--x11/xorg-docs/Makefile3
-rw-r--r--x11/xorg-docs/pkg-plist6
-rw-r--r--x11/xorg-libraries/Makefile7
-rw-r--r--x11/xorg/Makefile2
-rw-r--r--x11/xplsprinters/Makefile5
-rw-r--r--x11/xprehashprinterlist/Makefile5
-rw-r--r--x11/xprop/Makefile5
-rw-r--r--x11/xproto/Makefile2
-rw-r--r--x11/xproto/distinfo4
-rw-r--r--x11/xrandr/Makefile6
-rw-r--r--x11/xrdb/Makefile5
-rw-r--r--x11/xrefresh/Makefile5
-rw-r--r--x11/xrx/Makefile3
-rw-r--r--x11/xrx/pkg-plist3
-rw-r--r--x11/xsetmode/Makefile5
-rw-r--r--x11/xsetpointer/Makefile5
-rw-r--r--x11/xtrans/Makefile2
-rw-r--r--x11/xtrans/distinfo4
-rw-r--r--x11/xtrans/files/patch-Xtransint.h11
-rw-r--r--x11/xtrans/pkg-plist1
-rw-r--r--x11/xvidtune/Makefile1
-rw-r--r--x11/xvmcinfo/Makefile5
177 files changed, 1056 insertions, 727 deletions
diff --git a/x11/Makefile b/x11/Makefile
index e2278448c1be..802f034b0e94 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -42,6 +42,7 @@
SUBDIR += dmxproto
SUBDIR += docker
SUBDIR += dri2proto
+ SUBDIR += dri3proto
SUBDIR += dxpc
SUBDIR += dynamag
SUBDIR += dzen2
@@ -185,6 +186,7 @@
SUBDIR += libxkbfile
SUBDIR += libxkbui
SUBDIR += libxklavier
+ SUBDIR += libxshmfence
SUBDIR += linux-f10-xorg-libs
SUBDIR += listres
SUBDIR += lsw
@@ -232,6 +234,7 @@
SUBDIR += pixman
SUBDIR += plasma-scriptengine-python
SUBDIR += plasma-scriptengine-ruby
+ SUBDIR += presentproto
SUBDIR += printproto
SUBDIR += printscreen
SUBDIR += props
diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile
index df254adbdbde..54666d6edbbf 100644
--- a/x11/beforelight/Makefile
+++ b/x11/beforelight/Makefile
@@ -10,7 +10,4 @@ COMMENT= A sample screen saver for X
XORG_CAT= app
USE_XORG= x11 xscrnsaver xt xaw7 xt
-MAN1= beforelight.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/beforelight/pkg-plist b/x11/beforelight/pkg-plist
index 2bec9d123982..20c3f3ba1a5c 100644
--- a/x11/beforelight/pkg-plist
+++ b/x11/beforelight/pkg-plist
@@ -1,4 +1,5 @@
bin/beforelight
+man/man1/beforelight.1.gz
share/X11/app-defaults/Beforelight
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile
index 8478e288210b..10e8085c4728 100644
--- a/x11/bitmap/Makefile
+++ b/x11/bitmap/Makefile
@@ -9,7 +9,5 @@ COMMENT= Bitmap editor and converter utilities for X
XORG_CAT= app
USE_XORG= x11 xaw xbitmaps xmu xproto
-MAN1= atobm.1 bitmap.1 bmtoa.1
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/bitmap/pkg-plist b/x11/bitmap/pkg-plist
index 795f3709da1b..6e5c545b79dc 100644
--- a/x11/bitmap/pkg-plist
+++ b/x11/bitmap/pkg-plist
@@ -14,6 +14,9 @@ include/X11/bitmaps/RotateRight
include/X11/bitmaps/Stipple
include/X11/bitmaps/Term
include/X11/bitmaps/Up
+man/man1/atobm.1.gz
+man/man1/bitmap.1.gz
+man/man1/bmtoa.1.gz
share/X11/app-defaults/Bitmap
share/X11/app-defaults/Bitmap-color
share/X11/app-defaults/Bitmap-nocase
diff --git a/x11/dri3proto/Makefile b/x11/dri3proto/Makefile
new file mode 100644
index 000000000000..c7079fd4a6d9
--- /dev/null
+++ b/x11/dri3proto/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PORTNAME= dri3proto
+PORTVERSION= 1.0
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= DRI3 prototype headers
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/dri3proto/distinfo b/x11/dri3proto/distinfo
new file mode 100644
index 000000000000..948341bd6c11
--- /dev/null
+++ b/x11/dri3proto/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/proto/dri3proto-1.0.tar.bz2) = 01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074
+SIZE (xorg/proto/dri3proto-1.0.tar.bz2) = 105366
diff --git a/x11/dri3proto/pkg-descr b/x11/dri3proto/pkg-descr
new file mode 100644
index 000000000000..0ce5f634a246
--- /dev/null
+++ b/x11/dri3proto/pkg-descr
@@ -0,0 +1,3 @@
+This package contains X.Org DRI3 prototype headers.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs
diff --git a/x11/dri3proto/pkg-plist b/x11/dri3proto/pkg-plist
new file mode 100644
index 000000000000..b0c009711c13
--- /dev/null
+++ b/x11/dri3proto/pkg-plist
@@ -0,0 +1,5 @@
+include/X11/extensions/dri3proto.h
+libdata/pkgconfig/dri3proto.pc
+share/doc/dri3proto/dri3proto.txt
+@dirrm share/doc/dri3proto
+@dirrmtry include/X11/extensions
diff --git a/x11/editres/Makefile b/x11/editres/Makefile
index aac54c662812..0a0a82c15a36 100644
--- a/x11/editres/Makefile
+++ b/x11/editres/Makefile
@@ -10,7 +10,4 @@ COMMENT= Dynamic resource editor for X Toolkit Applications
XORG_CAT= app
USE_XORG= x11 xt xmu xaw
-MAN1= editres.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/editres/pkg-plist b/x11/editres/pkg-plist
index c447ad5d18af..8f71a414ca82 100644
--- a/x11/editres/pkg-plist
+++ b/x11/editres/pkg-plist
@@ -1,4 +1,5 @@
bin/editres
+man/man1/editres.1.gz
share/X11/app-defaults/Editres
share/X11/app-defaults/Editres-color
@dirrmtry share/X11/app-defaults
diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile
index 78c0703577b4..23f980033424 100644
--- a/x11/fstobdf/Makefile
+++ b/x11/fstobdf/Makefile
@@ -10,9 +10,6 @@ COMMENT= Generate BDF font from X font server
XORG_CAT= app
USE_XORG= x11 libfs
-PLIST_FILES= bin/fstobdf
+PLIST_FILES= bin/fstobdf man/man1/fstobdf.1.gz
-MAN1= fstobdf.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile
index 5ae9713a79e3..4f5f25cb7546 100644
--- a/x11/glproto/Makefile
+++ b/x11/glproto/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= glproto
-PORTVERSION= 1.4.16
+PORTVERSION= 1.4.17
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo
index 53aa21d42d09..b88e829ec59c 100644
--- a/x11/glproto/distinfo
+++ b/x11/glproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d
-SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584
+SHA256 (xorg/proto/glproto-1.4.17.tar.bz2) = adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40
+SIZE (xorg/proto/glproto-1.4.17.tar.bz2) = 126969
diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile
index 8748e3459421..9d291633a646 100644
--- a/x11/iceauth/Makefile
+++ b/x11/iceauth/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xproto ice
-PLIST_FILES= bin/iceauth
+PLIST_FILES= bin/iceauth man/man1/iceauth.1.gz
-MAN1= iceauth.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/ico/Makefile b/x11/ico/Makefile
index b76bbf27752b..ad5d0f4b4951 100644
--- a/x11/ico/Makefile
+++ b/x11/ico/Makefile
@@ -10,9 +10,6 @@ COMMENT= Displays a wire-frame rotating plyhedron
XORG_CAT= app
USE_XORG= x11
-PLIST_FILES= bin/ico
+PLIST_FILES= bin/ico man/man1/ico.1.gz
-MAN1= ico.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile
index e83a27669102..5676b8cc922a 100644
--- a/x11/libXScrnSaver/Makefile
+++ b/x11/libXScrnSaver/Makefile
@@ -10,18 +10,4 @@ COMMENT= The XScrnSaver library
XORG_CAT= lib
USE_XORG= x11 xext xextproto scrnsaverproto:both
-MAN3= Xss.3 \
- XScreenSaverAllocInfo.3 \
- XScreenSaverGetRegistered.3 \
- XScreenSaverQueryExtension.3 \
- XScreenSaverQueryInfo.3 \
- XScreenSaverQueryVersion.3 \
- XScreenSaverRegister.3 \
- XScreenSaverSelectInput.3 \
- XScreenSaverSetAttributes.3 \
- XScreenSaverSuspend.3 \
- XScreenSaverUnregister.3 \
- XScreenSaverUnsetAttributes.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXScrnSaver/pkg-plist b/x11/libXScrnSaver/pkg-plist
index 505b19dd1d2b..01aed8749352 100644
--- a/x11/libXScrnSaver/pkg-plist
+++ b/x11/libXScrnSaver/pkg-plist
@@ -4,4 +4,16 @@ lib/libXss.so
lib/libXss.la
lib/libXss.a
libdata/pkgconfig/xscrnsaver.pc
+man/man3/Xss.3.gz
+man/man3/XScreenSaverAllocInfo.3.gz
+man/man3/XScreenSaverGetRegistered.3.gz
+man/man3/XScreenSaverQueryExtension.3.gz
+man/man3/XScreenSaverQueryInfo.3.gz
+man/man3/XScreenSaverQueryVersion.3.gz
+man/man3/XScreenSaverRegister.3.gz
+man/man3/XScreenSaverSelectInput.3.gz
+man/man3/XScreenSaverSetAttributes.3.gz
+man/man3/XScreenSaverSuspend.3.gz
+man/man3/XScreenSaverUnregister.3.gz
+man/man3/XScreenSaverUnsetAttributes.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
index 3f946745b959..5192edac2d8d 100644
--- a/x11/libXTrap/Makefile
+++ b/x11/libXTrap/Makefile
@@ -10,4 +10,5 @@ COMMENT= The XTrap library
XORG_CAT= lib
USE_XORG= trapproto:both x11 xext xextproto xt
USE_AUTOTOOLS= libtool
+
.include <bsd.port.mk>
diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile
index 4ee84d1b6248..457813397706 100644
--- a/x11/libXau/Makefile
+++ b/x11/libXau/Makefile
@@ -11,12 +11,7 @@ COMMENT= Authentication Protocol library for X11
XORG_CAT= lib
USE_XORG= xproto:both
-MAN3= Xau.3 XauDisposeAuth.3 XauFileName.3 XauGetAuthByAddr.3 \
- XauGetBestAuthByAddr.3 XauLockAuth.3 XauReadAuth.3 \
- XauUnlockAuth.3 XauWriteAuth.3
-
-NO_STAGE= yes
post-install:
- ${LN} -sf ${PREFIX}/lib/libXau.so.6 ${PREFIX}/lib/libXau.so.0
+ ${LN} -sf ${PREFIX}/lib/libXau.so.6 ${STAGEDIR}${PREFIX}/lib/libXau.so.0
.include <bsd.port.mk>
diff --git a/x11/libXau/pkg-plist b/x11/libXau/pkg-plist
index f46f0a86cf15..38e98d07ebc2 100644
--- a/x11/libXau/pkg-plist
+++ b/x11/libXau/pkg-plist
@@ -5,3 +5,12 @@ lib/libXau.so
lib/libXau.so.0
lib/libXau.so.6
libdata/pkgconfig/xau.pc
+man/man3/Xau.3.gz
+man/man3/XauDisposeAuth.3.gz
+man/man3/XauFileName.3.gz
+man/man3/XauGetAuthByAddr.3.gz
+man/man3/XauGetBestAuthByAddr.3.gz
+man/man3/XauLockAuth.3.gz
+man/man3/XauReadAuth.3.gz
+man/man3/XauUnlockAuth.3.gz
+man/man3/XauWriteAuth.3.gz
diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile
index 04477a50275a..932a189b2531 100644
--- a/x11/libXcomposite/Makefile
+++ b/x11/libXcomposite/Makefile
@@ -11,18 +11,5 @@ COMMENT= X Composite extension library
XORG_CAT= lib
USE_XORG= compositeproto:both x11 xfixes xext fixesproto xproto:both
-MAN3= Xcomposite.3 \
- XCompositeQueryExtension.3 \
- XCompositeQueryVersion.3 \
- XCompositeVersion.3 \
- XCompositeRedirectWindow.3 \
- XCompositeRedirectSubwindows.3 \
- XCompositeUnredirectWindow.3 \
- XCompositeUnredirectSubwindows.3 \
- XCompositeCreateRegionFromBorderClip.3 \
- XCompositeNameWindowPixmap.3 \
- XCompositeGetOverlayWindow.3 \
- XCompositeReleaseOverlayWindow.3
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXcomposite/pkg-plist b/x11/libXcomposite/pkg-plist
index af59654c5698..42f12278c58a 100644
--- a/x11/libXcomposite/pkg-plist
+++ b/x11/libXcomposite/pkg-plist
@@ -4,4 +4,16 @@ lib/libXcomposite.la
lib/libXcomposite.so
lib/libXcomposite.so.1
libdata/pkgconfig/xcomposite.pc
+man/man3/Xcomposite.3.gz
+man/man3/XCompositeQueryExtension.3.gz
+man/man3/XCompositeQueryVersion.3.gz
+man/man3/XCompositeVersion.3.gz
+man/man3/XCompositeRedirectWindow.3.gz
+man/man3/XCompositeRedirectSubwindows.3.gz
+man/man3/XCompositeUnredirectWindow.3.gz
+man/man3/XCompositeUnredirectSubwindows.3.gz
+man/man3/XCompositeCreateRegionFromBorderClip.3.gz
+man/man3/XCompositeNameWindowPixmap.3.gz
+man/man3/XCompositeGetOverlayWindow.3.gz
+man/man3/XCompositeReleaseOverlayWindow.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile
index f4ef75c7782c..7d4c122d42d0 100644
--- a/x11/libXcursor/Makefile
+++ b/x11/libXcursor/Makefile
@@ -16,38 +16,4 @@ USE_XORG= xrender x11 xfixes fixesproto xproto:both \
CONFIGURE_ARGS= --with-icondir=${PREFIX}/lib/X11/icons
-MAN3= Xcursor.3 \
- XcursorImageCreate.3 \
- XcursorImageDestroy.3 \
- XcursorImagesCreate.3 \
- XcursorImagesDestroy.3 \
- XcursorCursorsCreate.3 \
- XcursorCursorsDestroy.3 \
- XcursorXcFileLoadImage.3 \
- XcursorXcFileLoadImages.3 \
- XcursorXcFileLoadAllImages.3 \
- XcursorXcFileLoad.3 \
- XcursorXcFileSave.3 \
- XcursorFilenameLoadImage.3 \
- XcursorFilenameLoadImages.3 \
- XcursorFilenameLoadAllImages.3 \
- XcursorFilenameLoad.3 \
- XcursorFilenameSaveImages.3 \
- XcursorFilenameSave.3 \
- XcursorLibraryLoadImage.3 \
- XcursorLibraryLoadImages.3 \
- XcursorFilenameLoadCursor.3 \
- XcursorLibraryLoadCursor.3 \
- XcursorLibraryLoadCursors.3 \
- XcursorShapeLoadImage.3 \
- XcursorShapeLoadImages.3 \
- XcursorShapeLoadCursor.3 \
- XcursorShapeLoadCursors.3 \
- XcursorSupportsARGB.3 \
- XcursorSetDefaultSize.3 \
- XcursorGetDefaultSize.3 \
- XcursorSetTheme.3 \
- XcursorGetTheme.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXcursor/pkg-plist b/x11/libXcursor/pkg-plist
index 0a6c4807af0b..786b7aa4c618 100644
--- a/x11/libXcursor/pkg-plist
+++ b/x11/libXcursor/pkg-plist
@@ -4,4 +4,36 @@ lib/libXcursor.la
lib/libXcursor.so
lib/libXcursor.so.1
libdata/pkgconfig/xcursor.pc
+man/man3/Xcursor.3.gz
+man/man3/XcursorImageCreate.3.gz
+man/man3/XcursorImageDestroy.3.gz
+man/man3/XcursorImagesCreate.3.gz
+man/man3/XcursorImagesDestroy.3.gz
+man/man3/XcursorCursorsCreate.3.gz
+man/man3/XcursorCursorsDestroy.3.gz
+man/man3/XcursorXcFileLoadImage.3.gz
+man/man3/XcursorXcFileLoadImages.3.gz
+man/man3/XcursorXcFileLoadAllImages.3.gz
+man/man3/XcursorXcFileLoad.3.gz
+man/man3/XcursorXcFileSave.3.gz
+man/man3/XcursorFilenameLoadImage.3.gz
+man/man3/XcursorFilenameLoadImages.3.gz
+man/man3/XcursorFilenameLoadAllImages.3.gz
+man/man3/XcursorFilenameLoad.3.gz
+man/man3/XcursorFilenameSaveImages.3.gz
+man/man3/XcursorFilenameSave.3.gz
+man/man3/XcursorLibraryLoadImage.3.gz
+man/man3/XcursorLibraryLoadImages.3.gz
+man/man3/XcursorFilenameLoadCursor.3.gz
+man/man3/XcursorLibraryLoadCursor.3.gz
+man/man3/XcursorLibraryLoadCursors.3.gz
+man/man3/XcursorShapeLoadImage.3.gz
+man/man3/XcursorShapeLoadImages.3.gz
+man/man3/XcursorShapeLoadCursor.3.gz
+man/man3/XcursorShapeLoadCursors.3.gz
+man/man3/XcursorSupportsARGB.3.gz
+man/man3/XcursorSetDefaultSize.3.gz
+man/man3/XcursorGetDefaultSize.3.gz
+man/man3/XcursorSetTheme.3.gz
+man/man3/XcursorGetTheme.3.gz
@dirrm include/X11/Xcursor
diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile
index a3de750f061a..0f23abbea8de 100644
--- a/x11/libXdamage/Makefile
+++ b/x11/libXdamage/Makefile
@@ -10,4 +10,5 @@ COMMENT= X Damage extension library
XORG_CAT= lib
USE_XORG= x11 damageproto:both xfixes fixesproto xextproto xproto:both
+
.include <bsd.port.mk>
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile
index ee8b0fc7714b..36c324553b0e 100644
--- a/x11/libXevie/Makefile
+++ b/x11/libXevie/Makefile
@@ -12,12 +12,4 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= evieproto x11 xext xextproto xproto:both
-MAN3= Xevie.3 \
- XevieEnd.3 \
- XevieQueryVersion.3 \
- XevieSelectInput.3 \
- XevieSendEvent.3 \
- XevieStart.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXevie/pkg-plist b/x11/libXevie/pkg-plist
index 7bea8757d158..ca7920ee0c83 100644
--- a/x11/libXevie/pkg-plist
+++ b/x11/libXevie/pkg-plist
@@ -4,3 +4,9 @@ lib/libXevie.so
lib/libXevie.la
lib/libXevie.a
libdata/pkgconfig/xevie.pc
+man/man3/Xevie.3.gz
+man/man3/XevieEnd.3.gz
+man/man3/XevieQueryVersion.3.gz
+man/man3/XevieSelectInput.3.gz
+man/man3/XevieSendEvent.3.gz
+man/man3/XevieStart.3.gz
diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile
index 8a7b8cb31341..48ec2feff1e0 100644
--- a/x11/libXext/Makefile
+++ b/x11/libXext/Makefile
@@ -15,67 +15,4 @@ XORG_CAT= lib
USE_XORG= xproto x11 xextproto:both xau
CONFIGURE_ARGS+=--disable-specs --without-xmlto
-MAN3= DBE.3 \
- DPMSCapable.3 \
- DPMSDisable.3 \
- DPMSEnable.3 \
- DPMSForceLevel.3 \
- DPMSGetTimeouts.3 \
- DPMSGetVersion.3 \
- DPMSInfo.3 \
- DPMSQueryExtension.3 \
- DPMSSetTimeouts.3 \
- XShape.3 \
- XShapeCombineMask.3 \
- XShapeCombineRectangles.3 \
- XShapeCombineRegion.3 \
- XShapeCombineShape.3 \
- XShapeGetRectangles.3 \
- XShapeInputSelected.3 \
- XShapeOffsetShape.3 \
- XShapeQueryExtension.3 \
- XShapeQueryExtents.3 \
- XShapeQueryVersion.3 \
- XShapeSelectInput.3 \
- XcupGetReservedColormapEntries.3 \
- XcupQueryVersion.3 \
- XcupStoreColors.3 \
- XdbeAllocateBackBufferName.3 \
- XdbeBeginIdiom.3 \
- XdbeDeallocateBackBufferName.3 \
- XdbeEndIdiom.3 \
- XdbeFreeVisualInfo.3 \
- XdbeGetBackBufferAttributes.3 \
- XdbeGetVisualInfo.3 \
- XdbeQueryExtension.3 \
- XdbeSwapBuffers.3 \
- Xevi.3 \
- XeviGetVisualInfo.3 \
- XeviQueryExtension.3 \
- XeviQueryVersion.3 \
- Xmbuf.3 \
- XmbufChangeBufferAttributes.3 \
- XmbufChangeWindowAttributes.3 \
- XmbufCreateBuffers.3 \
- XmbufCreateStereoWindow.3 \
- XmbufDestroyBuffers.3 \
- XmbufDisplayBuffers.3 \
- XmbufGetBufferAttributes.3 \
- XmbufGetScreenInfo.3 \
- XmbufGetVersion.3 \
- XmbufGetWindowAttributes.3 \
- XmbufQueryExtension.3 \
- XShm.3 \
- XShmAttach.3 \
- XShmCreateImage.3 \
- XShmCreatePixmap.3 \
- XShmDetach.3 \
- XShmGetEventBase.3 \
- XShmGetImage.3 \
- XShmPixmapFormat.3 \
- XShmPutImage.3 \
- XShmQueryExtension.3 \
- XShmQueryVersion.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist
index 61c829c6eddb..023b27aa5d95 100644
--- a/x11/libXext/pkg-plist
+++ b/x11/libXext/pkg-plist
@@ -19,4 +19,65 @@ include/X11/extensions/shape.h
include/X11/extensions/sync.h
include/X11/extensions/xtestext1.h
libdata/pkgconfig/xext.pc
+man/man3/DBE.3.gz
+man/man3/DPMSCapable.3.gz
+man/man3/DPMSDisable.3.gz
+man/man3/DPMSEnable.3.gz
+man/man3/DPMSForceLevel.3.gz
+man/man3/DPMSGetTimeouts.3.gz
+man/man3/DPMSGetVersion.3.gz
+man/man3/DPMSInfo.3.gz
+man/man3/DPMSQueryExtension.3.gz
+man/man3/DPMSSetTimeouts.3.gz
+man/man3/XShape.3.gz
+man/man3/XShapeCombineMask.3.gz
+man/man3/XShapeCombineRectangles.3.gz
+man/man3/XShapeCombineRegion.3.gz
+man/man3/XShapeCombineShape.3.gz
+man/man3/XShapeGetRectangles.3.gz
+man/man3/XShapeInputSelected.3.gz
+man/man3/XShapeOffsetShape.3.gz
+man/man3/XShapeQueryExtension.3.gz
+man/man3/XShapeQueryExtents.3.gz
+man/man3/XShapeQueryVersion.3.gz
+man/man3/XShapeSelectInput.3.gz
+man/man3/XcupGetReservedColormapEntries.3.gz
+man/man3/XcupQueryVersion.3.gz
+man/man3/XcupStoreColors.3.gz
+man/man3/XdbeAllocateBackBufferName.3.gz
+man/man3/XdbeBeginIdiom.3.gz
+man/man3/XdbeDeallocateBackBufferName.3.gz
+man/man3/XdbeEndIdiom.3.gz
+man/man3/XdbeFreeVisualInfo.3.gz
+man/man3/XdbeGetBackBufferAttributes.3.gz
+man/man3/XdbeGetVisualInfo.3.gz
+man/man3/XdbeQueryExtension.3.gz
+man/man3/XdbeSwapBuffers.3.gz
+man/man3/Xevi.3.gz
+man/man3/XeviGetVisualInfo.3.gz
+man/man3/XeviQueryExtension.3.gz
+man/man3/XeviQueryVersion.3.gz
+man/man3/Xmbuf.3.gz
+man/man3/XmbufChangeBufferAttributes.3.gz
+man/man3/XmbufChangeWindowAttributes.3.gz
+man/man3/XmbufCreateBuffers.3.gz
+man/man3/XmbufCreateStereoWindow.3.gz
+man/man3/XmbufDestroyBuffers.3.gz
+man/man3/XmbufDisplayBuffers.3.gz
+man/man3/XmbufGetBufferAttributes.3.gz
+man/man3/XmbufGetScreenInfo.3.gz
+man/man3/XmbufGetVersion.3.gz
+man/man3/XmbufGetWindowAttributes.3.gz
+man/man3/XmbufQueryExtension.3.gz
+man/man3/XShm.3.gz
+man/man3/XShmAttach.3.gz
+man/man3/XShmCreateImage.3.gz
+man/man3/XShmCreatePixmap.3.gz
+man/man3/XShmDetach.3.gz
+man/man3/XShmGetEventBase.3.gz
+man/man3/XShmGetImage.3.gz
+man/man3/XShmPixmapFormat.3.gz
+man/man3/XShmPutImage.3.gz
+man/man3/XShmQueryExtension.3.gz
+man/man3/XShmQueryVersion.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile
index b0b5c9b5f12e..a2df62bb1310 100644
--- a/x11/libXfixes/Makefile
+++ b/x11/libXfixes/Makefile
@@ -13,7 +13,4 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 fixesproto:both xproto:both xextproto
-MAN3= Xfixes.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXfixes/pkg-plist b/x11/libXfixes/pkg-plist
index f8e8b57a030d..43f539b2f033 100644
--- a/x11/libXfixes/pkg-plist
+++ b/x11/libXfixes/pkg-plist
@@ -4,3 +4,4 @@ lib/libXfixes.la
lib/libXfixes.so
lib/libXfixes.so.3
libdata/pkgconfig/xfixes.pc
+man/man3/Xfixes.3.gz
diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile
index ecbfd003fc61..d83f968496a0 100644
--- a/x11/libXi/Makefile
+++ b/x11/libXi/Makefile
@@ -21,79 +21,4 @@ CONFIGURE_ARGS+=--disable-docs \
--without-asciidoc \
--without-xsltproc
-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\
- XGetDeviceButtonMapping.3\
- XGetDeviceControl.3\
- XGetDeviceDontPropagateList.3\
- XGetDeviceFocus.3\
- XGetDeviceKeyMapping.3 \
- XGetDeviceModifierMapping.3\
- XGetDeviceMotionEvents.3\
- XGetDeviceProperty.3\
- XGetExtensionVersion.3\
- XGetFeedbackControl.3\
- XGetSelectedExtensionEvents.3\
- XGrabDevice.3\
- XGrabDeviceButton.3\
- XGrabDeviceKey.3\
- XIBarrierReleasePointer.3\
- XIBarrierReleasePointers.3\
- XIChangeHierarchy.3\
- XIChangeProperty.3\
- XIDefineCursor.3\
- XIDeleteProperty.3\
- XIFreeDeviceInfo.3\
- XIGetClientPointer.3\
- XIGetFocus.3\
- XIGetProperty.3\
- XIGetSelectedEvents.3\
- XIGrabButton.3 \
- XIGrabDevice.3\
- XIGrabEnter.3\
- XIGrabFocusIn.3\
- XIGrabKeycode.3\
- XIGrabTouchBegin.3 \
- XIListProperties.3\
- XIQueryDevice.3\
- XIQueryPointer.3\
- XIQueryVersion.3\
- XISelectEvents.3\
- XISetClientPointer.3\
- XISetFocus.3\
- XIUndefineCursor.3\
- XIUngrabButton.3\
- XIUngrabDevice.3 \
- XIUngrabEnter.3 \
- XIUngrabFocusIn.3 \
- XIUngrabKeycode.3 \
- XIUngrabTouchBegin.3 \
- XIWarpPointer.3 \
- XListDeviceProperties.3 \
- XListInputDevices.3 \
- XOpenDevice.3 \
- XQueryDeviceState.3 \
- XSelectExtensionEvent.3\
- XSendExtensionEvent.3\
- XSetDeviceButtonMapping.3\
- XSetDeviceFocus.3\
- XSetDeviceMode.3\
- XSetDeviceModifierMapping.3 \
- XSetDeviceValuators.3 \
- XUngrabDevice.3 \
- XUngrabDeviceButton.3 \
- XUngrabDeviceKey.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXi/pkg-plist b/x11/libXi/pkg-plist
index 0f704e228faf..51bbd1da2e49 100644
--- a/x11/libXi/pkg-plist
+++ b/x11/libXi/pkg-plist
@@ -5,4 +5,77 @@ lib/libXi.la
lib/libXi.so
lib/libXi.so.6
libdata/pkgconfig/xi.pc
+man/man3/XAllowDeviceEvents.3.gz
+man/man3/XChangeDeviceControl.3.gz
+man/man3/XChangeDeviceDontPropagateList.3.gz
+man/man3/XChangeDeviceKeyMapping.3.gz
+man/man3/XChangeDeviceProperty.3.gz
+man/man3/XChangeFeedbackControl.3.gz
+man/man3/XChangeKeyboardDevice.3.gz
+man/man3/XChangePointerDevice.3.gz
+man/man3/XCloseDevice.3.gz
+man/man3/XDeleteDeviceProperty.3.gz
+man/man3/XDeviceBell.3.gz
+man/man3/XDeviceTimeCoord.3.gz
+man/man3/XFreeDeviceList.3.gz
+man/man3/XGetDeviceButtonMapping.3.gz
+man/man3/XGetDeviceControl.3.gz
+man/man3/XGetDeviceDontPropagateList.3.gz
+man/man3/XGetDeviceFocus.3.gz
+man/man3/XGetDeviceKeyMapping.3.gz
+man/man3/XGetDeviceModifierMapping.3.gz
+man/man3/XGetDeviceMotionEvents.3.gz
+man/man3/XGetDeviceProperty.3.gz
+man/man3/XGetExtensionVersion.3.gz
+man/man3/XGetFeedbackControl.3.gz
+man/man3/XGetSelectedExtensionEvents.3.gz
+man/man3/XGrabDevice.3.gz
+man/man3/XGrabDeviceButton.3.gz
+man/man3/XGrabDeviceKey.3.gz
+man/man3/XIBarrierReleasePointer.3.gz
+man/man3/XIBarrierReleasePointers.3.gz
+man/man3/XIChangeHierarchy.3.gz
+man/man3/XIChangeProperty.3.gz
+man/man3/XIDefineCursor.3.gz
+man/man3/XIDeleteProperty.3.gz
+man/man3/XIFreeDeviceInfo.3.gz
+man/man3/XIGetClientPointer.3.gz
+man/man3/XIGetFocus.3.gz
+man/man3/XIGetProperty.3.gz
+man/man3/XIGetSelectedEvents.3.gz
+man/man3/XIGrabButton.3.gz
+man/man3/XIGrabDevice.3.gz
+man/man3/XIGrabEnter.3.gz
+man/man3/XIGrabFocusIn.3.gz
+man/man3/XIGrabKeycode.3.gz
+man/man3/XIGrabTouchBegin.3.gz
+man/man3/XIListProperties.3.gz
+man/man3/XIQueryDevice.3.gz
+man/man3/XIQueryPointer.3.gz
+man/man3/XIQueryVersion.3.gz
+man/man3/XISelectEvents.3.gz
+man/man3/XISetClientPointer.3.gz
+man/man3/XISetFocus.3.gz
+man/man3/XIUndefineCursor.3.gz
+man/man3/XIUngrabButton.3.gz
+man/man3/XIUngrabDevice.3.gz
+man/man3/XIUngrabEnter.3.gz
+man/man3/XIUngrabFocusIn.3.gz
+man/man3/XIUngrabKeycode.3.gz
+man/man3/XIUngrabTouchBegin.3.gz
+man/man3/XIWarpPointer.3.gz
+man/man3/XListDeviceProperties.3.gz
+man/man3/XListInputDevices.3.gz
+man/man3/XOpenDevice.3.gz
+man/man3/XQueryDeviceState.3.gz
+man/man3/XSelectExtensionEvent.3.gz
+man/man3/XSendExtensionEvent.3.gz
+man/man3/XSetDeviceButtonMapping.3.gz
+man/man3/XSetDeviceFocus.3.gz
+man/man3/XSetDeviceMode.3.gz
+man/man3/XSetDeviceModifierMapping.3.gz
+man/man3/XSetDeviceValuators.3.gz
+man/man3/XUngrabDevice.3.gz
+man/man3/XUngrabDeviceButton.3.gz
+man/man3/XUngrabDeviceKey.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile
index 2acc3be4735e..e17c983a0fac 100644
--- a/x11/libXinerama/Makefile
+++ b/x11/libXinerama/Makefile
@@ -15,11 +15,4 @@ XORG_CAT= lib
USE_XORG= x11 xext xextproto xineramaproto:both
USE_AUTOTOOLS= libtool
-MAN3= Xinerama.3 \
- XineramaQueryExtension.3 \
- XineramaQueryVersion.3 \
- XineramaIsActive.3 \
- XineramaQueryScreens.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXinerama/pkg-plist b/x11/libXinerama/pkg-plist
index ff8b840ac2d8..5e7b01258d38 100644
--- a/x11/libXinerama/pkg-plist
+++ b/x11/libXinerama/pkg-plist
@@ -5,4 +5,9 @@ lib/libXinerama.la
lib/libXinerama.so
lib/libXinerama.so.1
libdata/pkgconfig/xinerama.pc
+man/man3/Xinerama.3.gz
+man/man3/XineramaQueryExtension.3.gz
+man/man3/XineramaQueryVersion.3.gz
+man/man3/XineramaIsActive.3.gz
+man/man3/XineramaQueryScreens.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 5ec2b371cd37..21e92caa49ab 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -15,40 +15,4 @@ XORG_CAT= lib
USE_XORG= x11 xext xextproto xau printproto:both
USE_AUTOTOOLS= libtool
-MAN3= XpCancelDoc.3 \
- XpCancelJob.3 \
- XpCancelPage.3 \
- XpCreateContext.3 \
- XpDestroyContext.3 \
- XpEndDoc.3 \
- XpEndJob.3 \
- XpEndPage.3 \
- XpFreePrinterList.3 \
- XpGetAttributes.3 \
- XpGetContext.3 \
- XpGetDocumentData.3 \
- XpGetImageResolution.3 \
- XpGetLocaleHinter.3 \
- XpGetOneAttribute.3 \
- XpGetPageDimensions.3 \
- XpGetPdmStartParams.3 \
- XpGetPrinterList.3 \
- XpGetScreenOfContext.3 \
- XpInputSelected.3 \
- XpPutDocumentData.3 \
- XpQueryExtension.3 \
- XpQueryScreens.3 \
- XpQueryVersion.3 \
- XpRehashPrinterList.3 \
- XpSelectInput.3 \
- XpSetAttributes.3 \
- XpSetContext.3 \
- XpSetImageResolution.3 \
- XpSetLocaleHinter.3 \
- XpStartDoc.3 \
- XpStartJob.3 \
- XpStartPage.3 \
- libXp.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXp/pkg-plist b/x11/libXp/pkg-plist
index ba86a7f4b48a..0c120ff02f46 100644
--- a/x11/libXp/pkg-plist
+++ b/x11/libXp/pkg-plist
@@ -3,3 +3,37 @@ lib/libXp.la
lib/libXp.so
lib/libXp.so.6
libdata/pkgconfig/xp.pc
+man/man3/XpCancelDoc.3.gz
+man/man3/XpCancelJob.3.gz
+man/man3/XpCancelPage.3.gz
+man/man3/XpCreateContext.3.gz
+man/man3/XpDestroyContext.3.gz
+man/man3/XpEndDoc.3.gz
+man/man3/XpEndJob.3.gz
+man/man3/XpEndPage.3.gz
+man/man3/XpFreePrinterList.3.gz
+man/man3/XpGetAttributes.3.gz
+man/man3/XpGetContext.3.gz
+man/man3/XpGetDocumentData.3.gz
+man/man3/XpGetImageResolution.3.gz
+man/man3/XpGetLocaleHinter.3.gz
+man/man3/XpGetOneAttribute.3.gz
+man/man3/XpGetPageDimensions.3.gz
+man/man3/XpGetPdmStartParams.3.gz
+man/man3/XpGetPrinterList.3.gz
+man/man3/XpGetScreenOfContext.3.gz
+man/man3/XpInputSelected.3.gz
+man/man3/XpPutDocumentData.3.gz
+man/man3/XpQueryExtension.3.gz
+man/man3/XpQueryScreens.3.gz
+man/man3/XpQueryVersion.3.gz
+man/man3/XpRehashPrinterList.3.gz
+man/man3/XpSelectInput.3.gz
+man/man3/XpSetAttributes.3.gz
+man/man3/XpSetContext.3.gz
+man/man3/XpSetImageResolution.3.gz
+man/man3/XpSetLocaleHinter.3.gz
+man/man3/XpStartDoc.3.gz
+man/man3/XpStartJob.3.gz
+man/man3/XpStartPage.3.gz
+man/man3/libXp.3.gz
diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile
index 28e9d78b5da5..13ca108b9861 100644
--- a/x11/libXpm/Makefile
+++ b/x11/libXpm/Makefile
@@ -13,7 +13,4 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= xproto x11 xext xextproto xt
-MAN1= cxpm.1 sxpm.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXpm/pkg-plist b/x11/libXpm/pkg-plist
index 57c946914dce..aa4d1743fa36 100644
--- a/x11/libXpm/pkg-plist
+++ b/x11/libXpm/pkg-plist
@@ -6,3 +6,5 @@ lib/libXpm.la
lib/libXpm.so
lib/libXpm.so.4
libdata/pkgconfig/xpm.pc
+man/man1/cxpm.1.gz
+man/man1/sxpm.1.gz
diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile
index 715bf5f5b740..4dee0f8ec9f0 100644
--- a/x11/libXrandr/Makefile
+++ b/x11/libXrandr/Makefile
@@ -13,21 +13,4 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both
-MAN3= Xrandr.3 \
- XRRConfigCurrentConfiguration.3 \
- XRRConfigCurrentRate.3 \
- XRRConfigRates.3 \
- XRRConfigRotations.3 \
- XRRConfigSizes.3 \
- XRRConfigTimes.3 \
- XRRFreeScreenConfigInfo.3 \
- XRRGetScreenInfo.3 \
- XRRQueryExtension.3 \
- XRRQueryVersion.3 \
- XRRRootToScreen.3 \
- XRRSelectInput.3 \
- XRRSetScreenConfig.3 \
- XRRSetScreenConfigAndRate.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXrandr/pkg-plist b/x11/libXrandr/pkg-plist
index 1b0f1f3393e5..cd6f3dfa8fa7 100644
--- a/x11/libXrandr/pkg-plist
+++ b/x11/libXrandr/pkg-plist
@@ -4,3 +4,18 @@ lib/libXrandr.la
lib/libXrandr.so
lib/libXrandr.so.2
libdata/pkgconfig/xrandr.pc
+man/man3/Xrandr.3.gz
+man/man3/XRRConfigCurrentConfiguration.3.gz
+man/man3/XRRConfigCurrentRate.3.gz
+man/man3/XRRConfigRates.3.gz
+man/man3/XRRConfigRotations.3.gz
+man/man3/XRRConfigSizes.3.gz
+man/man3/XRRConfigTimes.3.gz
+man/man3/XRRFreeScreenConfigInfo.3.gz
+man/man3/XRRGetScreenInfo.3.gz
+man/man3/XRRQueryExtension.3.gz
+man/man3/XRRQueryVersion.3.gz
+man/man3/XRRRootToScreen.3.gz
+man/man3/XRRSelectInput.3.gz
+man/man3/XRRSetScreenConfig.3.gz
+man/man3/XRRSetScreenConfigAndRate.3.gz
diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile
index 2440704431e0..3866a0f87db5 100644
--- a/x11/libXrender/Makefile
+++ b/x11/libXrender/Makefile
@@ -12,4 +12,5 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 renderproto:both xproto:both
+
.include <bsd.port.mk>
diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile
index 38420c52fb8c..96f8f088b124 100644
--- a/x11/libXres/Makefile
+++ b/x11/libXres/Makefile
@@ -13,12 +13,4 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 xext xextproto resourceproto xproto:both
-MAN3= XRes.3 \
- XResQueryClients.3 \
- XResQueryClientPixmapBytes.3 \
- XResQueryClientResources.3 \
- XResQueryExtension.3 \
- XResQueryVersion.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXres/pkg-plist b/x11/libXres/pkg-plist
index ea8918ab97c5..1a5b78065af3 100644
--- a/x11/libXres/pkg-plist
+++ b/x11/libXres/pkg-plist
@@ -4,3 +4,9 @@ lib/libXRes.la
lib/libXRes.so
lib/libXRes.so.1
libdata/pkgconfig/xres.pc
+man/man3/XRes.3.gz
+man/man3/XResQueryClients.3.gz
+man/man3/XResQueryClientPixmapBytes.3.gz
+man/man3/XResQueryClientResources.3.gz
+man/man3/XResQueryExtension.3.gz
+man/man3/XResQueryVersion.3.gz
diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile
index 7ed7bf95f64c..c3c1cadf5de6 100644
--- a/x11/libXtst/Makefile
+++ b/x11/libXtst/Makefile
@@ -17,19 +17,6 @@ USE_AUTOTOOLS= libtool
CONFIGURE_ARGS+=--disable-specs --without-xmlto
-MAN3= XTestCompareCurrentCursorWithWindow.3 \
- XTestCompareCursorWithWindow.3 \
- XTestDiscard.3 \
- XTestFakeButtonEvent.3 \
- XTestFakeKeyEvent.3 \
- XTestFakeMotionEvent.3 \
- XTestFakeRelativeMotionEvent.3 \
- XTestGrabControl.3 \
- XTestQueryExtension.3 \
- XTestSetGContextOfGC.3 \
- XTestSetVisualIDOfVisual.3
-
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ \
s/specs//' ${WRKSRC}/Makefile.in
diff --git a/x11/libXtst/pkg-plist b/x11/libXtst/pkg-plist
index 26d878824249..e6ad93863a1f 100644
--- a/x11/libXtst/pkg-plist
+++ b/x11/libXtst/pkg-plist
@@ -5,4 +5,15 @@ lib/libXtst.la
lib/libXtst.so
lib/libXtst.so.6
libdata/pkgconfig/xtst.pc
+man/man3/XTestCompareCurrentCursorWithWindow.3.gz
+man/man3/XTestCompareCursorWithWindow.3.gz
+man/man3/XTestDiscard.3.gz
+man/man3/XTestFakeButtonEvent.3.gz
+man/man3/XTestFakeKeyEvent.3.gz
+man/man3/XTestFakeMotionEvent.3.gz
+man/man3/XTestFakeRelativeMotionEvent.3.gz
+man/man3/XTestGrabControl.3.gz
+man/man3/XTestQueryExtension.3.gz
+man/man3/XTestSetGContextOfGC.3.gz
+man/man3/XTestSetVisualIDOfVisual.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile
index f1784fdd126a..2c21649f3dbe 100644
--- a/x11/libXv/Makefile
+++ b/x11/libXv/Makefile
@@ -14,32 +14,4 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 xext xextproto videoproto:both xproto:both
-MAN3= Xv.3 \
- XvFreeAdaptorInfo.3 \
- XvFreeEncodingInfo.3 \
- XvCreateImage.3 \
- XvGetPortAttribute.3 \
- XvGetStill.3 \
- XvGetVideo.3 \
- XvGrabPort.3 \
- XvListImageFormats.3 \
- XvPutImage.3 \
- XvPortNotify.3 \
- XvPutStill.3 \
- XvPutVideo.3 \
- XvQueryAdaptors.3 \
- XvQueryBestSize.3 \
- XvQueryEncodings.3 \
- XvQueryExtension.3 \
- XvQueryPortAttributes.3 \
- XvSelectPortNotify.3 \
- XvSelectVideoNotify.3 \
- XvSetPortAttribute.3 \
- XvShmCreateImage.3 \
- XvShmPutImage.3 \
- XvStopVideo.3 \
- XvUngrabPort.3 \
- XvVideoNotify.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXv/pkg-plist b/x11/libXv/pkg-plist
index 6fb5643302a0..9465ee2fe1e0 100644
--- a/x11/libXv/pkg-plist
+++ b/x11/libXv/pkg-plist
@@ -4,4 +4,30 @@ lib/libXv.la
lib/libXv.so
lib/libXv.so.1
libdata/pkgconfig/xv.pc
+man/man3/Xv.3.gz
+man/man3/XvFreeAdaptorInfo.3.gz
+man/man3/XvFreeEncodingInfo.3.gz
+man/man3/XvCreateImage.3.gz
+man/man3/XvGetPortAttribute.3.gz
+man/man3/XvGetStill.3.gz
+man/man3/XvGetVideo.3.gz
+man/man3/XvGrabPort.3.gz
+man/man3/XvListImageFormats.3.gz
+man/man3/XvPutImage.3.gz
+man/man3/XvPortNotify.3.gz
+man/man3/XvPutStill.3.gz
+man/man3/XvPutVideo.3.gz
+man/man3/XvQueryAdaptors.3.gz
+man/man3/XvQueryBestSize.3.gz
+man/man3/XvQueryEncodings.3.gz
+man/man3/XvQueryExtension.3.gz
+man/man3/XvQueryPortAttributes.3.gz
+man/man3/XvSelectPortNotify.3.gz
+man/man3/XvSelectVideoNotify.3.gz
+man/man3/XvSetPortAttribute.3.gz
+man/man3/XvShmCreateImage.3.gz
+man/man3/XvShmPutImage.3.gz
+man/man3/XvStopVideo.3.gz
+man/man3/XvUngrabPort.3.gz
+man/man3/XvVideoNotify.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile
index f4552ff02c02..d370e052f94e 100644
--- a/x11/libXvMC/Makefile
+++ b/x11/libXvMC/Makefile
@@ -10,4 +10,5 @@ COMMENT= X Video Extension Motion Compensation library
XORG_CAT= lib
USE_XORG= x11 xext xv xextproto videoproto:both xproto:both
+
.include <bsd.port.mk>
diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile
index 4005033f090b..f46f39662d34 100644
--- a/x11/libXxf86dga/Makefile
+++ b/x11/libXxf86dga/Makefile
@@ -13,27 +13,4 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= xproto x11 xextproto xext xf86dgaproto:both
-MAN3= XDGA.3 \
- XDGAOpenFramebuffer.3 \
- XDGAChangePixmapMode.3 \
- XDGAQueryExtension.3 \
- XDGACloseFramebuffer.3 \
- XDGAQueryModes.3 \
- XDGACopyArea.3 \
- XDGAQueryVersion.3 \
- XDGACopyTransparentArea.3 \
- XDGASelectInput.3 \
- XDGACreateColormap.3 \
- XDGASetClientVersion.3 \
- XDGAFillRectangle.3 \
- XDGASetMode.3 \
- XDGAGetViewportStatus.3 \
- XDGASetViewport.3 \
- XDGAInstallColormap.3 \
- XDGASync.3 \
- XDGAKeyEventToXKeyEvent.3 \
- XF86DGA.3 \
- XFree86-DGA.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXxf86dga/pkg-plist b/x11/libXxf86dga/pkg-plist
index 77c173b86ef7..23fb304bb49a 100644
--- a/x11/libXxf86dga/pkg-plist
+++ b/x11/libXxf86dga/pkg-plist
@@ -5,4 +5,25 @@ lib/libXxf86dga.la
lib/libXxf86dga.so
lib/libXxf86dga.so.1
libdata/pkgconfig/xxf86dga.pc
+man/man3/XDGA.3.gz
+man/man3/XDGAOpenFramebuffer.3.gz
+man/man3/XDGAChangePixmapMode.3.gz
+man/man3/XDGAQueryExtension.3.gz
+man/man3/XDGACloseFramebuffer.3.gz
+man/man3/XDGAQueryModes.3.gz
+man/man3/XDGACopyArea.3.gz
+man/man3/XDGAQueryVersion.3.gz
+man/man3/XDGACopyTransparentArea.3.gz
+man/man3/XDGASelectInput.3.gz
+man/man3/XDGACreateColormap.3.gz
+man/man3/XDGASetClientVersion.3.gz
+man/man3/XDGAFillRectangle.3.gz
+man/man3/XDGASetMode.3.gz
+man/man3/XDGAGetViewportStatus.3.gz
+man/man3/XDGASetViewport.3.gz
+man/man3/XDGAInstallColormap.3.gz
+man/man3/XDGASync.3.gz
+man/man3/XDGAKeyEventToXKeyEvent.3.gz
+man/man3/XF86DGA.3.gz
+man/man3/XFree86-DGA.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile
index ceccb818cab1..43f39b9c7cc4 100644
--- a/x11/libXxf86misc/Makefile
+++ b/x11/libXxf86misc/Makefile
@@ -13,15 +13,4 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= xproto x11 xextproto xext xf86miscproto:both
-MAN3= XF86Misc.3 \
- XF86MiscGetKbdSettings.3 \
- XF86MiscGetMouseSettings.3 \
- XF86MiscGetSaver.3 \
- XF86MiscQueryExtension.3 \
- XF86MiscQueryVersion.3 \
- XF86MiscSetKbdSettings.3 \
- XF86MiscSetMouseSettings.3 \
- XF86MiscSetSaver.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXxf86misc/pkg-plist b/x11/libXxf86misc/pkg-plist
index 55b4a93e17f4..3b8091f49ec7 100644
--- a/x11/libXxf86misc/pkg-plist
+++ b/x11/libXxf86misc/pkg-plist
@@ -3,4 +3,12 @@ lib/libXxf86misc.la
lib/libXxf86misc.so
lib/libXxf86misc.so.1
libdata/pkgconfig/xxf86misc.pc
-@dirrmtry include/X11/extensions
+man/man3/XF86Misc.3.gz
+man/man3/XF86MiscGetKbdSettings.3.gz
+man/man3/XF86MiscGetMouseSettings.3.gz
+man/man3/XF86MiscGetSaver.3.gz
+man/man3/XF86MiscQueryExtension.3.gz
+man/man3/XF86MiscQueryVersion.3.gz
+man/man3/XF86MiscSetKbdSettings.3.gz
+man/man3/XF86MiscSetMouseSettings.3.gz
+man/man3/XF86MiscSetSaver.3.gz
diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile
index aec047e973c0..4593ad541d8f 100644
--- a/x11/libXxf86vm/Makefile
+++ b/x11/libXxf86vm/Makefile
@@ -13,28 +13,4 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= xproto x11 xextproto xext xf86vidmodeproto:both
-MAN3= XF86VM.3 \
- XF86VidModeLockModeSwitch.3 \
- XF86VidModeDeleteModeLine.3 \
- XF86VidModeModModeLine.3 \
- XF86VidModeGetAllModeLines.3 \
- XF86VidModeQueryExtension.3 \
- XF86VidModeGetDotClocks.3 \
- XF86VidModeQueryVersion.3 \
- XF86VidModeGetGamma.3 \
- XF86VidModeSetClientVersion.3 \
- XF86VidModeGetGammaRamp.3 \
- XF86VidModeSetGamma.3 \
- XF86VidModeGetGammaRampSize.3 \
- XF86VidModeSetGammaRamp.3 \
- XF86VidModeGetModeLine.3 \
- XF86VidModeSetViewPort.3 \
- XF86VidModeGetMonitor.3 \
- XF86VidModeSwitchMode.3 \
- XF86VidModeGetPermissions.3 \
- XF86VidModeSwitchToMode.3 \
- XF86VidModeGetViewPort.3 \
- XF86VidModeValidateModeLine.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libXxf86vm/pkg-plist b/x11/libXxf86vm/pkg-plist
index 17f8d37f31b7..050fb6c9066d 100644
--- a/x11/libXxf86vm/pkg-plist
+++ b/x11/libXxf86vm/pkg-plist
@@ -4,4 +4,26 @@ lib/libXxf86vm.la
lib/libXxf86vm.so
lib/libXxf86vm.so.1
libdata/pkgconfig/xxf86vm.pc
+man/man3/XF86VM.3.gz
+man/man3/XF86VidModeLockModeSwitch.3.gz
+man/man3/XF86VidModeDeleteModeLine.3.gz
+man/man3/XF86VidModeModModeLine.3.gz
+man/man3/XF86VidModeGetAllModeLines.3.gz
+man/man3/XF86VidModeQueryExtension.3.gz
+man/man3/XF86VidModeGetDotClocks.3.gz
+man/man3/XF86VidModeQueryVersion.3.gz
+man/man3/XF86VidModeGetGamma.3.gz
+man/man3/XF86VidModeSetClientVersion.3.gz
+man/man3/XF86VidModeGetGammaRamp.3.gz
+man/man3/XF86VidModeSetGamma.3.gz
+man/man3/XF86VidModeGetGammaRampSize.3.gz
+man/man3/XF86VidModeSetGammaRamp.3.gz
+man/man3/XF86VidModeGetModeLine.3.gz
+man/man3/XF86VidModeSetViewPort.3.gz
+man/man3/XF86VidModeGetMonitor.3.gz
+man/man3/XF86VidModeSwitchMode.3.gz
+man/man3/XF86VidModeGetPermissions.3.gz
+man/man3/XF86VidModeSwitchToMode.3.gz
+man/man3/XF86VidModeGetViewPort.3.gz
+man/man3/XF86VidModeValidateModeLine.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile
index 5ffb20b91cca..2c209dd92580 100644
--- a/x11/libdmx/Makefile
+++ b/x11/libdmx/Makefile
@@ -11,23 +11,4 @@ COMMENT= DMX extension library
XORG_CAT= lib
USE_XORG= x11 xext xextproto dmxproto:both
-MAN3= DMX.3 \
- DMXAddInput.3 \
- DMXAddScreen.3 \
- DMXChangeDesktopAttributes.3 \
- DMXChangeScreensAttributes.3 \
- DMXForceWindowCreation.3 \
- DMXGetDesktopAttributes.3 \
- DMXGetInputAttributes.3 \
- DMXGetInputCount.3 \
- DMXGetScreenAttributes.3 \
- DMXGetScreenCount.3 \
- DMXGetWindowAttributes.3 \
- DMXQueryExtension.3 \
- DMXQueryVersion.3 \
- DMXRemoveInput.3 \
- DMXRemoveScreen.3 \
- DMXSync.3
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/libdmx/pkg-plist b/x11/libdmx/pkg-plist
index 933f89e9c78f..f6cbd3319195 100644
--- a/x11/libdmx/pkg-plist
+++ b/x11/libdmx/pkg-plist
@@ -4,4 +4,21 @@ lib/libdmx.la
lib/libdmx.so
lib/libdmx.so.1
libdata/pkgconfig/dmx.pc
+man/man3/DMX.3.gz
+man/man3/DMXAddInput.3.gz
+man/man3/DMXAddScreen.3.gz
+man/man3/DMXChangeDesktopAttributes.3.gz
+man/man3/DMXChangeScreensAttributes.3.gz
+man/man3/DMXForceWindowCreation.3.gz
+man/man3/DMXGetDesktopAttributes.3.gz
+man/man3/DMXGetInputAttributes.3.gz
+man/man3/DMXGetInputCount.3.gz
+man/man3/DMXGetScreenAttributes.3.gz
+man/man3/DMXGetScreenCount.3.gz
+man/man3/DMXGetWindowAttributes.3.gz
+man/man3/DMXQueryExtension.3.gz
+man/man3/DMXQueryVersion.3.gz
+man/man3/DMXRemoveInput.3.gz
+man/man3/DMXRemoveScreen.3.gz
+man/man3/DMXSync.3.gz
@dirrmtry include/X11/extensions
diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile
index d9e45402b7c6..27e5fd927734 100644
--- a/x11/libxcb/Makefile
+++ b/x11/libxcb/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= libxcb
-PORTVERSION= 1.9.1
-PORTREVISION= 1
+PORTVERSION= 1.9.3
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -14,7 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \
- xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \
+ xcb-proto>=1.9:${PORTSDIR}/x11/xcb-proto \
${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
@@ -46,9 +45,6 @@ XPROTO_LIBS= -L${LOCALBASE}/lib
.include <bsd.port.options.mk>
post-install:
-.if ${PORT_OPTIONS:MDOCS}
- ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET}
-.endif
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxcb*.so.*
.include <bsd.port.mk>
diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo
index 1143ac88627b..a5aff8e252ca 100644
--- a/x11/libxcb/distinfo
+++ b/x11/libxcb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libxcb-1.9.1.tar.bz2) = d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f
-SIZE (libxcb-1.9.1.tar.bz2) = 373312
+SHA256 (libxcb-1.9.3.tar.bz2) = aad09d223fcb5bd345ce4d1737f178a557b6f2e201128e1ee3c83af46028018b
+SIZE (libxcb-1.9.3.tar.bz2) = 400283
diff --git a/x11/libxcb/files/patch-Makefile.in b/x11/libxcb/files/patch-Makefile.in
deleted file mode 100644
index 86d274f9b8c4..000000000000
--- a/x11/libxcb/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Sun Jun 17 17:33:00 2007
-+++ Makefile.in Sun Jun 17 17:34:18 2007
-@@ -220,7 +220,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- xcbincludedir = @xcbincludedir@
--SUBDIRS = src tests doc
-+SUBDIRS = src tests
- pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = \
- xcb.pc \
diff --git a/x11/libxcb/files/patch-src__c_client.py b/x11/libxcb/files/patch-src__c_client.py
new file mode 100644
index 000000000000..bfd9524ac691
--- /dev/null
+++ b/x11/libxcb/files/patch-src__c_client.py
@@ -0,0 +1,34 @@
+--- src/c_client.py.orig 2013-11-11 14:30:55.471622828 +0100
++++ src/c_client.py 2013-11-11 14:32:05.334624142 +0100
+@@ -1133,11 +1133,11 @@
+ _c(' %s *xcb_out = *_buffer;', self.c_type)
+ _c(' unsigned int xcb_out_pad = -sizeof(%s) & 3;', self.c_type)
+ _c(' unsigned int xcb_buffer_len = sizeof(%s) + xcb_out_pad;', self.c_type)
+- _c(' unsigned int xcb_align_to;')
++ _c(' unsigned int xcb_align_to = 0;')
+ else:
+ _c(' char *xcb_out = *_buffer;')
+ _c(' unsigned int xcb_buffer_len = 0;')
+- _c(' unsigned int xcb_align_to;')
++ _c(' unsigned int xcb_align_to = 0;')
+ prefix = [('_aux', '->', self)]
+ aux_ptr = 'xcb_out'
+
+@@ -1160,7 +1160,7 @@
+ _c(' unsigned int xcb_buffer_len = 0;')
+ _c(' unsigned int xcb_block_len = 0;')
+ _c(' unsigned int xcb_pad = 0;')
+- _c(' unsigned int xcb_align_to;')
++ _c(' unsigned int xcb_align_to = 0;')
+
+ elif 'sizeof' == context:
+ param_names = [p[2] for p in params]
+@@ -1205,7 +1205,7 @@
+ _c(' unsigned int xcb_buffer_len = 0;')
+ _c(' unsigned int xcb_block_len = 0;')
+ _c(' unsigned int xcb_pad = 0;')
+- _c(' unsigned int xcb_align_to;')
++ _c(' unsigned int xcb_align_to = 0;')
+
+ _c('')
+ for t in temp_vars:
diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist
index 1551ad9a854b..c40714c64646 100644
--- a/x11/libxcb/pkg-plist
+++ b/x11/libxcb/pkg-plist
@@ -3,7 +3,9 @@ include/xcb/composite.h
include/xcb/damage.h
include/xcb/dpms.h
include/xcb/dri2.h
+include/xcb/dri3.h
include/xcb/glx.h
+include/xcb/present.h
include/xcb/randr.h
include/xcb/record.h
include/xcb/render.h
@@ -43,10 +45,18 @@ lib/libxcb-dri2.a
lib/libxcb-dri2.la
lib/libxcb-dri2.so
lib/libxcb-dri2.so.0
+lib/libxcb-dri3.a
+lib/libxcb-dri3.la
+lib/libxcb-dri3.so
+lib/libxcb-dri3.so.0
lib/libxcb-glx.a
lib/libxcb-glx.la
lib/libxcb-glx.so
lib/libxcb-glx.so.0
+lib/libxcb-present.a
+lib/libxcb-present.la
+lib/libxcb-present.so
+lib/libxcb-present.so.0
lib/libxcb-randr.a
lib/libxcb-randr.la
lib/libxcb-randr.so
@@ -127,7 +137,9 @@ libdata/pkgconfig/xcb-composite.pc
libdata/pkgconfig/xcb-damage.pc
libdata/pkgconfig/xcb-dpms.pc
libdata/pkgconfig/xcb-dri2.pc
+libdata/pkgconfig/xcb-dri3.pc
libdata/pkgconfig/xcb-glx.pc
+libdata/pkgconfig/xcb-present.pc
libdata/pkgconfig/xcb-randr.pc
libdata/pkgconfig/xcb-record.pc
libdata/pkgconfig/xcb-render.pc
@@ -349,6 +361,22 @@ man/man3/xcb_dri2_wait_msc_unchecked.3.gz
man/man3/xcb_dri2_wait_sbc.3.gz
man/man3/xcb_dri2_wait_sbc_reply.3.gz
man/man3/xcb_dri2_wait_sbc_unchecked.3.gz
+man/man3/xcb_dri3_buffer_from_pixmap.3.gz
+man/man3/xcb_dri3_buffer_from_pixmap_reply.3.gz
+man/man3/xcb_dri3_buffer_from_pixmap_unchecked.3.gz
+man/man3/xcb_dri3_fd_from_fence.3.gz
+man/man3/xcb_dri3_fd_from_fence_reply.3.gz
+man/man3/xcb_dri3_fd_from_fence_unchecked.3.gz
+man/man3/xcb_dri3_fence_from_fd.3.gz
+man/man3/xcb_dri3_fence_from_fd_checked.3.gz
+man/man3/xcb_dri3_open.3.gz
+man/man3/xcb_dri3_open_reply.3.gz
+man/man3/xcb_dri3_open_unchecked.3.gz
+man/man3/xcb_dri3_pixmap_from_buffer.3.gz
+man/man3/xcb_dri3_pixmap_from_buffer_checked.3.gz
+man/man3/xcb_dri3_query_version.3.gz
+man/man3/xcb_dri3_query_version_reply.3.gz
+man/man3/xcb_dri3_query_version_unchecked.3.gz
man/man3/xcb_enter_notify_event_t.3.gz
man/man3/xcb_expose_event_t.3.gz
man/man3/xcb_fill_poly.3.gz
@@ -367,6 +395,7 @@ man/man3/xcb_free_gc.3.gz
man/man3/xcb_free_gc_checked.3.gz
man/man3/xcb_free_pixmap.3.gz
man/man3/xcb_free_pixmap_checked.3.gz
+man/man3/xcb_ge_event_t.3.gz
man/man3/xcb_get_atom_name.3.gz
man/man3/xcb_get_atom_name_name.3.gz
man/man3/xcb_get_atom_name_name_end.3.gz
@@ -441,6 +470,7 @@ man/man3/xcb_glx_are_textures_resident_data_end.3.gz
man/man3/xcb_glx_are_textures_resident_data_length.3.gz
man/man3/xcb_glx_are_textures_resident_reply.3.gz
man/man3/xcb_glx_are_textures_resident_unchecked.3.gz
+man/man3/xcb_glx_buffer_swap_complete_event_t.3.gz
man/man3/xcb_glx_change_drawable_attributes.3.gz
man/man3/xcb_glx_change_drawable_attributes_checked.3.gz
man/man3/xcb_glx_client_info.3.gz
@@ -887,11 +917,22 @@ man/man3/xcb_image_text_8.3.gz
man/man3/xcb_image_text_8_checked.3.gz
man/man3/xcb_input_allow_device_events.3.gz
man/man3/xcb_input_allow_device_events_checked.3.gz
+man/man3/xcb_input_barrier_hit_event_t.3.gz
+man/man3/xcb_input_barrier_leave_event_t.3.gz
+man/man3/xcb_input_button_press_event_t.3.gz
+man/man3/xcb_input_button_release_event_t.3.gz
+man/man3/xcb_input_change_device_control.3.gz
+man/man3/xcb_input_change_device_control_reply.3.gz
+man/man3/xcb_input_change_device_control_unchecked.3.gz
man/man3/xcb_input_change_device_dont_propagate_list.3.gz
man/man3/xcb_input_change_device_dont_propagate_list_checked.3.gz
man/man3/xcb_input_change_device_key_mapping.3.gz
man/man3/xcb_input_change_device_key_mapping_checked.3.gz
man/man3/xcb_input_change_device_notify_event_t.3.gz
+man/man3/xcb_input_change_device_property.3.gz
+man/man3/xcb_input_change_device_property_checked.3.gz
+man/man3/xcb_input_change_feedback_control.3.gz
+man/man3/xcb_input_change_feedback_control_checked.3.gz
man/man3/xcb_input_change_keyboard_device.3.gz
man/man3/xcb_input_change_keyboard_device_reply.3.gz
man/man3/xcb_input_change_keyboard_device_unchecked.3.gz
@@ -900,19 +941,26 @@ man/man3/xcb_input_change_pointer_device_reply.3.gz
man/man3/xcb_input_change_pointer_device_unchecked.3.gz
man/man3/xcb_input_close_device.3.gz
man/man3/xcb_input_close_device_checked.3.gz
+man/man3/xcb_input_delete_device_property.3.gz
+man/man3/xcb_input_delete_device_property_checked.3.gz
man/man3/xcb_input_device_bell.3.gz
man/man3/xcb_input_device_bell_checked.3.gz
man/man3/xcb_input_device_button_press_event_t.3.gz
man/man3/xcb_input_device_button_release_event_t.3.gz
man/man3/xcb_input_device_button_state_notify_event_t.3.gz
+man/man3/xcb_input_device_changed_event_t.3.gz
+man/man3/xcb_input_device_focus_in_event_t.3.gz
+man/man3/xcb_input_device_focus_out_event_t.3.gz
man/man3/xcb_input_device_key_press_event_t.3.gz
man/man3/xcb_input_device_key_release_event_t.3.gz
man/man3/xcb_input_device_key_state_notify_event_t.3.gz
man/man3/xcb_input_device_mapping_notify_event_t.3.gz
man/man3/xcb_input_device_motion_notify_event_t.3.gz
man/man3/xcb_input_device_presence_notify_event_t.3.gz
+man/man3/xcb_input_device_property_notify_event_t.3.gz
man/man3/xcb_input_device_state_notify_event_t.3.gz
man/man3/xcb_input_device_valuator_event_t.3.gz
+man/man3/xcb_input_enter_event_t.3.gz
man/man3/xcb_input_focus_in_event_t.3.gz
man/man3/xcb_input_focus_out_event_t.3.gz
man/man3/xcb_input_get_device_button_mapping.3.gz
@@ -922,6 +970,7 @@ man/man3/xcb_input_get_device_button_mapping_map_length.3.gz
man/man3/xcb_input_get_device_button_mapping_reply.3.gz
man/man3/xcb_input_get_device_button_mapping_unchecked.3.gz
man/man3/xcb_input_get_device_control.3.gz
+man/man3/xcb_input_get_device_control_control.3.gz
man/man3/xcb_input_get_device_control_reply.3.gz
man/man3/xcb_input_get_device_control_unchecked.3.gz
man/man3/xcb_input_get_device_dont_propagate_list.3.gz
@@ -948,10 +997,16 @@ man/man3/xcb_input_get_device_modifier_mapping_unchecked.3.gz
man/man3/xcb_input_get_device_motion_events.3.gz
man/man3/xcb_input_get_device_motion_events_reply.3.gz
man/man3/xcb_input_get_device_motion_events_unchecked.3.gz
+man/man3/xcb_input_get_device_property.3.gz
+man/man3/xcb_input_get_device_property_items.3.gz
+man/man3/xcb_input_get_device_property_reply.3.gz
+man/man3/xcb_input_get_device_property_unchecked.3.gz
man/man3/xcb_input_get_extension_version.3.gz
man/man3/xcb_input_get_extension_version_reply.3.gz
man/man3/xcb_input_get_extension_version_unchecked.3.gz
man/man3/xcb_input_get_feedback_control.3.gz
+man/man3/xcb_input_get_feedback_control_feedbacks_iterator.3.gz
+man/man3/xcb_input_get_feedback_control_feedbacks_length.3.gz
man/man3/xcb_input_get_feedback_control_reply.3.gz
man/man3/xcb_input_get_feedback_control_unchecked.3.gz
man/man3/xcb_input_get_selected_extension_events.3.gz
@@ -970,23 +1025,45 @@ man/man3/xcb_input_grab_device_key.3.gz
man/man3/xcb_input_grab_device_key_checked.3.gz
man/man3/xcb_input_grab_device_reply.3.gz
man/man3/xcb_input_grab_device_unchecked.3.gz
+man/man3/xcb_input_hierarchy_event_t.3.gz
+man/man3/xcb_input_key_press_event_t.3.gz
+man/man3/xcb_input_key_release_event_t.3.gz
+man/man3/xcb_input_leave_event_t.3.gz
+man/man3/xcb_input_list_device_properties.3.gz
+man/man3/xcb_input_list_device_properties_atoms.3.gz
+man/man3/xcb_input_list_device_properties_atoms_end.3.gz
+man/man3/xcb_input_list_device_properties_atoms_length.3.gz
+man/man3/xcb_input_list_device_properties_reply.3.gz
+man/man3/xcb_input_list_device_properties_unchecked.3.gz
man/man3/xcb_input_list_input_devices.3.gz
man/man3/xcb_input_list_input_devices_devices.3.gz
man/man3/xcb_input_list_input_devices_devices_iterator.3.gz
man/man3/xcb_input_list_input_devices_devices_length.3.gz
man/man3/xcb_input_list_input_devices_reply.3.gz
man/man3/xcb_input_list_input_devices_unchecked.3.gz
+man/man3/xcb_input_motion_event_t.3.gz
man/man3/xcb_input_open_device.3.gz
man/man3/xcb_input_open_device_class_info.3.gz
man/man3/xcb_input_open_device_class_info_iterator.3.gz
man/man3/xcb_input_open_device_class_info_length.3.gz
man/man3/xcb_input_open_device_reply.3.gz
man/man3/xcb_input_open_device_unchecked.3.gz
+man/man3/xcb_input_property_event_t.3.gz
man/man3/xcb_input_proximity_in_event_t.3.gz
man/man3/xcb_input_proximity_out_event_t.3.gz
man/man3/xcb_input_query_device_state.3.gz
+man/man3/xcb_input_query_device_state_classes_iterator.3.gz
+man/man3/xcb_input_query_device_state_classes_length.3.gz
man/man3/xcb_input_query_device_state_reply.3.gz
man/man3/xcb_input_query_device_state_unchecked.3.gz
+man/man3/xcb_input_raw_button_press_event_t.3.gz
+man/man3/xcb_input_raw_button_release_event_t.3.gz
+man/man3/xcb_input_raw_key_press_event_t.3.gz
+man/man3/xcb_input_raw_key_release_event_t.3.gz
+man/man3/xcb_input_raw_motion_event_t.3.gz
+man/man3/xcb_input_raw_touch_begin_event_t.3.gz
+man/man3/xcb_input_raw_touch_end_event_t.3.gz
+man/man3/xcb_input_raw_touch_update_event_t.3.gz
man/man3/xcb_input_select_extension_event.3.gz
man/man3/xcb_input_select_extension_event_checked.3.gz
man/man3/xcb_input_send_extension_event.3.gz
@@ -1005,12 +1082,84 @@ man/man3/xcb_input_set_device_modifier_mapping_unchecked.3.gz
man/man3/xcb_input_set_device_valuators.3.gz
man/man3/xcb_input_set_device_valuators_reply.3.gz
man/man3/xcb_input_set_device_valuators_unchecked.3.gz
+man/man3/xcb_input_touch_begin_event_t.3.gz
+man/man3/xcb_input_touch_end_event_t.3.gz
+man/man3/xcb_input_touch_ownership_event_t.3.gz
+man/man3/xcb_input_touch_update_event_t.3.gz
man/man3/xcb_input_ungrab_device.3.gz
man/man3/xcb_input_ungrab_device_button.3.gz
man/man3/xcb_input_ungrab_device_button_checked.3.gz
man/man3/xcb_input_ungrab_device_checked.3.gz
man/man3/xcb_input_ungrab_device_key.3.gz
man/man3/xcb_input_ungrab_device_key_checked.3.gz
+man/man3/xcb_input_xi_allow_events.3.gz
+man/man3/xcb_input_xi_allow_events_checked.3.gz
+man/man3/xcb_input_xi_barrier_release_pointer.3.gz
+man/man3/xcb_input_xi_barrier_release_pointer_checked.3.gz
+man/man3/xcb_input_xi_change_cursor.3.gz
+man/man3/xcb_input_xi_change_cursor_checked.3.gz
+man/man3/xcb_input_xi_change_hierarchy.3.gz
+man/man3/xcb_input_xi_change_hierarchy_checked.3.gz
+man/man3/xcb_input_xi_change_property.3.gz
+man/man3/xcb_input_xi_change_property_checked.3.gz
+man/man3/xcb_input_xi_delete_property.3.gz
+man/man3/xcb_input_xi_delete_property_checked.3.gz
+man/man3/xcb_input_xi_get_client_pointer.3.gz
+man/man3/xcb_input_xi_get_client_pointer_reply.3.gz
+man/man3/xcb_input_xi_get_client_pointer_unchecked.3.gz
+man/man3/xcb_input_xi_get_focus.3.gz
+man/man3/xcb_input_xi_get_focus_reply.3.gz
+man/man3/xcb_input_xi_get_focus_unchecked.3.gz
+man/man3/xcb_input_xi_get_property.3.gz
+man/man3/xcb_input_xi_get_property_items.3.gz
+man/man3/xcb_input_xi_get_property_reply.3.gz
+man/man3/xcb_input_xi_get_property_unchecked.3.gz
+man/man3/xcb_input_xi_get_selected_events.3.gz
+man/man3/xcb_input_xi_get_selected_events_masks_iterator.3.gz
+man/man3/xcb_input_xi_get_selected_events_masks_length.3.gz
+man/man3/xcb_input_xi_get_selected_events_reply.3.gz
+man/man3/xcb_input_xi_get_selected_events_unchecked.3.gz
+man/man3/xcb_input_xi_grab_device.3.gz
+man/man3/xcb_input_xi_grab_device_reply.3.gz
+man/man3/xcb_input_xi_grab_device_unchecked.3.gz
+man/man3/xcb_input_xi_list_properties.3.gz
+man/man3/xcb_input_xi_list_properties_properties.3.gz
+man/man3/xcb_input_xi_list_properties_properties_end.3.gz
+man/man3/xcb_input_xi_list_properties_properties_length.3.gz
+man/man3/xcb_input_xi_list_properties_reply.3.gz
+man/man3/xcb_input_xi_list_properties_unchecked.3.gz
+man/man3/xcb_input_xi_passive_grab_device.3.gz
+man/man3/xcb_input_xi_passive_grab_device_modifiers.3.gz
+man/man3/xcb_input_xi_passive_grab_device_modifiers_iterator.3.gz
+man/man3/xcb_input_xi_passive_grab_device_modifiers_length.3.gz
+man/man3/xcb_input_xi_passive_grab_device_reply.3.gz
+man/man3/xcb_input_xi_passive_grab_device_unchecked.3.gz
+man/man3/xcb_input_xi_passive_ungrab_device.3.gz
+man/man3/xcb_input_xi_passive_ungrab_device_checked.3.gz
+man/man3/xcb_input_xi_query_device.3.gz
+man/man3/xcb_input_xi_query_device_infos_iterator.3.gz
+man/man3/xcb_input_xi_query_device_infos_length.3.gz
+man/man3/xcb_input_xi_query_device_reply.3.gz
+man/man3/xcb_input_xi_query_device_unchecked.3.gz
+man/man3/xcb_input_xi_query_pointer.3.gz
+man/man3/xcb_input_xi_query_pointer_buttons.3.gz
+man/man3/xcb_input_xi_query_pointer_buttons_end.3.gz
+man/man3/xcb_input_xi_query_pointer_buttons_length.3.gz
+man/man3/xcb_input_xi_query_pointer_reply.3.gz
+man/man3/xcb_input_xi_query_pointer_unchecked.3.gz
+man/man3/xcb_input_xi_query_version.3.gz
+man/man3/xcb_input_xi_query_version_reply.3.gz
+man/man3/xcb_input_xi_query_version_unchecked.3.gz
+man/man3/xcb_input_xi_select_events.3.gz
+man/man3/xcb_input_xi_select_events_checked.3.gz
+man/man3/xcb_input_xi_set_client_pointer.3.gz
+man/man3/xcb_input_xi_set_client_pointer_checked.3.gz
+man/man3/xcb_input_xi_set_focus.3.gz
+man/man3/xcb_input_xi_set_focus_checked.3.gz
+man/man3/xcb_input_xi_ungrab_device.3.gz
+man/man3/xcb_input_xi_ungrab_device_checked.3.gz
+man/man3/xcb_input_xi_warp_pointer.3.gz
+man/man3/xcb_input_xi_warp_pointer_checked.3.gz
man/man3/xcb_install_colormap.3.gz
man/man3/xcb_install_colormap_checked.3.gz
man/man3/xcb_intern_atom.3.gz
@@ -1092,6 +1241,23 @@ man/man3/xcb_poly_text_16.3.gz
man/man3/xcb_poly_text_16_checked.3.gz
man/man3/xcb_poly_text_8.3.gz
man/man3/xcb_poly_text_8_checked.3.gz
+man/man3/xcb_present_complete_notify_event_t.3.gz
+man/man3/xcb_present_configure_notify_event_t.3.gz
+man/man3/xcb_present_generic_event_t.3.gz
+man/man3/xcb_present_idle_notify_event_t.3.gz
+man/man3/xcb_present_notify_msc.3.gz
+man/man3/xcb_present_notify_msc_checked.3.gz
+man/man3/xcb_present_pixmap.3.gz
+man/man3/xcb_present_pixmap_checked.3.gz
+man/man3/xcb_present_query_capabilities.3.gz
+man/man3/xcb_present_query_capabilities_reply.3.gz
+man/man3/xcb_present_query_capabilities_unchecked.3.gz
+man/man3/xcb_present_query_version.3.gz
+man/man3/xcb_present_query_version_reply.3.gz
+man/man3/xcb_present_query_version_unchecked.3.gz
+man/man3/xcb_present_redirect_notify_event_t.3.gz
+man/man3/xcb_present_select_input.3.gz
+man/man3/xcb_present_select_input_checked.3.gz
man/man3/xcb_property_notify_event_t.3.gz
man/man3/xcb_put_image.3.gz
man/man3/xcb_put_image_checked.3.gz
@@ -1135,8 +1301,12 @@ man/man3/xcb_randr_add_output_mode.3.gz
man/man3/xcb_randr_add_output_mode_checked.3.gz
man/man3/xcb_randr_change_output_property.3.gz
man/man3/xcb_randr_change_output_property_checked.3.gz
+man/man3/xcb_randr_change_provider_property.3.gz
+man/man3/xcb_randr_change_provider_property_checked.3.gz
man/man3/xcb_randr_configure_output_property.3.gz
man/man3/xcb_randr_configure_output_property_checked.3.gz
+man/man3/xcb_randr_configure_provider_property.3.gz
+man/man3/xcb_randr_configure_provider_property_checked.3.gz
man/man3/xcb_randr_create_mode.3.gz
man/man3/xcb_randr_create_mode_reply.3.gz
man/man3/xcb_randr_create_mode_unchecked.3.gz
@@ -1144,6 +1314,8 @@ man/man3/xcb_randr_delete_output_mode.3.gz
man/man3/xcb_randr_delete_output_mode_checked.3.gz
man/man3/xcb_randr_delete_output_property.3.gz
man/man3/xcb_randr_delete_output_property_checked.3.gz
+man/man3/xcb_randr_delete_provider_property.3.gz
+man/man3/xcb_randr_delete_provider_property_checked.3.gz
man/man3/xcb_randr_destroy_mode.3.gz
man/man3/xcb_randr_destroy_mode_checked.3.gz
man/man3/xcb_randr_get_crtc_gamma.3.gz
@@ -1212,6 +1384,36 @@ man/man3/xcb_randr_get_output_property_unchecked.3.gz
man/man3/xcb_randr_get_panning.3.gz
man/man3/xcb_randr_get_panning_reply.3.gz
man/man3/xcb_randr_get_panning_unchecked.3.gz
+man/man3/xcb_randr_get_provider_info.3.gz
+man/man3/xcb_randr_get_provider_info_associated_capability.3.gz
+man/man3/xcb_randr_get_provider_info_associated_capability_end.3.gz
+man/man3/xcb_randr_get_provider_info_associated_capability_length.3.gz
+man/man3/xcb_randr_get_provider_info_associated_providers.3.gz
+man/man3/xcb_randr_get_provider_info_associated_providers_end.3.gz
+man/man3/xcb_randr_get_provider_info_associated_providers_length.3.gz
+man/man3/xcb_randr_get_provider_info_crtcs.3.gz
+man/man3/xcb_randr_get_provider_info_crtcs_end.3.gz
+man/man3/xcb_randr_get_provider_info_crtcs_length.3.gz
+man/man3/xcb_randr_get_provider_info_name.3.gz
+man/man3/xcb_randr_get_provider_info_name_end.3.gz
+man/man3/xcb_randr_get_provider_info_name_length.3.gz
+man/man3/xcb_randr_get_provider_info_outputs.3.gz
+man/man3/xcb_randr_get_provider_info_outputs_end.3.gz
+man/man3/xcb_randr_get_provider_info_outputs_length.3.gz
+man/man3/xcb_randr_get_provider_info_reply.3.gz
+man/man3/xcb_randr_get_provider_info_unchecked.3.gz
+man/man3/xcb_randr_get_provider_property.3.gz
+man/man3/xcb_randr_get_provider_property_data.3.gz
+man/man3/xcb_randr_get_provider_property_data_end.3.gz
+man/man3/xcb_randr_get_provider_property_data_length.3.gz
+man/man3/xcb_randr_get_provider_property_reply.3.gz
+man/man3/xcb_randr_get_provider_property_unchecked.3.gz
+man/man3/xcb_randr_get_providers.3.gz
+man/man3/xcb_randr_get_providers_providers.3.gz
+man/man3/xcb_randr_get_providers_providers_end.3.gz
+man/man3/xcb_randr_get_providers_providers_length.3.gz
+man/man3/xcb_randr_get_providers_reply.3.gz
+man/man3/xcb_randr_get_providers_unchecked.3.gz
man/man3/xcb_randr_get_screen_info.3.gz
man/man3/xcb_randr_get_screen_info_rates_iterator.3.gz
man/man3/xcb_randr_get_screen_info_rates_length.3.gz
@@ -1259,6 +1461,12 @@ man/man3/xcb_randr_list_output_properties_atoms_end.3.gz
man/man3/xcb_randr_list_output_properties_atoms_length.3.gz
man/man3/xcb_randr_list_output_properties_reply.3.gz
man/man3/xcb_randr_list_output_properties_unchecked.3.gz
+man/man3/xcb_randr_list_provider_properties.3.gz
+man/man3/xcb_randr_list_provider_properties_atoms.3.gz
+man/man3/xcb_randr_list_provider_properties_atoms_end.3.gz
+man/man3/xcb_randr_list_provider_properties_atoms_length.3.gz
+man/man3/xcb_randr_list_provider_properties_reply.3.gz
+man/man3/xcb_randr_list_provider_properties_unchecked.3.gz
man/man3/xcb_randr_notify_event_t.3.gz
man/man3/xcb_randr_query_output_property.3.gz
man/man3/xcb_randr_query_output_property_reply.3.gz
@@ -1266,6 +1474,12 @@ man/man3/xcb_randr_query_output_property_unchecked.3.gz
man/man3/xcb_randr_query_output_property_valid_values.3.gz
man/man3/xcb_randr_query_output_property_valid_values_end.3.gz
man/man3/xcb_randr_query_output_property_valid_values_length.3.gz
+man/man3/xcb_randr_query_provider_property.3.gz
+man/man3/xcb_randr_query_provider_property_reply.3.gz
+man/man3/xcb_randr_query_provider_property_unchecked.3.gz
+man/man3/xcb_randr_query_provider_property_valid_values.3.gz
+man/man3/xcb_randr_query_provider_property_valid_values_end.3.gz
+man/man3/xcb_randr_query_provider_property_valid_values_length.3.gz
man/man3/xcb_randr_query_version.3.gz
man/man3/xcb_randr_query_version_reply.3.gz
man/man3/xcb_randr_query_version_unchecked.3.gz
@@ -1284,6 +1498,10 @@ man/man3/xcb_randr_set_output_primary_checked.3.gz
man/man3/xcb_randr_set_panning.3.gz
man/man3/xcb_randr_set_panning_reply.3.gz
man/man3/xcb_randr_set_panning_unchecked.3.gz
+man/man3/xcb_randr_set_provider_offload_sink.3.gz
+man/man3/xcb_randr_set_provider_offload_sink_checked.3.gz
+man/man3/xcb_randr_set_provider_output_source.3.gz
+man/man3/xcb_randr_set_provider_output_source_checked.3.gz
man/man3/xcb_randr_set_screen_config.3.gz
man/man3/xcb_randr_set_screen_config_reply.3.gz
man/man3/xcb_randr_set_screen_config_unchecked.3.gz
@@ -1400,6 +1618,11 @@ man/man3/xcb_render_triangles_checked.3.gz
man/man3/xcb_reparent_notify_event_t.3.gz
man/man3/xcb_reparent_window.3.gz
man/man3/xcb_reparent_window_checked.3.gz
+man/man3/xcb_res_query_client_ids.3.gz
+man/man3/xcb_res_query_client_ids_ids_iterator.3.gz
+man/man3/xcb_res_query_client_ids_ids_length.3.gz
+man/man3/xcb_res_query_client_ids_reply.3.gz
+man/man3/xcb_res_query_client_ids_unchecked.3.gz
man/man3/xcb_res_query_client_pixmap_bytes.3.gz
man/man3/xcb_res_query_client_pixmap_bytes_reply.3.gz
man/man3/xcb_res_query_client_pixmap_bytes_unchecked.3.gz
@@ -1415,6 +1638,11 @@ man/man3/xcb_res_query_clients_clients_iterator.3.gz
man/man3/xcb_res_query_clients_clients_length.3.gz
man/man3/xcb_res_query_clients_reply.3.gz
man/man3/xcb_res_query_clients_unchecked.3.gz
+man/man3/xcb_res_query_resource_bytes.3.gz
+man/man3/xcb_res_query_resource_bytes_reply.3.gz
+man/man3/xcb_res_query_resource_bytes_sizes_iterator.3.gz
+man/man3/xcb_res_query_resource_bytes_sizes_length.3.gz
+man/man3/xcb_res_query_resource_bytes_unchecked.3.gz
man/man3/xcb_res_query_version.3.gz
man/man3/xcb_res_query_version_reply.3.gz
man/man3/xcb_res_query_version_unchecked.3.gz
@@ -1596,9 +1824,14 @@ man/man3/xcb_shape_select_input.3.gz
man/man3/xcb_shape_select_input_checked.3.gz
man/man3/xcb_shm_attach.3.gz
man/man3/xcb_shm_attach_checked.3.gz
+man/man3/xcb_shm_attach_fd.3.gz
+man/man3/xcb_shm_attach_fd_checked.3.gz
man/man3/xcb_shm_completion_event_t.3.gz
man/man3/xcb_shm_create_pixmap.3.gz
man/man3/xcb_shm_create_pixmap_checked.3.gz
+man/man3/xcb_shm_create_segment.3.gz
+man/man3/xcb_shm_create_segment_reply.3.gz
+man/man3/xcb_shm_create_segment_unchecked.3.gz
man/man3/xcb_shm_detach.3.gz
man/man3/xcb_shm_detach_checked.3.gz
man/man3/xcb_shm_get_image.3.gz
@@ -1860,6 +2093,8 @@ man/man3/xcb_xfixes_change_save_set.3.gz
man/man3/xcb_xfixes_change_save_set_checked.3.gz
man/man3/xcb_xfixes_copy_region.3.gz
man/man3/xcb_xfixes_copy_region_checked.3.gz
+man/man3/xcb_xfixes_create_pointer_barrier.3.gz
+man/man3/xcb_xfixes_create_pointer_barrier_checked.3.gz
man/man3/xcb_xfixes_create_region.3.gz
man/man3/xcb_xfixes_create_region_checked.3.gz
man/man3/xcb_xfixes_create_region_from_bitmap.3.gz
@@ -1871,6 +2106,8 @@ man/man3/xcb_xfixes_create_region_from_picture_checked.3.gz
man/man3/xcb_xfixes_create_region_from_window.3.gz
man/man3/xcb_xfixes_create_region_from_window_checked.3.gz
man/man3/xcb_xfixes_cursor_notify_event_t.3.gz
+man/man3/xcb_xfixes_delete_pointer_barrier.3.gz
+man/man3/xcb_xfixes_delete_pointer_barrier_checked.3.gz
man/man3/xcb_xfixes_destroy_region.3.gz
man/man3/xcb_xfixes_destroy_region_checked.3.gz
man/man3/xcb_xfixes_expand_region.3.gz
@@ -1971,7 +2208,7 @@ man/man3/xcb_xkb_get_compat_map_group_rtrn_iterator.3.gz
man/man3/xcb_xkb_get_compat_map_group_rtrn_length.3.gz
man/man3/xcb_xkb_get_compat_map_reply.3.gz
man/man3/xcb_xkb_get_compat_map_si_rtrn.3.gz
-man/man3/xcb_xkb_get_compat_map_si_rtrn_end.3.gz
+man/man3/xcb_xkb_get_compat_map_si_rtrn_iterator.3.gz
man/man3/xcb_xkb_get_compat_map_si_rtrn_length.3.gz
man/man3/xcb_xkb_get_compat_map_unchecked.3.gz
man/man3/xcb_xkb_get_controls.3.gz
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index aeda4fb51803..304bde7c769c 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -12,4 +12,5 @@ LICENSE= MIT
XORG_CAT= lib
USE_XORG= x11 kbproto:both
+
.include <bsd.port.mk>
diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile
new file mode 100644
index 000000000000..84bfdd3c44d2
--- /dev/null
+++ b/x11/libxshmfence/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= libxshmfence
+PORTVERSION= 1.1
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Shared memory 'SyncFence' synchronization primitive
+
+LICENSE= MIT
+
+USE_XORG= xproto
+XORG_CAT= lib
+
+test: build
+ @cd ${WRKSRC} && ${MAKE} check
+
+.include <bsd.port.mk>
diff --git a/x11/libxshmfence/distinfo b/x11/libxshmfence/distinfo
new file mode 100644
index 000000000000..3b5cd8708404
--- /dev/null
+++ b/x11/libxshmfence/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/lib/libxshmfence-1.1.tar.bz2) = dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe
+SIZE (xorg/lib/libxshmfence-1.1.tar.bz2) = 291347
diff --git a/x11/libxshmfence/files/patch-config.h.in b/x11/libxshmfence/files/patch-config.h.in
new file mode 100644
index 000000000000..bbb52e10cc3a
--- /dev/null
+++ b/x11/libxshmfence/files/patch-config.h.in
@@ -0,0 +1,22 @@
+--- config.h.in 2013-11-27 00:54:40.000000000 -0500
++++ config.h.in 2013-12-09 16:56:20.000000000 -0500
+@@ -12,6 +12,9 @@
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
++/* Use mkostemp(3) */
++#undef HAVE_MKOSTEMP
++
+ /* Use pthread primitives */
+ #undef HAVE_PTHREAD
+
+@@ -33,6 +36,9 @@
+ /* Define to 1 if you have the <sys/types.h> header file. */
+ #undef HAVE_SYS_TYPES_H
+
++/* Use umtx */
++#undef HAVE_UMTX
++
+ /* Define to 1 if you have the <unistd.h> header file. */
+ #undef HAVE_UNISTD_H
+
diff --git a/x11/libxshmfence/files/patch-configure b/x11/libxshmfence/files/patch-configure
new file mode 100644
index 000000000000..dda82c69cf4f
--- /dev/null
+++ b/x11/libxshmfence/files/patch-configure
@@ -0,0 +1,45 @@
+--- configure 2013-11-27 00:54:35.000000000 -0500
++++ configure 2013-12-09 15:03:55.000000000 -0500
+@@ -17633,11 +17633,27 @@
+ ac_fn_c_check_header_mongrel "$LINENO" "linux/futex.h" "ac_cv_header_linux_futex_h" "$ac_includes_default"
+ if test "x$ac_cv_header_linux_futex_h" = xyes; then :
+ FUTEX=yes
++fi
++
++
++fi
++
++if test "x$FUTEX" = "xauto"; then
++ ac_fn_c_check_header_compile "$LINENO" "sys/umtx.h" "ac_cv_header_sys_umtx_h" "#include <errno.h>
++ #include <sys/types.h>
++"
++if test "x$ac_cv_header_sys_umtx_h" = xyes; then :
++ FUTEX=yes
+ else
+ FUTEX=no
+ fi
+
+
++ if test "x$FUTEX" = "xyes"; then
++
++$as_echo "#define HAVE_UMTX 1" >>confdefs.h
++
++ fi
+ fi
+
+ if test "x$FUTEX" = "xyes"; then
+@@ -17717,6 +17733,14 @@
+ fi
+
+
++ac_fn_c_check_func "$LINENO" "mkostemp" "ac_cv_func_mkostemp"
++if test "x$ac_cv_func_mkostemp" = xyes; then :
++
++$as_echo "#define HAVE_MKOSTEMP 1" >>confdefs.h
++
++fi
++
++
+
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPROTO" >&5
diff --git a/x11/libxshmfence/files/patch-src__xshmfence_alloc.c b/x11/libxshmfence/files/patch-src__xshmfence_alloc.c
new file mode 100644
index 000000000000..df38300fb2a8
--- /dev/null
+++ b/x11/libxshmfence/files/patch-src__xshmfence_alloc.c
@@ -0,0 +1,20 @@
+--- src/xshmfence_alloc.c 2013-11-20 17:13:08.000000000 -0500
++++ src/xshmfence_alloc.c 2013-12-09 16:06:17.000000000 -0500
+@@ -41,11 +41,15 @@
+ char template[] = SHMDIR "/shmfd-XXXXXX";
+ int fd;
+
+-#ifdef O_TMPFILE
++#if defined(O_CLOEXEC)
++#if defined(HAVE_MKOSTEMP)
++ fd = mkostemp(template, O_CLOEXEC);
++#elif defined(O_TMPFILE)
+ fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666);
+- if (fd < 0)
+ #endif
++ if (fd < 0)
+ {
++#endif
+ fd = mkstemp(template);
+ if (fd < 0)
+ return fd;
diff --git a/x11/libxshmfence/files/patch-src__xshmfence_futex.h b/x11/libxshmfence/files/patch-src__xshmfence_futex.h
new file mode 100644
index 000000000000..58c42a9a8b4e
--- /dev/null
+++ b/x11/libxshmfence/files/patch-src__xshmfence_futex.h
@@ -0,0 +1,46 @@
+--- src/xshmfence_futex.h 2013-11-20 17:13:08.000000000 -0500
++++ src/xshmfence_futex.h 2013-12-09 15:52:29.000000000 -0500
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright © 2013 Keith Packard
++ * Copyright © 2013 Jung-uk Kim <jkim@FreeBSD.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+@@ -24,6 +25,27 @@
+ #define _XSHMFENCE_FUTEX_H_
+
+ #include <errno.h>
++
++#ifdef HAVE_UMTX
++
++#include <sys/types.h>
++#include <sys/umtx.h>
++
++static inline int sys_futex(void *addr, int op, int32_t val)
++{
++ return _umtx_op(addr, op, (uint32_t)val, NULL, NULL) == -1 ? errno : 0;
++}
++
++static inline int futex_wake(int32_t *addr) {
++ return sys_futex(addr, UMTX_OP_WAKE, INT_MAX);
++}
++
++static inline int futex_wait(int32_t *addr, int32_t value) {
++ return sys_futex(addr, UMTX_OP_WAIT_UINT, value);
++}
++
++#else
++
+ #include <stdint.h>
+ #include <values.h>
+ #include <linux/futex.h>
+@@ -43,6 +65,8 @@
+ return sys_futex(addr, FUTEX_WAIT, value, NULL, NULL, 0);
+ }
+
++#endif
++
+ #define barrier() __asm__ __volatile__("": : :"memory")
+
+ static inline void atomic_store(int32_t *f, int32_t v)
diff --git a/x11/libxshmfence/files/patch-src__xshmfenceint.h b/x11/libxshmfence/files/patch-src__xshmfenceint.h
new file mode 100644
index 000000000000..bc8aead76698
--- /dev/null
+++ b/x11/libxshmfence/files/patch-src__xshmfenceint.h
@@ -0,0 +1,10 @@
+--- src/xshmfenceint.h 2013-11-20 17:14:05.000000000 -0500
++++ src/xshmfenceint.h 2013-12-09 15:14:36.000000000 -0500
+@@ -23,6 +23,7 @@
+ #ifndef _XSHMFENCEINT_H_
+ #define _XSHMFENCEINT_H_
+
++#include <fcntl.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
diff --git a/x11/libxshmfence/pkg-descr b/x11/libxshmfence/pkg-descr
new file mode 100644
index 000000000000..fdc1a01f56cc
--- /dev/null
+++ b/x11/libxshmfence/pkg-descr
@@ -0,0 +1,5 @@
+This library offers a CPU-based synchronization primitive compatible
+with the X SyncFence objects that can be shared between processes
+using file descriptor passing.
+
+WWW: http://www.freedesktop.org/Software/xlibs
diff --git a/x11/libxshmfence/pkg-plist b/x11/libxshmfence/pkg-plist
new file mode 100644
index 000000000000..462fda09126c
--- /dev/null
+++ b/x11/libxshmfence/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/xshmfence.h
+lib/libxshmfence.a
+lib/libxshmfence.la
+lib/libxshmfence.so
+lib/libxshmfence.so.1
+libdata/pkgconfig/xshmfence.pc
diff --git a/x11/listres/Makefile b/x11/listres/Makefile
index 37519f599af2..e21396ce6be2 100644
--- a/x11/listres/Makefile
+++ b/x11/listres/Makefile
@@ -10,9 +10,6 @@ COMMENT= List resources in widgets
XORG_CAT= app
USE_XORG= xproto xt xmu xaw
-PLIST_FILES= bin/listres
+PLIST_FILES= bin/listres man/man1/listres.1.gz
-MAN1= listres.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/luit/Makefile b/x11/luit/Makefile
index 3f36c4796952..bfa31c298f20 100644
--- a/x11/luit/Makefile
+++ b/x11/luit/Makefile
@@ -12,9 +12,6 @@ USE_XORG= x11 fontenc
CONFIGURE_ARGS= --datadir=${LOCALBASE}/lib
-PLIST_FILES= bin/luit
+PLIST_FILES= bin/luit man/man1/luit.1.gz
-MAN1= luit.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile
index 907278d6ebe7..0395cc91318d 100644
--- a/x11/mkcomposecache/Makefile
+++ b/x11/mkcomposecache/Makefile
@@ -10,9 +10,6 @@ COMMENT= Program to create Compose cache files
XORG_CAT= app
USE_XORG= x11
-PLIST_FILES= sbin/mkcomposecache
+PLIST_FILES= sbin/mkcomposecache man/man8/mkcomposecache.8.gz
-MAN8= mkcomposecache.8
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index dff8bdf2722c..4787c11a22a1 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pixman
-PORTVERSION= 0.30.2
+PORTVERSION= 0.32.4
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
@@ -12,6 +12,7 @@ USE_PERL5= build
XORG_CAT= lib
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --disable-gtk
+USE_GNOME= ltverhack:30
OPTIONS_DEFINE= SIMD
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo
index 676ffb26f115..a2dcca7a51e8 100644
--- a/x11/pixman/distinfo
+++ b/x11/pixman/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/pixman-0.30.2.tar.bz2) = 4fbb51788fe7cbd8abb5f80aed95ec878704e57a06328f7bebe0306e3822c96c
-SIZE (xorg/lib/pixman-0.30.2.tar.bz2) = 666281
+SHA256 (xorg/lib/pixman-0.32.4.tar.bz2) = ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c
+SIZE (xorg/lib/pixman-0.32.4.tar.bz2) = 701414
diff --git a/x11/presentproto/Makefile b/x11/presentproto/Makefile
new file mode 100644
index 000000000000..7afb4cc5161d
--- /dev/null
+++ b/x11/presentproto/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PORTNAME= presentproto
+PORTVERSION= 1.0
+CATEGORIES= x11
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= Present protocol specification
+
+XORG_CAT= proto
+
+.include <bsd.port.mk>
diff --git a/x11/presentproto/distinfo b/x11/presentproto/distinfo
new file mode 100644
index 000000000000..a9823e0cff07
--- /dev/null
+++ b/x11/presentproto/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/proto/presentproto-1.0.tar.bz2) = 812c7d48721f909a0f7a2cb1e91f6eead76159a36c4712f4579ca587552839ce
+SIZE (xorg/proto/presentproto-1.0.tar.bz2) = 107998
diff --git a/x11/presentproto/pkg-descr b/x11/presentproto/pkg-descr
new file mode 100644
index 000000000000..d047c1d74b59
--- /dev/null
+++ b/x11/presentproto/pkg-descr
@@ -0,0 +1 @@
+This package contains X.Org Present protocol specification.
diff --git a/x11/presentproto/pkg-plist b/x11/presentproto/pkg-plist
new file mode 100644
index 000000000000..6b56729a0bd8
--- /dev/null
+++ b/x11/presentproto/pkg-plist
@@ -0,0 +1,6 @@
+include/X11/extensions/presentproto.h
+include/X11/extensions/presenttokens.h
+libdata/pkgconfig/presentproto.pc
+share/doc/presentproto/presentproto.txt
+@dirrm share/doc/presentproto
+@dirrmtry include/X11/extensions
diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile
index 341a851baaa6..f0319f9f46e6 100644
--- a/x11/printproto/Makefile
+++ b/x11/printproto/Makefile
@@ -10,7 +10,4 @@ COMMENT= Print extension headers
XORG_CAT= proto
-MAN7= Xprint.7
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/printproto/pkg-plist b/x11/printproto/pkg-plist
index 44d872813219..a0fd03bab281 100644
--- a/x11/printproto/pkg-plist
+++ b/x11/printproto/pkg-plist
@@ -1,4 +1,5 @@
include/X11/extensions/Print.h
include/X11/extensions/Printstr.h
libdata/pkgconfig/printproto.pc
+man/man7/Xprint.7.gz
@dirrmtry include/X11/extensions
diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile
index 391111e40660..b05393a0f589 100644
--- a/x11/rstart/Makefile
+++ b/x11/rstart/Makefile
@@ -10,7 +10,4 @@ COMMENT= Sample implementation of a Remote Start client
XORG_CAT= app
USE_XORG= x11
-MAN1= rstart.1 rstartd.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/rstart/pkg-plist b/x11/rstart/pkg-plist
index 53445f8d1135..3395861a25c4 100644
--- a/x11/rstart/pkg-plist
+++ b/x11/rstart/pkg-plist
@@ -15,6 +15,8 @@ lib/X11/rstart/contexts/x
lib/X11/rstart/contexts/x11
lib/X11/rstart/contexts/x11r6
lib/X11/rstart/rstartd.real
+man/man1/rstart.1.gz
+man/man1/rstartd.1.gz
@dirrm lib/X11/rstart/contexts
@dirrm lib/X11/rstart/commands/x11r6
@dirrm lib/X11/rstart/commands
diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile
index 61b9706a3eea..1d7caf8492ac 100644
--- a/x11/scripts/Makefile
+++ b/x11/scripts/Makefile
@@ -10,7 +10,4 @@ COMMENT= Various X related scripts
XORG_CAT= app
USE_XORG= x11
-MAN1= xon.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/scripts/pkg-plist b/x11/scripts/pkg-plist
index 1135a62d4315..976030aa677f 100644
--- a/x11/scripts/pkg-plist
+++ b/x11/scripts/pkg-plist
@@ -2,3 +2,4 @@ bin/xauth_switch_to_sun-des-1
bin/fontname.sh
bin/fontprop.sh
bin/xon
+man/man1/xon.1.gz
diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile
index b622b670fa94..3b6fb7f571a3 100644
--- a/x11/sessreg/Makefile
+++ b/x11/sessreg/Makefile
@@ -10,9 +10,6 @@ COMMENT= Manage utmp/wtmp entries for non-init X clients
XORG_CAT= app
USE_XORG= x11
-PLIST_FILES= bin/sessreg
+PLIST_FILES= bin/sessreg man/man1/sessreg.1.gz
-MAN1= sessreg.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
index 8c2dec8c7549..53b369809a67 100644
--- a/x11/setxkbmap/Makefile
+++ b/x11/setxkbmap/Makefile
@@ -12,9 +12,6 @@ USE_XORG= xkbfile x11
CONFIGURE_ARGS= --with-xkb-config-root=${LOCALBASE}/share/X11/xkb
-PLIST_FILES= bin/setxkbmap
+PLIST_FILES= bin/setxkbmap man/man1/setxkbmap.1.gz
-MAN1= setxkbmap.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile
index 3e55c0ac7b4c..78a13ec16c59 100644
--- a/x11/smproxy/Makefile
+++ b/x11/smproxy/Makefile
@@ -10,9 +10,6 @@ COMMENT= Session Manager Proxy
XORG_CAT= app
USE_XORG= xt xmu
-PLIST_FILES= bin/smproxy
+PLIST_FILES= bin/smproxy man/man1/smproxy.1.gz
-MAN1= smproxy.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/trapproto/Makefile b/x11/trapproto/Makefile
index 29ada379cbac..dd42adb42869 100644
--- a/x11/trapproto/Makefile
+++ b/x11/trapproto/Makefile
@@ -12,5 +12,4 @@ XORG_CAT= proto
USE_XORG= xt:both
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile
index 89a7477f1e8c..5088ea648248 100644
--- a/x11/viewres/Makefile
+++ b/x11/viewres/Makefile
@@ -10,13 +10,11 @@ COMMENT= Graphical class browser for Xt
XORG_CAT= app
USE_XORG= xt xaw
-MAN1= viewres.1
-
PLIST_FILES+= bin/viewres \
+ man/man1/viewres.1.gz \
share/X11/app-defaults/Viewres \
share/X11/app-defaults/Viewres-color
PLIST_DIRS+= share/X11/app-defaults \
share/X11
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile
index f8663f01c0fe..f8a0ee48babd 100644
--- a/x11/x11perf/Makefile
+++ b/x11/x11perf/Makefile
@@ -12,9 +12,4 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11 xmuu xrender xft xext
-MAN1= Xmark.1 \
- x11perf.1 \
- x11perfcomp.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/x11perf/pkg-plist b/x11/x11perf/pkg-plist
index dd7d17277145..4c9b64afcdc4 100644
--- a/x11/x11perf/pkg-plist
+++ b/x11/x11perf/pkg-plist
@@ -4,4 +4,7 @@ lib/X11/x11perfcomp/fillblnk
lib/X11/x11perfcomp/perfboth
lib/X11/x11perfcomp/perfratio
lib/X11/x11perfcomp/Xmark
+man/man1/Xmark.1.gz
+man/man1/x11perf.1.gz
+man/man1/x11perfcomp.1.gz
@dirrm lib/X11/x11perfcomp
diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile
index 9e548225d29c..1c79c3cdd2f2 100644
--- a/x11/xcalc/Makefile
+++ b/x11/xcalc/Makefile
@@ -8,14 +8,11 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= Scientific calculator for X
RUN_DEPENDS= font-misc-misc>=1.1.2:${PORTSDIR}/x11-fonts/font-misc-misc \
- font-adobe-100dpi>=1.0.3:${PORTSDIR}/x11-fonts/font-adobe-100dpi \
- font-alias>=1.0.3:${PORTSDIR}/x11-fonts/font-alias \
- xbitmaps>=1.1.0:${PORTSDIR}/x11/xbitmaps
+ font-adobe-100dpi>=1.0.3:${PORTSDIR}/x11-fonts/font-adobe-100dpi \
+ font-alias>=1.0.3:${PORTSDIR}/x11-fonts/font-alias \
+ xbitmaps>=1.1.0:${PORTSDIR}/x11/xbitmaps
XORG_CAT= app
USE_XORG= xt xaw
-MAN1= xcalc.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xcalc/pkg-plist b/x11/xcalc/pkg-plist
index 7c6d17bdc858..21e5d60ced8f 100644
--- a/x11/xcalc/pkg-plist
+++ b/x11/xcalc/pkg-plist
@@ -1,4 +1,5 @@
bin/xcalc
+man/man1/xcalc.1.gz
share/X11/app-defaults/XCalc
share/X11/app-defaults/XCalc-color
@dirrmtry share/X11/app-defaults
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 17fb42069f4d..778dcf9da82b 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xcb-proto
-PORTVERSION= 1.8
+PORTVERSION= 1.9
CATEGORIES= x11 python
MASTER_SITES= http://xcb.freedesktop.org/dist/
@@ -17,4 +17,5 @@ USE_PYTHON= 2.5+
GNU_CONFIGURE= yes
DATADIR= ${PREFIX}/share/xcb
+
.include <bsd.port.mk>
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index e92e4ee65e2b..27738e9c05c4 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0
-SIZE (xcb-proto-1.8.tar.bz2) = 125072
+SHA256 (xcb-proto-1.9.tar.bz2) = 895afe21793e6e26c5ce999b1900c02a5984c201d96d55cc42c182d3c3bde43c
+SIZE (xcb-proto-1.9.tar.bz2) = 136421
diff --git a/x11/xcb-proto/files/patch-src_sync.xml b/x11/xcb-proto/files/patch-src_sync.xml
new file mode 100644
index 000000000000..cc530683cabc
--- /dev/null
+++ b/x11/xcb-proto/files/patch-src_sync.xml
@@ -0,0 +1,50 @@
+From 9c343995eacdc39db2ec7f93cbeab00c88a55026 Mon Sep 17 00:00:00 2001
+From: Peter Harris <pharris@opentext.com>
+Date: Fri, 15 Nov 2013 16:07:39 +0000
+Subject: sync: Add missing namespace for the INT64 struct
+
+Signed-off-by: Peter Harris <pharris@opentext.com>
+Reviewed-By: Daniel Martin <consume.noise@gmail.com>
+---
+diff --git a/src/sync.xml b/src/sync.xml
+index bc07c5b..dd70a08 100644
+--- src/sync.xml
++++ src/sync.xml
+@@ -147,7 +147,7 @@ for licensing information.
+ </bitcase>
+ <bitcase>
+ <enumref ref="CA">Value</enumref>
+- <field type="INT64" name="value" />
++ <field type="sync:INT64" name="value" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CA">TestType</enumref>
+@@ -155,7 +155,7 @@ for licensing information.
+ </bitcase>
+ <bitcase>
+ <enumref ref="CA">Delta</enumref>
+- <field type="INT64" name="delta" />
++ <field type="sync:INT64" name="delta" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CA">Events</enumref>
+@@ -179,7 +179,7 @@ for licensing information.
+ </bitcase>
+ <bitcase>
+ <enumref ref="CA">Value</enumref>
+- <field type="INT64" name="value" />
++ <field type="sync:INT64" name="value" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CA">TestType</enumref>
+@@ -187,7 +187,7 @@ for licensing information.
+ </bitcase>
+ <bitcase>
+ <enumref ref="CA">Delta</enumref>
+- <field type="INT64" name="delta" />
++ <field type="sync:INT64" name="delta" />
+ </bitcase>
+ <bitcase>
+ <enumref ref="CA">Events</enumref>
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist
index 4d3495fbc5f5..7b7cec797e70 100644
--- a/x11/xcb-proto/pkg-plist
+++ b/x11/xcb-proto/pkg-plist
@@ -4,8 +4,10 @@ libdata/pkgconfig/xcb-proto.pc
%%DATADIR%%/damage.xml
%%DATADIR%%/dpms.xml
%%DATADIR%%/dri2.xml
+%%DATADIR%%/dri3.xml
%%DATADIR%%/ge.xml
%%DATADIR%%/glx.xml
+%%DATADIR%%/present.xml
%%DATADIR%%/randr.xml
%%DATADIR%%/record.xml
%%DATADIR%%/render.xml
diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile
index 082a6848fb4a..312238191293 100644
--- a/x11/xclipboard/Makefile
+++ b/x11/xclipboard/Makefile
@@ -13,7 +13,4 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xt xaw
-MAN1= xclipboard.1 xcutsel.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xclipboard/pkg-plist b/x11/xclipboard/pkg-plist
index 92f5f1914b62..6a48976afb30 100644
--- a/x11/xclipboard/pkg-plist
+++ b/x11/xclipboard/pkg-plist
@@ -1,5 +1,7 @@
bin/xclipboard
bin/xcutsel
+man/man1/xclipboard.1.gz
+man/man1/xcutsel.1.gz
share/X11/app-defaults/XClipboard
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/xcmsdb/Makefile b/x11/xcmsdb/Makefile
index 3888acbb325e..cc6990ce6b04 100644
--- a/x11/xcmsdb/Makefile
+++ b/x11/xcmsdb/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11
-PLIST_FILES= bin/xcmsdb
+PLIST_FILES= bin/xcmsdb man/man1/xcmsdb.1.gz
-MAN1= xcmsdb.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile
index abf5907770cc..c0a8299e0c82 100644
--- a/x11/xconsole/Makefile
+++ b/x11/xconsole/Makefile
@@ -10,7 +10,4 @@ COMMENT= Monitor system console messages with X
XORG_CAT= app
USE_XORG= xt xaw
-MAN1= xconsole.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xconsole/pkg-plist b/x11/xconsole/pkg-plist
index 0fc9d891afa9..8677613b845e 100644
--- a/x11/xconsole/pkg-plist
+++ b/x11/xconsole/pkg-plist
@@ -1,4 +1,5 @@
bin/xconsole
+man/man1/xconsole.1.gz
share/X11/app-defaults/XConsole
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/xdbedizzy/Makefile b/x11/xdbedizzy/Makefile
index a18b84fe4149..ab970b405a42 100644
--- a/x11/xdbedizzy/Makefile
+++ b/x11/xdbedizzy/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xp xext xprintutil xp xau xext
-PLIST_FILES= bin/xdbedizzy
+PLIST_FILES= bin/xdbedizzy man/man1/xdbedizzy.1.gz
-MAN1= xdbedizzy.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile
index 41ece9bfbe6f..11df94fbf42f 100644
--- a/x11/xditview/Makefile
+++ b/x11/xditview/Makefile
@@ -12,7 +12,4 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xt xaw
-MAN1= xditview.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xditview/pkg-plist b/x11/xditview/pkg-plist
index 484e20afbea9..93d82955f130 100644
--- a/x11/xditview/pkg-plist
+++ b/x11/xditview/pkg-plist
@@ -1,6 +1,7 @@
bin/xditview
include/X11/bitmaps/ldblarrow
include/X11/bitmaps/rdblarrow
+man/man1/xditview.1.gz
share/X11/app-defaults/Xditview
share/X11/app-defaults/Xditview-chrtr
@dirrmtry share/X11/app-defaults
diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 8e8de415b1c1..938efb90a030 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -14,20 +14,16 @@ USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw
CONFIGURE_ARGS+= --with-xdmconfigdir=${EXAMPLESDIR} \
--with-xdmscriptdir=${EXAMPLESDIR}
-MAN1= xdm.1
-
CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \
Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
OPTIONS_DEFINE= XDMSHELL
XDMSHELL_DESC= Install xdmshell
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MXDMSHELL}
CONFIGURE_ARGS+=--enable-xdmshell
-MAN1+= xdmshell.1
PLIST_SUB+= XDMSHELL=""
.else
CONFIGURE_ARGS+=--disable-xdmshell
@@ -50,9 +46,9 @@ post-configure:
post-install:
.for f in ${CFFILES}
- ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f || ${TRUE}
+ ${CP} -n ${EXAMPLESDIR}/$f ${STAGEDIR}${PREFIX}/lib/X11/xdm/$f || ${TRUE}
.endfor
${MKDIR} /var/lib/xdm/authdir
- ${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir
+ ${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir
.include <bsd.port.mk>
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
index 5dcf7e385441..a360f42e8af7 100644
--- a/x11/xdm/pkg-plist
+++ b/x11/xdm/pkg-plist
@@ -6,6 +6,8 @@ lib/X11/xdm/libXdmGreet.la
lib/X11/xdm/libXdmGreet.so
lib/X11/xdm/pixmaps/xorg-bw.xpm
lib/X11/xdm/pixmaps/xorg.xpm
+man/man1/xdm.1.gz
+%%XDMSHELL%%man/man1/xmdshell.1.gz
share/X11/app-defaults/Chooser
@unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
@unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile
index 3dd1d659e6c2..17da952314cc 100644
--- a/x11/xdpyinfo/Makefile
+++ b/x11/xdpyinfo/Makefile
@@ -13,9 +13,6 @@ XORG_CAT= app
USE_XORG= dmx x11 xcb xcomposite xext xinerama xproto xrender \
xtst xxf86dga xxf86misc xxf86vm
-PLIST_FILES= bin/xdpyinfo
+PLIST_FILES= bin/xdpyinfo man/man1/xdpyinfo.1.gz
-MAN1= xdpyinfo.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile
index 11134e0e0923..f792875841fc 100644
--- a/x11/xdriinfo/Makefile
+++ b/x11/xdriinfo/Makefile
@@ -11,8 +11,6 @@ USE_GL= gl
XORG_CAT= app
USE_XORG= x11 glproto
-MAN1= xdriinfo.1
-PLIST_FILES= bin/xdriinfo
+PLIST_FILES= bin/xdriinfo man/man1/xdriinfo.1.gz
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
index 6c43308ee676..8d91fb83230e 100644
--- a/x11/xedit/Makefile
+++ b/x11/xedit/Makefile
@@ -10,7 +10,4 @@ COMMENT= Simple text editor for X
XORG_CAT= app
USE_XORG= xt xaw7
-MAN1= xedit.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xedit/pkg-plist b/x11/xedit/pkg-plist
index 1bd6252ee24b..47b1f8773128 100644
--- a/x11/xedit/pkg-plist
+++ b/x11/xedit/pkg-plist
@@ -19,6 +19,7 @@ lib/X11/xedit/lisp/lisp.lsp
lib/X11/xedit/lisp/xedit.lsp
lib/X11/xedit/lisp/syntax.lsp
lib/X11/xedit/lisp/indent.lsp
+man/man1/xedit.1.gz
share/X11/app-defaults/Xedit-color
share/X11/app-defaults/Xedit
@dirrmtry share/X11/app-defaults
diff --git a/x11/xev/Makefile b/x11/xev/Makefile
index a9b5c1f70ed1..3bcf87650c1b 100644
--- a/x11/xev/Makefile
+++ b/x11/xev/Makefile
@@ -10,9 +10,6 @@ COMMENT= Print contents of X events
XORG_CAT= app
USE_XORG= x11 xrandr
-PLIST_FILES= bin/xev
+PLIST_FILES= bin/xev man/man1/xev.1.gz
-MAN1= xev.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile
index 5eb9744a9a67..98cabf52df7e 100644
--- a/x11/xeyes/Makefile
+++ b/x11/xeyes/Makefile
@@ -10,9 +10,6 @@ COMMENT= A follow the mouse X demo
XORG_CAT= app
USE_XORG= x11 xt xext xmu xrender
-PLIST_FILES= bin/xeyes
+PLIST_FILES= bin/xeyes man/man1/xeyes.1.gz
-MAN1= xeyes.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
index 0c5b9faedae2..719a4b1724bf 100644
--- a/x11/xf86dga/Makefile
+++ b/x11/xf86dga/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11 xxf86dga xt xaw7 xmu
-PLIST_FILES= bin/dga
+PLIST_FILES= bin/dga man/man1/dga.1.gz
-MAN1= dga.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile
index 2774d5786026..c954273b1a08 100644
--- a/x11/xfindproxy/Makefile
+++ b/x11/xfindproxy/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11 ice xt xproxymngproto
-PLIST_FILES= bin/xfindproxy
+PLIST_FILES= bin/xfindproxy man/man1/xfindproxy.1.gz
-MAN1= xfindproxy.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile
index 45aae4e0c0f2..d2c8e1ed7e60 100644
--- a/x11/xfwp/Makefile
+++ b/x11/xfwp/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11 ice xproxymngproto
-PLIST_FILES= bin/xfwp
+PLIST_FILES= bin/xfwp man/man1/xfwp.1.gz
-MAN1= xfwp.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile
index a3e96fd70326..af73b7abbe3c 100644
--- a/x11/xgamma/Makefile
+++ b/x11/xgamma/Makefile
@@ -10,9 +10,6 @@ COMMENT= Gamma correction through the X server.
XORG_CAT= app
USE_XORG= x11 xxf86vm
-PLIST_FILES= bin/xgamma
+PLIST_FILES= bin/xgamma man/man1/xgamma.1.gz
-MAN1= xgamma.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile
index b2aa5276ed92..47f7ae63d9b2 100644
--- a/x11/xgc/Makefile
+++ b/x11/xgc/Makefile
@@ -12,7 +12,4 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xt xaw
-MAN1= xgc.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xgc/pkg-plist b/x11/xgc/pkg-plist
index 3dce453f0156..1447f6a353db 100644
--- a/x11/xgc/pkg-plist
+++ b/x11/xgc/pkg-plist
@@ -1,4 +1,5 @@
bin/xgc
+man/man1/xgc.1.gz
share/X11/app-defaults/Xgc
share/X11/app-defaults/Xgc-color
@dirrmtry share/X11/app-defaults
diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile
index 66a762ecb290..0038cd1aa4b7 100644
--- a/x11/xhost/Makefile
+++ b/x11/xhost/Makefile
@@ -10,9 +10,6 @@ COMMENT= Server access control program for X
XORG_CAT= app
USE_XORG= x11 xmuu xau
-PLIST_FILES= bin/xhost
+PLIST_FILES= bin/xhost man/man1/xhost.1.gz
-MAN1= xhost.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile
index c61f83f85180..37fb950c627a 100644
--- a/x11/xinit/Makefile
+++ b/x11/xinit/Makefile
@@ -13,9 +13,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11
-MAN1= startx.1 xinit.1
-
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|hexdump|/usr/bin/hexdump|' ${WRKSRC}/startx.cpp
diff --git a/x11/xinit/pkg-plist b/x11/xinit/pkg-plist
index d485e2debdfd..c83f92eecef7 100644
--- a/x11/xinit/pkg-plist
+++ b/x11/xinit/pkg-plist
@@ -1,5 +1,7 @@
bin/startx
bin/xinit
+man/man1/startx.1.gz
+man/man1/xinit.1.gz
etc/X11/xinit/xinitrc
@dirrm etc/X11/xinit
@dirrmtry etc/X11
diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile
index 76b5ab893ad7..cc69266bd367 100644
--- a/x11/xinput/Makefile
+++ b/x11/xinput/Makefile
@@ -11,9 +11,6 @@ COMMENT= Very useful utility for configuring and testing XInput devices
XORG_CAT= app
USE_XORG= inputproto x11 xi xext xrandr xinerama
-PLIST_FILES= bin/xinput
+PLIST_FILES= bin/xinput man/man1/xinput.1.gz
-MAN1= xinput.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile
index 6c569460fb2c..e541ea728d9f 100644
--- a/x11/xkbcomp/Makefile
+++ b/x11/xkbcomp/Makefile
@@ -14,9 +14,7 @@ USE_XORG= x11 xkbfile
USES= pathfix
PLIST_FILES= bin/xkbcomp \
- libdata/pkgconfig/xkbcomp.pc
+ libdata/pkgconfig/xkbcomp.pc \
+ man/man1/xkbcomp.1.gz
-MAN1= xkbcomp.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xkbevd/Makefile b/x11/xkbevd/Makefile
index 35ebe580e078..b683a9600730 100644
--- a/x11/xkbevd/Makefile
+++ b/x11/xkbevd/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xkbfile x11
-PLIST_FILES= bin/xkbevd
+PLIST_FILES= bin/xkbevd man/man1/xkbevd.1.gz
-MAN1= xkbevd.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xkbprint/Makefile b/x11/xkbprint/Makefile
index ef020a59f3f5..cf0f6bcfc4a0 100644
--- a/x11/xkbprint/Makefile
+++ b/x11/xkbprint/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xkbfile x11
-PLIST_FILES= bin/xkbprint
+PLIST_FILES= bin/xkbprint man/man1/xkbprint.1.gz
-MAN1= xkbprint.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile
index 5674cd59301b..ed4a3361ded7 100644
--- a/x11/xkbutils/Makefile
+++ b/x11/xkbutils/Makefile
@@ -12,7 +12,4 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xkbfile x11 xaw inputproto
-MAN1= xkbbell.1 xkbvleds.1 xkbwatch.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xkbutils/pkg-plist b/x11/xkbutils/pkg-plist
index d946aac18f93..8606612d937f 100644
--- a/x11/xkbutils/pkg-plist
+++ b/x11/xkbutils/pkg-plist
@@ -1,3 +1,6 @@
bin/xkbvleds
bin/xkbwatch
bin/xkbbell
+man/man1/xkbbell.1.gz
+man/man1/xkbvleds.1.gz
+man/man1/xkbwatch.1.gz
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index ebfa770a8e7a..73c761d034ff 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,13 +1,12 @@
# $FreeBSD$
PORTNAME= xkeyboard-config
-PORTVERSION= 2.9
-PORTREVISION= 1
+PORTVERSION= 2.10.1
CATEGORIES= x11
-MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME}
MAINTAINER= x11@FreeBSD.org
COMMENT= X Keyboard Configuration Database
+MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME}
LICENSE= MIT
@@ -19,21 +18,13 @@ USE_GNOME= intlhack libxslt:build
USES= gmake pathfix perl5
USE_PERL5= build
GNU_CONFIGURE= yes
-MAKE_JOBS_UNSAFE=yes
CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \
--with-xkb-rules-symlink=xorg
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAN7= xkeyboard-config.7
-
-OPTIONS_DEFINE= ETERSOFT
-ETERSOFT_DESC= Add pre-1918 Russian letters to typographic layout
-ETERSOFT_EXTRA_PATCHES= ${FILESDIR}/etersoft-patch-symbols-typo
-
-NO_STAGE= yes
-#.include <bsd.port.options.mk>
+.include <bsd.port.options.mk>
# !nls case doesn't work correctly, comment it out.
#.if ${PORT_OPTIONS:MNLS}
@@ -49,7 +40,7 @@ post-patch:
${WRKSRC}/rules/merge.sh
post-install:
- ${MKDIR} /var/lib/xkb
- ${LN} -sf /var/lib/xkb ${PREFIX}/share/X11/xkb/compiled
+ ${MKDIR} ${STAGEDIR}/var/lib/xkb
+ ${LN} -sf /var/lib/xkb ${STAGEDIR}${PREFIX}/share/X11/xkb/compiled
.include <bsd.port.mk>
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index e147c55fd1b4..f2a7757fb8a8 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.9.tar.bz2) = 5e89bc182a10d53c3e83efc6c3546de0fe5504d91c3dbc80d55cc64ddab5643a
-SIZE (xorg/data/xkeyboard-config-2.9.tar.bz2) = 912379
+SHA256 (xorg/data/xkeyboard-config-2.10.1.tar.bz2) = 7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b
+SIZE (xorg/data/xkeyboard-config-2.10.1.tar.bz2) = 908897
diff --git a/x11/xkeyboard-config/files/etersoft-patch-symbols-typo b/x11/xkeyboard-config/files/etersoft-patch-symbols-typo
deleted file mode 100644
index cf04abcf75bd..000000000000
--- a/x11/xkeyboard-config/files/etersoft-patch-symbols-typo
+++ /dev/null
@@ -1,26 +0,0 @@
-Etersoft version of typographic keyboard layout. It removes Yen symbol `¥'
-(can be easily inserted via "Compose Y =") and adds four letters of Russian
-orthography that were removed during the reform of 1917-1918.
-
-Original upstream bugzilla request:
-
- http://bugs.etersoft.ru/show_bug.cgi?id=5466
-
-Description (in Russian) and the picture of keyboard layout:
-
- http://kb.etersoft.ru/Типографская_раскладка_Etersoft
-
---- symbols/typo.orig
-+++ symbols/typo
-@@ -29,7 +29,10 @@
- key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e"
- key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r"
- key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t"
-- key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y"
-+ key <AD06> { [NoSymbol, NoSymbol, U0463, U0462] };
-+ key <AD07> { [NoSymbol, NoSymbol, U0475, U0474] };
-+ key <AD08> { [NoSymbol, NoSymbol, U0456, U0406] };
-+ key <AD09> { [NoSymbol, NoSymbol, U0473, U0472] };
- key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p"
- key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft] }; // [
- key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright] }; // ]
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index bf29a8ae8293..8dc25a892d0c 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -1,4 +1,5 @@
libdata/pkgconfig/xkeyboard-config.pc
+man/man7/xkeyboard-config.7.gz
share/X11/xkb/compat/README
share/X11/xkb/compat/accessx
share/X11/xkb/compat/basic
diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile
index 55daade0bb5d..a68108318283 100644
--- a/x11/xkill/Makefile
+++ b/x11/xkill/Makefile
@@ -10,9 +10,6 @@ COMMENT= Utility for killing a client by its X resource
XORG_CAT= app
USE_XORG= x11 xmuu
-PLIST_FILES= bin/xkill
+PLIST_FILES= bin/xkill man/man1/xkill.1.gz
-MAN1= xkill.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xload/Makefile b/x11/xload/Makefile
index a8c92e4bc826..feaeae0b9d3c 100644
--- a/x11/xload/Makefile
+++ b/x11/xload/Makefile
@@ -12,7 +12,4 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xt xaw
-MAN1= xload.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xload/pkg-plist b/x11/xload/pkg-plist
index ab27b78d7852..898cb85d4aee 100644
--- a/x11/xload/pkg-plist
+++ b/x11/xload/pkg-plist
@@ -1,4 +1,5 @@
bin/xload
+man/man1/xload.1.gz
share/X11/app-defaults/XLoad
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile
index 5bddb2544d32..13b340dc89ff 100644
--- a/x11/xlogo/Makefile
+++ b/x11/xlogo/Makefile
@@ -12,7 +12,4 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xrender xft xext xt xaw xp xprintutil
-MAN1= xlogo.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xlogo/pkg-plist b/x11/xlogo/pkg-plist
index 79ee77826802..e6aad53dad6f 100644
--- a/x11/xlogo/pkg-plist
+++ b/x11/xlogo/pkg-plist
@@ -1,4 +1,5 @@
bin/xlogo
+man/man1/xlogo.1.gz
share/X11/app-defaults/XLogo
share/X11/app-defaults/XLogo-color
@dirrmtry share/X11/app-defaults
diff --git a/x11/xlsatoms/Makefile b/x11/xlsatoms/Makefile
index 240bf4abb8c9..4485740100bd 100644
--- a/x11/xlsatoms/Makefile
+++ b/x11/xlsatoms/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11 xmuu
-PLIST_FILES= bin/xlsatoms
+PLIST_FILES= bin/xlsatoms man/man1/xlsatoms.1.gz
-MAN1= xlsatoms.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile
index 1fa64f8301c3..45dc3d3ea192 100644
--- a/x11/xlsclients/Makefile
+++ b/x11/xlsclients/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11 xmuu
-PLIST_FILES= bin/xlsclients
+PLIST_FILES= bin/xlsclients man/man1/xlsclients.1.gz
-MAN1= xlsclients.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile
index 6efac1998527..7f5e20740a3f 100644
--- a/x11/xmag/Makefile
+++ b/x11/xmag/Makefile
@@ -12,7 +12,4 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xt xaw
-MAN1= xmag.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xmag/pkg-plist b/x11/xmag/pkg-plist
index 0aa24370b0d3..6fcd389d0987 100644
--- a/x11/xmag/pkg-plist
+++ b/x11/xmag/pkg-plist
@@ -1,4 +1,5 @@
bin/xmag
+man/man1/xmag.1.gz
share/X11/app-defaults/Xmag
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/xman/Makefile b/x11/xman/Makefile
index a741b1882467..aac364526c40 100644
--- a/x11/xman/Makefile
+++ b/x11/xman/Makefile
@@ -12,7 +12,4 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= xt xaw xp xprintutil
-MAN1= xman.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xman/pkg-plist b/x11/xman/pkg-plist
index 1a196e28303e..6bf595b17e0c 100644
--- a/x11/xman/pkg-plist
+++ b/x11/xman/pkg-plist
@@ -1,4 +1,5 @@
bin/xman
+man/man1/xman.1.gz
share/X11/app-defaults/Xman
share/X11/xman.help
@dirrmtry share/X11/app-defaults
diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile
index 5eb4ef85fcc6..b3a598548a13 100644
--- a/x11/xmessage/Makefile
+++ b/x11/xmessage/Makefile
@@ -10,7 +10,4 @@ COMMENT= Display message or query in a X window
XORG_CAT= app
USE_XORG= xt xaw
-MAN1= xmessage.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xmessage/pkg-plist b/x11/xmessage/pkg-plist
index e93abc75c414..eaa9bba9c727 100644
--- a/x11/xmessage/pkg-plist
+++ b/x11/xmessage/pkg-plist
@@ -1,4 +1,5 @@
bin/xmessage
+man/man1/xmessage.1.gz
share/X11/app-defaults/Xmessage
share/X11/app-defaults/Xmessage-color
@dirrmtry share/X11/app-defaults
diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile
index 736c3c84e2b8..563602956e01 100644
--- a/x11/xmh/Makefile
+++ b/x11/xmh/Makefile
@@ -12,7 +12,4 @@ RUN_DEPENDS+= repl:${PORTSDIR}/mail/nmh
XORG_CAT= app
USE_XORG= xaw xmu xt xbitmaps
-MAN1= xmh.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xmh/pkg-plist b/x11/xmh/pkg-plist
index 7def48663490..85ac46442232 100644
--- a/x11/xmh/pkg-plist
+++ b/x11/xmh/pkg-plist
@@ -1,4 +1,5 @@
bin/xmh
+man/man1/xmh.1.gz
share/X11/app-defaults/Xmh
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile
index 84aad25b169c..1bf0d3e5d45b 100644
--- a/x11/xmodmap/Makefile
+++ b/x11/xmodmap/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11
-PLIST_FILES= bin/xmodmap
+PLIST_FILES= bin/xmodmap man/man1/xmodmap.1.gz
-MAN1= xmodmap.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile
index dceb6e005ae7..b2c131b759b5 100644
--- a/x11/xmore/Makefile
+++ b/x11/xmore/Makefile
@@ -10,7 +10,4 @@ COMMENT= Plain text display program for X
XORG_CAT= app
USE_XORG= xt xaw xp xprintutil
-MAN1= xmore.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xmore/pkg-plist b/x11/xmore/pkg-plist
index ee66b5f19057..61f8ed735ba8 100644
--- a/x11/xmore/pkg-plist
+++ b/x11/xmore/pkg-plist
@@ -1,4 +1,5 @@
bin/xmore
+man/man1/xmore.1.gz
share/X11/app-defaults/XMore
@dirrmtry share/X11/app-defaults
@dirrmtry share/X11
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index 1ccd5325eba3..b0710c24e8c2 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -27,10 +27,9 @@ COMPONENTS+= x11-wm/twm:twm x11-clocks/xclock:xclock xinit xterm
NO_BUILD= yes
-NO_STAGE= yes
do-install:
- ${MKDIR} ${PREFIX}/libdata/xorg
- ${TOUCH} ${PREFIX}/libdata/xorg/apps
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/xorg
+ ${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/apps
.for comp in ${COMPONENTS}
OPTIONS_DEFINE+= ${comp:C/:.*//:C/.*\///:U}
diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile
index 66422254b5e7..b6549ddcc7a2 100644
--- a/x11/xorg-docs/Makefile
+++ b/x11/xorg-docs/Makefile
@@ -8,11 +8,8 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X.org documentation files
-MAN7= X.7 Standards.7 XProjectTeam.7 Consortium.7 Xsecurity.7 XOrgFoundation.7
-
CONFIGURE_ARGS+= --without-xmlto --without-fop --disable-specs
XORG_CAT= doc
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xorg-docs/pkg-plist b/x11/xorg-docs/pkg-plist
index 43c3bc46582c..dcbfbc2b7372 100644
--- a/x11/xorg-docs/pkg-plist
+++ b/x11/xorg-docs/pkg-plist
@@ -1,3 +1,9 @@
+man/man7/X.7.gz
+man/man7/Standards.7.gz
+man/man7/XProjectTeam.7.gz
+man/man7/Consortium.7.gz
+man/man7/Xsecurity.7.gz
+man/man7/XOrgFoundation.7.gz
%%DOCSDIR%%/fonts/fonts.xml
%%DOCSDIR%%/input/XKB-Config.xml
%%DOCSDIR%%/input/XKB-Enhancing.xml
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index c76f622c71ae..db86bf71a50a 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -3,7 +3,6 @@
PORTNAME= xorg-libraries
PORTVERSION= 7.7
-PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= # none
DISTFILES= # none
@@ -40,7 +39,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
${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 \
@@ -56,9 +54,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \
${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm
-NO_STAGE= yes
do-install:
- ${MKDIR} ${PREFIX}/libdata/xorg
- ${TOUCH} ${PREFIX}/libdata/xorg/libraries
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/xorg
+ ${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/libraries
.include <bsd.port.mk>
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index 58d594273a56..8ba46be0f4f4 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -12,6 +12,7 @@ MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org complete distribution metaport
NO_BUILD= yes
+NO_MTREE= yes
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
@@ -19,7 +20,6 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
-NO_STAGE= yes
.include <bsd.port.options.mk>
# doc
diff --git a/x11/xplsprinters/Makefile b/x11/xplsprinters/Makefile
index e163448a9d22..600dde2391ae 100644
--- a/x11/xplsprinters/Makefile
+++ b/x11/xplsprinters/Makefile
@@ -10,9 +10,6 @@ COMMENT= Shows a list of Xprint printers
XORG_CAT= app
USE_XORG= xp xprintutil x11
-PLIST_FILES= bin/xplsprinters
+PLIST_FILES= bin/xplsprinters man/man1/xplsprinters.1.gz
-MAN1= xplsprinters.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xprehashprinterlist/Makefile b/x11/xprehashprinterlist/Makefile
index d47b71024f65..63053a1af6a5 100644
--- a/x11/xprehashprinterlist/Makefile
+++ b/x11/xprehashprinterlist/Makefile
@@ -10,9 +10,6 @@ COMMENT= Recomputes the list of available printers.
XORG_CAT= app
USE_XORG= xp x11
-PLIST_FILES= bin/xprehashprinterlist
+PLIST_FILES= bin/xprehashprinterlist man/man1/xprehashprinterlist.1.gz
-MAN1= xprehashprinterlist.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile
index ad0854334539..38acc2efb756 100644
--- a/x11/xprop/Makefile
+++ b/x11/xprop/Makefile
@@ -10,9 +10,6 @@ COMMENT= Property displayer for X
XORG_CAT= app
USE_XORG= xmuu x11
-PLIST_FILES= bin/xprop
+PLIST_FILES= bin/xprop man/man1/xprop.1.gz
-MAN1= xprop.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index 3fbb50b717af..22dd13cf77aa 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xproto
-PORTVERSION= 7.0.24
+PORTVERSION= 7.0.25
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index 88deba2211c1..9a92725117fd 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc
-SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795
+SHA256 (xorg/proto/xproto-7.0.25.tar.bz2) = 92247485dc4ffc3611384ba84136591923da857212a7dc29f4ad7797e13909fe
+SIZE (xorg/proto/xproto-7.0.25.tar.bz2) = 295948
diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile
index 52045ba58b25..8d067fa30d73 100644
--- a/x11/xrandr/Makefile
+++ b/x11/xrandr/Makefile
@@ -11,9 +11,7 @@ XORG_CAT= app
USE_XORG= xrandr xrender x11
PLIST_FILES= bin/xrandr \
- bin/xkeystone
+ bin/xkeystone \
+ man/man1/xrandr.1.gz
-MAN1= xrandr.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile
index eafd3bd5a2c0..810053bc7c2b 100644
--- a/x11/xrdb/Makefile
+++ b/x11/xrdb/Makefile
@@ -10,9 +10,6 @@ COMMENT= X server resource database utility
XORG_CAT= app
USE_XORG= xmuu x11
-PLIST_FILES= bin/xrdb
+PLIST_FILES= bin/xrdb man/man1/xrdb.1.gz
-MAN1= xrdb.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile
index 75e016be4c5b..b6c55219516f 100644
--- a/x11/xrefresh/Makefile
+++ b/x11/xrefresh/Makefile
@@ -12,9 +12,6 @@ LICENSE= MIT
XORG_CAT= app
USE_XORG= x11
-PLIST_FILES= bin/xrefresh
+PLIST_FILES= bin/xrefresh man/man1/xrefresh.1.gz
-MAN1= xrefresh.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
index 46b1d1462ae0..db83c048f313 100644
--- a/x11/xrx/Makefile
+++ b/x11/xrx/Makefile
@@ -12,9 +12,6 @@ USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw ice
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-MAN1= xrx.1 libxrx.1
-
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|mozilla-plugin|disabled-libxul-plugin|g' \
${WRKSRC}/configure
diff --git a/x11/xrx/pkg-plist b/x11/xrx/pkg-plist
index 783211e4a138..20c708613730 100644
--- a/x11/xrx/pkg-plist
+++ b/x11/xrx/pkg-plist
@@ -5,4 +5,5 @@ lib/libxrx.so
lib/libxrxnest.a
lib/libxrxnest.la
lib/libxrxnest.so
-@dirrmtry include/X11/extensions
+man/man1/xrx.1.gz
+man/man1/libxrx.1.gz
diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile
index 10a2d7bdb07b..19b457a96a67 100644
--- a/x11/xsetmode/Makefile
+++ b/x11/xsetmode/Makefile
@@ -10,9 +10,6 @@ COMMENT= Set the mode for an X Input Device
XORG_CAT= app
USE_XORG= xi x11
-PLIST_FILES= bin/xsetmode
+PLIST_FILES= bin/xsetmode man/man1/xsetmode.1.gz
-MAN1= xsetmode.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile
index 0589bb5ed681..06667e8400ab 100644
--- a/x11/xsetpointer/Makefile
+++ b/x11/xsetpointer/Makefile
@@ -10,9 +10,6 @@ COMMENT= Set an X Input device as the main pointer
XORG_CAT= app
USE_XORG= xi x11
-PLIST_FILES= bin/xsetpointer
+PLIST_FILES= bin/xsetpointer man/man1/xsetpointer.1.gz
-MAN1= xsetpointer.1
-
-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile
index 6a268d80d78d..f70ecdd1dc27 100644
--- a/x11/xtrans/Makefile
+++ b/x11/xtrans/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xtrans
-PORTVERSION= 1.2.7
+PORTVERSION= 1.3.2
CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo
index 15557067df4c..59088e2cd73a 100644
--- a/x11/xtrans/distinfo
+++ b/x11/xtrans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6
-SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025
+SHA256 (xorg/lib/xtrans-1.3.2.tar.bz2) = 94177c89b74f594bcddc6a12825e9b464e17ab1977de671d25f67a4ea922cb87
+SIZE (xorg/lib/xtrans-1.3.2.tar.bz2) = 177812
diff --git a/x11/xtrans/files/patch-Xtransint.h b/x11/xtrans/files/patch-Xtransint.h
new file mode 100644
index 000000000000..dad289484542
--- /dev/null
+++ b/x11/xtrans/files/patch-Xtransint.h
@@ -0,0 +1,11 @@
+--- Xtransint.h.orig 2013-11-08 10:46:59.086340096 +0100
++++ Xtransint.h 2013-11-08 11:02:02.275278727 +0100
+@@ -72,7 +72,7 @@
+ # define XTRANSDEBUG 1
+ #endif
+
+-#if XTRANS_SEND_FDS && !(defined(linux) || defined(__sun))
++#if XTRANS_SEND_FDS && !(defined(linux) || defined(__sun) || defined(__FreeBSD__))
+ #error "FD passing support only on Linux & Solaris"
+ #endif
+
diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist
index e0184a46f275..056a695d5cf5 100644
--- a/x11/xtrans/pkg-plist
+++ b/x11/xtrans/pkg-plist
@@ -3,7 +3,6 @@ include/X11/Xtrans/Xtrans.h
include/X11/Xtrans/Xtransint.h
include/X11/Xtrans/Xtranslcl.c
include/X11/Xtrans/Xtranssock.c
-include/X11/Xtrans/Xtranstli.c
include/X11/Xtrans/Xtransutil.c
include/X11/Xtrans/transport.c
libdata/pkgconfig/xtrans.pc
diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile
index ec0417552959..6e905ce2f845 100644
--- a/x11/xvidtune/Makefile
+++ b/x11/xvidtune/Makefile
@@ -9,4 +9,5 @@ COMMENT= Video mode tuner for X
XORG_CAT= app
USE_XORG= xxf86vm xt xaw
+
.include <bsd.port.mk>
diff --git a/x11/xvmcinfo/Makefile b/x11/xvmcinfo/Makefile
index 114dcd5c04ee..a85d9cf19818 100644
--- a/x11/xvmcinfo/Makefile
+++ b/x11/xvmcinfo/Makefile
@@ -16,15 +16,12 @@ NO_WRKSUBDIR= defined
PLIST_FILES= bin/xvmcinfo
-NO_MAN= defined
-
-NO_STAGE= yes
do-build:
${CC} ${CFLAGS} ${CPPFLAGS} \
-I${LOCALBASE}/include -L${LOCALBASE}/lib \
-o ${WRKSRC}/xvmcinfo ${FILESDIR}/xvmcinfo.c ${LDFLAGS}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xvmcinfo ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/xvmcinfo ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>