Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 11 Dec 2013 13:14:02 +0100 (CET)
From:      Niclas Zeising <zeising@daemonic.se>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/184684: [EXP-RUN] switch CURRENT to new xorg
Message-ID:  <201312111214.rBBCE2EJ068310@vivi.daemonic.se>
Resent-Message-ID: <201312111220.rBBCK1w9076212@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         184684
>Category:       ports
>Synopsis:       [EXP-RUN] switch CURRENT to new xorg
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 11 12:20:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Niclas Zeising
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD vivi.daemonic.se 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r252979M: Sun Jul 7 21:07:39 CEST 2013 root@vivi.daemonic.se:/usr/obj/usr/src/sys/VIVI amd64


	
>Description:
	Attached patch switches current over to new xorg, and stagifies remaining xorg ports.  Please apply it with svn patch and run an exp-run on FreeBSD current.

	Patch also available at http://people.freebsd.org/~zeising/xorg-switch.2013-12-11.diff
>How-To-Repeat:
	
>Fix:

	

--- xorg-switch.diff begins here ---
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk	(revision 336156)
+++ Mk/bsd.port.mk	(working copy)
@@ -1222,6 +1222,17 @@
 .endif
 .endif
 
+# Enable new xorg for FreeBSD versions after Radeon KMS was imported unless
+# WITHOUT_NEW_XORG is set.
+# XXX - This version should switch to whatever version newcons gets.
+.if ${OSVERSION} >= 1100000
+. if !defined(WITHOUT_NEW_XORG)
+WITH_NEW_XORG?=	yes
+. else
+.undef WITH_NEW_XORG
+. endif
+.endif
+
 # Only define tools here (for transition period with between pkg tools)
 .include "${PORTSDIR}/Mk/bsd.commands.mk"
 
Index: Mk/bsd.xorg.mk
===================================================================
--- Mk/bsd.xorg.mk	(revision 336156)
+++ Mk/bsd.xorg.mk	(working copy)
@@ -56,7 +56,9 @@
 . endif
 
 . if ${XORG_CAT} == "driver"
-USE_XORG+=	xorg-server xproto randrproto xi
+USE_XORG+=	xorg-server xproto randrproto xi renderproto xextproto \
+			inputproto kbproto fontsproto videoproto dri2proto xf86driproto \
+			glproto xineramaproto resourceproto scrnsaverproto
 # work around a llvm bug on i386, llvm bug #15806 
 # reproduced with clang 3.2 (current release) and 3.1
 .  if ${ARCH} == i386
@@ -63,14 +65,6 @@
 CFLAGS+=	-fno-optimize-sibling-calls
 .  endif
 CONFIGURE_ENV+=	DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4'
-.  if ${PORTNAME:M*input*}x != x
-USE_XORG+=	inputproto videoproto fontsproto renderproto xextproto \
-		dri2proto
-.  elif ${PORTNAME:M*video*}x != x
-USE_XORG+=	videoproto fontsproto renderproto xextproto dri2proto
-.  else
-IGNORE=		doesn't contain either "video" or "input"
-.  endif
 . endif
 
 . if ${XORG_CAT} == "font"
@@ -147,7 +141,7 @@
 CONFIGURE_ARGS+=	--with-xkb-path=${LOCALBASE}/share/X11/xkb
 
 LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri
-USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto
+USE_XORG+=	pciaccess xextproto videoproto fontsproto dri2proto fontutil:build
 . endif
 
 .endif
@@ -171,6 +165,7 @@
 				dmx \
 				dmxproto \
 				dri2proto \
+				dri3proto \
 				evieproto \
 				fixesproto \
 				fontcacheproto \
@@ -185,6 +180,7 @@
 				oldx \
 				pciaccess \
 				pixman \
+				presentproto \
 				printproto \
 				randrproto \
 				recordproto \
@@ -238,6 +234,7 @@
 				xrender \
 				xres \
 				xscrnsaver \
+				xshmfence \
 				xt \
 				xtrans \
 				xtrap \
@@ -254,6 +251,7 @@
 dmx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx
 dmxproto_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto
 dri2proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto
+dri3proto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dri3proto.pc:${PORTSDIR}/x11/dri3proto
 evieproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext
 fixesproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto
 fontcacheproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto
@@ -268,6 +266,7 @@
 oldx_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX
 pciaccess_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess
 pixman_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
+presentproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/presentproto.pc:${PORTSDIR}/x11/presentproto
 printproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
 randrproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto
 recordproto_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto
@@ -322,6 +321,7 @@
 xres_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres
 xscrnsaver_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver
 xt_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt
+xshmfence_LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xshmfence.pc:${PORTSDIR}/x11/libxshmfence
 xtrans_BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans
 xtrap_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap
 xtst_LIB_PC_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst
Index: UPDATING
===================================================================
--- UPDATING	(revision 336156)
+++ UPDATING	(working copy)
@@ -5,6 +5,31 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+201309xx:
+  AFFECTS: users of x11/xorg and all xorg ports
+  AUTHOR: zeising@FreeBSD.org
+
+  The default xorg version has been switched for FreeBSD CURRENT.
+
+  No special upgrade procedure should be needed, but it is necessary to
+  recompile all xorg drivers and other ports that depend on the xserver
+  version, including emulators/virtualbox-ose-additions.  Portrevisions
+  have been bumped where needed, but users of drivers not in the ports
+  tree will need to recompile those.
+
+201309xx:
+  AFFECTS: users of x11/pixman
+  AUTHOR: zeising@FreeBSD.org
+
+  The library version of x11/pixman has changed, and portrevision has
+  been bumped in all dependent ports.  If you have external software that
+  depends on pixman, this software needs to be recompiled.
+  To recompile all software dependent on pixman, run:
+  
+  # portmaster -r pixman
+  or
+  # portupgrade -rf pixman
+
 20131209:
   AFFECTS: users of dns/bind96, dns/bind98 and bind99 on FreeBSD 10.0
   AUTHOR: erwin@FreeBSD.org
Index: astro/viking/Makefile
===================================================================
--- astro/viking/Makefile	(revision 336156)
+++ astro/viking/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	viking
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/
 
Index: cad/pdnmesh/Makefile
===================================================================
--- cad/pdnmesh/Makefile	(revision 336156)
+++ cad/pdnmesh/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdnmesh
 PORTVERSION=	0.2.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 
Index: cad/repsnapper/Makefile
===================================================================
--- cad/repsnapper/Makefile	(revision 336156)
+++ cad/repsnapper/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	repsnapper
 PORTVERSION=	2.3.2a3
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://codeload.github.com/timschmidt/repsnapper/tar.gz/
 DISTNAME=	${PORTVERSION}
Index: deskutils/pinot/Makefile
===================================================================
--- deskutils/pinot/Makefile	(revision 336156)
+++ deskutils/pinot/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pinot
 PORTVERSION=	1.06
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 #MASTER_SITES=	http://colinf.chez.com/pinot/
Index: devel/gccmakedep/Makefile
===================================================================
--- devel/gccmakedep/Makefile	(revision 336156)
+++ devel/gccmakedep/Makefile	(working copy)
@@ -13,10 +13,7 @@
 
 BUILD_DEPENDS=	tradcpp:${PORTSDIR}/devel/tradcpp
 
-MAN1=		gccmakedep.1
-
-PLIST_FILES=	bin/gccmakedep
+PLIST_FILES=	bin/gccmakedep man/man1/gccmakedep.1.gz
 CONFIGURE_ENV+=	ac_cv_path_RAWCPP=tradcpp
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: devel/imake/Makefile
===================================================================
--- devel/imake/Makefile	(revision 336156)
+++ devel/imake/Makefile	(working copy)
@@ -25,15 +25,4 @@
 
 CONFIGURE_ENV=	ac_cv_path_RAWCPP=tradcpp
 
-MAN1=		ccmakedep.1 \
-		cleanlinks.1 \
-		imake.1 \
-		makeg.1 \
-		mergelib.1 \
-		mkdirhier.1 \
-		mkhtmlindex.1 \
-		revpath.1 \
-		xmkmf.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: devel/imake/pkg-plist
===================================================================
--- devel/imake/pkg-plist	(revision 336156)
+++ devel/imake/pkg-plist	(working copy)
@@ -7,3 +7,12 @@
 bin/mkhtmlindex
 bin/revpath
 bin/xmkmf
+man/man1/ccmakedep.1.gz
+man/man1/cleanlinks.1.gz
+man/man1/imake.1.gz
+man/man1/makeg.1.gz
+man/man1/mergelib.1.gz
+man/man1/mkdirhier.1.gz
+man/man1/mkhtmlindex.1.gz
+man/man1/revpath.1.gz
+man/man1/xmkmf.1.gz
Index: devel/libpciaccess/Makefile
===================================================================
--- devel/libpciaccess/Makefile	(revision 336156)
+++ devel/libpciaccess/Makefile	(working copy)
@@ -14,5 +14,4 @@
 
 XORG_CAT=	lib
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: devel/makedepend/Makefile
===================================================================
--- devel/makedepend/Makefile	(revision 336156)
+++ devel/makedepend/Makefile	(working copy)
@@ -12,9 +12,6 @@
 XORG_CAT=	util
 USE_XORG=	xproto
 
-PLIST_FILES=	bin/makedepend
+PLIST_FILES=	bin/makedepend man/man1/makedepend.1.gz
 
-MAN1=		makedepend.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: devel/xorg-macros/Makefile
===================================================================
--- devel/xorg-macros/Makefile	(revision 336156)
+++ devel/xorg-macros/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xorg-macros
-PORTVERSION=	1.17.1
+PORTVERSION=	1.18.0
 CATEGORIES=	devel x11
 DISTNAME=	util-macros-$(PORTVERSION)
 
Index: devel/xorg-macros/distinfo
===================================================================
--- devel/xorg-macros/distinfo	(revision 336156)
+++ devel/xorg-macros/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/util/util-macros-1.17.1.tar.bz2) = 5e52654f2a0b04223cf28a9d7fd62cf288852e639ac13a75172fd47d0d6ac625
-SIZE (xorg/util/util-macros-1.17.1.tar.bz2) = 79105
+SHA256 (xorg/util/util-macros-1.18.0.tar.bz2) = e5e3d132a852f0576ea2cf831a9813c54a58810a59cdb198f56b884c5a78945b
+SIZE (xorg/util/util-macros-1.18.0.tar.bz2) = 77830
Index: emulators/catapult/Makefile
===================================================================
--- emulators/catapult/Makefile	(revision 336156)
+++ emulators/catapult/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	catapult
 PORTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF/openmsx/openmsx/${PORTVERSION}
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
Index: emulators/qemu-devel/Makefile
===================================================================
--- emulators/qemu-devel/Makefile	(revision 336156)
+++ emulators/qemu-devel/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/:release \
 		LOCAL/nox:snapshot
Index: emulators/tme/Makefile
===================================================================
--- emulators/tme/Makefile	(revision 336156)
+++ emulators/tme/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tme
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://people.csail.mit.edu/fredette/tme/
 
Index: emulators/virtualbox-ose-additions/Makefile
===================================================================
--- emulators/virtualbox-ose-additions/Makefile	(revision 336156)
+++ emulators/virtualbox-ose-additions/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.2.20
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
Index: games/klavaro/Makefile
===================================================================
--- games/klavaro/Makefile	(revision 336156)
+++ games/klavaro/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	klavaro
 PORTVERSION=	1.9.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/
 
Index: graphics/cairo/Makefile
===================================================================
--- graphics/cairo/Makefile	(revision 336156)
+++ graphics/cairo/Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.10.2
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
Index: graphics/freeglut/Makefile
===================================================================
--- graphics/freeglut/Makefile	(revision 336156)
+++ graphics/freeglut/Makefile	(working copy)
@@ -28,7 +28,6 @@
 	progress.html structure.html
 BINS=	CallbackMaker Fractals Fractals_random Lorenz One shapes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 pre-configure:
@@ -43,17 +42,17 @@
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${STAGEDIR}${EXAMPLESDIR}
 .for prog in ${BINS}
-	@${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} ${EXAMPLESDIR}
+	@${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
Index: graphics/libdrm/Makefile
===================================================================
--- graphics/libdrm/Makefile	(revision 336156)
+++ graphics/libdrm/Makefile	(working copy)
@@ -17,7 +17,6 @@
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-NO_STAGE=	yes
 
 OPTIONS_DEFINE=	MANPAGES
 
@@ -42,28 +41,22 @@
 .endif
 
 .if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		xsltproc:${PORTSDIR}/textproc/libxslt
-MAN3=		drmAvailable.3 \
-		drmHandleEvent.3 \
-		drmModeGetResources.3
-MAN7=		drm-gem.7 \
-		drm-kms.7 \
-		drm-memory.7 \
-		drm-mm.7 \
-		drm-ttm.7 \
-		drm.7
+BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+USE_GNOME+=	libxslt:build
+PLIST_SUB+=	MAN=""
 .else
 CONFIGURE_ARGS+=--disable-manpages
+PLIST_SUB+=	MAN="@comment "
 .endif
 
-LIBDRM_VERSION=	2.4.46
+LIBDRM_VERSION=	2.4.50
 LIBDRM_REVISION=0
 PLIST_SUB+=	OLD="@comment " NEW=""
 EXTRA_PATCHES+=	${FILESDIR}/extra-configure \
 		${FILESDIR}/extra-tests_modetest_Makefile.in \
 		${FILESDIR}/extra-tests_modetest_modetest.c \
-		${FILESDIR}/extra-tests_modetest_strchrnul.c
+		${FILESDIR}/extra-tests_modetest_strchrnul.c \
+		${FILESDIR}/extra-tests__radeon__radeon_ttm.c
 CONFIGURE_ARGS+=--disable-vmwgfx
 .else
 CONFIGURE_ARGS=	--enable-nouveau-experimental-api
@@ -85,4 +78,7 @@
 			   s,i?86|x86_64),i?86|amd64|x86_64),g' \
 		${WRKSRC}/configure
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
+
 .include <bsd.port.mk>
Index: graphics/libdrm/distinfo
===================================================================
--- graphics/libdrm/distinfo	(revision 336156)
+++ graphics/libdrm/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
 SIZE (libdrm-2.4.17.tar.bz2) = 408882
-SHA256 (libdrm-2.4.46.tar.bz2) = 33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1
-SIZE (libdrm-2.4.46.tar.bz2) = 554190
+SHA256 (libdrm-2.4.50.tar.bz2) = 3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045
+SIZE (libdrm-2.4.50.tar.bz2) = 563613
Index: graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c
===================================================================
--- graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c	(revision 0)
+++ graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c	(working copy)
@@ -0,0 +1,13 @@
+--- tests/radeon/radeon_ttm.c.orig	2013-11-07 11:34:28.207096353 +0100
++++ tests/radeon/radeon_ttm.c	2013-11-07 11:37:41.571085931 +0100
+@@ -25,6 +25,10 @@
+  */
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
++
++#include <xf86drm.h>
++
+ #include "rbo.h"
+ 
+ /* allocate as many single page bo to try to starve the kernel

Property changes on: graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: graphics/libdrm/files/extra-tests_modetest_Makefile.in
===================================================================
--- graphics/libdrm/files/extra-tests_modetest_Makefile.in	(revision 336156)
+++ graphics/libdrm/files/extra-tests_modetest_Makefile.in	(working copy)
@@ -1,6 +1,6 @@
---- tests/modetest/Makefile.in.orig	2013-04-04 15:41:48.212028807 +0200
-+++ tests/modetest/Makefile.in	2013-04-04 15:45:21.384003991 +0200
-@@ -36,8 +52,11 @@
+--- tests/modetest/Makefile.in.orig	2013-10-11 18:46:07.000000000 +0200
++++ tests/modetest/Makefile.in	2013-11-07 11:30:15.274123603 +0100
+@@ -80,8 +80,11 @@
  host_triplet = @host@
  @HAVE_INSTALL_TESTS_TRUE@bin_PROGRAMS = modetest$(EXEEXT)
  @HAVE_INSTALL_TESTS_FALSE@noinst_PROGRAMS = modetest$(EXEEXT)
@@ -12,9 +12,9 @@
 +@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS)
 +@HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_LIBS)
  subdir = tests/modetest
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -53,7 +72,10 @@
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ 	$(top_srcdir)/build-aux/depcomp
+@@ -98,7 +101,10 @@
  CONFIG_CLEAN_VPATH_FILES =
  am__installdirs = "$(DESTDIR)$(bindir)"
  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -26,16 +26,16 @@
  modetest_OBJECTS = $(am_modetest_OBJECTS)
  am__DEPENDENCIES_1 =
  @HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-@@ -229,12 +265,10 @@
- top_builddir = @top_builddir@
+@@ -306,12 +312,12 @@
  top_srcdir = @top_srcdir@
- AM_CFLAGS = -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \
+ AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) \
+ 	-I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \
 -	-I$(top_srcdir) $(am__append_1)
--modetest_SOURCES = \
++	-I$(top_srcdir) $(am__append_2)
+ modetest_SOURCES = \
 -	buffers.c modetest.c buffers.h
--
-+	-I$(top_srcdir) $(am__append_2)
-+modetest_SOURCES = buffers.c modetest.c buffers.h $(am__append_1)
++	buffers.c modetest.c buffers.h $(am__append_1)
+ 
  modetest_LDADD = $(top_builddir)/libdrm.la \
 -	$(top_builddir)/libkms/libkms.la $(am__append_2)
 +	$(top_builddir)/libkms/libkms.la $(am__append_3)
@@ -42,7 +42,7 @@
  all: all-am
  
  .SUFFIXES:
-@@ -333,6 +370,7 @@
+@@ -417,6 +423,7 @@
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@
Index: graphics/libdrm/files/extra-tests_modetest_modetest.c
===================================================================
--- graphics/libdrm/files/extra-tests_modetest_modetest.c	(revision 336156)
+++ graphics/libdrm/files/extra-tests_modetest_modetest.c	(working copy)
@@ -1,6 +1,6 @@
---- tests/modetest/modetest.c.orig	2013-02-22 00:44:28.203705216 +0100
-+++ tests/modetest/modetest.c	2013-02-22 00:44:56.803699770 +0100
-@@ -57,6 +57,10 @@
+--- tests/modetest/modetest.c.orig	2013-09-16 22:56:20.000000000 +0200
++++ tests/modetest/modetest.c	2013-11-07 11:32:10.534114644 +0100
+@@ -59,6 +59,10 @@
  
  #include "buffers.h"
  
@@ -8,6 +8,6 @@
 +char *strchrnul(const char *, int);
 +#endif
 +
- drmModeRes *resources;
- int fd, modes;
- 
+ struct crtc {
+ 	drmModeCrtc *crtc;
+ 	drmModeObjectProperties *props;
Index: graphics/libdrm/pkg-plist
===================================================================
--- graphics/libdrm/pkg-plist	(revision 336156)
+++ graphics/libdrm/pkg-plist	(working copy)
@@ -70,6 +70,15 @@
 %%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc
 %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
 %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
+%%NEW%%%%MAN%%man/man3/drmAvailable.3.gz
+%%NEW%%%%MAN%%man/man3/drmHandleEvent.3.gz
+%%NEW%%%%MAN%%man/man3/drmModeGetResources.3.gz
+%%NEW%%%%MAN%%man/man7/drm-gem.7.gz
+%%NEW%%%%MAN%%man/man7/drm-kms.7.gz
+%%NEW%%%%MAN%%man/man7/drm-memory.7.gz
+%%NEW%%%%MAN%%man/man7/drm-mm.7.gz
+%%NEW%%%%MAN%%man/man7/drm-ttm.7.gz
+%%NEW%%%%MAN%%man/man7/drm.7.gz
 %%OLD%%@dirrm include/nouveau
 %%NEW%%%%KMS%%@dirrm include/libkms
 %%NEW%%@dirrm include/libdrm
Index: graphics/libreatlas/Makefile
===================================================================
--- graphics/libreatlas/Makefile	(revision 336156)
+++ graphics/libreatlas/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libreatlas
 PORTVERSION=	1.0.0a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 
Index: graphics/mesa-demos/Makefile
===================================================================
--- graphics/mesa-demos/Makefile	(revision 336156)
+++ graphics/mesa-demos/Makefile	(working copy)
@@ -23,7 +23,6 @@
 OPTIONS_DEFINE=	NVIDIA
 NVIDIA_DESC=	Use NVIDIA's libraries
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
 		${WRKSRC}/configure
Index: multimedia/freetuxtv/Makefile
===================================================================
--- multimedia/freetuxtv/Makefile	(revision 336156)
+++ multimedia/freetuxtv/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freetuxtv
 PORTVERSION=	0.6.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	GOOGLE_CODE
 
Index: net/cvsup/Makefile
===================================================================
--- net/cvsup/Makefile	(revision 336156)
+++ net/cvsup/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cvsup
 PORTVERSION=	16.1h
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net devel
 MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
 MASTER_SITE_SUBDIR=development/CVSup/snapshots
Index: net/tigervnc/Makefile
===================================================================
--- net/tigervnc/Makefile	(revision 336156)
+++ net/tigervnc/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tigervnc
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net x11-servers
 MASTER_SITES=	SF:tigervnc
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc
Index: print/photoprint/Makefile
===================================================================
--- print/photoprint/Makefile	(revision 336156)
+++ print/photoprint/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	photoprint
 DISTVERSION=	0.4.2-pre2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print graphics
 MASTER_SITES=	http://www.blackfiveimaging.co.uk/photoprint/
 
Index: sysutils/gtk-imonc/Makefile
===================================================================
--- sysutils/gtk-imonc/Makefile	(revision 336156)
+++ sysutils/gtk-imonc/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtk-imonc
 PORTVERSION=	0.6.4.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	sysutils
 MASTER_SITES=	http://stefan-strigler.de/download/
 
Index: sysutils/nitrogen/Makefile
===================================================================
--- sysutils/nitrogen/Makefile	(revision 336156)
+++ sysutils/nitrogen/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nitrogen
 PORTVERSION=	1.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://projects.l3ib.org/nitrogen/files/
 
Index: textproc/xorg-sgml-doctools/Makefile
===================================================================
--- textproc/xorg-sgml-doctools/Makefile	(revision 336156)
+++ textproc/xorg-sgml-doctools/Makefile	(working copy)
@@ -13,5 +13,4 @@
 USE_GMAKE=	yes
 USES=		pathfix
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/Makefile
===================================================================
--- x11/Makefile	(revision 336156)
+++ x11/Makefile	(working copy)
@@ -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
Index: x11/beforelight/Makefile
===================================================================
--- x11/beforelight/Makefile	(revision 336156)
+++ x11/beforelight/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	x11 xscrnsaver xt xaw7 xt
 
-MAN1=		beforelight.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/beforelight/pkg-plist
===================================================================
--- x11/beforelight/pkg-plist	(revision 336156)
+++ x11/beforelight/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/beforelight
+man/man1/beforelight.1.gz
 share/X11/app-defaults/Beforelight
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
Index: x11/bitmap/Makefile
===================================================================
--- x11/bitmap/Makefile	(revision 336156)
+++ x11/bitmap/Makefile	(working copy)
@@ -9,7 +9,5 @@
 
 XORG_CAT=	app
 USE_XORG=	x11 xaw xbitmaps xmu xproto
-MAN1=		atobm.1 bitmap.1 bmtoa.1
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/bitmap/pkg-plist
===================================================================
--- x11/bitmap/pkg-plist	(revision 336156)
+++ x11/bitmap/pkg-plist	(working copy)
@@ -14,6 +14,9 @@
 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
Index: x11/dri3proto/Makefile
===================================================================
--- x11/dri3proto/Makefile	(revision 0)
+++ x11/dri3proto/Makefile	(working copy)
@@ -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>

Property changes on: x11/dri3proto/Makefile
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/dri3proto/distinfo
===================================================================
--- x11/dri3proto/distinfo	(revision 0)
+++ x11/dri3proto/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (xorg/proto/dri3proto-1.0.tar.bz2) = 01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074
+SIZE (xorg/proto/dri3proto-1.0.tar.bz2) = 105366

Property changes on: x11/dri3proto/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/dri3proto/pkg-descr
===================================================================
--- x11/dri3proto/pkg-descr	(revision 0)
+++ x11/dri3proto/pkg-descr	(working copy)
@@ -0,0 +1,3 @@
+This package contains X.Org DRI3 prototype headers.
+
+WWW: http://www.freedesktop.org/wiki/Software/xlibs

Property changes on: x11/dri3proto/pkg-descr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/dri3proto/pkg-plist
===================================================================
--- x11/dri3proto/pkg-plist	(revision 0)
+++ x11/dri3proto/pkg-plist	(working copy)
@@ -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

Property changes on: x11/dri3proto/pkg-plist
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/editres/Makefile
===================================================================
--- x11/editres/Makefile	(revision 336156)
+++ x11/editres/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	x11 xt xmu xaw
 
-MAN1=		editres.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/editres/pkg-plist
===================================================================
--- x11/editres/pkg-plist	(revision 336156)
+++ x11/editres/pkg-plist	(working copy)
@@ -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
Index: x11/fstobdf/Makefile
===================================================================
--- x11/fstobdf/Makefile	(revision 336156)
+++ x11/fstobdf/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/glproto/Makefile
===================================================================
--- x11/glproto/Makefile	(revision 336156)
+++ x11/glproto/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	glproto
-PORTVERSION=	1.4.16
+PORTVERSION=	1.4.17
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/glproto/distinfo
===================================================================
--- x11/glproto/distinfo	(revision 336156)
+++ x11/glproto/distinfo	(working copy)
@@ -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
Index: x11/iceauth/Makefile
===================================================================
--- x11/iceauth/Makefile	(revision 336156)
+++ x11/iceauth/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/ico/Makefile
===================================================================
--- x11/ico/Makefile	(revision 336156)
+++ x11/ico/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/libXScrnSaver/Makefile
===================================================================
--- x11/libXScrnSaver/Makefile	(revision 336156)
+++ x11/libXScrnSaver/Makefile	(working copy)
@@ -10,18 +10,4 @@
 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>
Index: x11/libXScrnSaver/pkg-plist
===================================================================
--- x11/libXScrnSaver/pkg-plist	(revision 336156)
+++ x11/libXScrnSaver/pkg-plist	(working copy)
@@ -4,4 +4,16 @@
 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
Index: x11/libXTrap/Makefile
===================================================================
--- x11/libXTrap/Makefile	(revision 336156)
+++ x11/libXTrap/Makefile	(working copy)
@@ -10,4 +10,5 @@
 XORG_CAT=	lib
 USE_XORG=	trapproto:both x11 xext xextproto xt
 USE_AUTOTOOLS=	libtool
+
 .include <bsd.port.mk>
Index: x11/libXau/Makefile
===================================================================
--- x11/libXau/Makefile	(revision 336156)
+++ x11/libXau/Makefile	(working copy)
@@ -11,12 +11,7 @@
 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>
Index: x11/libXau/pkg-plist
===================================================================
--- x11/libXau/pkg-plist	(revision 336156)
+++ x11/libXau/pkg-plist	(working copy)
@@ -5,3 +5,12 @@
 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
Index: x11/libXcomposite/Makefile
===================================================================
--- x11/libXcomposite/Makefile	(revision 336156)
+++ x11/libXcomposite/Makefile	(working copy)
@@ -11,18 +11,5 @@
 
 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>
Index: x11/libXcomposite/pkg-plist
===================================================================
--- x11/libXcomposite/pkg-plist	(revision 336156)
+++ x11/libXcomposite/pkg-plist	(working copy)
@@ -4,4 +4,16 @@
 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
Index: x11/libXcursor/Makefile
===================================================================
--- x11/libXcursor/Makefile	(revision 336156)
+++ x11/libXcursor/Makefile	(working copy)
@@ -16,38 +16,4 @@
 
 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>
Index: x11/libXcursor/pkg-plist
===================================================================
--- x11/libXcursor/pkg-plist	(revision 336156)
+++ x11/libXcursor/pkg-plist	(working copy)
@@ -4,4 +4,36 @@
 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
Index: x11/libXdamage/Makefile
===================================================================
--- x11/libXdamage/Makefile	(revision 336156)
+++ x11/libXdamage/Makefile	(working copy)
@@ -10,4 +10,5 @@
 
 XORG_CAT=	lib
 USE_XORG=	x11 damageproto:both xfixes fixesproto xextproto xproto:both
+
 .include <bsd.port.mk>
Index: x11/libXevie/Makefile
===================================================================
--- x11/libXevie/Makefile	(revision 336156)
+++ x11/libXevie/Makefile	(working copy)
@@ -12,12 +12,4 @@
 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>
Index: x11/libXevie/pkg-plist
===================================================================
--- x11/libXevie/pkg-plist	(revision 336156)
+++ x11/libXevie/pkg-plist	(working copy)
@@ -4,3 +4,9 @@
 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
Index: x11/libXext/Makefile
===================================================================
--- x11/libXext/Makefile	(revision 336156)
+++ x11/libXext/Makefile	(working copy)
@@ -15,67 +15,4 @@
 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>
Index: x11/libXext/pkg-plist
===================================================================
--- x11/libXext/pkg-plist	(revision 336156)
+++ x11/libXext/pkg-plist	(working copy)
@@ -19,4 +19,65 @@
 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
Index: x11/libXfixes/Makefile
===================================================================
--- x11/libXfixes/Makefile	(revision 336156)
+++ x11/libXfixes/Makefile	(working copy)
@@ -13,7 +13,4 @@
 XORG_CAT=	lib
 USE_XORG=	x11 fixesproto:both xproto:both xextproto
 
-MAN3=		Xfixes.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/libXfixes/pkg-plist
===================================================================
--- x11/libXfixes/pkg-plist	(revision 336156)
+++ x11/libXfixes/pkg-plist	(working copy)
@@ -4,3 +4,4 @@
 lib/libXfixes.so
 lib/libXfixes.so.3
 libdata/pkgconfig/xfixes.pc
+man/man3/Xfixes.3.gz
Index: x11/libXi/Makefile
===================================================================
--- x11/libXi/Makefile	(revision 336156)
+++ x11/libXi/Makefile	(working copy)
@@ -21,79 +21,4 @@
 		--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>
Index: x11/libXi/pkg-plist
===================================================================
--- x11/libXi/pkg-plist	(revision 336156)
+++ x11/libXi/pkg-plist	(working copy)
@@ -5,4 +5,77 @@
 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
Index: x11/libXinerama/Makefile
===================================================================
--- x11/libXinerama/Makefile	(revision 336156)
+++ x11/libXinerama/Makefile	(working copy)
@@ -15,11 +15,4 @@
 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>
Index: x11/libXinerama/pkg-plist
===================================================================
--- x11/libXinerama/pkg-plist	(revision 336156)
+++ x11/libXinerama/pkg-plist	(working copy)
@@ -5,4 +5,9 @@
 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
Index: x11/libXp/Makefile
===================================================================
--- x11/libXp/Makefile	(revision 336156)
+++ x11/libXp/Makefile	(working copy)
@@ -15,40 +15,4 @@
 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>
Index: x11/libXp/pkg-plist
===================================================================
--- x11/libXp/pkg-plist	(revision 336156)
+++ x11/libXp/pkg-plist	(working copy)
@@ -3,3 +3,37 @@
 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
Index: x11/libXpm/Makefile
===================================================================
--- x11/libXpm/Makefile	(revision 336156)
+++ x11/libXpm/Makefile	(working copy)
@@ -13,7 +13,4 @@
 XORG_CAT=	lib
 USE_XORG=	xproto x11 xext xextproto xt
 
-MAN1=		cxpm.1 sxpm.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/libXpm/pkg-plist
===================================================================
--- x11/libXpm/pkg-plist	(revision 336156)
+++ x11/libXpm/pkg-plist	(working copy)
@@ -6,3 +6,5 @@
 lib/libXpm.so
 lib/libXpm.so.4
 libdata/pkgconfig/xpm.pc
+man/man1/cxpm.1.gz
+man/man1/sxpm.1.gz
Index: x11/libXrandr/Makefile
===================================================================
--- x11/libXrandr/Makefile	(revision 336156)
+++ x11/libXrandr/Makefile	(working copy)
@@ -13,21 +13,4 @@
 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>
Index: x11/libXrandr/pkg-plist
===================================================================
--- x11/libXrandr/pkg-plist	(revision 336156)
+++ x11/libXrandr/pkg-plist	(working copy)
@@ -4,3 +4,18 @@
 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
Index: x11/libXrender/Makefile
===================================================================
--- x11/libXrender/Makefile	(revision 336156)
+++ x11/libXrender/Makefile	(working copy)
@@ -12,4 +12,5 @@
 
 XORG_CAT=	lib
 USE_XORG=	x11 renderproto:both xproto:both
+
 .include <bsd.port.mk>
Index: x11/libXres/Makefile
===================================================================
--- x11/libXres/Makefile	(revision 336156)
+++ x11/libXres/Makefile	(working copy)
@@ -13,12 +13,4 @@
 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>
Index: x11/libXres/pkg-plist
===================================================================
--- x11/libXres/pkg-plist	(revision 336156)
+++ x11/libXres/pkg-plist	(working copy)
@@ -4,3 +4,9 @@
 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
Index: x11/libXtst/Makefile
===================================================================
--- x11/libXtst/Makefile	(revision 336156)
+++ x11/libXtst/Makefile	(working copy)
@@ -17,19 +17,6 @@
 
 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
Index: x11/libXtst/pkg-plist
===================================================================
--- x11/libXtst/pkg-plist	(revision 336156)
+++ x11/libXtst/pkg-plist	(working copy)
@@ -5,4 +5,15 @@
 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
Index: x11/libXv/Makefile
===================================================================
--- x11/libXv/Makefile	(revision 336156)
+++ x11/libXv/Makefile	(working copy)
@@ -14,32 +14,4 @@
 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>
Index: x11/libXv/pkg-plist
===================================================================
--- x11/libXv/pkg-plist	(revision 336156)
+++ x11/libXv/pkg-plist	(working copy)
@@ -4,4 +4,30 @@
 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
Index: x11/libXvMC/Makefile
===================================================================
--- x11/libXvMC/Makefile	(revision 336156)
+++ x11/libXvMC/Makefile	(working copy)
@@ -10,4 +10,5 @@
 
 XORG_CAT=	lib
 USE_XORG=	x11 xext xv xextproto videoproto:both xproto:both
+
 .include <bsd.port.mk>
Index: x11/libXxf86dga/Makefile
===================================================================
--- x11/libXxf86dga/Makefile	(revision 336156)
+++ x11/libXxf86dga/Makefile	(working copy)
@@ -13,27 +13,4 @@
 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>
Index: x11/libXxf86dga/pkg-plist
===================================================================
--- x11/libXxf86dga/pkg-plist	(revision 336156)
+++ x11/libXxf86dga/pkg-plist	(working copy)
@@ -5,4 +5,25 @@
 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
Index: x11/libXxf86misc/Makefile
===================================================================
--- x11/libXxf86misc/Makefile	(revision 336156)
+++ x11/libXxf86misc/Makefile	(working copy)
@@ -13,15 +13,4 @@
 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>
Index: x11/libXxf86misc/pkg-plist
===================================================================
--- x11/libXxf86misc/pkg-plist	(revision 336156)
+++ x11/libXxf86misc/pkg-plist	(working copy)
@@ -3,4 +3,13 @@
 lib/libXxf86misc.so
 lib/libXxf86misc.so.1
 libdata/pkgconfig/xxf86misc.pc
+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
 @dirrmtry include/X11/extensions
Index: x11/libXxf86vm/Makefile
===================================================================
--- x11/libXxf86vm/Makefile	(revision 336156)
+++ x11/libXxf86vm/Makefile	(working copy)
@@ -13,28 +13,4 @@
 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>
Index: x11/libXxf86vm/pkg-plist
===================================================================
--- x11/libXxf86vm/pkg-plist	(revision 336156)
+++ x11/libXxf86vm/pkg-plist	(working copy)
@@ -4,4 +4,26 @@
 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
Index: x11/libdmx/Makefile
===================================================================
--- x11/libdmx/Makefile	(revision 336156)
+++ x11/libdmx/Makefile	(working copy)
@@ -11,23 +11,4 @@
 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>
Index: x11/libdmx/pkg-plist
===================================================================
--- x11/libdmx/pkg-plist	(revision 336156)
+++ x11/libdmx/pkg-plist	(working copy)
@@ -4,4 +4,21 @@
 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
Index: x11/libxcb/Makefile
===================================================================
--- x11/libxcb/Makefile	(revision 336156)
+++ x11/libxcb/Makefile	(working copy)
@@ -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_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 @@
 .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>
Index: x11/libxcb/distinfo
===================================================================
--- x11/libxcb/distinfo	(revision 336156)
+++ x11/libxcb/distinfo	(working copy)
@@ -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
Index: x11/libxcb/files/patch-Makefile.in
===================================================================
--- x11/libxcb/files/patch-Makefile.in	(revision 336156)
+++ x11/libxcb/files/patch-Makefile.in	(working copy)
@@ -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 \
Index: x11/libxcb/files/patch-src__c_client.py
===================================================================
--- x11/libxcb/files/patch-src__c_client.py	(revision 0)
+++ x11/libxcb/files/patch-src__c_client.py	(working copy)
@@ -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:

Property changes on: x11/libxcb/files/patch-src__c_client.py
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/libxcb/pkg-plist
===================================================================
--- x11/libxcb/pkg-plist	(revision 336156)
+++ x11/libxcb/pkg-plist	(working copy)
@@ -3,7 +3,9 @@
 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.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-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_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_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_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_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,11 +941,16 @@
 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
@@ -911,8 +957,10 @@
 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_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_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,6 +1025,16 @@
 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
@@ -976,6 +1041,7 @@
 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
@@ -982,11 +1048,22 @@
 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,6 +1082,10 @@
 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
@@ -1011,6 +1092,74 @@
 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_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_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_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_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_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_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_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_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_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_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_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_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_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
Index: x11/libxkbfile/Makefile
===================================================================
--- x11/libxkbfile/Makefile	(revision 336156)
+++ x11/libxkbfile/Makefile	(working copy)
@@ -12,4 +12,5 @@
 
 XORG_CAT=	lib
 USE_XORG=	x11 kbproto:both
+
 .include <bsd.port.mk>
Index: x11/libxshmfence/Makefile
===================================================================
--- x11/libxshmfence/Makefile	(revision 0)
+++ x11/libxshmfence/Makefile	(working copy)
@@ -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>

Property changes on: x11/libxshmfence/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: x11/libxshmfence/distinfo
===================================================================
--- x11/libxshmfence/distinfo	(revision 0)
+++ x11/libxshmfence/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (xorg/lib/libxshmfence-1.1.tar.bz2) = dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe
+SIZE (xorg/lib/libxshmfence-1.1.tar.bz2) = 291347

Property changes on: x11/libxshmfence/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/libxshmfence/files/patch-config.h.in
===================================================================
--- x11/libxshmfence/files/patch-config.h.in	(revision 0)
+++ x11/libxshmfence/files/patch-config.h.in	(working copy)
@@ -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
+ 

Property changes on: x11/libxshmfence/files/patch-config.h.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/libxshmfence/files/patch-configure
===================================================================
--- x11/libxshmfence/files/patch-configure	(revision 0)
+++ x11/libxshmfence/files/patch-configure	(working copy)
@@ -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

Property changes on: x11/libxshmfence/files/patch-configure
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/libxshmfence/files/patch-src__xshmfence_alloc.c
===================================================================
--- x11/libxshmfence/files/patch-src__xshmfence_alloc.c	(revision 0)
+++ x11/libxshmfence/files/patch-src__xshmfence_alloc.c	(working copy)
@@ -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;

Property changes on: x11/libxshmfence/files/patch-src__xshmfence_alloc.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/libxshmfence/files/patch-src__xshmfence_futex.h
===================================================================
--- x11/libxshmfence/files/patch-src__xshmfence_futex.h	(revision 0)
+++ x11/libxshmfence/files/patch-src__xshmfence_futex.h	(working copy)
@@ -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)

Property changes on: x11/libxshmfence/files/patch-src__xshmfence_futex.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/libxshmfence/files/patch-src__xshmfenceint.h
===================================================================
--- x11/libxshmfence/files/patch-src__xshmfenceint.h	(revision 0)
+++ x11/libxshmfence/files/patch-src__xshmfenceint.h	(working copy)
@@ -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>

Property changes on: x11/libxshmfence/files/patch-src__xshmfenceint.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/libxshmfence/pkg-descr
===================================================================
--- x11/libxshmfence/pkg-descr	(revision 0)
+++ x11/libxshmfence/pkg-descr	(working copy)
@@ -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

Property changes on: x11/libxshmfence/pkg-descr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/libxshmfence/pkg-plist
===================================================================
--- x11/libxshmfence/pkg-plist	(revision 0)
+++ x11/libxshmfence/pkg-plist	(working copy)
@@ -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

Property changes on: x11/libxshmfence/pkg-plist
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/listres/Makefile
===================================================================
--- x11/listres/Makefile	(revision 336156)
+++ x11/listres/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/luit/Makefile
===================================================================
--- x11/luit/Makefile	(revision 336156)
+++ x11/luit/Makefile	(working copy)
@@ -12,9 +12,6 @@
 
 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>
Index: x11/mkcomposecache/Makefile
===================================================================
--- x11/mkcomposecache/Makefile	(revision 336156)
+++ x11/mkcomposecache/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/pixman/Makefile
===================================================================
--- x11/pixman/Makefile	(revision 336156)
+++ x11/pixman/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pixman
-PORTVERSION=	0.30.2
+PORTVERSION=	0.32.4
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/pixman/distinfo
===================================================================
--- x11/pixman/distinfo	(revision 336156)
+++ x11/pixman/distinfo	(working copy)
@@ -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
Index: x11/pixman/pkg-plist
===================================================================
--- x11/pixman/pkg-plist	(revision 336156)
+++ x11/pixman/pkg-plist	(working copy)
@@ -3,6 +3,6 @@
 lib/libpixman-1.a
 lib/libpixman-1.la
 lib/libpixman-1.so
-lib/libpixman-1.so.30
+lib/libpixman-1.so.32
 libdata/pkgconfig/pixman-1.pc
 @dirrm include/pixman-1
Index: x11/presentproto/Makefile
===================================================================
--- x11/presentproto/Makefile	(revision 0)
+++ x11/presentproto/Makefile	(working copy)
@@ -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>

Property changes on: x11/presentproto/Makefile
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/presentproto/distinfo
===================================================================
--- x11/presentproto/distinfo	(revision 0)
+++ x11/presentproto/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (xorg/proto/presentproto-1.0.tar.bz2) = 812c7d48721f909a0f7a2cb1e91f6eead76159a36c4712f4579ca587552839ce
+SIZE (xorg/proto/presentproto-1.0.tar.bz2) = 107998

Property changes on: x11/presentproto/distinfo
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/presentproto/pkg-descr
===================================================================
--- x11/presentproto/pkg-descr	(revision 0)
+++ x11/presentproto/pkg-descr	(working copy)
@@ -0,0 +1 @@
+This package contains X.Org Present protocol specification.

Property changes on: x11/presentproto/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11/presentproto/pkg-plist
===================================================================
--- x11/presentproto/pkg-plist	(revision 0)
+++ x11/presentproto/pkg-plist	(working copy)
@@ -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

Property changes on: x11/presentproto/pkg-plist
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/printproto/Makefile
===================================================================
--- x11/printproto/Makefile	(revision 336156)
+++ x11/printproto/Makefile	(working copy)
@@ -10,7 +10,4 @@
 
 XORG_CAT=	proto
 
-MAN7=	Xprint.7
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/printproto/pkg-plist
===================================================================
--- x11/printproto/pkg-plist	(revision 336156)
+++ x11/printproto/pkg-plist	(working copy)
@@ -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
Index: x11/rstart/Makefile
===================================================================
--- x11/rstart/Makefile	(revision 336156)
+++ x11/rstart/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	x11
 
-MAN1=		rstart.1 rstartd.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/rstart/pkg-plist
===================================================================
--- x11/rstart/pkg-plist	(revision 336156)
+++ x11/rstart/pkg-plist	(working copy)
@@ -15,6 +15,8 @@
 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
Index: x11/scripts/Makefile
===================================================================
--- x11/scripts/Makefile	(revision 336156)
+++ x11/scripts/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	x11
 
-MAN1=		xon.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/scripts/pkg-plist
===================================================================
--- x11/scripts/pkg-plist	(revision 336156)
+++ x11/scripts/pkg-plist	(working copy)
@@ -2,3 +2,4 @@
 bin/fontname.sh
 bin/fontprop.sh
 bin/xon
+man/man1/xon.1.gz
Index: x11/sessreg/Makefile
===================================================================
--- x11/sessreg/Makefile	(revision 336156)
+++ x11/sessreg/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/setxkbmap/Makefile
===================================================================
--- x11/setxkbmap/Makefile	(revision 336156)
+++ x11/setxkbmap/Makefile	(working copy)
@@ -12,9 +12,6 @@
 
 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>
Index: x11/smproxy/Makefile
===================================================================
--- x11/smproxy/Makefile	(revision 336156)
+++ x11/smproxy/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/trapproto/Makefile
===================================================================
--- x11/trapproto/Makefile	(revision 336156)
+++ x11/trapproto/Makefile	(working copy)
@@ -12,5 +12,4 @@
 
 USE_XORG=	xt:both
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/viewres/Makefile
===================================================================
--- x11/viewres/Makefile	(revision 336156)
+++ x11/viewres/Makefile	(working copy)
@@ -10,13 +10,11 @@
 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>
Index: x11/x11perf/Makefile
===================================================================
--- x11/x11perf/Makefile	(revision 336156)
+++ x11/x11perf/Makefile	(working copy)
@@ -12,9 +12,4 @@
 XORG_CAT=	app
 USE_XORG=	x11 xmuu xrender xft xext
 
-MAN1=		Xmark.1 \
-		x11perf.1 \
-		x11perfcomp.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/x11perf/pkg-plist
===================================================================
--- x11/x11perf/pkg-plist	(revision 336156)
+++ x11/x11perf/pkg-plist	(working copy)
@@ -4,4 +4,7 @@
 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
Index: x11/xcalc/Makefile
===================================================================
--- x11/xcalc/Makefile	(revision 336156)
+++ x11/xcalc/Makefile	(working copy)
@@ -8,14 +8,11 @@
 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>
Index: x11/xcalc/pkg-plist
===================================================================
--- x11/xcalc/pkg-plist	(revision 336156)
+++ x11/xcalc/pkg-plist	(working copy)
@@ -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
Index: x11/xcb-proto/Makefile
===================================================================
--- x11/xcb-proto/Makefile	(revision 336156)
+++ x11/xcb-proto/Makefile	(working copy)
@@ -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 @@
 GNU_CONFIGURE=	yes
 
 DATADIR=	${PREFIX}/share/xcb
+
 .include <bsd.port.mk>
Index: x11/xcb-proto/distinfo
===================================================================
--- x11/xcb-proto/distinfo	(revision 336156)
+++ x11/xcb-proto/distinfo	(working copy)
@@ -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
Index: x11/xcb-proto/pkg-plist
===================================================================
--- x11/xcb-proto/pkg-plist	(revision 336156)
+++ x11/xcb-proto/pkg-plist	(working copy)
@@ -4,8 +4,10 @@
 %%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
Index: x11/xclipboard/Makefile
===================================================================
--- x11/xclipboard/Makefile	(revision 336156)
+++ x11/xclipboard/Makefile	(working copy)
@@ -13,7 +13,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw
 
-MAN1=		xclipboard.1 xcutsel.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xclipboard/pkg-plist
===================================================================
--- x11/xclipboard/pkg-plist	(revision 336156)
+++ x11/xclipboard/pkg-plist	(working copy)
@@ -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
Index: x11/xcmsdb/Makefile
===================================================================
--- x11/xcmsdb/Makefile	(revision 336156)
+++ x11/xcmsdb/Makefile	(working copy)
@@ -12,9 +12,6 @@
 XORG_CAT=	app
 USE_XORG=	x11
 
-PLIST_FILES=	bin/xcmsdb
+PLIST_FILES=	bin/xcmsdb man/man1/xcmsdb.1
 
-MAN1=		xcmsdb.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xconsole/Makefile
===================================================================
--- x11/xconsole/Makefile	(revision 336156)
+++ x11/xconsole/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw
 
-MAN1=		xconsole.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xconsole/pkg-plist
===================================================================
--- x11/xconsole/pkg-plist	(revision 336156)
+++ x11/xconsole/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/xconsole
+man/man1/xconsole.1.gz
 share/X11/app-defaults/XConsole
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
Index: x11/xdbedizzy/Makefile
===================================================================
--- x11/xdbedizzy/Makefile	(revision 336156)
+++ x11/xdbedizzy/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/xditview/Makefile
===================================================================
--- x11/xditview/Makefile	(revision 336156)
+++ x11/xditview/Makefile	(working copy)
@@ -12,7 +12,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw
 
-MAN1=		xditview.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xditview/pkg-plist
===================================================================
--- x11/xditview/pkg-plist	(revision 336156)
+++ x11/xditview/pkg-plist	(working copy)
@@ -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
Index: x11/xdm/Makefile
===================================================================
--- x11/xdm/Makefile	(revision 336156)
+++ x11/xdm/Makefile	(working copy)
@@ -14,8 +14,6 @@
 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
 
@@ -22,12 +20,10 @@
 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,7 +46,7 @@
 
 post-install:
 .for f in ${CFFILES}
-	${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f || ${TRUE}
+	${CP} -n ${EXAMPLESDIR}/$f ${EXAMPLESDIR}${PREFIX}/lib/X11/xdm/$f || ${TRUE}
 .endfor
 	${MKDIR} /var/lib/xdm/authdir
 	${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir
Index: x11/xdm/pkg-plist
===================================================================
--- x11/xdm/pkg-plist	(revision 336156)
+++ x11/xdm/pkg-plist	(working copy)
@@ -6,6 +6,8 @@
 lib/X11/xdm/libXdmGreet.so
 lib/X11/xdm/pixmaps/xorg-bw.xpm
 lib/X11/xdm/pixmaps/xorg.xpm
+man/man1/xdm.1.gz
+%%XMDSHELL%%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
Index: x11/xdpyinfo/Makefile
===================================================================
--- x11/xdpyinfo/Makefile	(revision 336156)
+++ x11/xdpyinfo/Makefile	(working copy)
@@ -13,9 +13,6 @@
 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>
Index: x11/xdriinfo/Makefile
===================================================================
--- x11/xdriinfo/Makefile	(revision 336156)
+++ x11/xdriinfo/Makefile	(working copy)
@@ -11,8 +11,6 @@
 
 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>
Index: x11/xedit/Makefile
===================================================================
--- x11/xedit/Makefile	(revision 336156)
+++ x11/xedit/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw7
 
-MAN1=		xedit.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xedit/pkg-plist
===================================================================
--- x11/xedit/pkg-plist	(revision 336156)
+++ x11/xedit/pkg-plist	(working copy)
@@ -19,6 +19,7 @@
 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
Index: x11/xev/Makefile
===================================================================
--- x11/xev/Makefile	(revision 336156)
+++ x11/xev/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xeyes/Makefile
===================================================================
--- x11/xeyes/Makefile	(revision 336156)
+++ x11/xeyes/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xf86dga/Makefile
===================================================================
--- x11/xf86dga/Makefile	(revision 336156)
+++ x11/xf86dga/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/xfindproxy/Makefile
===================================================================
--- x11/xfindproxy/Makefile	(revision 336156)
+++ x11/xfindproxy/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/xfwp/Makefile
===================================================================
--- x11/xfwp/Makefile	(revision 336156)
+++ x11/xfwp/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/xgamma/Makefile
===================================================================
--- x11/xgamma/Makefile	(revision 336156)
+++ x11/xgamma/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xgc/Makefile
===================================================================
--- x11/xgc/Makefile	(revision 336156)
+++ x11/xgc/Makefile	(working copy)
@@ -12,7 +12,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw
 
-MAN1=		xgc.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xgc/pkg-plist
===================================================================
--- x11/xgc/pkg-plist	(revision 336156)
+++ x11/xgc/pkg-plist	(working copy)
@@ -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
Index: x11/xhost/Makefile
===================================================================
--- x11/xhost/Makefile	(revision 336156)
+++ x11/xhost/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xinit/Makefile
===================================================================
--- x11/xinit/Makefile	(revision 336156)
+++ x11/xinit/Makefile	(working copy)
@@ -13,9 +13,6 @@
 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
Index: x11/xinit/pkg-plist
===================================================================
--- x11/xinit/pkg-plist	(revision 336156)
+++ x11/xinit/pkg-plist	(working copy)
@@ -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
Index: x11/xinput/Makefile
===================================================================
--- x11/xinput/Makefile	(revision 336156)
+++ x11/xinput/Makefile	(working copy)
@@ -11,9 +11,6 @@
 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>
Index: x11/xkbcomp/Makefile
===================================================================
--- x11/xkbcomp/Makefile	(revision 336156)
+++ x11/xkbcomp/Makefile	(working copy)
@@ -14,9 +14,7 @@
 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>
Index: x11/xkbevd/Makefile
===================================================================
--- x11/xkbevd/Makefile	(revision 336156)
+++ x11/xkbevd/Makefile	(working copy)
@@ -12,9 +12,6 @@
 XORG_CAT=	app
 USE_XORG=	xkbfile x11
 
-PLIST_FILES=	bin/xkbevd
+PLIST_FILES=	bin/xkbevd man/man1/xkbevd.1
 
-MAN1=		xkbevd.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xkbprint/Makefile
===================================================================
--- x11/xkbprint/Makefile	(revision 336156)
+++ x11/xkbprint/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/xkbutils/Makefile
===================================================================
--- x11/xkbutils/Makefile	(revision 336156)
+++ x11/xkbutils/Makefile	(working copy)
@@ -12,7 +12,4 @@
 XORG_CAT=	app
 USE_XORG=	xkbfile x11 xaw inputproto
 
-MAN1=		xkbbell.1 xkbvleds.1 xkbwatch.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xkbutils/pkg-plist
===================================================================
--- x11/xkbutils/pkg-plist	(revision 336156)
+++ x11/xkbutils/pkg-plist	(working copy)
@@ -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
Index: x11/xkeyboard-config/Makefile
===================================================================
--- x11/xkeyboard-config/Makefile	(revision 336156)
+++ x11/xkeyboard-config/Makefile	(working copy)
@@ -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,7 +18,6 @@
 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
@@ -26,15 +24,8 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN7=		xkeyboard-config.7
+.include <bsd.port.options.mk>
 
-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>
-
 # !nls case doesn't work correctly, comment it out.
 #.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext:build iconv
@@ -49,7 +40,7 @@
 		${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>
Index: x11/xkeyboard-config/distinfo
===================================================================
--- x11/xkeyboard-config/distinfo	(revision 336156)
+++ x11/xkeyboard-config/distinfo	(working copy)
@@ -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
Index: x11/xkeyboard-config/files/etersoft-patch-symbols-typo
===================================================================
--- x11/xkeyboard-config/files/etersoft-patch-symbols-typo	(revision 336156)
+++ x11/xkeyboard-config/files/etersoft-patch-symbols-typo	(working copy)
@@ -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] }; // ]
Index: x11/xkeyboard-config/pkg-plist
===================================================================
--- x11/xkeyboard-config/pkg-plist	(revision 336156)
+++ x11/xkeyboard-config/pkg-plist	(working copy)
@@ -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
Index: x11/xkill/Makefile
===================================================================
--- x11/xkill/Makefile	(revision 336156)
+++ x11/xkill/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xload/Makefile
===================================================================
--- x11/xload/Makefile	(revision 336156)
+++ x11/xload/Makefile	(working copy)
@@ -12,7 +12,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw
 
-MAN1=		xload.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xload/pkg-plist
===================================================================
--- x11/xload/pkg-plist	(revision 336156)
+++ x11/xload/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/xload
+man/man1/xload.1.gz
 share/X11/app-defaults/XLoad
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
Index: x11/xlogo/Makefile
===================================================================
--- x11/xlogo/Makefile	(revision 336156)
+++ x11/xlogo/Makefile	(working copy)
@@ -12,7 +12,4 @@
 XORG_CAT=	app
 USE_XORG=	xrender xft xext xt xaw xp xprintutil
 
-MAN1=		xlogo.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xlogo/pkg-plist
===================================================================
--- x11/xlogo/pkg-plist	(revision 336156)
+++ x11/xlogo/pkg-plist	(working copy)
@@ -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
Index: x11/xlsatoms/Makefile
===================================================================
--- x11/xlsatoms/Makefile	(revision 336156)
+++ x11/xlsatoms/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/xlsclients/Makefile
===================================================================
--- x11/xlsclients/Makefile	(revision 336156)
+++ x11/xlsclients/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/xmag/Makefile
===================================================================
--- x11/xmag/Makefile	(revision 336156)
+++ x11/xmag/Makefile	(working copy)
@@ -12,7 +12,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw
 
-MAN1=		xmag.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xmag/pkg-plist
===================================================================
--- x11/xmag/pkg-plist	(revision 336156)
+++ x11/xmag/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/xmag
+man/man1/xmag.1.gz
 share/X11/app-defaults/Xmag
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
Index: x11/xman/Makefile
===================================================================
--- x11/xman/Makefile	(revision 336156)
+++ x11/xman/Makefile	(working copy)
@@ -12,7 +12,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw xp xprintutil
 
-MAN1=		xman.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xman/pkg-plist
===================================================================
--- x11/xman/pkg-plist	(revision 336156)
+++ x11/xman/pkg-plist	(working copy)
@@ -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
Index: x11/xmessage/Makefile
===================================================================
--- x11/xmessage/Makefile	(revision 336156)
+++ x11/xmessage/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw
 
-MAN1=		xmessage.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xmessage/pkg-plist
===================================================================
--- x11/xmessage/pkg-plist	(revision 336156)
+++ x11/xmessage/pkg-plist	(working copy)
@@ -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
Index: x11/xmh/Makefile
===================================================================
--- x11/xmh/Makefile	(revision 336156)
+++ x11/xmh/Makefile	(working copy)
@@ -12,7 +12,4 @@
 XORG_CAT=	app
 USE_XORG=	xaw xmu xt xbitmaps
 
-MAN1=		xmh.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xmh/pkg-plist
===================================================================
--- x11/xmh/pkg-plist	(revision 336156)
+++ x11/xmh/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/xmh
+man/man1/xmh.1.gz
 share/X11/app-defaults/Xmh
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
Index: x11/xmodmap/Makefile
===================================================================
--- x11/xmodmap/Makefile	(revision 336156)
+++ x11/xmodmap/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/xmore/Makefile
===================================================================
--- x11/xmore/Makefile	(revision 336156)
+++ x11/xmore/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw xp xprintutil
 
-MAN1=		xmore.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11/xmore/pkg-plist
===================================================================
--- x11/xmore/pkg-plist	(revision 336156)
+++ x11/xmore/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/xmore
+man/man1/xmore.1.gz
 share/X11/app-defaults/XMore
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
Index: x11/xorg/Makefile
===================================================================
--- x11/xorg/Makefile	(revision 336156)
+++ x11/xorg/Makefile	(working copy)
@@ -12,6 +12,7 @@
 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/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
Index: x11/xorg-apps/Makefile
===================================================================
--- x11/xorg-apps/Makefile	(revision 336156)
+++ x11/xorg-apps/Makefile	(working copy)
@@ -27,7 +27,6 @@
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 do-install:
 		${MKDIR} ${PREFIX}/libdata/xorg
 		${TOUCH} ${PREFIX}/libdata/xorg/apps
Index: x11/xorg-docs/Makefile
===================================================================
--- x11/xorg-docs/Makefile	(revision 336156)
+++ x11/xorg-docs/Makefile	(working copy)
@@ -8,11 +8,8 @@
 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>
Index: x11/xorg-docs/pkg-plist
===================================================================
--- x11/xorg-docs/pkg-plist	(revision 336156)
+++ x11/xorg-docs/pkg-plist	(working copy)
@@ -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
Index: x11/xorg-libraries/Makefile
===================================================================
--- x11/xorg-libraries/Makefile	(revision 336156)
+++ x11/xorg-libraries/Makefile	(working copy)
@@ -3,7 +3,6 @@
 
 PORTNAME=	xorg-libraries
 PORTVERSION=	7.7
-PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -40,7 +39,6 @@
 		${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,7 +54,6 @@
 		${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
Index: x11/xplsprinters/Makefile
===================================================================
--- x11/xplsprinters/Makefile	(revision 336156)
+++ x11/xplsprinters/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xprehashprinterlist/Makefile
===================================================================
--- x11/xprehashprinterlist/Makefile	(revision 336156)
+++ x11/xprehashprinterlist/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xprop/Makefile
===================================================================
--- x11/xprop/Makefile	(revision 336156)
+++ x11/xprop/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xproto/Makefile
===================================================================
--- x11/xproto/Makefile	(revision 336156)
+++ x11/xproto/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xproto
-PORTVERSION=	7.0.24
+PORTVERSION=	7.0.25
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/xproto/distinfo
===================================================================
--- x11/xproto/distinfo	(revision 336156)
+++ x11/xproto/distinfo	(working copy)
@@ -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
Index: x11/xrandr/Makefile
===================================================================
--- x11/xrandr/Makefile	(revision 336156)
+++ x11/xrandr/Makefile	(working copy)
@@ -11,9 +11,7 @@
 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>
Index: x11/xrdb/Makefile
===================================================================
--- x11/xrdb/Makefile	(revision 336156)
+++ x11/xrdb/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xrefresh/Makefile
===================================================================
--- x11/xrefresh/Makefile	(revision 336156)
+++ x11/xrefresh/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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>
Index: x11/xrx/Makefile
===================================================================
--- x11/xrx/Makefile	(revision 336156)
+++ x11/xrx/Makefile	(working copy)
@@ -12,9 +12,6 @@
 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
Index: x11/xrx/pkg-plist
===================================================================
--- x11/xrx/pkg-plist	(revision 336156)
+++ x11/xrx/pkg-plist	(working copy)
@@ -5,4 +5,6 @@
 lib/libxrxnest.a
 lib/libxrxnest.la
 lib/libxrxnest.so
+man/man1/xrx.1.gz
+man/man1/libxrx.1.gz
 @dirrmtry include/X11/extensions
Index: x11/xsetmode/Makefile
===================================================================
--- x11/xsetmode/Makefile	(revision 336156)
+++ x11/xsetmode/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xsetpointer/Makefile
===================================================================
--- x11/xsetpointer/Makefile	(revision 336156)
+++ x11/xsetpointer/Makefile	(working copy)
@@ -10,9 +10,6 @@
 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>
Index: x11/xtrans/Makefile
===================================================================
--- x11/xtrans/Makefile	(revision 336156)
+++ x11/xtrans/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xtrans
-PORTVERSION=	1.2.7
+PORTVERSION=	1.3.2
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11/xtrans/distinfo
===================================================================
--- x11/xtrans/distinfo	(revision 336156)
+++ x11/xtrans/distinfo	(working copy)
@@ -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
Index: x11/xtrans/files/patch-Xtransint.h
===================================================================
--- x11/xtrans/files/patch-Xtransint.h	(revision 0)
+++ x11/xtrans/files/patch-Xtransint.h	(working copy)
@@ -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
+ 

Property changes on: x11/xtrans/files/patch-Xtransint.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: x11/xtrans/pkg-plist
===================================================================
--- x11/xtrans/pkg-plist	(revision 336156)
+++ x11/xtrans/pkg-plist	(working copy)
@@ -3,7 +3,6 @@
 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
Index: x11/xvidtune/Makefile
===================================================================
--- x11/xvidtune/Makefile	(revision 336156)
+++ x11/xvidtune/Makefile	(working copy)
@@ -9,4 +9,5 @@
 
 XORG_CAT=	app
 USE_XORG=	xxf86vm xt xaw
+
 .include <bsd.port.mk>
Index: x11/xvmcinfo/Makefile
===================================================================
--- x11/xvmcinfo/Makefile	(revision 336156)
+++ x11/xvmcinfo/Makefile	(working copy)
@@ -16,9 +16,6 @@
 
 PLIST_FILES=	bin/xvmcinfo
 
-NO_MAN=		defined
-
-NO_STAGE=	yes
 do-build:
 	${CC} ${CFLAGS} ${CPPFLAGS} \
 	    -I${LOCALBASE}/include -L${LOCALBASE}/lib \
@@ -25,6 +22,6 @@
 	    -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>
Index: x11-clocks/oclock/Makefile
===================================================================
--- x11-clocks/oclock/Makefile	(revision 336156)
+++ x11-clocks/oclock/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	x11 xmu xext xt xkbfile
 
-MAN1=		oclock.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-clocks/oclock/pkg-plist
===================================================================
--- x11-clocks/oclock/pkg-plist	(revision 336156)
+++ x11-clocks/oclock/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/oclock
+man/man1/oclock.1.gz
 share/X11/app-defaults/Clock-color
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
Index: x11-clocks/xclock/Makefile
===================================================================
--- x11-clocks/xclock/Makefile	(revision 336156)
+++ x11-clocks/xclock/Makefile	(working copy)
@@ -12,7 +12,4 @@
 USE_XORG=	xrender xft xkbfile xt xaw
 USES=		iconv
 
-MAN1=		xclock.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-clocks/xclock/pkg-plist
===================================================================
--- x11-clocks/xclock/pkg-plist	(revision 336156)
+++ x11-clocks/xclock/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/xclock
+man/man1/xclock.1.gz
 share/X11/app-defaults/XClock-color
 share/X11/app-defaults/XClock
 @dirrmtry share/X11/app-defaults
Index: x11-drivers/input-wacom/Makefile
===================================================================
--- x11-drivers/input-wacom/Makefile	(revision 336156)
+++ x11-drivers/input-wacom/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	input-wacom
 PORTVERSION=	${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11-drivers kld
 MASTER_SITES=	http://www.chillt.de/bsdwacom/:bsdwacom \
 		SF/linuxwacom/xf86-input-wacom/:linuxwacom
Index: x11-drivers/xf86-input-acecad/Makefile
===================================================================
--- x11-drivers/xf86-input-acecad/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-acecad/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-acecad
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org acecad input driver
 
 XORG_CAT=	driver
-MAN4=		acecad.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-acecad/pkg-plist
===================================================================
--- x11-drivers/xf86-input-acecad/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-acecad/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/input/acecad_drv.la
 lib/xorg/modules/input/acecad_drv.so
+man/man4/acecad.4x.gz
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-input-elographics/Makefile
===================================================================
--- x11-drivers/xf86-input-elographics/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-elographics/Makefile	(working copy)
@@ -9,8 +9,9 @@
 COMMENT=	X.Org elographics input driver
 
 XORG_CAT=	driver
-MAN4=		elographics.4x
 
+.include <bsd.port.options.mk>
+
 .if defined(WITH_NEW_XORG)
 ELO_VERSION=	1.4.1
 ELO_REVISION=	0
@@ -19,5 +20,4 @@
 ELO_REVISION=	0
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-elographics/pkg-plist
===================================================================
--- x11-drivers/xf86-input-elographics/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-elographics/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/input/elographics_drv.la
 lib/xorg/modules/input/elographics_drv.so
+man/man4/elographics.4x.gz
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-input-fpit/Makefile
===================================================================
--- x11-drivers/xf86-input-fpit/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-fpit/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-fpit
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,6 +11,8 @@
 XORG_CAT=	driver
 USE_XORG=	xrandr
 
+.include <bsd.port.options.mk>
+
 .if !defined(WITH_NEW_XORG)
 IGNORE=		does not build with X server 1.7.7
 .endif
Index: x11-drivers/xf86-input-hyperpen/Makefile
===================================================================
--- x11-drivers/xf86-input-hyperpen/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-hyperpen/Makefile	(working copy)
@@ -10,6 +10,8 @@
 
 XORG_CAT=	driver
 
+.include <bsd.port.options.mk>
+
 .if defined(WITH_NEW_XORG)
 HYPERVER=	1.4.1
 HYPERREVISION=	0
@@ -19,5 +21,4 @@
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xf86HyperPen.c
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-joystick/Makefile
===================================================================
--- x11-drivers/xf86-input-joystick/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-joystick/Makefile	(working copy)
@@ -9,8 +9,9 @@
 COMMENT=	X.Org joystick input driver
 
 XORG_CAT=	driver
-MAN4=		joystick.4x
 
+.include <bsd.port.options.mk>
+
 .if defined(WITH_NEW_XORG)
 JOYVER=		1.6.2
 JOYREVISION=	0
@@ -19,7 +20,6 @@
 JOYREVISION=	1
 .endif
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.in
Index: x11-drivers/xf86-input-joystick/pkg-plist
===================================================================
--- x11-drivers/xf86-input-joystick/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-joystick/pkg-plist	(working copy)
@@ -2,6 +2,7 @@
 lib/xorg/modules/input/joystick_drv.la
 lib/xorg/modules/input/joystick_drv.so
 libdata/pkgconfig/xorg-joystick.pc
+man/man4/joystick.4x.gz
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-input-keyboard/Makefile
===================================================================
--- x11-drivers/xf86-input-keyboard/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-keyboard/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.7.0
+PORTVERSION=	1.8.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,7 +9,5 @@
 
 XORG_CAT=	driver
 USE_XORG=	kbproto
-MAN4=		kbd.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-keyboard/distinfo
===================================================================
--- x11-drivers/xf86-input-keyboard/distinfo	(revision 336156)
+++ x11-drivers/xf86-input-keyboard/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c
-SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043
+SHA256 (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b
+SIZE (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 323838
Index: x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c
===================================================================
--- x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c	(revision 0)
+++ x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c	(working copy)
@@ -0,0 +1,14 @@
+Index: src/bsd_kbd.c
+@@ -205,6 +205,12 @@
+ #endif
+         }
+     }
++/*
++ * Switch keyboards which are not attached to console in RAW mode
++ */
++#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT)
++	ioctl(pInfo->fd, KDSKBMODE, K_RAW);
++#endif
+     return Success;
+ }
+ 

Property changes on: x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c
===================================================================
--- x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c	(revision 0)
+++ x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c	(working copy)
@@ -0,0 +1,24 @@
+Index: src/kbd.c
+@@ -25,6 +25,7 @@
+ 
+ #include "xf86.h"
+ #include "atKeynames.h"
++#include "xf86Priv.h"
+ #include "xf86Privstr.h"
+ 
+ #include <X11/extensions/XI.h>
+@@ -392,6 +393,14 @@
+       RemoveEnabledDevice(pInfo->fd);
+     pKbd->KbdOff(pInfo, what);
+     device->public.on = FALSE;
++	/*
++	 * Close device file for keyboards which are not attached
++	 * to console, otherwise they can't be opened again after
++	 * relogin when using session manager like xdm.
++	 * X server will take care about console attached keyboards.
++	 */
++	if (pInfo->fd != xf86Info.consoleFd)
++		close(pInfo->fd);
+     break;
+ 
+   default:

Property changes on: x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: x11-drivers/xf86-input-keyboard/pkg-plist
===================================================================
--- x11-drivers/xf86-input-keyboard/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-keyboard/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/input/kbd_drv.la
 lib/xorg/modules/input/kbd_drv.so
+man/man4/kbd.4x.gz
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-input-magictouch/Makefile
===================================================================
--- x11-drivers/xf86-input-magictouch/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-magictouch/Makefile	(working copy)
@@ -8,11 +8,13 @@
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org magictouch input driver
 
+.include <bsd.port.options.mk>
+
+.if defined(WITH_NEW_XORG)
 IGNORE=		needs xf86_ansic.h which doesn't exist with recent xserver
+.endif
 
 XORG_CAT=	driver
-MAN4=		magictouch.4x
 USE_AUTOTOOLS=	libtool
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-magictouch/pkg-plist
===================================================================
--- x11-drivers/xf86-input-magictouch/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-magictouch/pkg-plist	(working copy)
@@ -1,6 +1,7 @@
 lib/xorg/modules/input/magictouch_drv.a
 lib/xorg/modules/input/magictouch_drv.la
 lib/xorg/modules/input/magictouch_drv.so
+man/man4/magictouch.4x.gz
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-input-mouse/Makefile
===================================================================
--- x11-drivers/xf86-input-mouse/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-mouse/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-input-mouse
 PORTVERSION=	1.9.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,7 +10,5 @@
 
 XORG_CAT=	driver
 USES=		pathfix
-MAN4=		mousedrv.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-mouse/pkg-plist
===================================================================
--- x11-drivers/xf86-input-mouse/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-mouse/pkg-plist	(working copy)
@@ -2,6 +2,7 @@
 lib/xorg/modules/input/mouse_drv.la
 lib/xorg/modules/input/mouse_drv.so
 libdata/pkgconfig/xorg-mouse.pc
+man/man4/mousedrv.4x.gz
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-input-mutouch/Makefile
===================================================================
--- x11-drivers/xf86-input-mutouch/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-mutouch/Makefile	(working copy)
@@ -8,13 +8,11 @@
 COMMENT=	X.Org mutouch input driver
 
 XORG_CAT=	driver
-MAN4=		mutouch.4x
 
+.include <bsd.port.options.mk>
+
 .if !defined(WITH_NEW_XORG)
 IGNORE=		does not build with xorg-server 1.7.7
-.else
-
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-mutouch/pkg-plist
===================================================================
--- x11-drivers/xf86-input-mutouch/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-mutouch/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/input/mutouch_drv.la
 lib/xorg/modules/input/mutouch_drv.so
+man/man4/mutouch.4x.gz
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-input-penmount/Makefile
===================================================================
--- x11-drivers/xf86-input-penmount/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-penmount/Makefile	(working copy)
@@ -9,8 +9,9 @@
 COMMENT=	X.Org penmount input driver
 
 XORG_CAT=	driver
-MAN4=		penmount.4x
 
+.include <bsd.port.options.mk>
+
 .if defined(WITH_NEW_XORG)
 PEN_VERSION=	1.5.0
 PEN_REVISION=	0
@@ -19,5 +20,4 @@
 PEN_REVISION=	1
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-penmount/pkg-plist
===================================================================
--- x11-drivers/xf86-input-penmount/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-penmount/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/input/penmount_drv.la
 lib/xorg/modules/input/penmount_drv.so
+man/man4/penmount.4x.gz
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-input-synaptics/Makefile
===================================================================
--- x11-drivers/xf86-input-synaptics/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-synaptics/Makefile	(working copy)
@@ -10,29 +10,12 @@
 
 CONFLICTS=	synaptics-[0-9]*
 
-OPTIONS_DEFINE=	HAL
-OPTIONS_DEFAULT=HAL
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 USES=		pathfix
 USE_XORG=	x11 xtst
 XORG_CAT=	driver
 
-.if ${PORT_OPTIONS:MHAL}
-PLIST_SUB+=	HAL=""
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
-.else
-PLIST_SUB+=	HAL="@comment "
-.endif
-
-MAN1=		syndaemon.1 \
-		synclient.1
-MAN4=		synaptics.4x
-
 .if defined(WITH_NEW_XORG)
-SYNAPTICS_VERSION=	1.7.1
+SYNAPTICS_VERSION=	1.7.2
 SYNAPTICS_REVISION=	0
 PLIST_SUB+=	NEW="" OLD="@comment "
 .else
@@ -42,16 +25,4 @@
 EXTRA_PATCHES+=	${PATCHDIR}/extra-Makefile.in
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MHAL}
-	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
-	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
-		${PREFIX}/share/hal/fdi/policy/10osvendor/
-.if !defined(WITH_NEW_XORG)
-	${MKDIR} ${PREFIX}/share/hal/fdi/policy/20thirdparty
-	${INSTALL_DATA} ${WRKSRC}/conf/11-x11-synaptics.fdi \
-		${PREFIX}/share/hal/fdi/policy/20thirdparty/
-.endif
-.endif
-
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-synaptics/distinfo
===================================================================
--- x11-drivers/xf86-input-synaptics/distinfo	(revision 336156)
+++ x11-drivers/xf86-input-synaptics/distinfo	(working copy)
@@ -1,4 +1,4 @@
 SHA256 (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = fe15b1afc61b40800f74a0dcf976c15b299ca0680ae5e537baef543455a732ee
 SIZE (xorg/driver/xf86-input-synaptics-1.6.4.tar.bz2) = 447004
-SHA256 (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e
-SIZE (xorg/driver/xf86-input-synaptics-1.7.1.tar.bz2) = 441407
+SHA256 (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd
+SIZE (xorg/driver/xf86-input-synaptics-1.7.2.tar.bz2) = 448170
Index: x11-drivers/xf86-input-synaptics/pkg-plist
===================================================================
--- x11-drivers/xf86-input-synaptics/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-synaptics/pkg-plist	(working copy)
@@ -5,14 +5,12 @@
 lib/xorg/modules/input/synaptics_drv.la
 lib/xorg/modules/input/synaptics_drv.so
 libdata/pkgconfig/xorg-synaptics.pc
+man/man1/synclient.1.gz
+man/man1/syndaemon.1.gz
+man/man4/synaptics.4x.gz
 %%NEW%%share/X11/xorg.conf.d/50-synaptics.conf
-%%HAL%%share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
-%%HAL%%%%OLD%%share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
 @dirrmtry include/xorg
-%%HAL%%@dirrmtry share/hal/fdi/policy/10osvendor
-%%HAL%%@dirrmtry share/hal/fdi/policy
-%%HAL%%@dirrmtry share/hal/fdi
-%%HAL%%@dirrmtry share/hal
Index: x11-drivers/xf86-input-vmmouse/Makefile
===================================================================
--- x11-drivers/xf86-input-vmmouse/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-vmmouse/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xf86-input-vmmouse
 PORTVERSION=	13.0.0
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -14,12 +15,11 @@
 CONFIGURE_ARGS=	--with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts
 USE_GMAKE=	yes
 
-MAN1=		vmmouse_detect.1
-MAN4=		vmmouse.4x
-
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	The vmmouse protocol is only supported on x86-compatible architectures.
 
+.include <bsd.port.options.mk>
+
 .if defined(WITH_NEW_XORG)
 PLIST_SUB+=	NEW=""
 .else
@@ -26,5 +26,4 @@
 PLIST_SUB+=	NEW="@comment "
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-vmmouse/pkg-plist
===================================================================
--- x11-drivers/xf86-input-vmmouse/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-vmmouse/pkg-plist	(working copy)
@@ -2,6 +2,8 @@
 libexec/hal/scripts/hal-probe-vmmouse
 lib/xorg/modules/input/vmmouse_drv.la
 lib/xorg/modules/input/vmmouse_drv.so
+man/man1/vmmouse_detect.1.gz
+man/man4/vmmouse.4x.gz
 %%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf
 share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
 @dirrmtry lib/xorg/modules/input
Index: x11-drivers/xf86-input-void/Makefile
===================================================================
--- x11-drivers/xf86-input-void/Makefile	(revision 336156)
+++ x11-drivers/xf86-input-void/Makefile	(working copy)
@@ -9,8 +9,9 @@
 COMMENT=	X.Org void input driver
 
 XORG_CAT=	driver
-MAN4=		void.4x
 
+.include <bsd.port.options.mk>
+
 .if defined(WITH_NEW_XORG)
 VOID_VERSION=	1.4.0
 VOID_REVISION=	0
@@ -19,6 +20,4 @@
 VOID_REVISION=	0
 .endif
 
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-input-void/pkg-plist
===================================================================
--- x11-drivers/xf86-input-void/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-input-void/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/input/void_drv.la
 lib/xorg/modules/input/void_drv.so
+man/man4/void.4x.gz
 @dirrmtry lib/xorg/modules/input
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-apm/Makefile
===================================================================
--- x11-drivers/xf86-video-apm/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-apm/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-apm
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org apm display driver
 
 XORG_CAT=	driver
-MAN4=		apm.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-apm/pkg-plist
===================================================================
--- x11-drivers/xf86-video-apm/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-apm/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/apm_drv.la
 lib/xorg/modules/drivers/apm_drv.so
+man/man4/apm.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-ark/Makefile
===================================================================
--- x11-drivers/xf86-video-ark/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-ark/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-ark
 PORTVERSION=	0.7.5
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,5 +10,4 @@
 
 XORG_CAT=	driver
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-ati/Makefile
===================================================================
--- x11-drivers/xf86-video-ati/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-ati/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-ati
 PORTVERSION=	${ATI_VERSION}
+PORTREVISION=	${ATI_REVISION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,17 +11,17 @@
 USE_GL=		gl
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
-MAN4=		ati.4x radeon.4x
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG)
 ATI_VERSION=	6.14.6
+ATI_REVISION=	1
 CONFIGURE_ARGS+=--disable-kms
 PLIST_SUB+=	OLD=""
 .else
 ATI_VERSION=	7.2.0
+ATI_REVISION=	1
 CONFIGURE_ARGS+=--disable-udev
 EXTRA_PATCHES+=	${FILESDIR}/extra-src__radeon_kms.c
 PLIST_SUB+=	OLD="@comment "
Index: x11-drivers/xf86-video-ati/pkg-plist
===================================================================
--- x11-drivers/xf86-video-ati/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-ati/pkg-plist	(working copy)
@@ -8,6 +8,8 @@
 %%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
 %%OLD%%lib/xorg/modules/multimedia/theatre_drv.la
 %%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
+man/man4/ati.4x.gz
+man/man4/radeon.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 %%OLD%%@dirrmtry lib/xorg/modules/multimedia
 @dirrmtry lib/xorg/modules
Index: x11-drivers/xf86-video-chips/Makefile
===================================================================
--- x11-drivers/xf86-video-chips/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-chips/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-chips
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org chips display driver
 
 XORG_CAT=	driver
-MAN4=		chips.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-chips/pkg-plist
===================================================================
--- x11-drivers/xf86-video-chips/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-chips/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/chips_drv.la
 lib/xorg/modules/drivers/chips_drv.so
+man/man4/chips.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-cirrus/Makefile
===================================================================
--- x11-drivers/xf86-video-cirrus/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-cirrus/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-cirrus
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org cirrus display driver
 
 XORG_CAT=	driver
-MAN4=		cirrus.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-cirrus/pkg-plist
===================================================================
--- x11-drivers/xf86-video-cirrus/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-cirrus/pkg-plist	(working copy)
@@ -4,6 +4,7 @@
 lib/xorg/modules/drivers/cirrus_drv.so
 lib/xorg/modules/drivers/cirrus_laguna.la
 lib/xorg/modules/drivers/cirrus_laguna.so
+man/man4/cirrus.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-cyrix/Makefile
===================================================================
--- x11-drivers/xf86-video-cyrix/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-cyrix/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-cyrix
 PORTVERSION=	1.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -12,7 +12,5 @@
 
 XORG_CAT=	driver
 USE_XORG=	xextproto xf86dgaproto
-MAN4=		cyrix.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-cyrix/pkg-plist
===================================================================
--- x11-drivers/xf86-video-cyrix/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-cyrix/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/cyrix_drv.la
 lib/xorg/modules/drivers/cyrix_drv.so
+man/man4/cyrix.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-dummy/Makefile
===================================================================
--- x11-drivers/xf86-video-dummy/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-dummy/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-dummy
 PORTVERSION=	0.3.7
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,5 +11,4 @@
 XORG_CAT=	driver
 USE_XORG=	xf86dgaproto
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-fbdev/Makefile
===================================================================
--- x11-drivers/xf86-video-fbdev/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-fbdev/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-fbdev
 PORTVERSION=	0.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,7 +9,5 @@
 COMMENT=	X.Org fbdev display driver
 
 XORG_CAT=	driver
-MAN4=		fbdev.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-fbdev/pkg-plist
===================================================================
--- x11-drivers/xf86-video-fbdev/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-fbdev/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/fbdev_drv.la
 lib/xorg/modules/drivers/fbdev_drv.so
+man/man4/fbdev.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-glint/Makefile
===================================================================
--- x11-drivers/xf86-video-glint/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-glint/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-glint
 PORTVERSION=	1.2.8
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,7 +12,5 @@
 
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xf86dgaproto glproto
-MAN4=		glint.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-glint/pkg-plist
===================================================================
--- x11-drivers/xf86-video-glint/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-glint/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/glint_drv.la
 lib/xorg/modules/drivers/glint_drv.so
+man/man4/glint.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-i128/Makefile
===================================================================
--- x11-drivers/xf86-video-i128/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-i128/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-i128
 PORTVERSION=	1.3.6
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org i128 display driver
 
 XORG_CAT=	driver
-MAN4=		i128.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-i128/pkg-plist
===================================================================
--- x11-drivers/xf86-video-i128/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-i128/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/i128_drv.la
 lib/xorg/modules/drivers/i128_drv.so
+man/man4/i128.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-i740/Makefile
===================================================================
--- x11-drivers/xf86-video-i740/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-i740/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-i740
 PORTVERSION=	1.3.4
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org i740 display driver
 
 XORG_CAT=	driver
-MAN4=		i740.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-i740/pkg-plist
===================================================================
--- x11-drivers/xf86-video-i740/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-i740/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/i740_drv.la
 lib/xorg/modules/drivers/i740_drv.so
+man/man4/i740.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-imstt/Makefile
===================================================================
--- x11-drivers/xf86-video-imstt/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-imstt/Makefile	(working copy)
@@ -2,16 +2,15 @@
 
 PORTNAME=	xf86-video-imstt
 PORTVERSION=	1.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org imstt display driver
 
-IGNORE=		requires pciVideoPtr typedef
+DEPRECATED=	requires pciVideoPtr typedef
+EXPIRATION_DATE=2014-01-31
 
 XORG_CAT=	driver
-MAN4=		imstt.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-imstt/pkg-plist
===================================================================
--- x11-drivers/xf86-video-imstt/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-imstt/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/imstt_drv.la
 lib/xorg/modules/drivers/imstt_drv.so
+man/man4/imstt.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-intel/Makefile
===================================================================
--- x11-drivers/xf86-video-intel/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-intel/Makefile	(working copy)
@@ -23,14 +23,11 @@
 		xrender \
 		xvmc
 
-MAN4=		intel.4x
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if defined(WITH_NEW_XORG)
 INTEL_VERSION=	2.21.15
-INTEL_REVISION=	0
+INTEL_REVISION=	1
 CONFIGURE_ENV+=	xorg_cv_cc_flag__Wno_maybe_uninitialized=no
 CONFIGURE_ARGS+=	--enable-sna
 MAKE_JOBS_UNSAFE=yes
@@ -39,10 +36,10 @@
 		${PATCHDIR}/extra-src_sna_kgem.c \
 		${PATCHDIR}/extra-clang \
 		${PATCHDIR}/extra-i915kms
-LIB_DEPENDS+=	xcb-util:${PORTSDIR}/x11/xcb-util
+LIB_DEPENDS+=	libxcb-util.so:${PORTSDIR}/x11/xcb-util
 .else
 INTEL_VERSION=	2.7.1
-INTEL_REVISION=	5
+INTEL_REVISION=	6
 PLIST_SUB+=	OLD=""
 
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src_ch7017_ch7017.c \
@@ -65,14 +62,9 @@
 		${PATCHDIR}/extra-uxa_uxa-priv.h
 .endif
 
-.include <bsd.port.pre.mk>
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libIntelXvMC.so.1
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libI810XvMC.so.1
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/drivers/intel_drv.so
 
-.if defined(WITH_NEW_XORG)
-pre-configure:
-.if !exists(${LOCALBASE}/lib/libkms.so)
-	@${ECHO} "${PKGNAME}: Rebuild graphics/libdrm with the WITH_KMS option."
-	@${FALSE}
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: x11-drivers/xf86-video-intel/pkg-plist
===================================================================
--- x11-drivers/xf86-video-intel/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-intel/pkg-plist	(working copy)
@@ -16,6 +16,7 @@
 %%OLD%%lib/xorg/modules/drivers/sil164.so
 %%OLD%%lib/xorg/modules/drivers/tfp410.la
 %%OLD%%lib/xorg/modules/drivers/tfp410.so
+man/man4/intel.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-mach64/Makefile
===================================================================
--- x11-drivers/xf86-video-mach64/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-mach64/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-mach64
 PORTVERSION=	6.9.4
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -12,5 +13,4 @@
 XORG_CAT=	driver
 USE_XORG=	glproto xf86driproto xf86miscproto
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-mga/Makefile
===================================================================
--- x11-drivers/xf86-video-mga/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-mga/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-mga
 PORTVERSION=	1.6.3
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	x11-drivers
 
Index: x11-drivers/xf86-video-neomagic/Makefile
===================================================================
--- x11-drivers/xf86-video-neomagic/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-neomagic/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-neomagic
 PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-newport/Makefile
===================================================================
--- x11-drivers/xf86-video-newport/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-newport/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-newport
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,9 +9,7 @@
 COMMENT=	X.Org newport display driver
 
 XORG_CAT=	driver
-MAN4=		newport.4x
 
-NO_STAGE=	yes
 post-patch:
 		${REINPLACE_CMD} -e 's|values.h|sys/limits.h|' \
 				 -e 's|MAXSHORT|SHRT_MAX|g' \
Index: x11-drivers/xf86-video-newport/pkg-plist
===================================================================
--- x11-drivers/xf86-video-newport/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-newport/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/newport_drv.la
 lib/xorg/modules/drivers/newport_drv.so
+man/man4/newport.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-nouveau/Makefile
===================================================================
--- x11-drivers/xf86-video-nouveau/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-nouveau/Makefile	(working copy)
@@ -4,7 +4,7 @@
 PORTNAME=	xf86-video-nouveau
 PORTVERSION=	0.0.10.${SNAPDATE}
 DISTVERSIONSUFFIX=.${SNAPREV}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 MASTER_SITES=	ftp://ftp.lissyara.su/users/Guest/distfiles/
 
@@ -13,13 +13,11 @@
 
 XORG_CAT=	driver
 USE_XORG=	xf86driproto glproto
-MAN4=		nouveau.4x
 
-
 # also doesn't work with mesa (libGL) version higher then 7.4.x
-IGNORE=		Not supported, missing kernel support. use the nvidia driver.
+DEPRECATED=	Not supported, missing kernel support. use the nvidia driver.
+EXPIRATION_DATE=2014-01-31
 
-NO_STAGE=	yes
 post-configure:
 	${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h
 
Index: x11-drivers/xf86-video-nouveau/pkg-plist
===================================================================
--- x11-drivers/xf86-video-nouveau/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-nouveau/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/nouveau_drv.la
 lib/xorg/modules/drivers/nouveau_drv.so
+man/man4/nouveau.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-nv/Makefile
===================================================================
--- x11-drivers/xf86-video-nv/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-nv/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-nv
 PORTVERSION=	2.1.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,7 +9,5 @@
 COMMENT=	X.Org nv display driver
 
 XORG_CAT=	driver
-MAN4=		nv.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-nv/pkg-plist
===================================================================
--- x11-drivers/xf86-video-nv/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-nv/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/nv_drv.la
 lib/xorg/modules/drivers/nv_drv.so
+man/man4/nv.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-openchrome/Makefile
===================================================================
--- x11-drivers/xf86-video-openchrome/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-openchrome/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-openchrome
 PORTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,11 +12,9 @@
 
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xvmc glproto
-MAN4=		openchrome.4x
 
 MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 
 ONLY_FOR_ARCHS=	amd64 i386 ia64
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-openchrome/pkg-plist
===================================================================
--- x11-drivers/xf86-video-openchrome/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-openchrome/pkg-plist	(working copy)
@@ -6,6 +6,7 @@
 lib/libchromeXvMCPro.so.1
 lib/xorg/modules/drivers/openchrome_drv.la
 lib/xorg/modules/drivers/openchrome_drv.so
+man/man4/openchrome.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-r128/Makefile
===================================================================
--- x11-drivers/xf86-video-r128/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-r128/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-r128
 PORTVERSION=	6.9.2
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-radeonhd/Makefile
===================================================================
--- x11-drivers/xf86-video-radeonhd/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-radeonhd/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-radeonhd
 PORTVERSION=	1.3.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -17,9 +17,6 @@
 CONFIGURE_ARGS=	--enable-exa
 CONFLICTS=	xf86-video-radeonhd-devel-[0-9]*
 
-MAN4=	radeonhd.4x
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUTILS}
Index: x11-drivers/xf86-video-radeonhd/pkg-plist
===================================================================
--- x11-drivers/xf86-video-radeonhd/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-radeonhd/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/radeonhd_drv.la
 lib/xorg/modules/drivers/radeonhd_drv.so
+man/man4/radeonhd.4x.gz
 %%UTILS%%sbin/rhd_conntest
 %%UTILS%%sbin/rhd_dump
 @dirrmtry lib/xorg/modules/drivers
Index: x11-drivers/xf86-video-rdc/Makefile
===================================================================
--- x11-drivers/xf86-video-rdc/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-rdc/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xf86-video-rdc
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://www.SpringDaemons.com/stas/
 
@@ -13,6 +14,8 @@
 XORG_CAT=	driver
 USE_XORG=	xvmc xf86driproto xextproto x11 glproto
 
+.include <bsd.port.options.mk>
+
 .if defined(WITH_NEW_XORG)
 IGNORE=         does not build with X server 1.12
 .endif
Index: x11-drivers/xf86-video-rendition/Makefile
===================================================================
--- x11-drivers/xf86-video-rendition/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-rendition
 PORTVERSION=	4.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,7 +9,5 @@
 COMMENT=	X.Org rendition display driver
 
 XORG_CAT=	driver
-MAN4=		rendition.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-rendition/pkg-plist
===================================================================
--- x11-drivers/xf86-video-rendition/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-rendition/pkg-plist	(working copy)
@@ -2,6 +2,7 @@
 lib/xorg/modules/drivers/rendition_drv.so
 lib/xorg/modules/v10002d.uc
 lib/xorg/modules/v20002d.uc
+man/man4/rendition.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-s3/Makefile
===================================================================
--- x11-drivers/xf86-video-s3/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-s3/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-s3
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org s3 display driver
 
 XORG_CAT=	driver
-MAN4=		s3.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-s3/pkg-plist
===================================================================
--- x11-drivers/xf86-video-s3/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-s3/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/s3_drv.la
 lib/xorg/modules/drivers/s3_drv.so
+man/man4/s3.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-s3virge/Makefile
===================================================================
--- x11-drivers/xf86-video-s3virge/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-s3virge/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-s3virge
 PORTVERSION=	1.10.6
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org s3virge display driver
 
 XORG_CAT=	driver
-MAN4=		s3virge.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-s3virge/pkg-plist
===================================================================
--- x11-drivers/xf86-video-s3virge/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-s3virge/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/s3virge_drv.la
 lib/xorg/modules/drivers/s3virge_drv.so
+man/man4/s3virge.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-savage/Makefile
===================================================================
--- x11-drivers/xf86-video-savage/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-savage/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-savage
 PORTVERSION=	2.3.7
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-siliconmotion/Makefile
===================================================================
--- x11-drivers/xf86-video-siliconmotion/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-siliconmotion/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-siliconmotion
 PORTVERSION=	1.7.7
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org siliconmotion display driver
 
 XORG_CAT=	driver
-MAN4=		siliconmotion.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-siliconmotion/pkg-plist
===================================================================
--- x11-drivers/xf86-video-siliconmotion/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-siliconmotion/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/siliconmotion_drv.la
 lib/xorg/modules/drivers/siliconmotion_drv.so
+man/man4/siliconmotion.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-sis/Makefile
===================================================================
--- x11-drivers/xf86-video-sis/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-sis/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-sis
 PORTVERSION=	0.10.7
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -13,7 +14,5 @@
 
 XORG_CAT=	driver
 USE_XORG=	xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto
-MAN4=		sis.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-sis/pkg-plist
===================================================================
--- x11-drivers/xf86-video-sis/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-sis/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/sis_drv.la
 lib/xorg/modules/drivers/sis_drv.so
+man/man4/sis.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-sis-intel/Makefile
===================================================================
--- x11-drivers/xf86-video-sis-intel/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-sis-intel/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xf86-video-sis-intel
 PORTVERSION=	300407
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://downloadmirror.intel.com/15443/eng/
 DISTNAME=	sis_drv_src_300407
Index: x11-drivers/xf86-video-sunffb/Makefile
===================================================================
--- x11-drivers/xf86-video-sunffb/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-sunffb/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-sunffb
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
Index: x11-drivers/xf86-video-tdfx/Makefile
===================================================================
--- x11-drivers/xf86-video-tdfx/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-tdfx/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-tdfx
 PORTVERSION=	1.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -12,7 +12,5 @@
 
 XORG_CAT=	driver
 USE_XORG=	xf86driproto glproto
-MAN4=		tdfx.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-tdfx/pkg-plist
===================================================================
--- x11-drivers/xf86-video-tdfx/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-tdfx/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/tdfx_drv.la
 lib/xorg/modules/drivers/tdfx_drv.so
+man/man4/tdfx.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-tga/Makefile
===================================================================
--- x11-drivers/xf86-video-tga/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-tga/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	driver
 USE_XORG=	xf86dgaproto
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-trident/Makefile
===================================================================
--- x11-drivers/xf86-video-trident/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-trident/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-trident
 PORTVERSION=	1.3.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,7 +10,5 @@
 
 XORG_CAT=	driver
 USE_XORG=	xf86dgaproto
-MAN4=		trident.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-trident/pkg-plist
===================================================================
--- x11-drivers/xf86-video-trident/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-trident/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/trident_drv.la
 lib/xorg/modules/drivers/trident_drv.so
+man/man4/trident.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-tseng/Makefile
===================================================================
--- x11-drivers/xf86-video-tseng/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-tseng/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-tseng
 PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -9,7 +9,5 @@
 COMMENT=	X.Org tseng display driver
 
 XORG_CAT=	driver
-MAN4=		tseng.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-tseng/pkg-plist
===================================================================
--- x11-drivers/xf86-video-tseng/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-tseng/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/tseng_drv.la
 lib/xorg/modules/drivers/tseng_drv.so
+man/man4/tseng.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-vesa/Makefile
===================================================================
--- x11-drivers/xf86-video-vesa/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-vesa/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-vesa
 PORTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -8,7 +9,5 @@
 COMMENT=	X.Org vesa display driver
 
 XORG_CAT=	driver
-MAN4=		vesa.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-vesa/pkg-plist
===================================================================
--- x11-drivers/xf86-video-vesa/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-vesa/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/vesa_drv.la
 lib/xorg/modules/drivers/vesa_drv.so
+man/man4/vesa.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-via/Makefile
===================================================================
--- x11-drivers/xf86-video-via/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-via/Makefile	(working copy)
@@ -2,21 +2,19 @@
 
 PORTNAME=	xf86-video-via
 PORTVERSION=	0.2.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org via display driver
 
-IGNORE=		requires pciVideoPtr typedef
+DEPRECATED=	requires pciVideoPtr typedef
+EXPIRATION_DATE=2014-01-31
 
 USE_GL=		gl
 XORG_CAT=	driver
 USE_XORG=	xvmc xf86driproto xextproto x11 glproto
 
-MAN4=		via.4x
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
Index: x11-drivers/xf86-video-via/pkg-plist
===================================================================
--- x11-drivers/xf86-video-via/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-via/pkg-plist	(working copy)
@@ -6,6 +6,7 @@
 lib/libviaXvMCPro.so.1
 lib/xorg/modules/drivers/via_drv.la
 lib/xorg/modules/drivers/via_drv.so
+man/man4/via.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-vmware/Makefile
===================================================================
--- x11-drivers/xf86-video-vmware/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-vmware/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	xf86-video-vmware
 PORTVERSION=	13.0.1
+PORTREVISION=	1
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,7 +11,4 @@
 XORG_CAT=	driver
 USE_XORG=	xextproto xineramaproto videoproto
 
-MAN4=		vmware.4x
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-vmware/pkg-plist
===================================================================
--- x11-drivers/xf86-video-vmware/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-vmware/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/vmware_drv.la
 lib/xorg/modules/drivers/vmware_drv.so
+man/man4/vmware.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xf86-video-voodoo/Makefile
===================================================================
--- x11-drivers/xf86-video-voodoo/Makefile	(revision 336156)
+++ x11-drivers/xf86-video-voodoo/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-voodoo
 PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,7 +10,5 @@
 
 XORG_CAT=	driver
 USE_XORG=	xf86dgaproto
-MAN4=		voodoo.4x
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-drivers/xf86-video-voodoo/pkg-plist
===================================================================
--- x11-drivers/xf86-video-voodoo/pkg-plist	(revision 336156)
+++ x11-drivers/xf86-video-voodoo/pkg-plist	(working copy)
@@ -1,5 +1,6 @@
 lib/xorg/modules/drivers/voodoo_drv.la
 lib/xorg/modules/drivers/voodoo_drv.so
+man/man4/voodoo.4x.gz
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
Index: x11-drivers/xorg-drivers/Makefile
===================================================================
--- x11-drivers/xorg-drivers/Makefile	(revision 336156)
+++ x11-drivers/xorg-drivers/Makefile	(working copy)
@@ -97,7 +97,6 @@
 # these drivers have a different module name compared to the plugin they install
 QUIRKS=		keyboard:kbd
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # Manual add arch specific drivers so they be added to depend lines.
Index: x11-fonts/bdftopcf/Makefile
===================================================================
--- x11-fonts/bdftopcf/Makefile	(revision 336156)
+++ x11-fonts/bdftopcf/Makefile	(working copy)
@@ -11,8 +11,6 @@
 XORG_CAT=	app
 USE_XORG=	xfont
 
-PLIST_FILES=	bin/bdftopcf
-MAN1=		bdftopcf.1
+PLIST_FILES=	bin/bdftopcf man/man1/bdftopcf.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/encodings/Makefile
===================================================================
--- x11-fonts/encodings/Makefile	(revision 336156)
+++ x11-fonts/encodings/Makefile	(working copy)
@@ -12,5 +12,4 @@
 USE_XORG=	fontutil
 FONTDIR=	encodings/large encodings
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-adobe-100dpi/Makefile
===================================================================
--- x11-fonts/font-adobe-100dpi/Makefile	(revision 336156)
+++ x11-fonts/font-adobe-100dpi/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-adobe-75dpi/Makefile
===================================================================
--- x11-fonts/font-adobe-75dpi/Makefile	(revision 336156)
+++ x11-fonts/font-adobe-75dpi/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-adobe-utopia-100dpi/Makefile
===================================================================
--- x11-fonts/font-adobe-utopia-100dpi/Makefile	(revision 336156)
+++ x11-fonts/font-adobe-utopia-100dpi/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-adobe-utopia-75dpi/Makefile
===================================================================
--- x11-fonts/font-adobe-utopia-75dpi/Makefile	(revision 336156)
+++ x11-fonts/font-adobe-utopia-75dpi/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-adobe-utopia-type1/Makefile
===================================================================
--- x11-fonts/font-adobe-utopia-type1/Makefile	(revision 336156)
+++ x11-fonts/font-adobe-utopia-type1/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-alias/Makefile
===================================================================
--- x11-fonts/font-alias/Makefile	(revision 336156)
+++ x11-fonts/font-alias/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 FONTDIR=	100dpi 75dpi misc cyrillic
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-arabic-misc/Makefile
===================================================================
--- x11-fonts/font-arabic-misc/Makefile	(revision 336156)
+++ x11-fonts/font-arabic-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bh-100dpi/Makefile
===================================================================
--- x11-fonts/font-bh-100dpi/Makefile	(revision 336156)
+++ x11-fonts/font-bh-100dpi/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bh-75dpi/Makefile
===================================================================
--- x11-fonts/font-bh-75dpi/Makefile	(revision 336156)
+++ x11-fonts/font-bh-75dpi/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
===================================================================
--- x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(revision 336156)
+++ x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
===================================================================
--- x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(revision 336156)
+++ x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bh-ttf/Makefile
===================================================================
--- x11-fonts/font-bh-ttf/Makefile	(revision 336156)
+++ x11-fonts/font-bh-ttf/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bh-type1/Makefile
===================================================================
--- x11-fonts/font-bh-type1/Makefile	(revision 336156)
+++ x11-fonts/font-bh-type1/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bitstream-100dpi/Makefile
===================================================================
--- x11-fonts/font-bitstream-100dpi/Makefile	(revision 336156)
+++ x11-fonts/font-bitstream-100dpi/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bitstream-75dpi/Makefile
===================================================================
--- x11-fonts/font-bitstream-75dpi/Makefile	(revision 336156)
+++ x11-fonts/font-bitstream-75dpi/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bitstream-speedo/Makefile
===================================================================
--- x11-fonts/font-bitstream-speedo/Makefile	(revision 336156)
+++ x11-fonts/font-bitstream-speedo/Makefile	(working copy)
@@ -9,5 +9,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-bitstream-type1/Makefile
===================================================================
--- x11-fonts/font-bitstream-type1/Makefile	(revision 336156)
+++ x11-fonts/font-bitstream-type1/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-cronyx-cyrillic/Makefile
===================================================================
--- x11-fonts/font-cronyx-cyrillic/Makefile	(revision 336156)
+++ x11-fonts/font-cronyx-cyrillic/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-cursor-misc/Makefile
===================================================================
--- x11-fonts/font-cursor-misc/Makefile	(revision 336156)
+++ x11-fonts/font-cursor-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-daewoo-misc/Makefile
===================================================================
--- x11-fonts/font-daewoo-misc/Makefile	(revision 336156)
+++ x11-fonts/font-daewoo-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-dec-misc/Makefile
===================================================================
--- x11-fonts/font-dec-misc/Makefile	(revision 336156)
+++ x11-fonts/font-dec-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-ibm-type1/Makefile
===================================================================
--- x11-fonts/font-ibm-type1/Makefile	(revision 336156)
+++ x11-fonts/font-ibm-type1/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-isas-misc/Makefile
===================================================================
--- x11-fonts/font-isas-misc/Makefile	(revision 336156)
+++ x11-fonts/font-isas-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-jis-misc/Makefile
===================================================================
--- x11-fonts/font-jis-misc/Makefile	(revision 336156)
+++ x11-fonts/font-jis-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-micro-misc/Makefile
===================================================================
--- x11-fonts/font-micro-misc/Makefile	(revision 336156)
+++ x11-fonts/font-micro-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-misc-cyrillic/Makefile
===================================================================
--- x11-fonts/font-misc-cyrillic/Makefile	(revision 336156)
+++ x11-fonts/font-misc-cyrillic/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-misc-ethiopic/Makefile
===================================================================
--- x11-fonts/font-misc-ethiopic/Makefile	(revision 336156)
+++ x11-fonts/font-misc-ethiopic/Makefile	(working copy)
@@ -11,5 +11,4 @@
 INSTALLS_TTF=	yes
 FONTDIR=	TTF OTF
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-misc-meltho/Makefile
===================================================================
--- x11-fonts/font-misc-meltho/Makefile	(revision 336156)
+++ x11-fonts/font-misc-meltho/Makefile	(working copy)
@@ -11,5 +11,4 @@
 INSTALLS_TTF=	yes
 FONTDIR=	OTF
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-misc-misc/Makefile
===================================================================
--- x11-fonts/font-misc-misc/Makefile	(revision 336156)
+++ x11-fonts/font-misc-misc/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-mutt-misc/Makefile
===================================================================
--- x11-fonts/font-mutt-misc/Makefile	(revision 336156)
+++ x11-fonts/font-mutt-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-schumacher-misc/Makefile
===================================================================
--- x11-fonts/font-schumacher-misc/Makefile	(revision 336156)
+++ x11-fonts/font-schumacher-misc/Makefile	(working copy)
@@ -11,5 +11,4 @@
 XORG_CAT=	font
 USE_XORG=	fontutil
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-screen-cyrillic/Makefile
===================================================================
--- x11-fonts/font-screen-cyrillic/Makefile	(revision 336156)
+++ x11-fonts/font-screen-cyrillic/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-sony-misc/Makefile
===================================================================
--- x11-fonts/font-sony-misc/Makefile	(revision 336156)
+++ x11-fonts/font-sony-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-sun-misc/Makefile
===================================================================
--- x11-fonts/font-sun-misc/Makefile	(revision 336156)
+++ x11-fonts/font-sun-misc/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-util/Makefile
===================================================================
--- x11-fonts/font-util/Makefile	(revision 336156)
+++ x11-fonts/font-util/Makefile	(working copy)
@@ -10,7 +10,4 @@
 
 XORG_CAT=	font
 
-MAN1=		bdftruncate.1 ucs2any.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-util/pkg-plist
===================================================================
--- x11-fonts/font-util/pkg-plist	(revision 336156)
+++ x11-fonts/font-util/pkg-plist	(working copy)
@@ -18,4 +18,6 @@
 lib/X11/fonts/util/map-JISX0201.1976-0
 lib/X11/fonts/util/map-KOI8-R
 libdata/pkgconfig/fontutil.pc
+man/man1/bdftruncate.1.gz
+man/man1/ucs2any.1.gz
 share/aclocal/fontutil.m4
Index: x11-fonts/font-winitzki-cyrillic/Makefile
===================================================================
--- x11-fonts/font-winitzki-cyrillic/Makefile	(revision 336156)
+++ x11-fonts/font-winitzki-cyrillic/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/font-xfree86-type1/Makefile
===================================================================
--- x11-fonts/font-xfree86-type1/Makefile	(revision 336156)
+++ x11-fonts/font-xfree86-type1/Makefile	(working copy)
@@ -10,5 +10,4 @@
 
 XORG_CAT=	font
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/fonttosfnt/Makefile
===================================================================
--- x11-fonts/fonttosfnt/Makefile	(revision 336156)
+++ x11-fonts/fonttosfnt/Makefile	(working copy)
@@ -12,9 +12,6 @@
 XORG_CAT=	app
 USE_XORG=	xproto fontenc
 
-PLIST_FILES=	bin/fonttosfnt
+PLIST_FILES=	bin/fonttosfnt fonttosfnt.1.gz
 
-MAN1=		fonttosfnt.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/fslsfonts/Makefile
===================================================================
--- x11-fonts/fslsfonts/Makefile	(revision 336156)
+++ x11-fonts/fslsfonts/Makefile	(working copy)
@@ -10,9 +10,6 @@
 XORG_CAT=	app
 USE_XORG=	x11 libfs
 
-PLIST_FILES=	bin/fslsfonts
+PLIST_FILES=	bin/fslsfonts man/man1/fslfonts.1.gz
 
-MAN1=		fslsfonts.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/libXfont/Makefile
===================================================================
--- x11-fonts/libXfont/Makefile	(revision 336156)
+++ x11-fonts/libXfont/Makefile	(working copy)
@@ -16,5 +16,4 @@
 
 CONFIGURE_ARGS=--without-xmlto --disable-devel-docs
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/libXfontcache/Makefile
===================================================================
--- x11-fonts/libXfontcache/Makefile	(revision 336156)
+++ x11-fonts/libXfontcache/Makefile	(working copy)
@@ -10,12 +10,4 @@
 XORG_CAT=	lib
 USE_XORG=	fontcacheproto:both x11 xext xextproto
 
-MAN3=		FontCacheChangeCacheSettings.3 \
-		FontCacheQueryExtension.3 \
-		FontCacheQueryVersion.3 \
-		FontCacheGetCacheSettings.3 \
-		FontCacheGetCacheStatistics.3 \
-		Xfontcache.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/libXfontcache/pkg-plist
===================================================================
--- x11-fonts/libXfontcache/pkg-plist	(revision 336156)
+++ x11-fonts/libXfontcache/pkg-plist	(working copy)
@@ -3,3 +3,9 @@
 lib/libXfontcache.so
 lib/libXfontcache.so.1
 libdata/pkgconfig/xfontcache.pc
+man/man3/FontCacheChangeCacheSettings.3.gz
+man/man3/FontCacheQueryExtension.3.gz
+man/man3/FontCacheQueryVersion.3.gz
+man/man3/FontCacheGetCacheSettings.3.gz
+man/man3/FontCacheGetCacheStatistics.3.gz
+man/man3/Xfontcache.3.gz
Index: x11-fonts/mkfontdir/Makefile
===================================================================
--- x11-fonts/mkfontdir/Makefile	(revision 336156)
+++ x11-fonts/mkfontdir/Makefile	(working copy)
@@ -12,8 +12,6 @@
 
 XORG_CAT=	app
 
-PLIST_FILES=	bin/mkfontdir
-MAN1=		mkfontdir.1
+PLIST_FILES=	bin/mkfontdir man/man1/mkfontdir.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/mkfontscale/Makefile
===================================================================
--- x11-fonts/mkfontscale/Makefile	(revision 336156)
+++ x11-fonts/mkfontscale/Makefile	(working copy)
@@ -15,8 +15,6 @@
 
 CONFIGURE_ARGS+=--disable-maintainer-mode
 
-PLIST_FILES=	bin/mkfontscale
-MAN1=		mkfontscale.1
+PLIST_FILES=	bin/mkfontscale man/man1/mkfontscale.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/showfont/Makefile
===================================================================
--- x11-fonts/showfont/Makefile	(revision 336156)
+++ x11-fonts/showfont/Makefile	(working copy)
@@ -10,9 +10,6 @@
 XORG_CAT=	app
 USE_XORG=	libfs
 
-PLIST_FILES=	bin/showfont
+PLIST_FILES=	bin/showfont man/man1/showfont.1.gz
 
-MAN1=		showfont.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/xfontsel/Makefile
===================================================================
--- x11-fonts/xfontsel/Makefile	(revision 336156)
+++ x11-fonts/xfontsel/Makefile	(working copy)
@@ -10,7 +10,4 @@
 XORG_CAT=	app
 USE_XORG=	xt xaw
 
-MAN1=		xfontsel.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/xfontsel/pkg-plist
===================================================================
--- x11-fonts/xfontsel/pkg-plist	(revision 336156)
+++ x11-fonts/xfontsel/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/xfontsel
+man/man1/xfontsel.1.gz
 share/X11/app-defaults/XFontSel
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11
Index: x11-fonts/xfs/Makefile
===================================================================
--- x11-fonts/xfs/Makefile	(revision 336156)
+++ x11-fonts/xfs/Makefile	(working copy)
@@ -14,9 +14,6 @@
 USE_RC_SUBR=	xfs
 CONFIGURE_ARGS=	--without-xmlto --without-fop
 
-MAN1=		xfs.1
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in
 .if defined(WITHOUT_XFS_CACHE)
@@ -27,9 +24,7 @@
 	@cd ${WRKSRC}/config/ && ${GMAKE} config
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config.default
-	@if [ ! -f ${PREFIX}/etc/X11/fs/config ]; then \
-		${INSTALL_SCRIPT} ${WRKSRC}/config/config ${PREFIX}/etc/X11/fs/config; \
-	fi
+	${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config.default
+	${INSTALL_SCRIPT} ${WRKSRC}/config/config ${STAGEDIR}${PREFIX}/etc/X11/fs/config; \
 
 .include <bsd.port.mk>
Index: x11-fonts/xfs/pkg-plist
===================================================================
--- x11-fonts/xfs/pkg-plist	(revision 336156)
+++ x11-fonts/xfs/pkg-plist	(working copy)
@@ -1,4 +1,5 @@
 bin/xfs
+man/man1/xfs.1.gz
 @unexec if cmp -s %D/etc/X11/fs/config.default %D/etc/X11/fs/config; then rm -f %D/etc/X11/fs/config; fi
 etc/X11/fs/config.default
 @exec if [ ! -f %D/etc/X11/fs/config ] ; then cp -p %D/%F %B/config; fi
Index: x11-fonts/xfsinfo/Makefile
===================================================================
--- x11-fonts/xfsinfo/Makefile	(revision 336156)
+++ x11-fonts/xfsinfo/Makefile	(working copy)
@@ -10,9 +10,6 @@
 XORG_CAT=	app
 USE_XORG=	x11 libfs
 
-PLIST_FILES=	bin/xfsinfo
+PLIST_FILES=	bin/xfsinfo man/man1/xfsinfo.1.gz
 
-MAN1=		xfsinfo.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/xlsfonts/Makefile
===================================================================
--- x11-fonts/xlsfonts/Makefile	(revision 336156)
+++ x11-fonts/xlsfonts/Makefile	(working copy)
@@ -10,9 +10,6 @@
 XORG_CAT=	app
 USE_XORG=	x11
 
-PLIST_FILES=	bin/xlsfonts
+PLIST_FILES=	bin/xlsfonts man/man1/xlsfonts.1.gz
 
-MAN1=		xlsfonts.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/xorg-fonts/Makefile
===================================================================
--- x11-fonts/xorg-fonts/Makefile	(revision 336156)
+++ x11-fonts/xorg-fonts/Makefile	(working copy)
@@ -23,7 +23,6 @@
 
 NO_BUILD=	yes
 
-NO_STAGE=	yes
 do-install:
 		${MKDIR} ${PREFIX}/libdata/xorg
 		${TOUCH} ${PREFIX}/libdata/xorg/fonts
Index: x11-fonts/xorg-fonts-100dpi/Makefile
===================================================================
--- x11-fonts/xorg-fonts-100dpi/Makefile	(revision 336156)
+++ x11-fonts/xorg-fonts-100dpi/Makefile	(working copy)
@@ -21,9 +21,9 @@
 CONFLICTS=	XFree86-font100dpi-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/xorg-fonts-75dpi/Makefile
===================================================================
--- x11-fonts/xorg-fonts-75dpi/Makefile	(revision 336156)
+++ x11-fonts/xorg-fonts-75dpi/Makefile	(working copy)
@@ -21,9 +21,9 @@
 CONFLICTS=	XFree86-font75dpi-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/xorg-fonts-cyrillic/Makefile
===================================================================
--- x11-fonts/xorg-fonts-cyrillic/Makefile	(revision 336156)
+++ x11-fonts/xorg-fonts-cyrillic/Makefile	(working copy)
@@ -20,9 +20,9 @@
 CONFLICTS=	XFree86-fontCyrillic-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/xorg-fonts-miscbitmaps/Makefile
===================================================================
--- x11-fonts/xorg-fonts-miscbitmaps/Makefile	(revision 336156)
+++ x11-fonts/xorg-fonts-miscbitmaps/Makefile	(working copy)
@@ -27,9 +27,9 @@
 CONFLICTS=	XFree86-fontDefaultBitmaps-*
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/xorg-fonts-truetype/Makefile
===================================================================
--- x11-fonts/xorg-fonts-truetype/Makefile	(revision 336156)
+++ x11-fonts/xorg-fonts-truetype/Makefile	(working copy)
@@ -21,7 +21,7 @@
 do-install:	# empty
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-fonts/xorg-fonts-type1/Makefile
===================================================================
--- x11-fonts/xorg-fonts-type1/Makefile	(revision 336156)
+++ x11-fonts/xorg-fonts-type1/Makefile	(working copy)
@@ -23,7 +23,7 @@
 do-install:	# empty
 
 NO_BUILD=	# none
+NO_MTREE=	yes
 FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-servers/mga_hal/Makefile
===================================================================
--- x11-servers/mga_hal/Makefile	(revision 336156)
+++ x11-servers/mga_hal/Makefile	(working copy)
@@ -16,7 +16,6 @@
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -31,13 +30,13 @@
 
 do-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/readme.txt ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/readme.txt ${STAGEDIR}${DOCSDIR}
 .endif
-	${MKDIR} ${PREFIX}/lib/modules/drivers
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/modules/drivers
 	${INSTALL_DATA} ${WRKSRC}/xserver/${XORG_VERSION}/mga_hal_drv.so \
-		${PREFIX}/lib/modules/drivers/
+		${STAGEDIR}${PREFIX}/lib/modules/drivers/
 	${INSTALL_DATA} ${WRKSRC}/xserver/${XORG_VERSION}/mga_drv.so \
-		${PREFIX}/lib/modules/drivers/
+		${STAGEDIR}${PREFIX}/lib/modules/drivers/
 
 .include <bsd.port.post.mk>
Index: x11-servers/xephyr/Makefile
===================================================================
--- x11-servers/xephyr/Makefile	(revision 336156)
+++ x11-servers/xephyr/Makefile	(working copy)
@@ -21,8 +21,8 @@
 SLAVE_PORT=	yes
 PLIST_FILES=	bin/Xephyr
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/
 
 .include "${MASTERDIR}/Makefile"
Index: x11-servers/xorg-dmx/Makefile
===================================================================
--- x11-servers/xorg-dmx/Makefile	(revision 336156)
+++ x11-servers/xorg-dmx/Makefile	(working copy)
@@ -20,11 +20,8 @@
 		--without-xmlto	--disable-docs --disable-devel-docs \
 		--enable-dmx --localstatedir=/var --without-dtrace
 
-MAN1=		Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1
-
 SLAVE_PORT=	yes
 
-NO_STAGE=	yes
 do-install:
 	cd ${WRKSRC}/hw/dmx; ${MAKE} install
 
Index: x11-servers/xorg-dmx/pkg-plist
===================================================================
--- x11-servers/xorg-dmx/pkg-plist	(revision 336156)
+++ x11-servers/xorg-dmx/pkg-plist	(working copy)
@@ -11,3 +11,8 @@
 bin/dmxwininfo
 bin/vdltodmx
 bin/xdmxconfig
+man/man1/Xdmx.1.gz
+man/man1/dmxtodmx.1.gz
+man/man1/vdltodmx.1.gz
+man/man1/xdmxconfig.1.gz
+
Index: x11-servers/xorg-nestserver/Makefile
===================================================================
--- x11-servers/xorg-nestserver/Makefile	(revision 336156)
+++ x11-servers/xorg-nestserver/Makefile	(working copy)
@@ -20,18 +20,16 @@
 		--localstatedir=/var --without-dtrace
 
 SLAVE_PORT=	yes
-PLIST_FILES=	bin/Xnest
-MAN1=		Xnest.1
+PLIST_FILES=	bin/Xnest man/man1/Xnest.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${STAGEDIR}${PREFIX}/bin/
 .if defined(WITH_NEW_XORG)
-	${INSTALL_MAN} ${WRKSRC}/hw/xnest/man/Xnest.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/hw/xnest/man/Xnest.1 ${STAGEDIR}${PREFIX}/man/man1/
 .else
-	${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${STAGEDIR}${PREFIX}/man/man1/
 .endif
 
 .include "${MASTERDIR}/Makefile"
Index: x11-servers/xorg-server/Makefile
===================================================================
--- x11-servers/xorg-server/Makefile	(revision 336156)
+++ x11-servers/xorg-server/Makefile	(working copy)
@@ -74,24 +74,8 @@
 
 .if ${SLAVE_PORT} == "no"
 SUB_FILES=	pkg-install pkg-deinstall
-MAN1=		Xorg.1 \
-		Xserver.1 \
-		cvt.1 \
-		gtf.1
-MAN4=		exa.4 \
-		fbdevhw.4
-MAN5=		xorg.conf.5
-
-.if defined(WITH_NEW_XORG)
-MAN5+=		xorg.conf.d.5
 .endif
-.else
-# for slave ports we need to overwrite PLIST, so it doesn't overwrite
-# PLIST_FILES, with the masterport plist.
-PLIST=		${.CURDIR}/pkg-plist
-.endif
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_OPENSSL_BASE)
Index: x11-servers/xorg-server/pkg-plist
===================================================================
--- x11-servers/xorg-server/pkg-plist	(revision 336156)
+++ x11-servers/xorg-server/pkg-plist	(working copy)
@@ -226,6 +226,14 @@
 lib/xorg/modules/multimedia/uda1380_drv.so
 lib/xorg/protocol.txt
 libdata/pkgconfig/xorg-server.pc
+man/man1/Xorg.1.gz
+man/man1/Xserver.1.gz
+man/man1/cvt.1.gz
+man/man1/gtf.1.gz
+man/man4/exa.4.gz
+man/man4/fbdevhw.4.gz
+man/man5/xorg.conf.5.gz
+%%NEW%%man/man5/xorg.conf.d.5.gz
 share/aclocal/xorg-server.m4
 %%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
 @comment %%NEW%%@dirrm share/doc/xorg-server
Index: x11-servers/xorg-vfbserver/Makefile
===================================================================
--- x11-servers/xorg-vfbserver/Makefile	(revision 336156)
+++ x11-servers/xorg-vfbserver/Makefile	(working copy)
@@ -20,10 +20,8 @@
 		--localstatedir=/var --without-dtrace
 
 SLAVE_PORT=	yes
-PLIST_FILES=	bin/Xvfb
-MAN1=		Xvfb.1
+PLIST_FILES=	bin/Xvfb man/man1/Xvfb.1.gz
 
-NO_STAGE=	yes
 do-install:
 	cd ${WRKSRC}/hw/vfb; ${MAKE} install
 
Index: x11-themes/gtk-murrine-engine/Makefile
===================================================================
--- x11-themes/gtk-murrine-engine/Makefile	(revision 336156)
+++ x11-themes/gtk-murrine-engine/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	murrine
 PORTVERSION=	0.98.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	GNOME
 PKGNAMEPREFIX=	gtk-
Index: x11-themes/xcursor-themes/Makefile
===================================================================
--- x11-themes/xcursor-themes/Makefile	(revision 336156)
+++ x11-themes/xcursor-themes/Makefile	(working copy)
@@ -16,5 +16,4 @@
 
 XORG_CAT=	data
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-toolkits/gtkglext/Makefile
===================================================================
--- x11-toolkits/gtkglext/Makefile	(revision 336156)
+++ x11-toolkits/gtkglext/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gtkglext
 PORTVERSION=	1.2.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 DIST_SUBDIR=	gnome2
Index: x11-toolkits/libXaw/Makefile
===================================================================
--- x11-toolkits/libXaw/Makefile	(revision 336156)
+++ x11-toolkits/libXaw/Makefile	(working copy)
@@ -14,7 +14,4 @@
 USES=		gmake
 CONFIGURE_ARGS+=--without-xmlto
 
-MAN3=		Xaw.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-toolkits/libXaw/pkg-plist
===================================================================
--- x11-toolkits/libXaw/pkg-plist	(revision 336156)
+++ x11-toolkits/libXaw/pkg-plist	(working copy)
@@ -82,6 +82,7 @@
 lib/libXaw7.so.7
 libdata/pkgconfig/xaw6.pc
 libdata/pkgconfig/xaw7.pc
+man/man3/xaw.3.gz
 %%DOCSDIR%%/AsciiSink.xml
 %%DOCSDIR%%/AsciiSource.xml
 %%DOCSDIR%%/AsciiText.xml
Index: x11-toolkits/libXmu/Makefile
===================================================================
--- x11-toolkits/libXmu/Makefile	(revision 336156)
+++ x11-toolkits/libXmu/Makefile	(working copy)
@@ -12,5 +12,4 @@
 XORG_CAT=	lib
 USE_XORG=	xproto:both x11 xt xext
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-toolkits/libXt/Makefile
===================================================================
--- x11-toolkits/libXt/Makefile	(revision 336156)
+++ x11-toolkits/libXt/Makefile	(working copy)
@@ -13,276 +13,6 @@
 USE_XORG=	x11 sm xproto:both kbproto
 CONFIGURE_ARGS=	--disable-specs
 
-MAN3=	MenuPopdown.3 \
-	MenuPopup.3 \
-	XtAddActions.3 \
-	XtAddCallback.3 \
-	XtAddCallbacks.3 \
-	XtAddConverter.3 \
-	XtAddEventHandler.3 \
-	XtAddExposureToRegion.3 \
-	XtAddGrab.3 \
-	XtAddInput.3 \
-	XtAddRawEventHandler.3 \
-	XtAddTimeOut.3 \
-	XtAddWorkProc.3 \
-	XtAllocateGC.3 \
-	XtAppAddActionHook.3 \
-	XtAppAddActions.3 \
-	XtAppAddBlockHook.3 \
-	XtAppAddConverter.3 \
-	XtAppAddInput.3 \
-	XtAppAddSignal.3 \
-	XtAppAddTimeOut.3 \
-	XtAppAddWorkProc.3 \
-	XtAppCreateShell.3 \
-	XtAppError.3 \
-	XtAppErrorMsg.3 \
-	XtAppGetErrorDatabase.3 \
-	XtAppGetErrorDatabaseText.3 \
-	XtAppGetExitFlag.3 \
-	XtAppGetSelectionTimeout.3 \
-	XtAppInitialize.3 \
-	XtAppLock.3 \
-	XtAppMainLoop.3 \
-	XtAppNextEvent.3 \
-	XtAppPeekEvent.3 \
-	XtAppPending.3 \
-	XtAppProcessEvent.3 \
-	XtAppReleaseCacheRefs.3 \
-	XtAppSetErrorHandler.3 \
-	XtAppSetErrorMsgHandler.3 \
-	XtAppSetExitFlag.3 \
-	XtAppSetFallbackResources.3 \
-	XtAppSetSelectionTimeout.3 \
-	XtAppSetTypeConverter.3 \
-	XtAppSetWarningHandler.3 \
-	XtAppSetWarningMsgHandler.3 \
-	XtAppUnlock.3 \
-	XtAppWarning.3 \
-	XtAppWarningMsg.3 \
-	XtAsprintf.3 \
-	XtAugmentTranslations.3 \
-	XtBuildEventMask.3 \
-	XtCallAcceptFocus.3\
-	XtCallActionProc.3 \
-	XtCallCallbackList.3 \
-	XtCallCallbacks.3 \
-	XtCallConverter.3 \
-	XtCallbackExclusive.3 \
-	XtCallbackNone.3 \
-	XtCallbackNonexclusive.3 \
-	XtCallbackPopdown.3 \
-	XtCalloc.3 \
-	XtCancelSelectionRequest.3 \
-	XtChangeManagedSet.3 \
-	XtCheckSubclass.3 \
-	XtClass.3\
-	XtCloseDisplay.3\
-	XtConfigureWidget.3\
-	XtConvert.3\
-	XtConvertAndStore.3\
-	XtConvertCase.3\
-	XtCreateApplicationContext.3\
-	XtCreateApplicationShell.3\
-	XtCreateManagedWidget.3\
-	XtCreatePopupShell.3\
-	XtCreateSelectionRequest.3\
-	XtCreateWidget.3\
-	XtCreateWindow.3\
-	XtDatabase.3\
-	XtDestroyApplicationContext.3\
-	XtDestroyWidget.3\
-	XtDirectConvert.3\
-	XtDisownSelection.3 \
-	XtDispatchEvent.3  \
-	XtDispatchEventToWidget.3\
-	XtDisplay.3\
-	XtDisplayInitialize.3\
-	XtDisplayOfObject.3\
-	XtDisplayStringConversionWarning.3\
-	XtDisplayToApplicationContext.3\
-	XtError.3\
-	XtErrorMsg.3\
-	XtFindFile.3\
-	XtFree.3\
-	XtGetActionKeysym.3\
-	XtGetActionList.3\
-	XtGetApplicationNameAndClass.3\
-	XtGetApplicationResources.3\
-	XtGetClassExtension.3\
-	XtGetConstraintResourceList.3\
-	XtGetDisplays.3\
-	XtGetErrorDatabase.3\
-	XtGetErrorDatabaseText.3\
-	XtGetGC.3\
-	XtGetKeyboardFocusWidget.3\
-	XtGetKeysymTable.3\
-	XtGetMultiClickTime.3 \
-	XtGetResourceList.3\
-	XtGetSelectionParameters.3\
-	XtGetSelectionRequest.3\
-	XtGetSelectionTimeout.3\
-	XtGetSelectionValue.3\
-	XtGetSelectionValueIncremental.3 \
-	XtGetSelectionValues.3\
-	XtGetSelectionValuesIncremental.3 \
-	XtGetSubresources.3 \
-	XtGetSubvalues.3 \
-	XtGetValues.3 \
-	XtGrabButton.3 \
-	XtGrabKey.3 \
-	XtGrabKeyboard.3 \
-	XtGrabPointer.3 \
-	XtHasCallbacks.3 \
-	XtHooksOfDisplay.3 \
-	XtInitialize.3 \
-	XtInitializeWidgetClass.3 \
-	XtInsertEventHandler.3 \
-	XtInsertEventTypeHandler.3 \
-	XtInsertRawEventHandler.3 \
-	XtInstallAccelerators.3\
-	XtInstallAllAccelerators.3\
-	XtIsApplicationShell.3\
-	XtIsComposite.3\
-	XtIsConstraint.3\
-	XtIsManaged.3\
-	XtIsObject.3\
-	XtIsOverrideShell.3\
-	XtIsRealized.3\
-	XtIsRectObj.3\
-	XtIsSensitive.3\
-	XtIsSessionShell.3\
-	XtIsShell.3\
-	XtIsSubclass.3\
-	XtIsTopLevelShell.3\
-	XtIsTransientShell.3\
-	XtIsVendorShell.3\
-	XtIsWMShell.3\
-	XtIsWidget.3\
-	XtKeysymToKeycodeList.3\
-	XtLastEventProcessed.3\
-	XtLastTimestampProcessed.3 \
-	XtMainLoop.3 \
-	XtMakeGeometryRequest.3 \
-	XtMakeResizeRequest.3 \
-	XtMalloc.3 \
-	XtManageChild.3 \
-	XtManageChildren.3 \
-	XtMapWidget.3 \
-	XtMergeArgLists.3 \
-	XtMoveWidget.3 \
-	XtName.3 \
-	XtNameToWidget.3 \
-	XtNew.3 \
-	XtNewString.3 \
-	XtNextEvent.3 \
-	XtNoticeSignal.3 \
-	XtNumber.3 \
-	XtOffset.3 \
-	XtOffsetOf.3 \
-	XtOpenApplication.3 \
-	XtOpenDisplay.3 \
-	XtOverrideTranslations.3 \
-	XtOwnSelection.3 \
-	XtOwnSelectionIncremental.3 \
-	XtParent.3 \
-	XtParseAcceleratorTable.3 \
-	XtParseTranslationTable.3 \
-	XtPeekEvent.3 \
-	XtPending.3 \
-	XtPopdown.3 \
-	XtPopup.3 \
-	XtPopupSpringLoaded.3 \
-	XtProcessEvent.3 \
-	XtProcessLock.3 \
-	XtProcessUnlock.3 \
-	XtQueryGeometry.3 \
-	XtRealizeWidget.3 \
-	XtRealloc.3 \
-	XtRegisterCaseConverter.3 \
-	XtRegisterDrawable.3 \
-	XtRegisterExtensionSelector.3 \
-	XtRegisterGrabAction.3 \
-	XtReleaseGC.3 \
-	XtReleasePropertyAtom.3 \
-	XtRemoveActionHook.3 \
-	XtRemoveAllCallbacks.3 \
-	XtRemoveBlockHook.3 \
-	XtRemoveCallback.3 \
-	XtRemoveCallbacks.3 \
-	XtRemoveEventHandler.3\
-	XtRemoveEventTypeHandler.3\
-	XtRemoveGrab.3\
-	XtRemoveInput.3\
-	XtRemoveRawEventHandler.3\
-	XtRemoveSignal.3\
-	XtRemoveTimeOut.3\
-	XtRemoveWorkProc.3\
-	XtReservePropertyAtom.3\
-	XtResizeWidget.3\
-	XtResolvePathname.3\
-	XtScreen.3\
-	XtScreenDatabase.3\
-	XtScreenOfObject.3\
-	XtSendSelectionRequest.3\
-	XtSessionGetToken.3\
-	XtSessionReturnToken.3\
-	XtSetArg.3\
-	XtSetErrorHandler.3\
-	XtSetErrorMsgHandler.3\
-	XtSetEventDispatcher.3\
-	XtSetKeyTranslator.3\
-	XtSetKeyboardFocus.3\
-	XtSetLanguageProc.3 \
-	XtSetMappedWhenManaged.3 \
-	XtSetMultiClickTime.3 \
-	XtSetSelectionParameters.3 \
-	XtSetSelectionTimeout.3 \
-	XtSetSensitive.3 \
-	XtSetSubvalues.3 \
-	XtSetTypeConverter.3 \
-	XtSetValues.3 \
-	XtSetWMColormapWindows.3 \
-	XtSetWarningHandler.3 \
-	XtSetWarningMsgHandler.3\
-	XtStringConversionWarning.3\
-	XtSuperclass.3\
-	XtToolkitInitialize.3\
-	XtToolkitThreadInitialize.3\
-	XtTranslateCoords.3 \
-	XtTranslateKeycode.3\
-	XtUngrabButton.3\
-	XtUngrabKey.3\
-	XtUngrabKeyboard.3\
-	XtUngrabPointer.3\
-	XtUninstallTranslations.3\
-	XtUnmanageChild.3\
-	XtUnmanageChildren.3\
-	XtUnmapWidget.3\
-	XtUnrealizeWidget.3\
-	XtUnregisterDrawable.3\
-	XtVaAppCreateShell.3\
-	XtVaAppInitialize.3\
-	XtVaCreateArgsList.3\
-	XtVaCreateManagedWidget.3\
-	XtVaCreatePopupShell.3\
-	XtVaCreateWidget.3\
-	XtVaGetApplicationResources.3\
-	XtVaGetSubresources.3\
-	XtVaGetSubvalues.3 \
-	XtVaGetValues.3 \
-	XtVaOpenApplication.3\
-	XtVaSetSubvalues.3\
-	XtVaSetValues.3\
-	XtWarning.3 \
-	XtWarningMsg.3\
-	XtWidgetToApplicationContext.3\
-	XtWindow.3 \
-	XtWindowOfObject.3 \
-	XtWindowToWidget.3
-
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 		${WRKSRC}/configure
Index: x11-toolkits/libXt/pkg-plist
===================================================================
--- x11-toolkits/libXt/pkg-plist	(revision 336156)
+++ x11-toolkits/libXt/pkg-plist	(working copy)
@@ -36,3 +36,271 @@
 lib/libXt.so
 lib/libXt.so.6
 libdata/pkgconfig/xt.pc
+man/man3/MenuPopdown.3.gz
+man/man3/MenuPopup.3.gz
+man/man3/XtAddActions.3.gz
+man/man3/XtAddCallback.3.gz
+man/man3/XtAddCallbacks.3.gz
+man/man3/XtAddConverter.3.gz
+man/man3/XtAddEventHandler.3.gz
+man/man3/XtAddExposureToRegion.3.gz
+man/man3/XtAddGrab.3.gz
+man/man3/XtAddInput.3.gz
+man/man3/XtAddRawEventHandler.3.gz
+man/man3/XtAddTimeOut.3.gz
+man/man3/XtAddWorkProc.3.gz
+man/man3/XtAllocateGC.3.gz
+man/man3/XtAppAddActionHook.3.gz
+man/man3/XtAppAddActions.3.gz
+man/man3/XtAppAddBlockHook.3.gz
+man/man3/XtAppAddConverter.3.gz
+man/man3/XtAppAddInput.3.gz
+man/man3/XtAppAddSignal.3.gz
+man/man3/XtAppAddTimeOut.3.gz
+man/man3/XtAppAddWorkProc.3.gz
+man/man3/XtAppCreateShell.3.gz
+man/man3/XtAppError.3.gz
+man/man3/XtAppErrorMsg.3.gz
+man/man3/XtAppGetErrorDatabase.3.gz
+man/man3/XtAppGetErrorDatabaseText.3.gz
+man/man3/XtAppGetExitFlag.3.gz
+man/man3/XtAppGetSelectionTimeout.3.gz
+man/man3/XtAppInitialize.3.gz
+man/man3/XtAppLock.3.gz
+man/man3/XtAppMainLoop.3.gz
+man/man3/XtAppNextEvent.3.gz
+man/man3/XtAppPeekEvent.3.gz
+man/man3/XtAppPending.3.gz
+man/man3/XtAppProcessEvent.3.gz
+man/man3/XtAppReleaseCacheRefs.3.gz
+man/man3/XtAppSetErrorHandler.3.gz
+man/man3/XtAppSetErrorMsgHandler.3.gz
+man/man3/XtAppSetExitFlag.3.gz
+man/man3/XtAppSetFallbackResources.3.gz
+man/man3/XtAppSetSelectionTimeout.3.gz
+man/man3/XtAppSetTypeConverter.3.gz
+man/man3/XtAppSetWarningHandler.3.gz
+man/man3/XtAppSetWarningMsgHandler.3.gz
+man/man3/XtAppUnlock.3.gz
+man/man3/XtAppWarning.3.gz
+man/man3/XtAppWarningMsg.3.gz
+man/man3/XtAsprintf.3.gz
+man/man3/XtAugmentTranslations.3.gz
+man/man3/XtBuildEventMask.3.gz
+man/man3/XtCallAcceptFocus.3.gz
+man/man3/XtCallActionProc.3.gz
+man/man3/XtCallCallbackList.3.gz
+man/man3/XtCallCallbacks.3.gz
+man/man3/XtCallConverter.3.gz
+man/man3/XtCallbackExclusive.3.gz
+man/man3/XtCallbackNone.3.gz
+man/man3/XtCallbackNonexclusive.3.gz
+man/man3/XtCallbackPopdown.3.gz
+man/man3/XtCalloc.3.gz
+man/man3/XtCancelSelectionRequest.3.gz
+man/man3/XtChangeManagedSet.3.gz
+man/man3/XtCheckSubclass.3.gz
+man/man3/XtClass.3.gz
+man/man3/XtCloseDisplay.3.gz
+man/man3/XtConfigureWidget.3.gz
+man/man3/XtConvert.3.gz
+man/man3/XtConvertAndStore.3.gz
+man/man3/XtConvertCase.3.gz
+man/man3/XtCreateApplicationContext.3.gz
+man/man3/XtCreateApplicationShell.3.gz
+man/man3/XtCreateManagedWidget.3.gz
+man/man3/XtCreatePopupShell.3.gz
+man/man3/XtCreateSelectionRequest.3.gz
+man/man3/XtCreateWidget.3.gz
+man/man3/XtCreateWindow.3.gz
+man/man3/XtDatabase.3.gz
+man/man3/XtDestroyApplicationContext.3.gz
+man/man3/XtDestroyWidget.3.gz
+man/man3/XtDirectConvert.3.gz
+man/man3/XtDisownSelection.3.gz
+man/man3/XtDispatchEvent.3 .gz
+man/man3/XtDispatchEventToWidget.3.gz
+man/man3/XtDisplay.3.gz
+man/man3/XtDisplayInitialize.3.gz
+man/man3/XtDisplayOfObject.3.gz
+man/man3/XtDisplayStringConversionWarning.3.gz
+man/man3/XtDisplayToApplicationContext.3.gz
+man/man3/XtError.3.gz
+man/man3/XtErrorMsg.3.gz
+man/man3/XtFindFile.3.gz
+man/man3/XtFree.3.gz
+man/man3/XtGetActionKeysym.3.gz
+man/man3/XtGetActionList.3.gz
+man/man3/XtGetApplicationNameAndClass.3.gz
+man/man3/XtGetApplicationResources.3.gz
+man/man3/XtGetClassExtension.3.gz
+man/man3/XtGetConstraintResourceList.3.gz
+man/man3/XtGetDisplays.3.gz
+man/man3/XtGetErrorDatabase.3.gz
+man/man3/XtGetErrorDatabaseText.3.gz
+man/man3/XtGetGC.3.gz
+man/man3/XtGetKeyboardFocusWidget.3.gz
+man/man3/XtGetKeysymTable.3.gz
+man/man3/XtGetMultiClickTime.3.gz
+man/man3/XtGetResourceList.3.gz
+man/man3/XtGetSelectionParameters.3.gz
+man/man3/XtGetSelectionRequest.3.gz
+man/man3/XtGetSelectionTimeout.3.gz
+man/man3/XtGetSelectionValue.3.gz
+man/man3/XtGetSelectionValueIncremental.3.gz
+man/man3/XtGetSelectionValues.3.gz
+man/man3/XtGetSelectionValuesIncremental.3.gz
+man/man3/XtGetSubresources.3.gz
+man/man3/XtGetSubvalues.3.gz
+man/man3/XtGetValues.3.gz
+man/man3/XtGrabButton.3.gz
+man/man3/XtGrabKey.3.gz
+man/man3/XtGrabKeyboard.3.gz
+man/man3/XtGrabPointer.3.gz
+man/man3/XtHasCallbacks.3.gz
+man/man3/XtHooksOfDisplay.3.gz
+man/man3/XtInitialize.3.gz
+man/man3/XtInitializeWidgetClass.3.gz
+man/man3/XtInsertEventHandler.3.gz
+man/man3/XtInsertEventTypeHandler.3.gz
+man/man3/XtInsertRawEventHandler.3.gz
+man/man3/XtInstallAccelerators.3.gz
+man/man3/XtInstallAllAccelerators.3.gz
+man/man3/XtIsApplicationShell.3.gz
+man/man3/XtIsComposite.3.gz
+man/man3/XtIsConstraint.3.gz
+man/man3/XtIsManaged.3.gz
+man/man3/XtIsObject.3.gz
+man/man3/XtIsOverrideShell.3.gz
+man/man3/XtIsRealized.3.gz
+man/man3/XtIsRectObj.3.gz
+man/man3/XtIsSensitive.3.gz
+man/man3/XtIsSessionShell.3.gz
+man/man3/XtIsShell.3.gz
+man/man3/XtIsSubclass.3.gz
+man/man3/XtIsTopLevelShell.3.gz
+man/man3/XtIsTransientShell.3.gz
+man/man3/XtIsVendorShell.3.gz
+man/man3/XtIsWMShell.3.gz
+man/man3/XtIsWidget.3.gz
+man/man3/XtKeysymToKeycodeList.3.gz
+man/man3/XtLastEventProcessed.3.gz
+man/man3/XtLastTimestampProcessed.3.gz
+man/man3/XtMainLoop.3.gz
+man/man3/XtMakeGeometryRequest.3.gz
+man/man3/XtMakeResizeRequest.3.gz
+man/man3/XtMalloc.3.gz
+man/man3/XtManageChild.3.gz
+man/man3/XtManageChildren.3.gz
+man/man3/XtMapWidget.3.gz
+man/man3/XtMergeArgLists.3.gz
+man/man3/XtMoveWidget.3.gz
+man/man3/XtName.3.gz
+man/man3/XtNameToWidget.3.gz
+man/man3/XtNew.3.gz
+man/man3/XtNewString.3.gz
+man/man3/XtNextEvent.3.gz
+man/man3/XtNoticeSignal.3.gz
+man/man3/XtNumber.3.gz
+man/man3/XtOffset.3.gz
+man/man3/XtOffsetOf.3.gz
+man/man3/XtOpenApplication.3.gz
+man/man3/XtOpenDisplay.3.gz
+man/man3/XtOverrideTranslations.3.gz
+man/man3/XtOwnSelection.3.gz
+man/man3/XtOwnSelectionIncremental.3.gz
+man/man3/XtParent.3.gz
+man/man3/XtParseAcceleratorTable.3.gz
+man/man3/XtParseTranslationTable.3.gz
+man/man3/XtPeekEvent.3.gz
+man/man3/XtPending.3.gz
+man/man3/XtPopdown.3.gz
+man/man3/XtPopup.3.gz
+man/man3/XtPopupSpringLoaded.3.gz
+man/man3/XtProcessEvent.3.gz
+man/man3/XtProcessLock.3.gz
+man/man3/XtProcessUnlock.3.gz
+man/man3/XtQueryGeometry.3.gz
+man/man3/XtRealizeWidget.3.gz
+man/man3/XtRealloc.3.gz
+man/man3/XtRegisterCaseConverter.3.gz
+man/man3/XtRegisterDrawable.3.gz
+man/man3/XtRegisterExtensionSelector.3.gz
+man/man3/XtRegisterGrabAction.3.gz
+man/man3/XtReleaseGC.3.gz
+man/man3/XtReleasePropertyAtom.3.gz
+man/man3/XtRemoveActionHook.3.gz
+man/man3/XtRemoveAllCallbacks.3.gz
+man/man3/XtRemoveBlockHook.3.gz
+man/man3/XtRemoveCallback.3.gz
+man/man3/XtRemoveCallbacks.3.gz
+man/man3/XtRemoveEventHandler.3.gz
+man/man3/XtRemoveEventTypeHandler.3.gz
+man/man3/XtRemoveGrab.3.gz
+man/man3/XtRemoveInput.3.gz
+man/man3/XtRemoveRawEventHandler.3.gz
+man/man3/XtRemoveSignal.3.gz
+man/man3/XtRemoveTimeOut.3.gz
+man/man3/XtRemoveWorkProc.3.gz
+man/man3/XtReservePropertyAtom.3.gz
+man/man3/XtResizeWidget.3.gz
+man/man3/XtResolvePathname.3.gz
+man/man3/XtScreen.3.gz
+man/man3/XtScreenDatabase.3.gz
+man/man3/XtScreenOfObject.3.gz
+man/man3/XtSendSelectionRequest.3.gz
+man/man3/XtSessionGetToken.3.gz
+man/man3/XtSessionReturnToken.3.gz
+man/man3/XtSetArg.3.gz
+man/man3/XtSetErrorHandler.3.gz
+man/man3/XtSetErrorMsgHandler.3.gz
+man/man3/XtSetEventDispatcher.3.gz
+man/man3/XtSetKeyTranslator.3.gz
+man/man3/XtSetKeyboardFocus.3.gz
+man/man3/XtSetLanguageProc.3.gz
+man/man3/XtSetMappedWhenManaged.3.gz
+man/man3/XtSetMultiClickTime.3.gz
+man/man3/XtSetSelectionParameters.3.gz
+man/man3/XtSetSelectionTimeout.3.gz
+man/man3/XtSetSensitive.3.gz
+man/man3/XtSetSubvalues.3.gz
+man/man3/XtSetTypeConverter.3.gz
+man/man3/XtSetValues.3.gz
+man/man3/XtSetWMColormapWindows.3.gz
+man/man3/XtSetWarningHandler.3.gz
+man/man3/XtSetWarningMsgHandler.3.gz
+man/man3/XtStringConversionWarning.3.gz
+man/man3/XtSuperclass.3.gz
+man/man3/XtToolkitInitialize.3.gz
+man/man3/XtToolkitThreadInitialize.3.gz
+man/man3/XtTranslateCoords.3.gz
+man/man3/XtTranslateKeycode.3.gz
+man/man3/XtUngrabButton.3.gz
+man/man3/XtUngrabKey.3.gz
+man/man3/XtUngrabKeyboard.3.gz
+man/man3/XtUngrabPointer.3.gz
+man/man3/XtUninstallTranslations.3.gz
+man/man3/XtUnmanageChild.3.gz
+man/man3/XtUnmanageChildren.3.gz
+man/man3/XtUnmapWidget.3.gz
+man/man3/XtUnrealizeWidget.3.gz
+man/man3/XtUnregisterDrawable.3.gz
+man/man3/XtVaAppCreateShell.3.gz
+man/man3/XtVaAppInitialize.3.gz
+man/man3/XtVaCreateArgsList.3.gz
+man/man3/XtVaCreateManagedWidget.3.gz
+man/man3/XtVaCreatePopupShell.3.gz
+man/man3/XtVaCreateWidget.3.gz
+man/man3/XtVaGetApplicationResources.3.gz
+man/man3/XtVaGetSubresources.3.gz
+man/man3/XtVaGetSubvalues.3.gz
+man/man3/XtVaGetValues.3.gz
+man/man3/XtVaOpenApplication.3.gz
+man/man3/XtVaSetSubvalues.3.gz
+man/man3/XtVaSetValues.3.gz
+man/man3/XtWarning.3.gz
+man/man3/XtWarningMsg.3.gz
+man/man3/XtWidgetToApplicationContext.3.gz
+man/man3/XtWindow.3.gz
+man/man3/XtWindowOfObject.3.gz
+man/man3/XtWindowToWidget.3.gz
Index: x11-toolkits/termit/Makefile
===================================================================
--- x11-toolkits/termit/Makefile	(revision 336156)
+++ x11-toolkits/termit/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	termit
 PORTVERSION=	2.9.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	http://cloud.github.com/downloads/nonstop/termit/
 
Index: x11-wm/awesome/Makefile
===================================================================
--- x11-wm/awesome/Makefile	(revision 336156)
+++ x11-wm/awesome/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	awesome
 PORTVERSION=	3.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
Index: x11-wm/transset/Makefile
===================================================================
--- x11-wm/transset/Makefile	(revision 336156)
+++ x11-wm/transset/Makefile	(working copy)
@@ -13,8 +13,6 @@
 XORG_CAT=	app
 USE_XORG=	x11 xproto
 
-MAN1=		transset.1
-PLIST_FILES=	bin/transset
+PLIST_FILES=	bin/transset man/man1/transset.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: x11-wm/xcompmgr/Makefile
===================================================================
--- x11-wm/xcompmgr/Makefile	(revision 336156)
+++ x11-wm/xcompmgr/Makefile	(working copy)
@@ -11,9 +11,6 @@
 XORG_CAT=	app
 USE_XORG=	x11 xcomposite xfixes xdamage xrender
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
-MAN1=		xcompmgr.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
--- xorg-switch.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312111214.rBBCE2EJ068310>