diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2013-12-16 11:11:09 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2013-12-16 11:11:09 +0000 |
| commit | 47be7a61c97731aa5fe34c56767ad5e10bb5c5d2 (patch) | |
| tree | 2df88f8b6e2af92b78ac24eb382268b7c290efab | |
| parent | 7b9110d87c22c27df1baa93f8cb4cf30e205efc7 (diff) | |
| download | ports-47be7a61c97731aa5fe34c56767ad5e10bb5c5d2.tar.gz ports-47be7a61c97731aa5fe34c56767ad5e10bb5c5d2.zip | |
Switch FreeBSD CURRENT to use the new xorg stack (WITH_NEW_XORG=) [0]
If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG=
to /etc/make.conf to get the old version.
Update several xorg related ports, including:
x11/libxcb 1.9.1 -> 1.9.3
graphics/libdrm 2.4.46 -> 2.4.50
x11/pixman 0.30.2 -> 0.32.4
x11/xkeyboard-config 2.9 -> 2.10.1
x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0
Fix dissapearing cursor in xf86-video-vmware [2]
Stagify all x11@-owned ports
Bump portrevisions for xf86-* ports due to xserver version change.
Fix fallout from updates where needed.
Thanks to: all testersi, bdrewery and the FreeBSD x11@ team
exp-run by: bdrewery [1]
PR: ports/184684 [1], ports/181385 [2]
Submitted by: Douglas Carmichael <dcarmich@dcarmichael.net> [2]
Approved by: portmgr (bdrewery), core (jhb) [0]
Notes
Notes:
svn path=/head/; revision=336621
395 files changed, 1741 insertions, 1410 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 00f989cee6c7..1437d7f00d73 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1222,6 +1222,16 @@ WITH_PKGNG?= yes .endif .endif +# Enable new xorg for FreeBSD versions after Radeon KMS was imported unless +# WITHOUT_NEW_XORG is set. +.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" diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index 951f092a2df1..7d585780987d 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -56,21 +56,15 @@ USE_XORG+= xorg-macros . 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 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 @@ USES+= pathfix 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 @@ XORG_MODULES= bigreqsproto \ dmx \ dmxproto \ dri2proto \ + dri3proto \ evieproto \ fixesproto \ fontcacheproto \ @@ -185,6 +180,7 @@ XORG_MODULES= bigreqsproto \ oldx \ pciaccess \ pixman \ + presentproto \ printproto \ randrproto \ recordproto \ @@ -238,6 +234,7 @@ XORG_MODULES= bigreqsproto \ xrender \ xres \ xscrnsaver \ + xshmfence \ xt \ xtrans \ xtrap \ @@ -254,6 +251,7 @@ damageproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/damageproto.pc:${PORTS 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 @@ libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-f 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 @@ xrender_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x 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 @@ -5,6 +5,35 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20131216: + AFFECTS: users of x11/xorg, graphics/libGL, graphics/dri, all xorg ports + AUTHOR: zeising@FreeBSD.org + + The default xorg version has been switched on FreeBSD CURRENT. + + To upgrade graphics/libGL, graphics/dri and related MESA ports, it is + neccessary to first remove the old versions of those ports. + No special upgrade procedure is needed for xorg port but it is + necessary to recompile all xorg drivers (xf86-*) 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. + + If it is important to stay on the old versions, it is possible to + specify WITHOUT_NEW_XORG= in /etc/make.conf to get the old xorg + distribution. + + To update: + + # pkg_delete -f libGL-\* dri-\* + or + # pkg delete -f libGL dri + followed by + # portmaster -a + or + # portupgrade -a + 20131214: AFFECTS: users of databases/db4* AUTHOR: mandree@FreeBSD.org diff --git a/astro/viking/Makefile b/astro/viking/Makefile index 7f9c0a6c878c..06bf1946e762 100644 --- a/astro/viking/Makefile +++ b/astro/viking/Makefile @@ -3,6 +3,7 @@ PORTNAME= viking PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/ diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile index e7a4f8adb7bf..e5e00822b07a 100644 --- a/cad/pdnmesh/Makefile +++ b/cad/pdnmesh/Makefile @@ -3,7 +3,7 @@ PORTNAME= pdnmesh PORTVERSION= 0.2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} diff --git a/cad/repsnapper/Makefile b/cad/repsnapper/Makefile index b35381f1eeef..a2afa9fae89d 100644 --- a/cad/repsnapper/Makefile +++ b/cad/repsnapper/Makefile @@ -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} diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index f572aeffc07f..588eefefa345 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -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/ diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile index e84be501206d..63bf1448eb6c 100644 --- a/devel/gccmakedep/Makefile +++ b/devel/gccmakedep/Makefile @@ -13,10 +13,7 @@ XORG_CAT= util 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> diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile index bcdcdee6e4da..60b0eb8de6a3 100644 --- a/devel/libpciaccess/Makefile +++ b/devel/libpciaccess/Makefile @@ -14,5 +14,4 @@ CONFIGURE_ARGS+= --with-pciids-path=${LOCALBASE}/share/pciids XORG_CAT= lib -NO_STAGE= yes .include <bsd.port.mk> diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile index bb3e3069a532..2d436c7ab547 100644 --- a/devel/makedepend/Makefile +++ b/devel/makedepend/Makefile @@ -12,9 +12,6 @@ COMMENT= Dependency generator for makefiles 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> diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile index aa54b1b5230a..9b3c17a5f035 100644 --- a/devel/xorg-macros/Makefile +++ b/devel/xorg-macros/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xorg-macros -PORTVERSION= 1.17.1 +PORTVERSION= 1.18.0 CATEGORIES= devel x11 DISTNAME= util-macros-$(PORTVERSION) diff --git a/devel/xorg-macros/distinfo b/devel/xorg-macros/distinfo index 203f9f7b9690..a1875ba28610 100644 --- a/devel/xorg-macros/distinfo +++ b/devel/xorg-macros/distinfo @@ -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 diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile index b7b6dab80206..e15da0060d19 100644 --- a/emulators/catapult/Makefile +++ b/emulators/catapult/Makefile @@ -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} diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 6ae26c78afee..ad7dad7c9e5c 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -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 diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile index c84b3f3eef58..fd07fa722c77 100644 --- a/emulators/tme/Makefile +++ b/emulators/tme/Makefile @@ -3,7 +3,7 @@ PORTNAME= tme PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://people.csail.mit.edu/fredette/tme/ diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index b5dcc95c53ac..2cc62dac9923 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -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/ \ diff --git a/games/fuhquake/files/Makefile b/games/fuhquake/files/Makefile index c9d31b27d205..2357c3bbca2c 100644 --- a/games/fuhquake/files/Makefile +++ b/games/fuhquake/files/Makefile @@ -187,7 +187,7 @@ CL_GLX_OBJS = \ CL_COMMON_LIBS = -lm CL_X11_LIBS = -L${LOCALBASE}/lib -lX11 -lXext -CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${LOCALBASE}/lib -lGL -lXxf86dga -lXxf86vm +CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${LOCALBASE}/lib -lX11 -lGL -lXxf86dga -lXxf86vm .c.o: ${CC} ${DO_CFLAGS} -c $< -o $*.o diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile index 3d4327e83175..e08f2fa68f83 100644 --- a/games/klavaro/Makefile +++ b/games/klavaro/Makefile @@ -3,7 +3,7 @@ PORTNAME= klavaro PORTVERSION= 1.9.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/ diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 5470183de2bf..3ca0084452e7 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -4,7 +4,7 @@ PORTNAME= cairo PORTVERSION= 1.10.2 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH?= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index dcf31d5dd5fd..9287d58e6dcb 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -28,7 +28,6 @@ DOCS= download.html freeglut.html freeglut_logo.png \ 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-build: 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 diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index d9aa3c68d292..5df692add25e 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -17,7 +17,6 @@ USES= pkgconfig USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -NO_STAGE= yes OPTIONS_DEFINE= MANPAGES @@ -42,28 +41,22 @@ PLIST_SUB+= KMS="@comment " NOUVEAU="@comment " .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 @@ pre-patch: 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> diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index 7a11d900452c..c020f636bd86 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -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 diff --git a/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c b/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c new file mode 100644 index 000000000000..ff022a3625a7 --- /dev/null +++ b/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c @@ -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 diff --git a/graphics/libdrm/files/extra-tests_modetest_Makefile.in b/graphics/libdrm/files/extra-tests_modetest_Makefile.in index 74748e9b240a..535bd83040a3 100644 --- a/graphics/libdrm/files/extra-tests_modetest_Makefile.in +++ b/graphics/libdrm/files/extra-tests_modetest_Makefile.in @@ -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,23 +26,23 @@ 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 = \ -- buffers.c modetest.c buffers.h -- + -I$(top_srcdir) $(am__append_2) -+modetest_SOURCES = buffers.c modetest.c buffers.h $(am__append_1) + modetest_SOURCES = \ +- buffers.c modetest.c buffers.h ++ 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) 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@ diff --git a/graphics/libdrm/files/extra-tests_modetest_modetest.c b/graphics/libdrm/files/extra-tests_modetest_modetest.c index db62e98f2cdf..73e4e74b88c8 100644 --- a/graphics/libdrm/files/extra-tests_modetest_modetest.c +++ b/graphics/libdrm/files/extra-tests_modetest_modetest.c @@ -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; diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index 52b736317e29..702e450ef77b 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -70,6 +70,15 @@ libdata/pkgconfig/libdrm.pc %%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 diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile index f73615868581..66d8717752ea 100644 --- a/graphics/libreatlas/Makefile +++ b/graphics/libreatlas/Makefile @@ -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/ diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index d3dac3e97443..81d1212e3960 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -23,7 +23,6 @@ DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME} 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 diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile index 88e82e40b201..fec96bbbca7f 100644 --- a/multimedia/freetuxtv/Makefile +++ b/multimedia/freetuxtv/Makefile @@ -3,7 +3,7 @@ PORTNAME= freetuxtv PORTVERSION= 0.6.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= GOOGLE_CODE diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile index 4b4fdea72e0f..b5fad298a21d 100644 --- a/net/cvsup/Makefile +++ b/net/cvsup/Makefile @@ -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 diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index c658ad54b6ea..8623a6f57ab5 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -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 diff --git a/print/photoprint/Makefile b/print/photoprint/Makefile index 8e0cc04cf7fb..a387562656ea 100644 --- a/print/photoprint/Makefile +++ b/print/photoprint/Makefile @@ -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/ diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile index 90e745db5f9d..f4c592310b09 100644 --- a/sysutils/gtk-imonc/Makefile +++ b/sysutils/gtk-imonc/Makefile @@ -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/ diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile index 61c9f10aac1b..0a745971c9e9 100644 --- a/sysutils/nitrogen/Makefile +++ b/sysutils/nitrogen/Makefile @@ -3,7 +3,7 @@ PORTNAME= nitrogen PORTVERSION= 1.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://projects.l3ib.org/nitrogen/files/ diff --git a/textproc/xorg-sgml-doctools/Makefile b/textproc/xorg-sgml-doctools/Makefile index f7a6a17e1cbe..a1b576754a15 100644 --- a/textproc/xorg-sgml-doctools/Makefile +++ b/textproc/xorg-sgml-doctools/Makefile @@ -13,5 +13,4 @@ XORG_CAT= doc USE_GMAKE= yes USES= pathfix -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/oclock/Makefile b/x11-clocks/oclock/Makefile index 12d1d758ae26..158402717385 100644 --- a/x11-clocks/oclock/Makefile +++ b/x11-clocks/oclock/Makefile @@ -10,7 +10,4 @@ COMMENT= Round clock application for X XORG_CAT= app USE_XORG= x11 xmu xext xt xkbfile -MAN1= oclock.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/oclock/pkg-plist b/x11-clocks/oclock/pkg-plist index d559700645f8..f8b98aee8934 100644 --- a/x11-clocks/oclock/pkg-plist +++ b/x11-clocks/oclock/pkg-plist @@ -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 diff --git a/x11-clocks/xclock/Makefile b/x11-clocks/xclock/Makefile index d751d318d2a8..728ad0b1487b 100644 --- a/x11-clocks/xclock/Makefile +++ b/x11-clocks/xclock/Makefile @@ -12,7 +12,4 @@ XORG_CAT= app USE_XORG= xrender xft xkbfile xt xaw USES= iconv -MAN1= xclock.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-clocks/xclock/pkg-plist b/x11-clocks/xclock/pkg-plist index f5c12d90c59b..eec54b2d2e3e 100644 --- a/x11-clocks/xclock/pkg-plist +++ b/x11-clocks/xclock/pkg-plist @@ -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 diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile index 7754c0fac70f..511d1db4c41b 100644 --- a/x11-drivers/input-wacom/Makefile +++ b/x11-drivers/input-wacom/Makefile @@ -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 diff --git a/x11-drivers/xf86-input-acecad/Makefile b/x11-drivers/xf86-input-acecad/Makefile index b3059da6472c..36840f9987f1 100644 --- a/x11-drivers/xf86-input-acecad/Makefile +++ b/x11-drivers/xf86-input-acecad/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-input-acecad PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org acecad input driver XORG_CAT= driver -MAN4= acecad.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-acecad/pkg-plist b/x11-drivers/xf86-input-acecad/pkg-plist index bece9a428b81..eb4b093f30e2 100644 --- a/x11-drivers/xf86-input-acecad/pkg-plist +++ b/x11-drivers/xf86-input-acecad/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile index 0e6a9a3f2823..50eb5511e396 100644 --- a/x11-drivers/xf86-input-elographics/Makefile +++ b/x11-drivers/xf86-input-elographics/Makefile @@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org 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 @@ -19,5 +20,4 @@ ELO_VERSION= 1.2.4 ELO_REVISION= 0 .endif -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-elographics/pkg-plist b/x11-drivers/xf86-input-elographics/pkg-plist index b6f57b12c197..04b774da2de4 100644 --- a/x11-drivers/xf86-input-elographics/pkg-plist +++ b/x11-drivers/xf86-input-elographics/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-input-fpit/Makefile b/x11-drivers/xf86-input-fpit/Makefile index ef79732c2bb2..b2c03ed78b04 100644 --- a/x11-drivers/xf86-input-fpit/Makefile +++ b/x11-drivers/xf86-input-fpit/Makefile @@ -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 @@ COMMENT= X.Org fpit input driver 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 diff --git a/x11-drivers/xf86-input-hyperpen/Makefile b/x11-drivers/xf86-input-hyperpen/Makefile index 30505e50e9a6..ba6a1a37f438 100644 --- a/x11-drivers/xf86-input-hyperpen/Makefile +++ b/x11-drivers/xf86-input-hyperpen/Makefile @@ -10,6 +10,8 @@ COMMENT= X.Org hyperpen input driver XORG_CAT= driver +.include <bsd.port.options.mk> + .if defined(WITH_NEW_XORG) HYPERVER= 1.4.1 HYPERREVISION= 0 @@ -19,5 +21,4 @@ HYPERREVISION= 6 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c .endif -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index 81b59d03630d..372d0e436389 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org 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 @@ -19,7 +20,6 @@ JOYVER= 1.5.0 JOYREVISION= 1 .endif -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.in diff --git a/x11-drivers/xf86-input-joystick/pkg-plist b/x11-drivers/xf86-input-joystick/pkg-plist index 1a0ab467f87b..dba9b4c7ef03 100644 --- a/x11-drivers/xf86-input-joystick/pkg-plist +++ b/x11-drivers/xf86-input-joystick/pkg-plist @@ -2,6 +2,7 @@ include/xorg/joystick-properties.h lib/xorg/modules/input/joystick_drv.la lib/xorg/modules/input/joystick_drv.so libdata/pkgconfig/xorg-joystick.pc +man/man4/joystick.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 607fb124ce97..841bd4cdbd5e 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -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 @@ COMMENT= X.Org keyboard input driver XORG_CAT= driver USE_XORG= kbproto -MAN4= kbd.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo index 35dda24723c9..158af292e26b 100644 --- a/x11-drivers/xf86-input-keyboard/distinfo +++ b/x11-drivers/xf86-input-keyboard/distinfo @@ -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 diff --git a/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c new file mode 100644 index 000000000000..2f62b8206b6b --- /dev/null +++ b/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c @@ -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; + } + diff --git a/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c new file mode 100644 index 000000000000..e9b0397baea7 --- /dev/null +++ b/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c @@ -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: diff --git a/x11-drivers/xf86-input-keyboard/pkg-plist b/x11-drivers/xf86-input-keyboard/pkg-plist index 7e9f47e9ffe1..a2281aefc6f9 100644 --- a/x11-drivers/xf86-input-keyboard/pkg-plist +++ b/x11-drivers/xf86-input-keyboard/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile index 61d5036b3a54..b070fdbd524f 100644 --- a/x11-drivers/xf86-input-magictouch/Makefile +++ b/x11-drivers/xf86-input-magictouch/Makefile @@ -8,11 +8,13 @@ CATEGORIES= x11-drivers 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> diff --git a/x11-drivers/xf86-input-magictouch/pkg-plist b/x11-drivers/xf86-input-magictouch/pkg-plist index c9dff9282436..18cb36565da1 100644 --- a/x11-drivers/xf86-input-magictouch/pkg-plist +++ b/x11-drivers/xf86-input-magictouch/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index 3bbe02f61dac..c5fe1623806d 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -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 @@ COMMENT= X.Org mouse input driver XORG_CAT= driver USES= pathfix -MAN4= mousedrv.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-mouse/pkg-plist b/x11-drivers/xf86-input-mouse/pkg-plist index 3e9b203c360f..b871c54a7a66 100644 --- a/x11-drivers/xf86-input-mouse/pkg-plist +++ b/x11-drivers/xf86-input-mouse/pkg-plist @@ -2,6 +2,7 @@ include/xorg/xf86-mouse-properties.h lib/xorg/modules/input/mouse_drv.la lib/xorg/modules/input/mouse_drv.so libdata/pkgconfig/xorg-mouse.pc +man/man4/mousedrv.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg diff --git a/x11-drivers/xf86-input-mutouch/Makefile b/x11-drivers/xf86-input-mutouch/Makefile index 00e303ad0567..aab8ea3f0a73 100644 --- a/x11-drivers/xf86-input-mutouch/Makefile +++ b/x11-drivers/xf86-input-mutouch/Makefile @@ -8,13 +8,11 @@ MAINTAINER= x11@FreeBSD.org 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> diff --git a/x11-drivers/xf86-input-mutouch/pkg-plist b/x11-drivers/xf86-input-mutouch/pkg-plist index b3ef9f346861..595ac731d28a 100644 --- a/x11-drivers/xf86-input-mutouch/pkg-plist +++ b/x11-drivers/xf86-input-mutouch/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-input-penmount/Makefile b/x11-drivers/xf86-input-penmount/Makefile index 06efbd521dfb..9b7cbe39583c 100644 --- a/x11-drivers/xf86-input-penmount/Makefile +++ b/x11-drivers/xf86-input-penmount/Makefile @@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org 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 @@ -19,5 +20,4 @@ PEN_VERSION= 1.4.1 PEN_REVISION= 1 .endif -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-penmount/pkg-plist b/x11-drivers/xf86-input-penmount/pkg-plist index a48eb1404b7c..46a7a8ac267d 100644 --- a/x11-drivers/xf86-input-penmount/pkg-plist +++ b/x11-drivers/xf86-input-penmount/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile index 9434c1eee5e2..d0e1183787ea 100644 --- a/x11-drivers/xf86-input-synaptics/Makefile +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -10,29 +10,12 @@ COMMENT= X.Org synaptics input driver 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 @@ PLIST_SUB+= NEW="@comment " OLD="" 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> diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86-input-synaptics/distinfo index bad1c22f40ed..a82a418573c0 100644 --- a/x11-drivers/xf86-input-synaptics/distinfo +++ b/x11-drivers/xf86-input-synaptics/distinfo @@ -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 diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf86-input-synaptics/pkg-plist index 3f9ad117dbf2..d29caf256087 100644 --- a/x11-drivers/xf86-input-synaptics/pkg-plist +++ b/x11-drivers/xf86-input-synaptics/pkg-plist @@ -5,14 +5,12 @@ include/xorg/synaptics-properties.h lib/xorg/modules/input/synaptics_drv.la lib/xorg/modules/input/synaptics_drv.so libdata/pkgconfig/xorg-synaptics.pc +man/man1/synclient.1.gz +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 diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile index d84f01f016f9..eb55ffa9e155 100644 --- a/x11-drivers/xf86-input-vmmouse/Makefile +++ b/x11-drivers/xf86-input-vmmouse/Makefile @@ -3,6 +3,7 @@ PORTNAME= xf86-input-vmmouse PORTVERSION= 13.0.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -14,17 +15,15 @@ XORG_CAT= driver 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 PLIST_SUB+= NEW="@comment " .endif -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-vmmouse/pkg-plist b/x11-drivers/xf86-input-vmmouse/pkg-plist index 0af5d7981aff..35717b9231d7 100644 --- a/x11-drivers/xf86-input-vmmouse/pkg-plist +++ b/x11-drivers/xf86-input-vmmouse/pkg-plist @@ -2,6 +2,8 @@ bin/vmmouse_detect libexec/hal/scripts/hal-probe-vmmouse lib/xorg/modules/input/vmmouse_drv.la lib/xorg/modules/input/vmmouse_drv.so +man/man1/vmmouse_detect.1.gz +man/man4/vmmouse.4x.gz %%NEW%%share/X11/xorg.conf.d/50-vmmouse.conf share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi @dirrmtry lib/xorg/modules/input diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile index 4493a71bf8de..b2bf5ef78add 100644 --- a/x11-drivers/xf86-input-void/Makefile +++ b/x11-drivers/xf86-input-void/Makefile @@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org 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 @@ -19,6 +20,4 @@ VOID_VERSION= 1.3.1 VOID_REVISION= 0 .endif - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-void/pkg-plist b/x11-drivers/xf86-input-void/pkg-plist index 554c36808518..e63ae58bbc28 100644 --- a/x11-drivers/xf86-input-void/pkg-plist +++ b/x11-drivers/xf86-input-void/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile index 815688873d27..49f83a350775 100644 --- a/x11-drivers/xf86-video-apm/Makefile +++ b/x11-drivers/xf86-video-apm/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-apm PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org apm display driver XORG_CAT= driver -MAN4= apm.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-apm/pkg-plist b/x11-drivers/xf86-video-apm/pkg-plist index e43fd8984848..3f8be66a23a4 100644 --- a/x11-drivers/xf86-video-apm/pkg-plist +++ b/x11-drivers/xf86-video-apm/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile index 84fd8c18f273..df031c8d07c7 100644 --- a/x11-drivers/xf86-video-ark/Makefile +++ b/x11-drivers/xf86-video-ark/Makefile @@ -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 @@ COMMENT= X.Org ark display driver XORG_CAT= driver -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index 17ed8f40b305..077caa18b9a1 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -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 @@ COMMENT= X.Org ati display driver 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 " diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist index 1c0799ff6e61..a244776f38d1 100644 --- a/x11-drivers/xf86-video-ati/pkg-plist +++ b/x11-drivers/xf86-video-ati/pkg-plist @@ -8,6 +8,8 @@ lib/xorg/modules/drivers/radeon_drv.so %%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 diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile index decf7db48a6a..cefa98a2b766 100644 --- a/x11-drivers/xf86-video-chips/Makefile +++ b/x11-drivers/xf86-video-chips/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-chips PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org chips display driver XORG_CAT= driver -MAN4= chips.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-chips/pkg-plist b/x11-drivers/xf86-video-chips/pkg-plist index 437be4ca72ac..7204691323b3 100644 --- a/x11-drivers/xf86-video-chips/pkg-plist +++ b/x11-drivers/xf86-video-chips/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile index c9a9cf9d53f2..a6dd1a257dc3 100644 --- a/x11-drivers/xf86-video-cirrus/Makefile +++ b/x11-drivers/xf86-video-cirrus/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-cirrus PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org cirrus display driver XORG_CAT= driver -MAN4= cirrus.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-cirrus/pkg-plist b/x11-drivers/xf86-video-cirrus/pkg-plist index 74f53f53dc0e..b47e0b8d149b 100644 --- a/x11-drivers/xf86-video-cirrus/pkg-plist +++ b/x11-drivers/xf86-video-cirrus/pkg-plist @@ -4,6 +4,7 @@ lib/xorg/modules/drivers/cirrus_drv.la lib/xorg/modules/drivers/cirrus_drv.so lib/xorg/modules/drivers/cirrus_laguna.la lib/xorg/modules/drivers/cirrus_laguna.so +man/man4/cirrus.4x.gz @dirrmtry lib/xorg/modules/drivers @dirrmtry lib/xorg/modules @dirrmtry lib/xorg diff --git a/x11-drivers/xf86-video-cyrix/Makefile b/x11-drivers/xf86-video-cyrix/Makefile index f6747bdafbd4..ccce8e78cc51 100644 --- a/x11-drivers/xf86-video-cyrix/Makefile +++ b/x11-drivers/xf86-video-cyrix/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-cyrix PORTVERSION= 1.1.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -12,7 +12,5 @@ IGNORE= requires pciVideoPtr typedef XORG_CAT= driver USE_XORG= xextproto xf86dgaproto -MAN4= cyrix.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-cyrix/pkg-plist b/x11-drivers/xf86-video-cyrix/pkg-plist index 3354c4136282..531bfe7b56a1 100644 --- a/x11-drivers/xf86-video-cyrix/pkg-plist +++ b/x11-drivers/xf86-video-cyrix/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile index 607efd749d69..59937958e703 100644 --- a/x11-drivers/xf86-video-dummy/Makefile +++ b/x11-drivers/xf86-video-dummy/Makefile @@ -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 @@ COMMENT= X.Org dummy display driver XORG_CAT= driver USE_XORG= xf86dgaproto -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-fbdev/Makefile b/x11-drivers/xf86-video-fbdev/Makefile index 3cc799f694ae..dea21f99d36c 100644 --- a/x11-drivers/xf86-video-fbdev/Makefile +++ b/x11-drivers/xf86-video-fbdev/Makefile @@ -2,14 +2,12 @@ PORTNAME= xf86-video-fbdev PORTVERSION= 0.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org fbdev display driver XORG_CAT= driver -MAN4= fbdev.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-fbdev/pkg-plist b/x11-drivers/xf86-video-fbdev/pkg-plist index 274315cac50d..e99ec711f3b1 100644 --- a/x11-drivers/xf86-video-fbdev/pkg-plist +++ b/x11-drivers/xf86-video-fbdev/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile index ffda5d581664..0a787d88265f 100644 --- a/x11-drivers/xf86-video-glint/Makefile +++ b/x11-drivers/xf86-video-glint/Makefile @@ -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 @@ USE_GL= gl XORG_CAT= driver USE_XORG= xf86driproto xf86dgaproto glproto -MAN4= glint.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-glint/pkg-plist b/x11-drivers/xf86-video-glint/pkg-plist index cb5ce1fa5e07..4943f96c01cd 100644 --- a/x11-drivers/xf86-video-glint/pkg-plist +++ b/x11-drivers/xf86-video-glint/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile index f38e1d77caee..a7b205367041 100644 --- a/x11-drivers/xf86-video-i128/Makefile +++ b/x11-drivers/xf86-video-i128/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-i128 PORTVERSION= 1.3.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org i128 display driver XORG_CAT= driver -MAN4= i128.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-i128/pkg-plist b/x11-drivers/xf86-video-i128/pkg-plist index 585e6b4e044f..8231266fd2b6 100644 --- a/x11-drivers/xf86-video-i128/pkg-plist +++ b/x11-drivers/xf86-video-i128/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile index 15f7bf3dfe80..bb0ab79dddb3 100644 --- a/x11-drivers/xf86-video-i740/Makefile +++ b/x11-drivers/xf86-video-i740/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-i740 PORTVERSION= 1.3.4 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org i740 display driver XORG_CAT= driver -MAN4= i740.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-i740/pkg-plist b/x11-drivers/xf86-video-i740/pkg-plist index 60628b412c8e..6a6250b12f2a 100644 --- a/x11-drivers/xf86-video-i740/pkg-plist +++ b/x11-drivers/xf86-video-i740/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-imstt/Makefile b/x11-drivers/xf86-video-imstt/Makefile index 54dd8f90f894..9072437f8f48 100644 --- a/x11-drivers/xf86-video-imstt/Makefile +++ b/x11-drivers/xf86-video-imstt/Makefile @@ -2,16 +2,16 @@ 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 +BROKEN= Does not build, requires pciVideoPtr typedef. +DEPRECATED= Broken, unsupported and unmaintained upstream. +EXPIRATION_DATE=2014-01-31 XORG_CAT= driver -MAN4= imstt.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-imstt/pkg-plist b/x11-drivers/xf86-video-imstt/pkg-plist index b50e55fd9c44..2a09e0bb5999 100644 --- a/x11-drivers/xf86-video-imstt/pkg-plist +++ b/x11-drivers/xf86-video-imstt/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index f34c93f32e26..708df7ff0999 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -23,14 +23,11 @@ USE_XORG= glproto \ 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 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src__sna__sna_threads.c \ ${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 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-src_ch7017_ch7017.c \ ${PATCHDIR}/extra-uxa_uxa-priv.h .endif -.include <bsd.port.pre.mk> - -.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 +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 -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-intel/pkg-plist b/x11-drivers/xf86-video-intel/pkg-plist index 0c16ed39e56b..2d3ca12deb10 100644 --- a/x11-drivers/xf86-video-intel/pkg-plist +++ b/x11-drivers/xf86-video-intel/pkg-plist @@ -16,6 +16,7 @@ lib/xorg/modules/drivers/intel_drv.so %%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 diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile index 5143d83a7192..3c1cf88e242f 100644 --- a/x11-drivers/xf86-video-mach64/Makefile +++ b/x11-drivers/xf86-video-mach64/Makefile @@ -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 @@ USE_GL= gl XORG_CAT= driver USE_XORG= glproto xf86driproto xf86miscproto -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile index cb81cb1c2126..036b5a9df829 100644 --- a/x11-drivers/xf86-video-mga/Makefile +++ b/x11-drivers/xf86-video-mga/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-mga PORTVERSION= 1.6.3 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= x11-drivers diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile index 5cf46db951a8..a9503712e748 100644 --- a/x11-drivers/xf86-video-neomagic/Makefile +++ b/x11-drivers/xf86-video-neomagic/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-neomagic PORTVERSION= 1.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-newport/Makefile b/x11-drivers/xf86-video-newport/Makefile index b87635d14727..e03da55a9166 100644 --- a/x11-drivers/xf86-video-newport/Makefile +++ b/x11-drivers/xf86-video-newport/Makefile @@ -2,15 +2,14 @@ PORTNAME= xf86-video-newport PORTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org 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' \ diff --git a/x11-drivers/xf86-video-newport/pkg-plist b/x11-drivers/xf86-video-newport/pkg-plist index 2100eb2b282f..088860fca3da 100644 --- a/x11-drivers/xf86-video-newport/pkg-plist +++ b/x11-drivers/xf86-video-newport/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile index c44ac008e671..a2aea2f3ac86 100644 --- a/x11-drivers/xf86-video-nouveau/Makefile +++ b/x11-drivers/xf86-video-nouveau/Makefile @@ -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,12 @@ COMMENT= Free nouveau display driver for nvidia-based cards XORG_CAT= driver USE_XORG= xf86driproto glproto -MAN4= nouveau.4x +# also doesn't work with mesa (libGL) version higher than 7.4.x +BROKEN= Does not build +DEPRECATED= Not supported, missing kernel support. use the nvidia driver. +EXPIRATION_DATE=2014-01-31 -# also doesn't work with mesa (libGL) version higher then 7.4.x -IGNORE= Not supported, missing kernel support. use the nvidia driver. - -NO_STAGE= yes post-configure: ${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h diff --git a/x11-drivers/xf86-video-nouveau/pkg-plist b/x11-drivers/xf86-video-nouveau/pkg-plist index 63ff28ca464a..d6b17908d8d4 100644 --- a/x11-drivers/xf86-video-nouveau/pkg-plist +++ b/x11-drivers/xf86-video-nouveau/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile index 15b5b81caa45..28cf7fc8496e 100644 --- a/x11-drivers/xf86-video-nv/Makefile +++ b/x11-drivers/xf86-video-nv/Makefile @@ -2,14 +2,12 @@ PORTNAME= xf86-video-nv PORTVERSION= 2.1.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org nv display driver XORG_CAT= driver -MAN4= nv.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-nv/pkg-plist b/x11-drivers/xf86-video-nv/pkg-plist index 78ec8ce4830f..f77c367a4212 100644 --- a/x11-drivers/xf86-video-nv/pkg-plist +++ b/x11-drivers/xf86-video-nv/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile index 77b60f265545..3e404a4bb4a3 100644 --- a/x11-drivers/xf86-video-openchrome/Makefile +++ b/x11-drivers/xf86-video-openchrome/Makefile @@ -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 @@ USE_GL= gl 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> diff --git a/x11-drivers/xf86-video-openchrome/pkg-plist b/x11-drivers/xf86-video-openchrome/pkg-plist index 51f4809b32e3..e936c4ef4609 100644 --- a/x11-drivers/xf86-video-openchrome/pkg-plist +++ b/x11-drivers/xf86-video-openchrome/pkg-plist @@ -6,6 +6,7 @@ lib/libchromeXvMCPro.so 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 diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile index f9464149d80d..2f976e966744 100644 --- a/x11-drivers/xf86-video-r128/Makefile +++ b/x11-drivers/xf86-video-r128/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-r128 PORTVERSION= 6.9.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-radeonhd/Makefile b/x11-drivers/xf86-video-radeonhd/Makefile index 129a45325dfd..f72eae30eccf 100644 --- a/x11-drivers/xf86-video-radeonhd/Makefile +++ b/x11-drivers/xf86-video-radeonhd/Makefile @@ -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 @@ USE_XORG= damageproto glproto videoproto xextproto xf86driproto 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} diff --git a/x11-drivers/xf86-video-radeonhd/pkg-plist b/x11-drivers/xf86-video-radeonhd/pkg-plist index 115b3f129639..5732974836e1 100644 --- a/x11-drivers/xf86-video-radeonhd/pkg-plist +++ b/x11-drivers/xf86-video-radeonhd/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-rdc/Makefile b/x11-drivers/xf86-video-rdc/Makefile index b4c838f28122..136511e8b6db 100644 --- a/x11-drivers/xf86-video-rdc/Makefile +++ b/x11-drivers/xf86-video-rdc/Makefile @@ -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 @@ COMMENT= X.Org RDC display driver 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 diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile index 404ccb37996a..6f16dcbb7cc0 100644 --- a/x11-drivers/xf86-video-rendition/Makefile +++ b/x11-drivers/xf86-video-rendition/Makefile @@ -2,14 +2,12 @@ PORTNAME= xf86-video-rendition PORTVERSION= 4.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org rendition display driver XORG_CAT= driver -MAN4= rendition.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-rendition/pkg-plist b/x11-drivers/xf86-video-rendition/pkg-plist index e27659167b4b..59aa530f8505 100644 --- a/x11-drivers/xf86-video-rendition/pkg-plist +++ b/x11-drivers/xf86-video-rendition/pkg-plist @@ -2,6 +2,7 @@ lib/xorg/modules/drivers/rendition_drv.la 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 diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile index 78028bcef927..fb0dd1c4bc57 100644 --- a/x11-drivers/xf86-video-s3/Makefile +++ b/x11-drivers/xf86-video-s3/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-s3 PORTVERSION= 0.6.5 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org s3 display driver XORG_CAT= driver -MAN4= s3.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-s3/pkg-plist b/x11-drivers/xf86-video-s3/pkg-plist index 0f96af8d750b..735f2aa01158 100644 --- a/x11-drivers/xf86-video-s3/pkg-plist +++ b/x11-drivers/xf86-video-s3/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile index 0a4130967f5a..0da4a4c95d2a 100644 --- a/x11-drivers/xf86-video-s3virge/Makefile +++ b/x11-drivers/xf86-video-s3virge/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-s3virge PORTVERSION= 1.10.6 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org s3virge display driver XORG_CAT= driver -MAN4= s3virge.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-s3virge/pkg-plist b/x11-drivers/xf86-video-s3virge/pkg-plist index 0db60dcaeebe..85fbb681accf 100644 --- a/x11-drivers/xf86-video-s3virge/pkg-plist +++ b/x11-drivers/xf86-video-s3virge/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index aca57f72ca5a..414be7e07de5 100644 --- a/x11-drivers/xf86-video-savage/Makefile +++ b/x11-drivers/xf86-video-savage/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-savage PORTVERSION= 2.3.7 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile index 4bd7ca801bfe..117af602b55f 100644 --- a/x11-drivers/xf86-video-siliconmotion/Makefile +++ b/x11-drivers/xf86-video-siliconmotion/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-siliconmotion PORTVERSION= 1.7.7 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org siliconmotion display driver XORG_CAT= driver -MAN4= siliconmotion.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-siliconmotion/pkg-plist b/x11-drivers/xf86-video-siliconmotion/pkg-plist index 199eda7785f9..7f27c3c38015 100644 --- a/x11-drivers/xf86-video-siliconmotion/pkg-plist +++ b/x11-drivers/xf86-video-siliconmotion/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-sis-intel/Makefile b/x11-drivers/xf86-video-sis-intel/Makefile index 40d26b51893e..40e4b47cc459 100644 --- a/x11-drivers/xf86-video-sis-intel/Makefile +++ b/x11-drivers/xf86-video-sis-intel/Makefile @@ -3,7 +3,7 @@ PORTNAME= xf86-video-sis-intel PORTVERSION= 300407 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-drivers MASTER_SITES= http://downloadmirror.intel.com/15443/eng/ DISTNAME= sis_drv_src_300407 diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile index 1fd3ede1afab..63d58c856b1d 100644 --- a/x11-drivers/xf86-video-sis/Makefile +++ b/x11-drivers/xf86-video-sis/Makefile @@ -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 @@ USE_GL= gl XORG_CAT= driver USE_XORG= xf86dgaproto xf86driproto xineramaproto xf86miscproto glproto -MAN4= sis.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-sis/pkg-plist b/x11-drivers/xf86-video-sis/pkg-plist index e1daba86088a..efcedbc0f6db 100644 --- a/x11-drivers/xf86-video-sis/pkg-plist +++ b/x11-drivers/xf86-video-sis/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile index f91d69f45af9..5ecb9e27dc1b 100644 --- a/x11-drivers/xf86-video-sunffb/Makefile +++ b/x11-drivers/xf86-video-sunffb/Makefile @@ -2,6 +2,7 @@ PORTNAME= xf86-video-sunffb PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile index ec9c69624798..5e17cc359bdc 100644 --- a/x11-drivers/xf86-video-tdfx/Makefile +++ b/x11-drivers/xf86-video-tdfx/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-tdfx PORTVERSION= 1.4.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -12,7 +12,5 @@ USE_GL= gl XORG_CAT= driver USE_XORG= xf86driproto glproto -MAN4= tdfx.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-tdfx/pkg-plist b/x11-drivers/xf86-video-tdfx/pkg-plist index 97d1e6df842b..fa4d8b44a61b 100644 --- a/x11-drivers/xf86-video-tdfx/pkg-plist +++ b/x11-drivers/xf86-video-tdfx/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-tga/Makefile b/x11-drivers/xf86-video-tga/Makefile index 4458f2c8189a..827dc8b06a94 100644 --- a/x11-drivers/xf86-video-tga/Makefile +++ b/x11-drivers/xf86-video-tga/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org tga display driver XORG_CAT= driver USE_XORG= xf86dgaproto -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile index 5408db1d526f..56c9fc522a6d 100644 --- a/x11-drivers/xf86-video-trident/Makefile +++ b/x11-drivers/xf86-video-trident/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-trident PORTVERSION= 1.3.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= X.Org trident display driver XORG_CAT= driver USE_XORG= xf86dgaproto -MAN4= trident.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-trident/pkg-plist b/x11-drivers/xf86-video-trident/pkg-plist index a2348baf7684..f2b5b0de9faa 100644 --- a/x11-drivers/xf86-video-trident/pkg-plist +++ b/x11-drivers/xf86-video-trident/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile index ec63a430d17f..71baafaf94a6 100644 --- a/x11-drivers/xf86-video-tseng/Makefile +++ b/x11-drivers/xf86-video-tseng/Makefile @@ -2,14 +2,12 @@ PORTNAME= xf86-video-tseng PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org tseng display driver XORG_CAT= driver -MAN4= tseng.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-tseng/pkg-plist b/x11-drivers/xf86-video-tseng/pkg-plist index 62decd9aa3df..3eba34ace5b6 100644 --- a/x11-drivers/xf86-video-tseng/pkg-plist +++ b/x11-drivers/xf86-video-tseng/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile index 3b80a5c8e154..6b2ed137f5e1 100644 --- a/x11-drivers/xf86-video-vesa/Makefile +++ b/x11-drivers/xf86-video-vesa/Makefile @@ -2,13 +2,12 @@ PORTNAME= xf86-video-vesa PORTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vesa display driver XORG_CAT= driver -MAN4= vesa.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-vesa/pkg-plist b/x11-drivers/xf86-video-vesa/pkg-plist index 5a9cf2e0b42c..1091e20a3eeb 100644 --- a/x11-drivers/xf86-video-vesa/pkg-plist +++ b/x11-drivers/xf86-video-vesa/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-via/Makefile b/x11-drivers/xf86-video-via/Makefile index 66e74aa504fe..550d304a79ff 100644 --- a/x11-drivers/xf86-video-via/Makefile +++ b/x11-drivers/xf86-video-via/Makefile @@ -2,21 +2,20 @@ 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 +BROKEN= Does not build, requires pciVideoPtr typedef +DEPRECATED= Broken, not supported upstream. +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" diff --git a/x11-drivers/xf86-video-via/pkg-plist b/x11-drivers/xf86-video-via/pkg-plist index 06c919d0743b..fe1713c885a3 100644 --- a/x11-drivers/xf86-video-via/pkg-plist +++ b/x11-drivers/xf86-video-via/pkg-plist @@ -6,6 +6,7 @@ lib/libviaXvMCPro.so 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 diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index 2e731b89da98..de0c5dcf8cf0 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -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 @@ COMMENT= X.Org vmware display driver XORG_CAT= driver USE_XORG= xextproto xineramaproto videoproto -MAN4= vmware.4x - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-vmware/files/patch-src_vmware.c b/x11-drivers/xf86-video-vmware/files/patch-src_vmware.c new file mode 100644 index 000000000000..6f3a552bb6b0 --- /dev/null +++ b/x11-drivers/xf86-video-vmware/files/patch-src_vmware.c @@ -0,0 +1,11 @@ +--- src/vmware.c.orig 2013-12-16 11:39:54.616921846 +0100 ++++ src/vmware.c 2013-12-16 11:40:27.592920514 +0100 +@@ -365,7 +365,7 @@ + "No supported VMware SVGA found (read ID 0x%08x).\n", id); + return FALSE; + } +- pVMWARE->suspensionSavedRegId = id; ++ pVMWARE->SavedReg.svga_reg_id = id; + + #if !XSERVER_LIBPCIACCESS + pVMWARE->PciTag = pciTag(pVMWARE->PciInfo->bus, pVMWARE->PciInfo->device, diff --git a/x11-drivers/xf86-video-vmware/pkg-plist b/x11-drivers/xf86-video-vmware/pkg-plist index 11352322763d..5b79c8f3e2de 100644 --- a/x11-drivers/xf86-video-vmware/pkg-plist +++ b/x11-drivers/xf86-video-vmware/pkg-plist @@ -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 diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile index c3e1361fd08b..0e23246f93ec 100644 --- a/x11-drivers/xf86-video-voodoo/Makefile +++ b/x11-drivers/xf86-video-voodoo/Makefile @@ -2,7 +2,7 @@ PORTNAME= xf86-video-voodoo PORTVERSION= 1.2.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= X.Org voodoo display driver XORG_CAT= driver USE_XORG= xf86dgaproto -MAN4= voodoo.4x -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-voodoo/pkg-plist b/x11-drivers/xf86-video-voodoo/pkg-plist index 98df90622eca..d4ef86aed783 100644 --- a/x11-drivers/xf86-video-voodoo/pkg-plist +++ b/x11-drivers/xf86-video-voodoo/pkg-plist @@ -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 diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile index a8f0921183f4..2729f9a59658 100644 --- a/x11-drivers/xorg-drivers/Makefile +++ b/x11-drivers/xorg-drivers/Makefile @@ -97,7 +97,6 @@ SUNFFB_DESC= Install sunffb video driver # 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. @@ -122,7 +121,7 @@ RUN_DEPENDS+= ${${type:U}DIR}/${i}_drv.so:${PORTSDIR}/x11-drivers/xf86-${type}-$ .endfor do-install: - ${MKDIR} ${PREFIX}/libdata/xorg - ${TOUCH} ${PREFIX}/libdata/xorg/drivers + ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/xorg + ${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/drivers .include <bsd.port.mk> diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile index 5cde862ed570..814a969baa01 100644 --- a/x11-fonts/bdftopcf/Makefile +++ b/x11-fonts/bdftopcf/Makefile @@ -11,8 +11,6 @@ COMMENT= Convert X font from BDF to PCF 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> diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile index 7c8913b2b8c8..4840274f3c38 100644 --- a/x11-fonts/encodings/Makefile +++ b/x11-fonts/encodings/Makefile @@ -12,5 +12,4 @@ XORG_CAT= font USE_XORG= fontutil FONTDIR= encodings/large encodings -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile index fa01ab83420a..0f634fac98ad 100644 --- a/x11-fonts/font-adobe-100dpi/Makefile +++ b/x11-fonts/font-adobe-100dpi/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org Adobe 100dpi font XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile index 1a5b6a15e742..ecdd02c74118 100644 --- a/x11-fonts/font-adobe-75dpi/Makefile +++ b/x11-fonts/font-adobe-75dpi/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org Adobe 75dpi font XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile index 92fcf6d93364..9abf4ae020a1 100644 --- a/x11-fonts/font-adobe-utopia-100dpi/Makefile +++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org Adobe Utopia 100dpi font XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile index 9ba0dcb318c9..6fcafcc10485 100644 --- a/x11-fonts/font-adobe-utopia-75dpi/Makefile +++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org Adobe Utopia 75dpi font XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile index bf97828611e5..a19133eee9c9 100644 --- a/x11-fonts/font-adobe-utopia-type1/Makefile +++ b/x11-fonts/font-adobe-utopia-type1/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org Adobe Utopia Type1 font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile index c7182ea856ad..e745bae96ee0 100644 --- a/x11-fonts/font-alias/Makefile +++ b/x11-fonts/font-alias/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org Font aliases XORG_CAT= font FONTDIR= 100dpi 75dpi misc cyrillic -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile index 6437d72a5756..3c3987487db5 100644 --- a/x11-fonts/font-arabic-misc/Makefile +++ b/x11-fonts/font-arabic-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous Arabic fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile index 9f309ccfca56..2411a3755b50 100644 --- a/x11-fonts/font-bh-100dpi/Makefile +++ b/x11-fonts/font-bh-100dpi/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org Bigelow Holmes 100dpi font XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile index 36a411b844a7..921a01d55dea 100644 --- a/x11-fonts/font-bh-75dpi/Makefile +++ b/x11-fonts/font-bh-75dpi/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org Bigelow Holmes 75dpi font XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile index 46411e8da81a..a23ca06f6f95 100644 --- a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile +++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org Bigelow Holmes Lucida TypeWriter 100dpi font XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile index af971c1f927e..335df69d056d 100644 --- a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile +++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org Bigelow Holmes Lucida TypeWriter 75dpi font XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile index 4e7ad12535ee..ae81fe96ad78 100644 --- a/x11-fonts/font-bh-ttf/Makefile +++ b/x11-fonts/font-bh-ttf/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org Bigelow & Holmes TTF font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile index b7f94e49226e..65d892853606 100644 --- a/x11-fonts/font-bh-type1/Makefile +++ b/x11-fonts/font-bh-type1/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org Bigelow Holmes Type1 font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile index 47007c85008d..a38a56e46efd 100644 --- a/x11-fonts/font-bitstream-100dpi/Makefile +++ b/x11-fonts/font-bitstream-100dpi/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org Bitstream Vera 100dpi font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile index bb1e2506ac7f..4ef122e674da 100644 --- a/x11-fonts/font-bitstream-75dpi/Makefile +++ b/x11-fonts/font-bitstream-75dpi/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org Bitstream Vera 75dpi font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bitstream-speedo/Makefile b/x11-fonts/font-bitstream-speedo/Makefile index c5d5fd0d1056..d2a81599f3e6 100644 --- a/x11-fonts/font-bitstream-speedo/Makefile +++ b/x11-fonts/font-bitstream-speedo/Makefile @@ -9,5 +9,4 @@ COMMENT= X.Org Bitstream Vera Speedo font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile index ba706b737050..00a6e5f6ea59 100644 --- a/x11-fonts/font-bitstream-type1/Makefile +++ b/x11-fonts/font-bitstream-type1/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org Bitstream Vera Type1 font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile index 03f2cba90082..3bca6ecb3393 100644 --- a/x11-fonts/font-cronyx-cyrillic/Makefile +++ b/x11-fonts/font-cronyx-cyrillic/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org Cronyx Cyrillic font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile index 7de94daa7a0c..09920f54db8d 100644 --- a/x11-fonts/font-cursor-misc/Makefile +++ b/x11-fonts/font-cursor-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous Cursor fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile index eeee4671de0b..952dd3368ec4 100644 --- a/x11-fonts/font-daewoo-misc/Makefile +++ b/x11-fonts/font-daewoo-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous Daewoo fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile index 064f33f244e9..a6bf1edc1613 100644 --- a/x11-fonts/font-dec-misc/Makefile +++ b/x11-fonts/font-dec-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous Dec fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile index 9dca516a0aae..ae4dd6e902ad 100644 --- a/x11-fonts/font-ibm-type1/Makefile +++ b/x11-fonts/font-ibm-type1/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org IBM Type1 font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile index 95c1b93e9907..0e038369fad8 100644 --- a/x11-fonts/font-isas-misc/Makefile +++ b/x11-fonts/font-isas-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous ISAS fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile index ad975de1c59a..43968fb8cf68 100644 --- a/x11-fonts/font-jis-misc/Makefile +++ b/x11-fonts/font-jis-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous JIS fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile index f3509477b8f9..b443a44ad6ba 100644 --- a/x11-fonts/font-micro-misc/Makefile +++ b/x11-fonts/font-micro-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous Micro fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile index 37208ef2083b..d06da8356f8f 100644 --- a/x11-fonts/font-misc-cyrillic/Makefile +++ b/x11-fonts/font-misc-cyrillic/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous Cyrillic font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile index 95e6c7d45dfe..81cdcf829b0b 100644 --- a/x11-fonts/font-misc-ethiopic/Makefile +++ b/x11-fonts/font-misc-ethiopic/Makefile @@ -11,5 +11,4 @@ XORG_CAT= font INSTALLS_TTF= yes FONTDIR= TTF OTF -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile index 9d7d1c2220eb..00116af8ef12 100644 --- a/x11-fonts/font-misc-meltho/Makefile +++ b/x11-fonts/font-misc-meltho/Makefile @@ -11,5 +11,4 @@ XORG_CAT= font INSTALLS_TTF= yes FONTDIR= OTF -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile index 21ad7f9083e9..99e9eb502854 100644 --- a/x11-fonts/font-misc-misc/Makefile +++ b/x11-fonts/font-misc-misc/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org miscellaneous Misc fonts XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile index bee5afdfc75d..28ff192bad5f 100644 --- a/x11-fonts/font-mutt-misc/Makefile +++ b/x11-fonts/font-mutt-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous Mutt fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile index 8cbadb659208..06b1f426bf94 100644 --- a/x11-fonts/font-schumacher-misc/Makefile +++ b/x11-fonts/font-schumacher-misc/Makefile @@ -11,5 +11,4 @@ COMMENT= X.Org miscellaneous Schumacher fonts XORG_CAT= font USE_XORG= fontutil -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile index 76a480861d9b..bd2a49c0efa7 100644 --- a/x11-fonts/font-screen-cyrillic/Makefile +++ b/x11-fonts/font-screen-cyrillic/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org Screen Cyrillic font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile index f3a38fb449e9..0ffd90e41426 100644 --- a/x11-fonts/font-sony-misc/Makefile +++ b/x11-fonts/font-sony-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous Sony fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile index 0d75e895de49..0eeee719e87f 100644 --- a/x11-fonts/font-sun-misc/Makefile +++ b/x11-fonts/font-sun-misc/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org miscellaneous Sun fonts XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-util/Makefile b/x11-fonts/font-util/Makefile index a902817260c4..9807bb091dc1 100644 --- a/x11-fonts/font-util/Makefile +++ b/x11-fonts/font-util/Makefile @@ -10,7 +10,4 @@ COMMENT= Create an index of X font files in a directory XORG_CAT= font -MAN1= bdftruncate.1 ucs2any.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-util/pkg-plist b/x11-fonts/font-util/pkg-plist index a89511bdd609..4d8ebc4ab861 100644 --- a/x11-fonts/font-util/pkg-plist +++ b/x11-fonts/font-util/pkg-plist @@ -18,4 +18,6 @@ lib/X11/fonts/util/map-ISO8859-9 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 diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile index 91d0dc0cdf32..9b8b09b01f6b 100644 --- a/x11-fonts/font-winitzki-cyrillic/Makefile +++ b/x11-fonts/font-winitzki-cyrillic/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org Winitzki Cyrillic font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile index b9ec5f12e333..3095a1df874d 100644 --- a/x11-fonts/font-xfree86-type1/Makefile +++ b/x11-fonts/font-xfree86-type1/Makefile @@ -10,5 +10,4 @@ COMMENT= X.Org XFree86 Type1 font XORG_CAT= font -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile index 0d65bc7268ee..541832855a77 100644 --- a/x11-fonts/fonttosfnt/Makefile +++ b/x11-fonts/fonttosfnt/Makefile @@ -12,9 +12,6 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 XORG_CAT= app USE_XORG= xproto fontenc -PLIST_FILES= bin/fonttosfnt +PLIST_FILES= bin/fonttosfnt man/man1/fonttosfnt.1.gz -MAN1= fonttosfnt.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile index 39cba878e234..d6860cb2cd79 100644 --- a/x11-fonts/fslsfonts/Makefile +++ b/x11-fonts/fslsfonts/Makefile @@ -10,9 +10,6 @@ COMMENT= List fonts served by the X font server XORG_CAT= app USE_XORG= x11 libfs -PLIST_FILES= bin/fslsfonts +PLIST_FILES= bin/fslsfonts man/man1/fslsfonts.1.gz -MAN1= fslsfonts.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index 17417680811c..dba8dc61ae79 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -16,5 +16,4 @@ USE_XORG= xproto:both xtrans fontsproto:both fontenc CONFIGURE_ARGS=--without-xmlto --disable-devel-docs -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/libXfontcache/Makefile b/x11-fonts/libXfontcache/Makefile index d488614475ef..1cf063cf297c 100644 --- a/x11-fonts/libXfontcache/Makefile +++ b/x11-fonts/libXfontcache/Makefile @@ -10,12 +10,4 @@ COMMENT= The Xfontcache library 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> diff --git a/x11-fonts/libXfontcache/pkg-plist b/x11-fonts/libXfontcache/pkg-plist index 53b501253a0d..cb25d17c1d80 100644 --- a/x11-fonts/libXfontcache/pkg-plist +++ b/x11-fonts/libXfontcache/pkg-plist @@ -3,3 +3,9 @@ lib/libXfontcache.la 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 diff --git a/x11-fonts/mkfontdir/Makefile b/x11-fonts/mkfontdir/Makefile index 72dee53c89d5..f7ea3a3da032 100644 --- a/x11-fonts/mkfontdir/Makefile +++ b/x11-fonts/mkfontdir/Makefile @@ -12,8 +12,6 @@ RUN_DEPENDS= mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale 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> diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile index 0b94126da85f..c2005428d82d 100644 --- a/x11-fonts/mkfontscale/Makefile +++ b/x11-fonts/mkfontscale/Makefile @@ -15,8 +15,6 @@ USE_XORG= xproto fontenc 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> diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile index ea8a95b93aba..42fc82c0535c 100644 --- a/x11-fonts/showfont/Makefile +++ b/x11-fonts/showfont/Makefile @@ -10,9 +10,6 @@ COMMENT= Font dumper for the X font server 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> diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile index 04bdfab70f79..bffb80a6c0a1 100644 --- a/x11-fonts/xfontsel/Makefile +++ b/x11-fonts/xfontsel/Makefile @@ -10,7 +10,4 @@ COMMENT= Point and click selection of X11 font names XORG_CAT= app USE_XORG= xt xaw -MAN1= xfontsel.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/xfontsel/pkg-plist b/x11-fonts/xfontsel/pkg-plist index b2a288e570ce..4365dff9480d 100644 --- a/x11-fonts/xfontsel/pkg-plist +++ b/x11-fonts/xfontsel/pkg-plist @@ -1,4 +1,5 @@ bin/xfontsel +man/man1/xfontsel.1.gz share/X11/app-defaults/XFontSel @dirrmtry share/X11/app-defaults @dirrmtry share/X11 diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index be18e10df1bb..0fa5429a5b2f 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -14,9 +14,6 @@ USE_XORG= libfs xfont xtrans 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 @@ post-build: @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> diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist index e2378ab6db01..e175b97fd85c 100644 --- a/x11-fonts/xfs/pkg-plist +++ b/x11-fonts/xfs/pkg-plist @@ -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 diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile index 5d8f9eedc47d..e052dcde5150 100644 --- a/x11-fonts/xfsinfo/Makefile +++ b/x11-fonts/xfsinfo/Makefile @@ -10,9 +10,6 @@ COMMENT= X font server information utility 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> diff --git a/x11-fonts/xlsfonts/Makefile b/x11-fonts/xlsfonts/Makefile index 38a8d29dc613..c965a197355f 100644 --- a/x11-fonts/xlsfonts/Makefile +++ b/x11-fonts/xlsfonts/Makefile @@ -10,9 +10,6 @@ COMMENT= Server font list displayer for X 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> diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile index c3a65206b5dd..7517c7737f25 100644 --- a/x11-fonts/xorg-fonts-100dpi/Makefile +++ b/x11-fonts/xorg-fonts-100dpi/Makefile @@ -21,9 +21,9 @@ RUN_DEPENDS= ${FONTDIR}/100dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-1 CONFLICTS= XFree86-font100dpi-* NO_BUILD= # none +NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile index 496f98f5a0b2..f8632676fd10 100644 --- a/x11-fonts/xorg-fonts-75dpi/Makefile +++ b/x11-fonts/xorg-fonts-75dpi/Makefile @@ -21,9 +21,9 @@ RUN_DEPENDS= ${FONTDIR}/75dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75 CONFLICTS= XFree86-font75dpi-* NO_BUILD= # none +NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile index b78adb9a04b1..d2242bccc1eb 100644 --- a/x11-fonts/xorg-fonts-cyrillic/Makefile +++ b/x11-fonts/xorg-fonts-cyrillic/Makefile @@ -20,9 +20,9 @@ RUN_DEPENDS= ${FONTDIR}/cyrillic/crox1c.pcf.gz:${PORTSDIR}/x11-fonts/font-cronyx CONFLICTS= XFree86-fontCyrillic-* NO_BUILD= # none +NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index dffea8bcec16..193725ed0589 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -27,9 +27,9 @@ RUN_DEPENDS= ${FONTDIR}/misc/arabic24.pcf.gz:${PORTSDIR}/x11-fonts/font-arabic-m CONFLICTS= XFree86-fontDefaultBitmaps-* NO_BUILD= # none +NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts do-install: # empty -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile index 09d1df2402e3..76d230c911ea 100644 --- a/x11-fonts/xorg-fonts-truetype/Makefile +++ b/x11-fonts/xorg-fonts-truetype/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${FONTDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf \ do-install: # empty NO_BUILD= # none +NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile index a6c273942a49..f254b37620be 100644 --- a/x11-fonts/xorg-fonts-type1/Makefile +++ b/x11-fonts/xorg-fonts-type1/Makefile @@ -23,7 +23,7 @@ CONFLICTS= XFree86-fontScalable-* do-install: # empty NO_BUILD= # none +NO_MTREE= yes FONTDIR= ${LOCALBASE}/lib/X11/fonts -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile index f3ef39b662e1..33a70418a992 100644 --- a/x11-fonts/xorg-fonts/Makefile +++ b/x11-fonts/xorg-fonts/Makefile @@ -23,9 +23,8 @@ RUN_DEPENDS= xorg-fonts-100dpi>=0:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \ NO_BUILD= yes -NO_STAGE= yes do-install: - ${MKDIR} ${PREFIX}/libdata/xorg - ${TOUCH} ${PREFIX}/libdata/xorg/fonts + ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/xorg + ${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/fonts .include <bsd.port.mk> diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile index 037fea7a03be..f91ab1518afe 100644 --- a/x11-servers/mga_hal/Makefile +++ b/x11-servers/mga_hal/Makefile @@ -16,7 +16,6 @@ RESTRICTED= Matrox drivers may not be distributed. ONLY_FOR_ARCHS= i386 amd64 -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${ARCH} == "i386" @@ -31,13 +30,13 @@ XORG_VERSION= 6.9.0 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> diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile index bab652ef2770..f62b4b09b5b4 100644 --- a/x11-servers/xephyr/Makefile +++ b/x11-servers/xephyr/Makefile @@ -19,10 +19,16 @@ CONFIGURE_ARGS= --enable-kdrive --enable-xephyr --disable-dmx --disable-xvfb \ --disable-xnest --localstatedir=/var --without-dtrace SLAVE_PORT= yes -PLIST_FILES= bin/Xephyr +PLIST_FILES= bin/Xephyr man/man1/Xephyr.1.gz + +.include <bsd.port.options.mk> -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/hw/kdrive/ephyr/Xephyr ${STAGEDIR}${PREFIX}/bin/ +.if defined(WITH_NEW_XORG) + ${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/man/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/ +.else + ${INSTALL_MAN} ${WRKSRC}/hw/kdrive/ephyr/Xephyr.1 ${STAGEDIR}${PREFIX}/man/man1/ +.endif .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index 1dcd91636225..e54c94f7fba9 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -20,12 +20,9 @@ CONFIGURE_ARGS= --disable-xvfb --disable-xnest \ --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 + cd ${WRKSRC}/hw/dmx; DESTDIR=${STAGEDIR} ${MAKE} install .include "${MASTERDIR}/Makefile" diff --git a/x11-servers/xorg-dmx/pkg-plist b/x11-servers/xorg-dmx/pkg-plist index c7fea5a1956a..03b4434ddab2 100644 --- a/x11-servers/xorg-dmx/pkg-plist +++ b/x11-servers/xorg-dmx/pkg-plist @@ -11,3 +11,8 @@ bin/dmxtodmx 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 + diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index e8a48159264a..3257a20e1d13 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -20,18 +20,16 @@ CONFIGURE_ARGS= --disable-dmx --disable-xvfb \ --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" diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 4a41c94af50a..05bdbb9555b1 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -13,7 +13,7 @@ DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs -LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm +LIB_DEPENDS= libdrm.so:${PORTSDIR}/graphics/libdrm RUN_DEPENDS= xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp @@ -74,24 +74,12 @@ CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \ .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) @@ -102,7 +90,7 @@ CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif .if ${PORT_OPTIONS:MHAL} -LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal +LIB_DEPENDS+= libhal.so:${PORTSDIR}/sysutils/hal CONFIGURE_ARGS+= --enable-config-hal=yes .else CONFIGURE_ARGS+= --enable-config-hal=no @@ -120,8 +108,10 @@ CONFIGURE_ARGS+= --enable-aiglx=no .if ${PORT_OPTIONS:MSUID} CONFIGURE_ARGS+=--enable-install-setuid=yes +PLIST_SUB+= SUID="" .else CONFIGURE_ARGS+=--enable-install-setuid=no +PLIST_SUB+= SUID="@comment" .endif .if ${ARCH} == i386 @@ -199,18 +189,21 @@ post-configure: .endif .if ${SLAVE_PORT} == "no" -pre-su-install: +post-install: # The .xorg dir because else the xorg-server might not load the correct # libglx module. - ${MKDIR} ${PREFIX}/lib/xorg/modules/extensions/.xorg + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg ${INSTALL_LIB} ${WRKSRC}/hw/xfree86/dixmods/.libs/libglx.so \ - ${PREFIX}/lib/xorg/modules/extensions/.xorg/ + ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/ + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/*.so +.if !defined(WITH_NEW_XORG) + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/*.so +.endif + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/xorg/modules/multimedia/*.so -post-install: .if defined(WITH_NEW_XORG) - @${MKDIR} ${PREFIX}/share/X11/xorg.conf.d -.endif - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d .endif +.endif # ! SLAVE_PORT .include <bsd.port.post.mk> diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index bee307f57e51..e9667478ffde 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -1,5 +1,11 @@ bin/X +%%SUID%%@owner root +%%SUID%%@group wheel +%%SUID%%@mode 4555 bin/Xorg +%%SUID%%@owner +%%SUID%%@group +%%SUID%%@mode bin/cvt bin/gtf include/xorg/BT.h @@ -226,8 +232,16 @@ lib/xorg/modules/multimedia/uda1380_drv.la 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 +%%NEW%%@exec /bin/mkdir -p %D/etc/X11/xorg.conf.d @comment %%NEW%%@dirrm share/doc/xorg-server @dirrm include/xorg @dirrm lib/xorg/modules/extensions/.xorg @@ -236,5 +250,5 @@ share/aclocal/xorg-server.m4 %%OLD%%@dirrm lib/xorg/modules/linux @dirrm lib/xorg/modules @dirrm lib/xorg -%%NEW%%@dirrmtry share/X11/xorg.conf.d -@dirrmtry share/X11 +%%NEW%%@dirrmtry etc/X11/xorg.conf.d +%%NEW%%@dirrmtry etc/X11 diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index 6f11ae9603b2..0d6babf32eb0 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -20,11 +20,16 @@ CONFIGURE_ARGS= --disable-dmx --disable-xnest \ --localstatedir=/var --without-dtrace SLAVE_PORT= yes -PLIST_FILES= bin/Xvfb -MAN1= Xvfb.1 +PLIST_FILES= bin/Xvfb man/man1/Xvfb.1.gz + +.include <bsd.port.options.mk> -NO_STAGE= yes do-install: - cd ${WRKSRC}/hw/vfb; ${MAKE} install + ${INSTALL_PROGRAM} ${WRKSRC}/hw/vfb/Xvfb ${STAGEDIR}${PREFIX}/bin/ +.if defined(WITH_NEW_XORG) + ${INSTALL_MAN} ${WRKSRC}/hw/vfb/man/Xvfb.1 ${STAGEDIR}${PREFIX}/man/man1/ +.else + ${INSTALL_MAN} ${WRKSRC}/hw/vfb/Xvfb.1 ${STAGEDIR}${PREFIX}/man/man1/ +.endif .include "${MASTERDIR}/Makefile" diff --git a/x11-themes/gtk-murrine-engine/Makefile b/x11-themes/gtk-murrine-engine/Makefile index ab591d4ac84f..4328b8da51e5 100644 --- a/x11-themes/gtk-murrine-engine/Makefile +++ b/x11-themes/gtk-murrine-engine/Makefile @@ -3,7 +3,7 @@ PORTNAME= murrine PORTVERSION= 0.98.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= GNOME PKGNAMEPREFIX= gtk- diff --git a/x11-themes/xcursor-themes/Makefile b/x11-themes/xcursor-themes/Makefile index 68075b4b0120..fb69a22d1a93 100644 --- a/x11-themes/xcursor-themes/Makefile +++ b/x11-themes/xcursor-themes/Makefile @@ -16,5 +16,4 @@ USE_XORG= xextproto XORG_CAT= data -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile index 505c1bbe5963..8e48924ffa1f 100644 --- a/x11-toolkits/gtkglext/Makefile +++ b/x11-toolkits/gtkglext/Makefile @@ -3,7 +3,7 @@ PORTNAME= gtkglext PORTVERSION= 1.2.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11-toolkits MASTER_SITES= SF DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index da11eaa90722..2dd6999454b1 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -14,7 +14,4 @@ USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt USES= gmake CONFIGURE_ARGS+=--without-xmlto -MAN3= Xaw.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-toolkits/libXaw/pkg-plist b/x11-toolkits/libXaw/pkg-plist index d8c4c79a0285..1d6a6c3040bb 100644 --- a/x11-toolkits/libXaw/pkg-plist +++ b/x11-toolkits/libXaw/pkg-plist @@ -82,6 +82,7 @@ lib/libXaw7.so 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 diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile index f5eab9c3c5c7..e0c0383510fa 100644 --- a/x11-toolkits/libXmu/Makefile +++ b/x11-toolkits/libXmu/Makefile @@ -12,5 +12,4 @@ COMMENT= X Miscellaneous Utilities libraries XORG_CAT= lib USE_XORG= xproto:both x11 xt xext -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index 6cc44393dd75..9b09cf61aee6 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -13,276 +13,6 @@ XORG_CAT= lib 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 diff --git a/x11-toolkits/libXt/pkg-plist b/x11-toolkits/libXt/pkg-plist index 2020099d260d..1f049a9bf633 100644 --- a/x11-toolkits/libXt/pkg-plist +++ b/x11-toolkits/libXt/pkg-plist @@ -36,3 +36,271 @@ lib/libXt.la 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 diff --git a/x11-toolkits/termit/Makefile b/x11-toolkits/termit/Makefile index 0a21dcb6f5cb..e665e719e421 100644 --- a/x11-toolkits/termit/Makefile +++ b/x11-toolkits/termit/Makefile @@ -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/ diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 465b7adf9e72..78c35ee8aa90 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -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/ diff --git a/x11-wm/transset/Makefile b/x11-wm/transset/Makefile index 60292b057a25..d23e26db622e 100644 --- a/x11-wm/transset/Makefile +++ b/x11-wm/transset/Makefile @@ -13,8 +13,6 @@ COMMENT= Make your windows transparent 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> diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile index 8326263c5071..68732cf1131c 100644 --- a/x11-wm/xcompmgr/Makefile +++ b/x11-wm/xcompmgr/Makefile @@ -11,9 +11,6 @@ COMMENT= A sample X compositing manager 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> diff --git a/x11/Makefile b/x11/Makefile index e2278448c1be..802f034b0e94 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -42,6 +42,7 @@ SUBDIR += dmxproto SUBDIR += docker SUBDIR += dri2proto + SUBDIR += dri3proto SUBDIR += dxpc SUBDIR += dynamag SUBDIR += dzen2 @@ -185,6 +186,7 @@ SUBDIR += libxkbfile SUBDIR += libxkbui SUBDIR += libxklavier + SUBDIR += libxshmfence SUBDIR += linux-f10-xorg-libs SUBDIR += listres SUBDIR += lsw @@ -232,6 +234,7 @@ SUBDIR += pixman SUBDIR += plasma-scriptengine-python SUBDIR += plasma-scriptengine-ruby + SUBDIR += presentproto SUBDIR += printproto SUBDIR += printscreen SUBDIR += props diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile index df254adbdbde..54666d6edbbf 100644 --- a/x11/beforelight/Makefile +++ b/x11/beforelight/Makefile @@ -10,7 +10,4 @@ COMMENT= A sample screen saver for X XORG_CAT= app USE_XORG= x11 xscrnsaver xt xaw7 xt -MAN1= beforelight.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/beforelight/pkg-plist b/x11/beforelight/pkg-plist index 2bec9d123982..20c3f3ba1a5c 100644 --- a/x11/beforelight/pkg-plist +++ b/x11/beforelight/pkg-plist @@ -1,4 +1,5 @@ bin/beforelight +man/man1/beforelight.1.gz share/X11/app-defaults/Beforelight @dirrmtry share/X11/app-defaults @dirrmtry share/X11 diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile index 8478e288210b..10e8085c4728 100644 --- a/x11/bitmap/Makefile +++ b/x11/bitmap/Makefile @@ -9,7 +9,5 @@ COMMENT= Bitmap editor and converter utilities for X XORG_CAT= app USE_XORG= x11 xaw xbitmaps xmu xproto -MAN1= atobm.1 bitmap.1 bmtoa.1 -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/bitmap/pkg-plist b/x11/bitmap/pkg-plist index 795f3709da1b..6e5c545b79dc 100644 --- a/x11/bitmap/pkg-plist +++ b/x11/bitmap/pkg-plist @@ -14,6 +14,9 @@ include/X11/bitmaps/RotateRight include/X11/bitmaps/Stipple include/X11/bitmaps/Term include/X11/bitmaps/Up +man/man1/atobm.1.gz +man/man1/bitmap.1.gz +man/man1/bmtoa.1.gz share/X11/app-defaults/Bitmap share/X11/app-defaults/Bitmap-color share/X11/app-defaults/Bitmap-nocase diff --git a/x11/dri3proto/Makefile b/x11/dri3proto/Makefile new file mode 100644 index 000000000000..c7079fd4a6d9 --- /dev/null +++ b/x11/dri3proto/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ + +PORTNAME= dri3proto +PORTVERSION= 1.0 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= DRI3 prototype headers + +XORG_CAT= proto + +.include <bsd.port.mk> diff --git a/x11/dri3proto/distinfo b/x11/dri3proto/distinfo new file mode 100644 index 000000000000..948341bd6c11 --- /dev/null +++ b/x11/dri3proto/distinfo @@ -0,0 +1,2 @@ +SHA256 (xorg/proto/dri3proto-1.0.tar.bz2) = 01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074 +SIZE (xorg/proto/dri3proto-1.0.tar.bz2) = 105366 diff --git a/x11/dri3proto/pkg-descr b/x11/dri3proto/pkg-descr new file mode 100644 index 000000000000..0ce5f634a246 --- /dev/null +++ b/x11/dri3proto/pkg-descr @@ -0,0 +1,3 @@ +This package contains X.Org DRI3 prototype headers. + +WWW: http://www.freedesktop.org/wiki/Software/xlibs diff --git a/x11/dri3proto/pkg-plist b/x11/dri3proto/pkg-plist new file mode 100644 index 000000000000..b0c009711c13 --- /dev/null +++ b/x11/dri3proto/pkg-plist @@ -0,0 +1,5 @@ +include/X11/extensions/dri3proto.h +libdata/pkgconfig/dri3proto.pc +share/doc/dri3proto/dri3proto.txt +@dirrm share/doc/dri3proto +@dirrmtry include/X11/extensions diff --git a/x11/editres/Makefile b/x11/editres/Makefile index aac54c662812..0a0a82c15a36 100644 --- a/x11/editres/Makefile +++ b/x11/editres/Makefile @@ -10,7 +10,4 @@ COMMENT= Dynamic resource editor for X Toolkit Applications XORG_CAT= app USE_XORG= x11 xt xmu xaw -MAN1= editres.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/editres/pkg-plist b/x11/editres/pkg-plist index c447ad5d18af..8f71a414ca82 100644 --- a/x11/editres/pkg-plist +++ b/x11/editres/pkg-plist @@ -1,4 +1,5 @@ bin/editres +man/man1/editres.1.gz share/X11/app-defaults/Editres share/X11/app-defaults/Editres-color @dirrmtry share/X11/app-defaults diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile index 78c0703577b4..23f980033424 100644 --- a/x11/fstobdf/Makefile +++ b/x11/fstobdf/Makefile @@ -10,9 +10,6 @@ COMMENT= Generate BDF font from X font server XORG_CAT= app USE_XORG= x11 libfs -PLIST_FILES= bin/fstobdf +PLIST_FILES= bin/fstobdf man/man1/fstobdf.1.gz -MAN1= fstobdf.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/glproto/Makefile b/x11/glproto/Makefile index 5ae9713a79e3..4f5f25cb7546 100644 --- a/x11/glproto/Makefile +++ b/x11/glproto/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= glproto -PORTVERSION= 1.4.16 +PORTVERSION= 1.4.17 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/glproto/distinfo b/x11/glproto/distinfo index 53aa21d42d09..b88e829ec59c 100644 --- a/x11/glproto/distinfo +++ b/x11/glproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/glproto-1.4.16.tar.bz2) = 54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d -SIZE (xorg/proto/glproto-1.4.16.tar.bz2) = 119584 +SHA256 (xorg/proto/glproto-1.4.17.tar.bz2) = adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40 +SIZE (xorg/proto/glproto-1.4.17.tar.bz2) = 126969 diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile index 8748e3459421..9d291633a646 100644 --- a/x11/iceauth/Makefile +++ b/x11/iceauth/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xproto ice -PLIST_FILES= bin/iceauth +PLIST_FILES= bin/iceauth man/man1/iceauth.1.gz -MAN1= iceauth.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/ico/Makefile b/x11/ico/Makefile index b76bbf27752b..ad5d0f4b4951 100644 --- a/x11/ico/Makefile +++ b/x11/ico/Makefile @@ -10,9 +10,6 @@ COMMENT= Displays a wire-frame rotating plyhedron XORG_CAT= app USE_XORG= x11 -PLIST_FILES= bin/ico +PLIST_FILES= bin/ico man/man1/ico.1.gz -MAN1= ico.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile index e83a27669102..5676b8cc922a 100644 --- a/x11/libXScrnSaver/Makefile +++ b/x11/libXScrnSaver/Makefile @@ -10,18 +10,4 @@ COMMENT= The XScrnSaver library XORG_CAT= lib USE_XORG= x11 xext xextproto scrnsaverproto:both -MAN3= Xss.3 \ - XScreenSaverAllocInfo.3 \ - XScreenSaverGetRegistered.3 \ - XScreenSaverQueryExtension.3 \ - XScreenSaverQueryInfo.3 \ - XScreenSaverQueryVersion.3 \ - XScreenSaverRegister.3 \ - XScreenSaverSelectInput.3 \ - XScreenSaverSetAttributes.3 \ - XScreenSaverSuspend.3 \ - XScreenSaverUnregister.3 \ - XScreenSaverUnsetAttributes.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXScrnSaver/pkg-plist b/x11/libXScrnSaver/pkg-plist index 505b19dd1d2b..01aed8749352 100644 --- a/x11/libXScrnSaver/pkg-plist +++ b/x11/libXScrnSaver/pkg-plist @@ -4,4 +4,16 @@ lib/libXss.so lib/libXss.la lib/libXss.a libdata/pkgconfig/xscrnsaver.pc +man/man3/Xss.3.gz +man/man3/XScreenSaverAllocInfo.3.gz +man/man3/XScreenSaverGetRegistered.3.gz +man/man3/XScreenSaverQueryExtension.3.gz +man/man3/XScreenSaverQueryInfo.3.gz +man/man3/XScreenSaverQueryVersion.3.gz +man/man3/XScreenSaverRegister.3.gz +man/man3/XScreenSaverSelectInput.3.gz +man/man3/XScreenSaverSetAttributes.3.gz +man/man3/XScreenSaverSuspend.3.gz +man/man3/XScreenSaverUnregister.3.gz +man/man3/XScreenSaverUnsetAttributes.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile index 3f946745b959..5192edac2d8d 100644 --- a/x11/libXTrap/Makefile +++ b/x11/libXTrap/Makefile @@ -10,4 +10,5 @@ COMMENT= The XTrap library XORG_CAT= lib USE_XORG= trapproto:both x11 xext xextproto xt USE_AUTOTOOLS= libtool + .include <bsd.port.mk> diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile index 4ee84d1b6248..457813397706 100644 --- a/x11/libXau/Makefile +++ b/x11/libXau/Makefile @@ -11,12 +11,7 @@ COMMENT= Authentication Protocol library for X11 XORG_CAT= lib USE_XORG= xproto:both -MAN3= Xau.3 XauDisposeAuth.3 XauFileName.3 XauGetAuthByAddr.3 \ - XauGetBestAuthByAddr.3 XauLockAuth.3 XauReadAuth.3 \ - XauUnlockAuth.3 XauWriteAuth.3 - -NO_STAGE= yes post-install: - ${LN} -sf ${PREFIX}/lib/libXau.so.6 ${PREFIX}/lib/libXau.so.0 + ${LN} -sf ${PREFIX}/lib/libXau.so.6 ${STAGEDIR}${PREFIX}/lib/libXau.so.0 .include <bsd.port.mk> diff --git a/x11/libXau/pkg-plist b/x11/libXau/pkg-plist index f46f0a86cf15..38e98d07ebc2 100644 --- a/x11/libXau/pkg-plist +++ b/x11/libXau/pkg-plist @@ -5,3 +5,12 @@ lib/libXau.so lib/libXau.so.0 lib/libXau.so.6 libdata/pkgconfig/xau.pc +man/man3/Xau.3.gz +man/man3/XauDisposeAuth.3.gz +man/man3/XauFileName.3.gz +man/man3/XauGetAuthByAddr.3.gz +man/man3/XauGetBestAuthByAddr.3.gz +man/man3/XauLockAuth.3.gz +man/man3/XauReadAuth.3.gz +man/man3/XauUnlockAuth.3.gz +man/man3/XauWriteAuth.3.gz diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile index 04477a50275a..932a189b2531 100644 --- a/x11/libXcomposite/Makefile +++ b/x11/libXcomposite/Makefile @@ -11,18 +11,5 @@ COMMENT= X Composite extension library XORG_CAT= lib USE_XORG= compositeproto:both x11 xfixes xext fixesproto xproto:both -MAN3= Xcomposite.3 \ - XCompositeQueryExtension.3 \ - XCompositeQueryVersion.3 \ - XCompositeVersion.3 \ - XCompositeRedirectWindow.3 \ - XCompositeRedirectSubwindows.3 \ - XCompositeUnredirectWindow.3 \ - XCompositeUnredirectSubwindows.3 \ - XCompositeCreateRegionFromBorderClip.3 \ - XCompositeNameWindowPixmap.3 \ - XCompositeGetOverlayWindow.3 \ - XCompositeReleaseOverlayWindow.3 -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXcomposite/pkg-plist b/x11/libXcomposite/pkg-plist index af59654c5698..42f12278c58a 100644 --- a/x11/libXcomposite/pkg-plist +++ b/x11/libXcomposite/pkg-plist @@ -4,4 +4,16 @@ lib/libXcomposite.la lib/libXcomposite.so lib/libXcomposite.so.1 libdata/pkgconfig/xcomposite.pc +man/man3/Xcomposite.3.gz +man/man3/XCompositeQueryExtension.3.gz +man/man3/XCompositeQueryVersion.3.gz +man/man3/XCompositeVersion.3.gz +man/man3/XCompositeRedirectWindow.3.gz +man/man3/XCompositeRedirectSubwindows.3.gz +man/man3/XCompositeUnredirectWindow.3.gz +man/man3/XCompositeUnredirectSubwindows.3.gz +man/man3/XCompositeCreateRegionFromBorderClip.3.gz +man/man3/XCompositeNameWindowPixmap.3.gz +man/man3/XCompositeGetOverlayWindow.3.gz +man/man3/XCompositeReleaseOverlayWindow.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile index f4ef75c7782c..7d4c122d42d0 100644 --- a/x11/libXcursor/Makefile +++ b/x11/libXcursor/Makefile @@ -16,38 +16,4 @@ USE_XORG= xrender x11 xfixes fixesproto xproto:both \ CONFIGURE_ARGS= --with-icondir=${PREFIX}/lib/X11/icons -MAN3= Xcursor.3 \ - XcursorImageCreate.3 \ - XcursorImageDestroy.3 \ - XcursorImagesCreate.3 \ - XcursorImagesDestroy.3 \ - XcursorCursorsCreate.3 \ - XcursorCursorsDestroy.3 \ - XcursorXcFileLoadImage.3 \ - XcursorXcFileLoadImages.3 \ - XcursorXcFileLoadAllImages.3 \ - XcursorXcFileLoad.3 \ - XcursorXcFileSave.3 \ - XcursorFilenameLoadImage.3 \ - XcursorFilenameLoadImages.3 \ - XcursorFilenameLoadAllImages.3 \ - XcursorFilenameLoad.3 \ - XcursorFilenameSaveImages.3 \ - XcursorFilenameSave.3 \ - XcursorLibraryLoadImage.3 \ - XcursorLibraryLoadImages.3 \ - XcursorFilenameLoadCursor.3 \ - XcursorLibraryLoadCursor.3 \ - XcursorLibraryLoadCursors.3 \ - XcursorShapeLoadImage.3 \ - XcursorShapeLoadImages.3 \ - XcursorShapeLoadCursor.3 \ - XcursorShapeLoadCursors.3 \ - XcursorSupportsARGB.3 \ - XcursorSetDefaultSize.3 \ - XcursorGetDefaultSize.3 \ - XcursorSetTheme.3 \ - XcursorGetTheme.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXcursor/pkg-plist b/x11/libXcursor/pkg-plist index 0a6c4807af0b..786b7aa4c618 100644 --- a/x11/libXcursor/pkg-plist +++ b/x11/libXcursor/pkg-plist @@ -4,4 +4,36 @@ lib/libXcursor.la lib/libXcursor.so lib/libXcursor.so.1 libdata/pkgconfig/xcursor.pc +man/man3/Xcursor.3.gz +man/man3/XcursorImageCreate.3.gz +man/man3/XcursorImageDestroy.3.gz +man/man3/XcursorImagesCreate.3.gz +man/man3/XcursorImagesDestroy.3.gz +man/man3/XcursorCursorsCreate.3.gz +man/man3/XcursorCursorsDestroy.3.gz +man/man3/XcursorXcFileLoadImage.3.gz +man/man3/XcursorXcFileLoadImages.3.gz +man/man3/XcursorXcFileLoadAllImages.3.gz +man/man3/XcursorXcFileLoad.3.gz +man/man3/XcursorXcFileSave.3.gz +man/man3/XcursorFilenameLoadImage.3.gz +man/man3/XcursorFilenameLoadImages.3.gz +man/man3/XcursorFilenameLoadAllImages.3.gz +man/man3/XcursorFilenameLoad.3.gz +man/man3/XcursorFilenameSaveImages.3.gz +man/man3/XcursorFilenameSave.3.gz +man/man3/XcursorLibraryLoadImage.3.gz +man/man3/XcursorLibraryLoadImages.3.gz +man/man3/XcursorFilenameLoadCursor.3.gz +man/man3/XcursorLibraryLoadCursor.3.gz +man/man3/XcursorLibraryLoadCursors.3.gz +man/man3/XcursorShapeLoadImage.3.gz +man/man3/XcursorShapeLoadImages.3.gz +man/man3/XcursorShapeLoadCursor.3.gz +man/man3/XcursorShapeLoadCursors.3.gz +man/man3/XcursorSupportsARGB.3.gz +man/man3/XcursorSetDefaultSize.3.gz +man/man3/XcursorGetDefaultSize.3.gz +man/man3/XcursorSetTheme.3.gz +man/man3/XcursorGetTheme.3.gz @dirrm include/X11/Xcursor diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile index a3de750f061a..0f23abbea8de 100644 --- a/x11/libXdamage/Makefile +++ b/x11/libXdamage/Makefile @@ -10,4 +10,5 @@ COMMENT= X Damage extension library XORG_CAT= lib USE_XORG= x11 damageproto:both xfixes fixesproto xextproto xproto:both + .include <bsd.port.mk> diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile index ee8b0fc7714b..36c324553b0e 100644 --- a/x11/libXevie/Makefile +++ b/x11/libXevie/Makefile @@ -12,12 +12,4 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= evieproto x11 xext xextproto xproto:both -MAN3= Xevie.3 \ - XevieEnd.3 \ - XevieQueryVersion.3 \ - XevieSelectInput.3 \ - XevieSendEvent.3 \ - XevieStart.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXevie/pkg-plist b/x11/libXevie/pkg-plist index 7bea8757d158..ca7920ee0c83 100644 --- a/x11/libXevie/pkg-plist +++ b/x11/libXevie/pkg-plist @@ -4,3 +4,9 @@ lib/libXevie.so lib/libXevie.la lib/libXevie.a libdata/pkgconfig/xevie.pc +man/man3/Xevie.3.gz +man/man3/XevieEnd.3.gz +man/man3/XevieQueryVersion.3.gz +man/man3/XevieSelectInput.3.gz +man/man3/XevieSendEvent.3.gz +man/man3/XevieStart.3.gz diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile index 8a7b8cb31341..48ec2feff1e0 100644 --- a/x11/libXext/Makefile +++ b/x11/libXext/Makefile @@ -15,67 +15,4 @@ XORG_CAT= lib USE_XORG= xproto x11 xextproto:both xau CONFIGURE_ARGS+=--disable-specs --without-xmlto -MAN3= DBE.3 \ - DPMSCapable.3 \ - DPMSDisable.3 \ - DPMSEnable.3 \ - DPMSForceLevel.3 \ - DPMSGetTimeouts.3 \ - DPMSGetVersion.3 \ - DPMSInfo.3 \ - DPMSQueryExtension.3 \ - DPMSSetTimeouts.3 \ - XShape.3 \ - XShapeCombineMask.3 \ - XShapeCombineRectangles.3 \ - XShapeCombineRegion.3 \ - XShapeCombineShape.3 \ - XShapeGetRectangles.3 \ - XShapeInputSelected.3 \ - XShapeOffsetShape.3 \ - XShapeQueryExtension.3 \ - XShapeQueryExtents.3 \ - XShapeQueryVersion.3 \ - XShapeSelectInput.3 \ - XcupGetReservedColormapEntries.3 \ - XcupQueryVersion.3 \ - XcupStoreColors.3 \ - XdbeAllocateBackBufferName.3 \ - XdbeBeginIdiom.3 \ - XdbeDeallocateBackBufferName.3 \ - XdbeEndIdiom.3 \ - XdbeFreeVisualInfo.3 \ - XdbeGetBackBufferAttributes.3 \ - XdbeGetVisualInfo.3 \ - XdbeQueryExtension.3 \ - XdbeSwapBuffers.3 \ - Xevi.3 \ - XeviGetVisualInfo.3 \ - XeviQueryExtension.3 \ - XeviQueryVersion.3 \ - Xmbuf.3 \ - XmbufChangeBufferAttributes.3 \ - XmbufChangeWindowAttributes.3 \ - XmbufCreateBuffers.3 \ - XmbufCreateStereoWindow.3 \ - XmbufDestroyBuffers.3 \ - XmbufDisplayBuffers.3 \ - XmbufGetBufferAttributes.3 \ - XmbufGetScreenInfo.3 \ - XmbufGetVersion.3 \ - XmbufGetWindowAttributes.3 \ - XmbufQueryExtension.3 \ - XShm.3 \ - XShmAttach.3 \ - XShmCreateImage.3 \ - XShmCreatePixmap.3 \ - XShmDetach.3 \ - XShmGetEventBase.3 \ - XShmGetImage.3 \ - XShmPixmapFormat.3 \ - XShmPutImage.3 \ - XShmQueryExtension.3 \ - XShmQueryVersion.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXext/pkg-plist b/x11/libXext/pkg-plist index 61c829c6eddb..023b27aa5d95 100644 --- a/x11/libXext/pkg-plist +++ b/x11/libXext/pkg-plist @@ -19,4 +19,65 @@ include/X11/extensions/shape.h include/X11/extensions/sync.h include/X11/extensions/xtestext1.h libdata/pkgconfig/xext.pc +man/man3/DBE.3.gz +man/man3/DPMSCapable.3.gz +man/man3/DPMSDisable.3.gz +man/man3/DPMSEnable.3.gz +man/man3/DPMSForceLevel.3.gz +man/man3/DPMSGetTimeouts.3.gz +man/man3/DPMSGetVersion.3.gz +man/man3/DPMSInfo.3.gz +man/man3/DPMSQueryExtension.3.gz +man/man3/DPMSSetTimeouts.3.gz +man/man3/XShape.3.gz +man/man3/XShapeCombineMask.3.gz +man/man3/XShapeCombineRectangles.3.gz +man/man3/XShapeCombineRegion.3.gz +man/man3/XShapeCombineShape.3.gz +man/man3/XShapeGetRectangles.3.gz +man/man3/XShapeInputSelected.3.gz +man/man3/XShapeOffsetShape.3.gz +man/man3/XShapeQueryExtension.3.gz +man/man3/XShapeQueryExtents.3.gz +man/man3/XShapeQueryVersion.3.gz +man/man3/XShapeSelectInput.3.gz +man/man3/XcupGetReservedColormapEntries.3.gz +man/man3/XcupQueryVersion.3.gz +man/man3/XcupStoreColors.3.gz +man/man3/XdbeAllocateBackBufferName.3.gz +man/man3/XdbeBeginIdiom.3.gz +man/man3/XdbeDeallocateBackBufferName.3.gz +man/man3/XdbeEndIdiom.3.gz +man/man3/XdbeFreeVisualInfo.3.gz +man/man3/XdbeGetBackBufferAttributes.3.gz +man/man3/XdbeGetVisualInfo.3.gz +man/man3/XdbeQueryExtension.3.gz +man/man3/XdbeSwapBuffers.3.gz +man/man3/Xevi.3.gz +man/man3/XeviGetVisualInfo.3.gz +man/man3/XeviQueryExtension.3.gz +man/man3/XeviQueryVersion.3.gz +man/man3/Xmbuf.3.gz +man/man3/XmbufChangeBufferAttributes.3.gz +man/man3/XmbufChangeWindowAttributes.3.gz +man/man3/XmbufCreateBuffers.3.gz +man/man3/XmbufCreateStereoWindow.3.gz +man/man3/XmbufDestroyBuffers.3.gz +man/man3/XmbufDisplayBuffers.3.gz +man/man3/XmbufGetBufferAttributes.3.gz +man/man3/XmbufGetScreenInfo.3.gz +man/man3/XmbufGetVersion.3.gz +man/man3/XmbufGetWindowAttributes.3.gz +man/man3/XmbufQueryExtension.3.gz +man/man3/XShm.3.gz +man/man3/XShmAttach.3.gz +man/man3/XShmCreateImage.3.gz +man/man3/XShmCreatePixmap.3.gz +man/man3/XShmDetach.3.gz +man/man3/XShmGetEventBase.3.gz +man/man3/XShmGetImage.3.gz +man/man3/XShmPixmapFormat.3.gz +man/man3/XShmPutImage.3.gz +man/man3/XShmQueryExtension.3.gz +man/man3/XShmQueryVersion.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile index b0b5c9b5f12e..a2df62bb1310 100644 --- a/x11/libXfixes/Makefile +++ b/x11/libXfixes/Makefile @@ -13,7 +13,4 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= x11 fixesproto:both xproto:both xextproto -MAN3= Xfixes.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXfixes/pkg-plist b/x11/libXfixes/pkg-plist index f8e8b57a030d..43f539b2f033 100644 --- a/x11/libXfixes/pkg-plist +++ b/x11/libXfixes/pkg-plist @@ -4,3 +4,4 @@ lib/libXfixes.la lib/libXfixes.so lib/libXfixes.so.3 libdata/pkgconfig/xfixes.pc +man/man3/Xfixes.3.gz diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile index ecbfd003fc61..d83f968496a0 100644 --- a/x11/libXi/Makefile +++ b/x11/libXi/Makefile @@ -21,79 +21,4 @@ CONFIGURE_ARGS+=--disable-docs \ --without-asciidoc \ --without-xsltproc -MAN3= XAllowDeviceEvents.3 \ - XChangeDeviceControl.3 \ - XChangeDeviceDontPropagateList.3 \ - XChangeDeviceKeyMapping.3 \ - XChangeDeviceProperty.3 \ - XChangeFeedbackControl.3 \ - XChangeKeyboardDevice.3\ - XChangePointerDevice.3\ - XCloseDevice.3\ - XDeleteDeviceProperty.3\ - XDeviceBell.3\ - XDeviceTimeCoord.3\ - XFreeDeviceList.3\ - XGetDeviceButtonMapping.3\ - XGetDeviceControl.3\ - XGetDeviceDontPropagateList.3\ - XGetDeviceFocus.3\ - XGetDeviceKeyMapping.3 \ - XGetDeviceModifierMapping.3\ - XGetDeviceMotionEvents.3\ - XGetDeviceProperty.3\ - XGetExtensionVersion.3\ - XGetFeedbackControl.3\ - XGetSelectedExtensionEvents.3\ - XGrabDevice.3\ - XGrabDeviceButton.3\ - XGrabDeviceKey.3\ - XIBarrierReleasePointer.3\ - XIBarrierReleasePointers.3\ - XIChangeHierarchy.3\ - XIChangeProperty.3\ - XIDefineCursor.3\ - XIDeleteProperty.3\ - XIFreeDeviceInfo.3\ - XIGetClientPointer.3\ - XIGetFocus.3\ - XIGetProperty.3\ - XIGetSelectedEvents.3\ - XIGrabButton.3 \ - XIGrabDevice.3\ - XIGrabEnter.3\ - XIGrabFocusIn.3\ - XIGrabKeycode.3\ - XIGrabTouchBegin.3 \ - XIListProperties.3\ - XIQueryDevice.3\ - XIQueryPointer.3\ - XIQueryVersion.3\ - XISelectEvents.3\ - XISetClientPointer.3\ - XISetFocus.3\ - XIUndefineCursor.3\ - XIUngrabButton.3\ - XIUngrabDevice.3 \ - XIUngrabEnter.3 \ - XIUngrabFocusIn.3 \ - XIUngrabKeycode.3 \ - XIUngrabTouchBegin.3 \ - XIWarpPointer.3 \ - XListDeviceProperties.3 \ - XListInputDevices.3 \ - XOpenDevice.3 \ - XQueryDeviceState.3 \ - XSelectExtensionEvent.3\ - XSendExtensionEvent.3\ - XSetDeviceButtonMapping.3\ - XSetDeviceFocus.3\ - XSetDeviceMode.3\ - XSetDeviceModifierMapping.3 \ - XSetDeviceValuators.3 \ - XUngrabDevice.3 \ - XUngrabDeviceButton.3 \ - XUngrabDeviceKey.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXi/pkg-plist b/x11/libXi/pkg-plist index 0f704e228faf..51bbd1da2e49 100644 --- a/x11/libXi/pkg-plist +++ b/x11/libXi/pkg-plist @@ -5,4 +5,77 @@ lib/libXi.la lib/libXi.so lib/libXi.so.6 libdata/pkgconfig/xi.pc +man/man3/XAllowDeviceEvents.3.gz +man/man3/XChangeDeviceControl.3.gz +man/man3/XChangeDeviceDontPropagateList.3.gz +man/man3/XChangeDeviceKeyMapping.3.gz +man/man3/XChangeDeviceProperty.3.gz +man/man3/XChangeFeedbackControl.3.gz +man/man3/XChangeKeyboardDevice.3.gz +man/man3/XChangePointerDevice.3.gz +man/man3/XCloseDevice.3.gz +man/man3/XDeleteDeviceProperty.3.gz +man/man3/XDeviceBell.3.gz +man/man3/XDeviceTimeCoord.3.gz +man/man3/XFreeDeviceList.3.gz +man/man3/XGetDeviceButtonMapping.3.gz +man/man3/XGetDeviceControl.3.gz +man/man3/XGetDeviceDontPropagateList.3.gz +man/man3/XGetDeviceFocus.3.gz +man/man3/XGetDeviceKeyMapping.3.gz +man/man3/XGetDeviceModifierMapping.3.gz +man/man3/XGetDeviceMotionEvents.3.gz +man/man3/XGetDeviceProperty.3.gz +man/man3/XGetExtensionVersion.3.gz +man/man3/XGetFeedbackControl.3.gz +man/man3/XGetSelectedExtensionEvents.3.gz +man/man3/XGrabDevice.3.gz +man/man3/XGrabDeviceButton.3.gz +man/man3/XGrabDeviceKey.3.gz +man/man3/XIBarrierReleasePointer.3.gz +man/man3/XIBarrierReleasePointers.3.gz +man/man3/XIChangeHierarchy.3.gz +man/man3/XIChangeProperty.3.gz +man/man3/XIDefineCursor.3.gz +man/man3/XIDeleteProperty.3.gz +man/man3/XIFreeDeviceInfo.3.gz +man/man3/XIGetClientPointer.3.gz +man/man3/XIGetFocus.3.gz +man/man3/XIGetProperty.3.gz +man/man3/XIGetSelectedEvents.3.gz +man/man3/XIGrabButton.3.gz +man/man3/XIGrabDevice.3.gz +man/man3/XIGrabEnter.3.gz +man/man3/XIGrabFocusIn.3.gz +man/man3/XIGrabKeycode.3.gz +man/man3/XIGrabTouchBegin.3.gz +man/man3/XIListProperties.3.gz +man/man3/XIQueryDevice.3.gz +man/man3/XIQueryPointer.3.gz +man/man3/XIQueryVersion.3.gz +man/man3/XISelectEvents.3.gz +man/man3/XISetClientPointer.3.gz +man/man3/XISetFocus.3.gz +man/man3/XIUndefineCursor.3.gz +man/man3/XIUngrabButton.3.gz +man/man3/XIUngrabDevice.3.gz +man/man3/XIUngrabEnter.3.gz +man/man3/XIUngrabFocusIn.3.gz +man/man3/XIUngrabKeycode.3.gz +man/man3/XIUngrabTouchBegin.3.gz +man/man3/XIWarpPointer.3.gz +man/man3/XListDeviceProperties.3.gz +man/man3/XListInputDevices.3.gz +man/man3/XOpenDevice.3.gz +man/man3/XQueryDeviceState.3.gz +man/man3/XSelectExtensionEvent.3.gz +man/man3/XSendExtensionEvent.3.gz +man/man3/XSetDeviceButtonMapping.3.gz +man/man3/XSetDeviceFocus.3.gz +man/man3/XSetDeviceMode.3.gz +man/man3/XSetDeviceModifierMapping.3.gz +man/man3/XSetDeviceValuators.3.gz +man/man3/XUngrabDevice.3.gz +man/man3/XUngrabDeviceButton.3.gz +man/man3/XUngrabDeviceKey.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index 2acc3be4735e..e17c983a0fac 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -15,11 +15,4 @@ XORG_CAT= lib USE_XORG= x11 xext xextproto xineramaproto:both USE_AUTOTOOLS= libtool -MAN3= Xinerama.3 \ - XineramaQueryExtension.3 \ - XineramaQueryVersion.3 \ - XineramaIsActive.3 \ - XineramaQueryScreens.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXinerama/pkg-plist b/x11/libXinerama/pkg-plist index ff8b840ac2d8..5e7b01258d38 100644 --- a/x11/libXinerama/pkg-plist +++ b/x11/libXinerama/pkg-plist @@ -5,4 +5,9 @@ lib/libXinerama.la lib/libXinerama.so lib/libXinerama.so.1 libdata/pkgconfig/xinerama.pc +man/man3/Xinerama.3.gz +man/man3/XineramaQueryExtension.3.gz +man/man3/XineramaQueryVersion.3.gz +man/man3/XineramaIsActive.3.gz +man/man3/XineramaQueryScreens.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile index 5ec2b371cd37..21e92caa49ab 100644 --- a/x11/libXp/Makefile +++ b/x11/libXp/Makefile @@ -15,40 +15,4 @@ XORG_CAT= lib USE_XORG= x11 xext xextproto xau printproto:both USE_AUTOTOOLS= libtool -MAN3= XpCancelDoc.3 \ - XpCancelJob.3 \ - XpCancelPage.3 \ - XpCreateContext.3 \ - XpDestroyContext.3 \ - XpEndDoc.3 \ - XpEndJob.3 \ - XpEndPage.3 \ - XpFreePrinterList.3 \ - XpGetAttributes.3 \ - XpGetContext.3 \ - XpGetDocumentData.3 \ - XpGetImageResolution.3 \ - XpGetLocaleHinter.3 \ - XpGetOneAttribute.3 \ - XpGetPageDimensions.3 \ - XpGetPdmStartParams.3 \ - XpGetPrinterList.3 \ - XpGetScreenOfContext.3 \ - XpInputSelected.3 \ - XpPutDocumentData.3 \ - XpQueryExtension.3 \ - XpQueryScreens.3 \ - XpQueryVersion.3 \ - XpRehashPrinterList.3 \ - XpSelectInput.3 \ - XpSetAttributes.3 \ - XpSetContext.3 \ - XpSetImageResolution.3 \ - XpSetLocaleHinter.3 \ - XpStartDoc.3 \ - XpStartJob.3 \ - XpStartPage.3 \ - libXp.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXp/pkg-plist b/x11/libXp/pkg-plist index ba86a7f4b48a..0c120ff02f46 100644 --- a/x11/libXp/pkg-plist +++ b/x11/libXp/pkg-plist @@ -3,3 +3,37 @@ lib/libXp.la lib/libXp.so lib/libXp.so.6 libdata/pkgconfig/xp.pc +man/man3/XpCancelDoc.3.gz +man/man3/XpCancelJob.3.gz +man/man3/XpCancelPage.3.gz +man/man3/XpCreateContext.3.gz +man/man3/XpDestroyContext.3.gz +man/man3/XpEndDoc.3.gz +man/man3/XpEndJob.3.gz +man/man3/XpEndPage.3.gz +man/man3/XpFreePrinterList.3.gz +man/man3/XpGetAttributes.3.gz +man/man3/XpGetContext.3.gz +man/man3/XpGetDocumentData.3.gz +man/man3/XpGetImageResolution.3.gz +man/man3/XpGetLocaleHinter.3.gz +man/man3/XpGetOneAttribute.3.gz +man/man3/XpGetPageDimensions.3.gz +man/man3/XpGetPdmStartParams.3.gz +man/man3/XpGetPrinterList.3.gz +man/man3/XpGetScreenOfContext.3.gz +man/man3/XpInputSelected.3.gz +man/man3/XpPutDocumentData.3.gz +man/man3/XpQueryExtension.3.gz +man/man3/XpQueryScreens.3.gz +man/man3/XpQueryVersion.3.gz +man/man3/XpRehashPrinterList.3.gz +man/man3/XpSelectInput.3.gz +man/man3/XpSetAttributes.3.gz +man/man3/XpSetContext.3.gz +man/man3/XpSetImageResolution.3.gz +man/man3/XpSetLocaleHinter.3.gz +man/man3/XpStartDoc.3.gz +man/man3/XpStartJob.3.gz +man/man3/XpStartPage.3.gz +man/man3/libXp.3.gz diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile index 28e9d78b5da5..13ca108b9861 100644 --- a/x11/libXpm/Makefile +++ b/x11/libXpm/Makefile @@ -13,7 +13,4 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= xproto x11 xext xextproto xt -MAN1= cxpm.1 sxpm.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXpm/pkg-plist b/x11/libXpm/pkg-plist index 57c946914dce..aa4d1743fa36 100644 --- a/x11/libXpm/pkg-plist +++ b/x11/libXpm/pkg-plist @@ -6,3 +6,5 @@ lib/libXpm.la lib/libXpm.so lib/libXpm.so.4 libdata/pkgconfig/xpm.pc +man/man1/cxpm.1.gz +man/man1/sxpm.1.gz diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index 715bf5f5b740..4dee0f8ec9f0 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -13,21 +13,4 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both -MAN3= Xrandr.3 \ - XRRConfigCurrentConfiguration.3 \ - XRRConfigCurrentRate.3 \ - XRRConfigRates.3 \ - XRRConfigRotations.3 \ - XRRConfigSizes.3 \ - XRRConfigTimes.3 \ - XRRFreeScreenConfigInfo.3 \ - XRRGetScreenInfo.3 \ - XRRQueryExtension.3 \ - XRRQueryVersion.3 \ - XRRRootToScreen.3 \ - XRRSelectInput.3 \ - XRRSetScreenConfig.3 \ - XRRSetScreenConfigAndRate.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXrandr/pkg-plist b/x11/libXrandr/pkg-plist index 1b0f1f3393e5..cd6f3dfa8fa7 100644 --- a/x11/libXrandr/pkg-plist +++ b/x11/libXrandr/pkg-plist @@ -4,3 +4,18 @@ lib/libXrandr.la lib/libXrandr.so lib/libXrandr.so.2 libdata/pkgconfig/xrandr.pc +man/man3/Xrandr.3.gz +man/man3/XRRConfigCurrentConfiguration.3.gz +man/man3/XRRConfigCurrentRate.3.gz +man/man3/XRRConfigRates.3.gz +man/man3/XRRConfigRotations.3.gz +man/man3/XRRConfigSizes.3.gz +man/man3/XRRConfigTimes.3.gz +man/man3/XRRFreeScreenConfigInfo.3.gz +man/man3/XRRGetScreenInfo.3.gz +man/man3/XRRQueryExtension.3.gz +man/man3/XRRQueryVersion.3.gz +man/man3/XRRRootToScreen.3.gz +man/man3/XRRSelectInput.3.gz +man/man3/XRRSetScreenConfig.3.gz +man/man3/XRRSetScreenConfigAndRate.3.gz diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index 2440704431e0..3866a0f87db5 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -12,4 +12,5 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= x11 renderproto:both xproto:both + .include <bsd.port.mk> diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile index 38420c52fb8c..96f8f088b124 100644 --- a/x11/libXres/Makefile +++ b/x11/libXres/Makefile @@ -13,12 +13,4 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= x11 xext xextproto resourceproto xproto:both -MAN3= XRes.3 \ - XResQueryClients.3 \ - XResQueryClientPixmapBytes.3 \ - XResQueryClientResources.3 \ - XResQueryExtension.3 \ - XResQueryVersion.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXres/pkg-plist b/x11/libXres/pkg-plist index ea8918ab97c5..1a5b78065af3 100644 --- a/x11/libXres/pkg-plist +++ b/x11/libXres/pkg-plist @@ -4,3 +4,9 @@ lib/libXRes.la lib/libXRes.so lib/libXRes.so.1 libdata/pkgconfig/xres.pc +man/man3/XRes.3.gz +man/man3/XResQueryClients.3.gz +man/man3/XResQueryClientPixmapBytes.3.gz +man/man3/XResQueryClientResources.3.gz +man/man3/XResQueryExtension.3.gz +man/man3/XResQueryVersion.3.gz diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile index 7ed7bf95f64c..c3c1cadf5de6 100644 --- a/x11/libXtst/Makefile +++ b/x11/libXtst/Makefile @@ -17,19 +17,6 @@ USE_AUTOTOOLS= libtool CONFIGURE_ARGS+=--disable-specs --without-xmlto -MAN3= XTestCompareCurrentCursorWithWindow.3 \ - XTestCompareCursorWithWindow.3 \ - XTestDiscard.3 \ - XTestFakeButtonEvent.3 \ - XTestFakeKeyEvent.3 \ - XTestFakeMotionEvent.3 \ - XTestFakeRelativeMotionEvent.3 \ - XTestGrabControl.3 \ - XTestQueryExtension.3 \ - XTestSetGContextOfGC.3 \ - XTestSetVisualIDOfVisual.3 - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ \ s/specs//' ${WRKSRC}/Makefile.in diff --git a/x11/libXtst/pkg-plist b/x11/libXtst/pkg-plist index 26d878824249..e6ad93863a1f 100644 --- a/x11/libXtst/pkg-plist +++ b/x11/libXtst/pkg-plist @@ -5,4 +5,15 @@ lib/libXtst.la lib/libXtst.so lib/libXtst.so.6 libdata/pkgconfig/xtst.pc +man/man3/XTestCompareCurrentCursorWithWindow.3.gz +man/man3/XTestCompareCursorWithWindow.3.gz +man/man3/XTestDiscard.3.gz +man/man3/XTestFakeButtonEvent.3.gz +man/man3/XTestFakeKeyEvent.3.gz +man/man3/XTestFakeMotionEvent.3.gz +man/man3/XTestFakeRelativeMotionEvent.3.gz +man/man3/XTestGrabControl.3.gz +man/man3/XTestQueryExtension.3.gz +man/man3/XTestSetGContextOfGC.3.gz +man/man3/XTestSetVisualIDOfVisual.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index f1784fdd126a..2c21649f3dbe 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -14,32 +14,4 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= x11 xext xextproto videoproto:both xproto:both -MAN3= Xv.3 \ - XvFreeAdaptorInfo.3 \ - XvFreeEncodingInfo.3 \ - XvCreateImage.3 \ - XvGetPortAttribute.3 \ - XvGetStill.3 \ - XvGetVideo.3 \ - XvGrabPort.3 \ - XvListImageFormats.3 \ - XvPutImage.3 \ - XvPortNotify.3 \ - XvPutStill.3 \ - XvPutVideo.3 \ - XvQueryAdaptors.3 \ - XvQueryBestSize.3 \ - XvQueryEncodings.3 \ - XvQueryExtension.3 \ - XvQueryPortAttributes.3 \ - XvSelectPortNotify.3 \ - XvSelectVideoNotify.3 \ - XvSetPortAttribute.3 \ - XvShmCreateImage.3 \ - XvShmPutImage.3 \ - XvStopVideo.3 \ - XvUngrabPort.3 \ - XvVideoNotify.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXv/pkg-plist b/x11/libXv/pkg-plist index 6fb5643302a0..9465ee2fe1e0 100644 --- a/x11/libXv/pkg-plist +++ b/x11/libXv/pkg-plist @@ -4,4 +4,30 @@ lib/libXv.la lib/libXv.so lib/libXv.so.1 libdata/pkgconfig/xv.pc +man/man3/Xv.3.gz +man/man3/XvFreeAdaptorInfo.3.gz +man/man3/XvFreeEncodingInfo.3.gz +man/man3/XvCreateImage.3.gz +man/man3/XvGetPortAttribute.3.gz +man/man3/XvGetStill.3.gz +man/man3/XvGetVideo.3.gz +man/man3/XvGrabPort.3.gz +man/man3/XvListImageFormats.3.gz +man/man3/XvPutImage.3.gz +man/man3/XvPortNotify.3.gz +man/man3/XvPutStill.3.gz +man/man3/XvPutVideo.3.gz +man/man3/XvQueryAdaptors.3.gz +man/man3/XvQueryBestSize.3.gz +man/man3/XvQueryEncodings.3.gz +man/man3/XvQueryExtension.3.gz +man/man3/XvQueryPortAttributes.3.gz +man/man3/XvSelectPortNotify.3.gz +man/man3/XvSelectVideoNotify.3.gz +man/man3/XvSetPortAttribute.3.gz +man/man3/XvShmCreateImage.3.gz +man/man3/XvShmPutImage.3.gz +man/man3/XvStopVideo.3.gz +man/man3/XvUngrabPort.3.gz +man/man3/XvVideoNotify.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile index f4552ff02c02..d370e052f94e 100644 --- a/x11/libXvMC/Makefile +++ b/x11/libXvMC/Makefile @@ -10,4 +10,5 @@ COMMENT= X Video Extension Motion Compensation library XORG_CAT= lib USE_XORG= x11 xext xv xextproto videoproto:both xproto:both + .include <bsd.port.mk> diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile index 4005033f090b..f46f39662d34 100644 --- a/x11/libXxf86dga/Makefile +++ b/x11/libXxf86dga/Makefile @@ -13,27 +13,4 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= xproto x11 xextproto xext xf86dgaproto:both -MAN3= XDGA.3 \ - XDGAOpenFramebuffer.3 \ - XDGAChangePixmapMode.3 \ - XDGAQueryExtension.3 \ - XDGACloseFramebuffer.3 \ - XDGAQueryModes.3 \ - XDGACopyArea.3 \ - XDGAQueryVersion.3 \ - XDGACopyTransparentArea.3 \ - XDGASelectInput.3 \ - XDGACreateColormap.3 \ - XDGASetClientVersion.3 \ - XDGAFillRectangle.3 \ - XDGASetMode.3 \ - XDGAGetViewportStatus.3 \ - XDGASetViewport.3 \ - XDGAInstallColormap.3 \ - XDGASync.3 \ - XDGAKeyEventToXKeyEvent.3 \ - XF86DGA.3 \ - XFree86-DGA.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXxf86dga/pkg-plist b/x11/libXxf86dga/pkg-plist index 77c173b86ef7..23fb304bb49a 100644 --- a/x11/libXxf86dga/pkg-plist +++ b/x11/libXxf86dga/pkg-plist @@ -5,4 +5,25 @@ lib/libXxf86dga.la lib/libXxf86dga.so lib/libXxf86dga.so.1 libdata/pkgconfig/xxf86dga.pc +man/man3/XDGA.3.gz +man/man3/XDGAOpenFramebuffer.3.gz +man/man3/XDGAChangePixmapMode.3.gz +man/man3/XDGAQueryExtension.3.gz +man/man3/XDGACloseFramebuffer.3.gz +man/man3/XDGAQueryModes.3.gz +man/man3/XDGACopyArea.3.gz +man/man3/XDGAQueryVersion.3.gz +man/man3/XDGACopyTransparentArea.3.gz +man/man3/XDGASelectInput.3.gz +man/man3/XDGACreateColormap.3.gz +man/man3/XDGASetClientVersion.3.gz +man/man3/XDGAFillRectangle.3.gz +man/man3/XDGASetMode.3.gz +man/man3/XDGAGetViewportStatus.3.gz +man/man3/XDGASetViewport.3.gz +man/man3/XDGAInstallColormap.3.gz +man/man3/XDGASync.3.gz +man/man3/XDGAKeyEventToXKeyEvent.3.gz +man/man3/XF86DGA.3.gz +man/man3/XFree86-DGA.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libXxf86misc/Makefile b/x11/libXxf86misc/Makefile index ceccb818cab1..43f39b9c7cc4 100644 --- a/x11/libXxf86misc/Makefile +++ b/x11/libXxf86misc/Makefile @@ -13,15 +13,4 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= xproto x11 xextproto xext xf86miscproto:both -MAN3= XF86Misc.3 \ - XF86MiscGetKbdSettings.3 \ - XF86MiscGetMouseSettings.3 \ - XF86MiscGetSaver.3 \ - XF86MiscQueryExtension.3 \ - XF86MiscQueryVersion.3 \ - XF86MiscSetKbdSettings.3 \ - XF86MiscSetMouseSettings.3 \ - XF86MiscSetSaver.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXxf86misc/pkg-plist b/x11/libXxf86misc/pkg-plist index 55b4a93e17f4..3b8091f49ec7 100644 --- a/x11/libXxf86misc/pkg-plist +++ b/x11/libXxf86misc/pkg-plist @@ -3,4 +3,12 @@ lib/libXxf86misc.la lib/libXxf86misc.so lib/libXxf86misc.so.1 libdata/pkgconfig/xxf86misc.pc -@dirrmtry include/X11/extensions +man/man3/XF86Misc.3.gz +man/man3/XF86MiscGetKbdSettings.3.gz +man/man3/XF86MiscGetMouseSettings.3.gz +man/man3/XF86MiscGetSaver.3.gz +man/man3/XF86MiscQueryExtension.3.gz +man/man3/XF86MiscQueryVersion.3.gz +man/man3/XF86MiscSetKbdSettings.3.gz +man/man3/XF86MiscSetMouseSettings.3.gz +man/man3/XF86MiscSetSaver.3.gz diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile index aec047e973c0..4593ad541d8f 100644 --- a/x11/libXxf86vm/Makefile +++ b/x11/libXxf86vm/Makefile @@ -13,28 +13,4 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= xproto x11 xextproto xext xf86vidmodeproto:both -MAN3= XF86VM.3 \ - XF86VidModeLockModeSwitch.3 \ - XF86VidModeDeleteModeLine.3 \ - XF86VidModeModModeLine.3 \ - XF86VidModeGetAllModeLines.3 \ - XF86VidModeQueryExtension.3 \ - XF86VidModeGetDotClocks.3 \ - XF86VidModeQueryVersion.3 \ - XF86VidModeGetGamma.3 \ - XF86VidModeSetClientVersion.3 \ - XF86VidModeGetGammaRamp.3 \ - XF86VidModeSetGamma.3 \ - XF86VidModeGetGammaRampSize.3 \ - XF86VidModeSetGammaRamp.3 \ - XF86VidModeGetModeLine.3 \ - XF86VidModeSetViewPort.3 \ - XF86VidModeGetMonitor.3 \ - XF86VidModeSwitchMode.3 \ - XF86VidModeGetPermissions.3 \ - XF86VidModeSwitchToMode.3 \ - XF86VidModeGetViewPort.3 \ - XF86VidModeValidateModeLine.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libXxf86vm/pkg-plist b/x11/libXxf86vm/pkg-plist index 17f8d37f31b7..050fb6c9066d 100644 --- a/x11/libXxf86vm/pkg-plist +++ b/x11/libXxf86vm/pkg-plist @@ -4,4 +4,26 @@ lib/libXxf86vm.la lib/libXxf86vm.so lib/libXxf86vm.so.1 libdata/pkgconfig/xxf86vm.pc +man/man3/XF86VM.3.gz +man/man3/XF86VidModeLockModeSwitch.3.gz +man/man3/XF86VidModeDeleteModeLine.3.gz +man/man3/XF86VidModeModModeLine.3.gz +man/man3/XF86VidModeGetAllModeLines.3.gz +man/man3/XF86VidModeQueryExtension.3.gz +man/man3/XF86VidModeGetDotClocks.3.gz +man/man3/XF86VidModeQueryVersion.3.gz +man/man3/XF86VidModeGetGamma.3.gz +man/man3/XF86VidModeSetClientVersion.3.gz +man/man3/XF86VidModeGetGammaRamp.3.gz +man/man3/XF86VidModeSetGamma.3.gz +man/man3/XF86VidModeGetGammaRampSize.3.gz +man/man3/XF86VidModeSetGammaRamp.3.gz +man/man3/XF86VidModeGetModeLine.3.gz +man/man3/XF86VidModeSetViewPort.3.gz +man/man3/XF86VidModeGetMonitor.3.gz +man/man3/XF86VidModeSwitchMode.3.gz +man/man3/XF86VidModeGetPermissions.3.gz +man/man3/XF86VidModeSwitchToMode.3.gz +man/man3/XF86VidModeGetViewPort.3.gz +man/man3/XF86VidModeValidateModeLine.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile index 5ffb20b91cca..2c209dd92580 100644 --- a/x11/libdmx/Makefile +++ b/x11/libdmx/Makefile @@ -11,23 +11,4 @@ COMMENT= DMX extension library XORG_CAT= lib USE_XORG= x11 xext xextproto dmxproto:both -MAN3= DMX.3 \ - DMXAddInput.3 \ - DMXAddScreen.3 \ - DMXChangeDesktopAttributes.3 \ - DMXChangeScreensAttributes.3 \ - DMXForceWindowCreation.3 \ - DMXGetDesktopAttributes.3 \ - DMXGetInputAttributes.3 \ - DMXGetInputCount.3 \ - DMXGetScreenAttributes.3 \ - DMXGetScreenCount.3 \ - DMXGetWindowAttributes.3 \ - DMXQueryExtension.3 \ - DMXQueryVersion.3 \ - DMXRemoveInput.3 \ - DMXRemoveScreen.3 \ - DMXSync.3 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/libdmx/pkg-plist b/x11/libdmx/pkg-plist index 933f89e9c78f..f6cbd3319195 100644 --- a/x11/libdmx/pkg-plist +++ b/x11/libdmx/pkg-plist @@ -4,4 +4,21 @@ lib/libdmx.la lib/libdmx.so lib/libdmx.so.1 libdata/pkgconfig/dmx.pc +man/man3/DMX.3.gz +man/man3/DMXAddInput.3.gz +man/man3/DMXAddScreen.3.gz +man/man3/DMXChangeDesktopAttributes.3.gz +man/man3/DMXChangeScreensAttributes.3.gz +man/man3/DMXForceWindowCreation.3.gz +man/man3/DMXGetDesktopAttributes.3.gz +man/man3/DMXGetInputAttributes.3.gz +man/man3/DMXGetInputCount.3.gz +man/man3/DMXGetScreenAttributes.3.gz +man/man3/DMXGetScreenCount.3.gz +man/man3/DMXGetWindowAttributes.3.gz +man/man3/DMXQueryExtension.3.gz +man/man3/DMXQueryVersion.3.gz +man/man3/DMXRemoveInput.3.gz +man/man3/DMXRemoveScreen.3.gz +man/man3/DMXSync.3.gz @dirrmtry include/X11/extensions diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile index d9e45402b7c6..27e5fd927734 100644 --- a/x11/libxcb/Makefile +++ b/x11/libxcb/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libxcb -PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTVERSION= 1.9.3 CATEGORIES= x11 python MASTER_SITES= http://xcb.freedesktop.org/dist/ @@ -14,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck \ - xcb-proto>=1.7:${PORTSDIR}/x11/xcb-proto \ + xcb-proto>=1.9:${PORTSDIR}/x11/xcb-proto \ ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs @@ -46,9 +45,6 @@ XPROTO_LIBS= -L${LOCALBASE}/lib .include <bsd.port.options.mk> post-install: -.if ${PORT_OPTIONS:MDOCS} - ${SETENV} DESTDIR=${STAGEDIR} ${MAKE} -C ${WRKSRC}/doc ${INSTALL_TARGET} -.endif @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxcb*.so.* .include <bsd.port.mk> diff --git a/x11/libxcb/distinfo b/x11/libxcb/distinfo index 1143ac88627b..a5aff8e252ca 100644 --- a/x11/libxcb/distinfo +++ b/x11/libxcb/distinfo @@ -1,2 +1,2 @@ -SHA256 (libxcb-1.9.1.tar.bz2) = d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f -SIZE (libxcb-1.9.1.tar.bz2) = 373312 +SHA256 (libxcb-1.9.3.tar.bz2) = aad09d223fcb5bd345ce4d1737f178a557b6f2e201128e1ee3c83af46028018b +SIZE (libxcb-1.9.3.tar.bz2) = 400283 diff --git a/x11/libxcb/files/patch-Makefile.in b/x11/libxcb/files/patch-Makefile.in deleted file mode 100644 index 86d274f9b8c4..000000000000 --- a/x11/libxcb/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Jun 17 17:33:00 2007 -+++ Makefile.in Sun Jun 17 17:34:18 2007 -@@ -220,7 +220,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - xcbincludedir = @xcbincludedir@ --SUBDIRS = src tests doc -+SUBDIRS = src tests - pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = \ - xcb.pc \ diff --git a/x11/libxcb/files/patch-src__c_client.py b/x11/libxcb/files/patch-src__c_client.py new file mode 100644 index 000000000000..bfd9524ac691 --- /dev/null +++ b/x11/libxcb/files/patch-src__c_client.py @@ -0,0 +1,34 @@ +--- src/c_client.py.orig 2013-11-11 14:30:55.471622828 +0100 ++++ src/c_client.py 2013-11-11 14:32:05.334624142 +0100 +@@ -1133,11 +1133,11 @@ + _c(' %s *xcb_out = *_buffer;', self.c_type) + _c(' unsigned int xcb_out_pad = -sizeof(%s) & 3;', self.c_type) + _c(' unsigned int xcb_buffer_len = sizeof(%s) + xcb_out_pad;', self.c_type) +- _c(' unsigned int xcb_align_to;') ++ _c(' unsigned int xcb_align_to = 0;') + else: + _c(' char *xcb_out = *_buffer;') + _c(' unsigned int xcb_buffer_len = 0;') +- _c(' unsigned int xcb_align_to;') ++ _c(' unsigned int xcb_align_to = 0;') + prefix = [('_aux', '->', self)] + aux_ptr = 'xcb_out' + +@@ -1160,7 +1160,7 @@ + _c(' unsigned int xcb_buffer_len = 0;') + _c(' unsigned int xcb_block_len = 0;') + _c(' unsigned int xcb_pad = 0;') +- _c(' unsigned int xcb_align_to;') ++ _c(' unsigned int xcb_align_to = 0;') + + elif 'sizeof' == context: + param_names = [p[2] for p in params] +@@ -1205,7 +1205,7 @@ + _c(' unsigned int xcb_buffer_len = 0;') + _c(' unsigned int xcb_block_len = 0;') + _c(' unsigned int xcb_pad = 0;') +- _c(' unsigned int xcb_align_to;') ++ _c(' unsigned int xcb_align_to = 0;') + + _c('') + for t in temp_vars: diff --git a/x11/libxcb/pkg-plist b/x11/libxcb/pkg-plist index 1551ad9a854b..c40714c64646 100644 --- a/x11/libxcb/pkg-plist +++ b/x11/libxcb/pkg-plist @@ -3,7 +3,9 @@ include/xcb/composite.h include/xcb/damage.h include/xcb/dpms.h include/xcb/dri2.h +include/xcb/dri3.h include/xcb/glx.h +include/xcb/present.h include/xcb/randr.h include/xcb/record.h include/xcb/render.h @@ -43,10 +45,18 @@ lib/libxcb-dri2.a lib/libxcb-dri2.la lib/libxcb-dri2.so lib/libxcb-dri2.so.0 +lib/libxcb-dri3.a +lib/libxcb-dri3.la +lib/libxcb-dri3.so +lib/libxcb-dri3.so.0 lib/libxcb-glx.a lib/libxcb-glx.la lib/libxcb-glx.so lib/libxcb-glx.so.0 +lib/libxcb-present.a +lib/libxcb-present.la +lib/libxcb-present.so +lib/libxcb-present.so.0 lib/libxcb-randr.a lib/libxcb-randr.la lib/libxcb-randr.so @@ -127,7 +137,9 @@ libdata/pkgconfig/xcb-composite.pc libdata/pkgconfig/xcb-damage.pc libdata/pkgconfig/xcb-dpms.pc libdata/pkgconfig/xcb-dri2.pc +libdata/pkgconfig/xcb-dri3.pc libdata/pkgconfig/xcb-glx.pc +libdata/pkgconfig/xcb-present.pc libdata/pkgconfig/xcb-randr.pc libdata/pkgconfig/xcb-record.pc libdata/pkgconfig/xcb-render.pc @@ -349,6 +361,22 @@ man/man3/xcb_dri2_wait_msc_unchecked.3.gz man/man3/xcb_dri2_wait_sbc.3.gz man/man3/xcb_dri2_wait_sbc_reply.3.gz man/man3/xcb_dri2_wait_sbc_unchecked.3.gz +man/man3/xcb_dri3_buffer_from_pixmap.3.gz +man/man3/xcb_dri3_buffer_from_pixmap_reply.3.gz +man/man3/xcb_dri3_buffer_from_pixmap_unchecked.3.gz +man/man3/xcb_dri3_fd_from_fence.3.gz +man/man3/xcb_dri3_fd_from_fence_reply.3.gz +man/man3/xcb_dri3_fd_from_fence_unchecked.3.gz +man/man3/xcb_dri3_fence_from_fd.3.gz +man/man3/xcb_dri3_fence_from_fd_checked.3.gz +man/man3/xcb_dri3_open.3.gz +man/man3/xcb_dri3_open_reply.3.gz +man/man3/xcb_dri3_open_unchecked.3.gz +man/man3/xcb_dri3_pixmap_from_buffer.3.gz +man/man3/xcb_dri3_pixmap_from_buffer_checked.3.gz +man/man3/xcb_dri3_query_version.3.gz +man/man3/xcb_dri3_query_version_reply.3.gz +man/man3/xcb_dri3_query_version_unchecked.3.gz man/man3/xcb_enter_notify_event_t.3.gz man/man3/xcb_expose_event_t.3.gz man/man3/xcb_fill_poly.3.gz @@ -367,6 +395,7 @@ man/man3/xcb_free_gc.3.gz man/man3/xcb_free_gc_checked.3.gz man/man3/xcb_free_pixmap.3.gz man/man3/xcb_free_pixmap_checked.3.gz +man/man3/xcb_ge_event_t.3.gz man/man3/xcb_get_atom_name.3.gz man/man3/xcb_get_atom_name_name.3.gz man/man3/xcb_get_atom_name_name_end.3.gz @@ -441,6 +470,7 @@ man/man3/xcb_glx_are_textures_resident_data_end.3.gz man/man3/xcb_glx_are_textures_resident_data_length.3.gz man/man3/xcb_glx_are_textures_resident_reply.3.gz man/man3/xcb_glx_are_textures_resident_unchecked.3.gz +man/man3/xcb_glx_buffer_swap_complete_event_t.3.gz man/man3/xcb_glx_change_drawable_attributes.3.gz man/man3/xcb_glx_change_drawable_attributes_checked.3.gz man/man3/xcb_glx_client_info.3.gz @@ -887,11 +917,22 @@ man/man3/xcb_image_text_8.3.gz man/man3/xcb_image_text_8_checked.3.gz man/man3/xcb_input_allow_device_events.3.gz man/man3/xcb_input_allow_device_events_checked.3.gz +man/man3/xcb_input_barrier_hit_event_t.3.gz +man/man3/xcb_input_barrier_leave_event_t.3.gz +man/man3/xcb_input_button_press_event_t.3.gz +man/man3/xcb_input_button_release_event_t.3.gz +man/man3/xcb_input_change_device_control.3.gz +man/man3/xcb_input_change_device_control_reply.3.gz +man/man3/xcb_input_change_device_control_unchecked.3.gz man/man3/xcb_input_change_device_dont_propagate_list.3.gz man/man3/xcb_input_change_device_dont_propagate_list_checked.3.gz man/man3/xcb_input_change_device_key_mapping.3.gz man/man3/xcb_input_change_device_key_mapping_checked.3.gz man/man3/xcb_input_change_device_notify_event_t.3.gz +man/man3/xcb_input_change_device_property.3.gz +man/man3/xcb_input_change_device_property_checked.3.gz +man/man3/xcb_input_change_feedback_control.3.gz +man/man3/xcb_input_change_feedback_control_checked.3.gz man/man3/xcb_input_change_keyboard_device.3.gz man/man3/xcb_input_change_keyboard_device_reply.3.gz man/man3/xcb_input_change_keyboard_device_unchecked.3.gz @@ -900,19 +941,26 @@ man/man3/xcb_input_change_pointer_device_reply.3.gz man/man3/xcb_input_change_pointer_device_unchecked.3.gz man/man3/xcb_input_close_device.3.gz man/man3/xcb_input_close_device_checked.3.gz +man/man3/xcb_input_delete_device_property.3.gz +man/man3/xcb_input_delete_device_property_checked.3.gz man/man3/xcb_input_device_bell.3.gz man/man3/xcb_input_device_bell_checked.3.gz man/man3/xcb_input_device_button_press_event_t.3.gz man/man3/xcb_input_device_button_release_event_t.3.gz man/man3/xcb_input_device_button_state_notify_event_t.3.gz +man/man3/xcb_input_device_changed_event_t.3.gz +man/man3/xcb_input_device_focus_in_event_t.3.gz +man/man3/xcb_input_device_focus_out_event_t.3.gz man/man3/xcb_input_device_key_press_event_t.3.gz man/man3/xcb_input_device_key_release_event_t.3.gz man/man3/xcb_input_device_key_state_notify_event_t.3.gz man/man3/xcb_input_device_mapping_notify_event_t.3.gz man/man3/xcb_input_device_motion_notify_event_t.3.gz man/man3/xcb_input_device_presence_notify_event_t.3.gz +man/man3/xcb_input_device_property_notify_event_t.3.gz man/man3/xcb_input_device_state_notify_event_t.3.gz man/man3/xcb_input_device_valuator_event_t.3.gz +man/man3/xcb_input_enter_event_t.3.gz man/man3/xcb_input_focus_in_event_t.3.gz man/man3/xcb_input_focus_out_event_t.3.gz man/man3/xcb_input_get_device_button_mapping.3.gz @@ -922,6 +970,7 @@ man/man3/xcb_input_get_device_button_mapping_map_length.3.gz man/man3/xcb_input_get_device_button_mapping_reply.3.gz man/man3/xcb_input_get_device_button_mapping_unchecked.3.gz man/man3/xcb_input_get_device_control.3.gz +man/man3/xcb_input_get_device_control_control.3.gz man/man3/xcb_input_get_device_control_reply.3.gz man/man3/xcb_input_get_device_control_unchecked.3.gz man/man3/xcb_input_get_device_dont_propagate_list.3.gz @@ -948,10 +997,16 @@ man/man3/xcb_input_get_device_modifier_mapping_unchecked.3.gz man/man3/xcb_input_get_device_motion_events.3.gz man/man3/xcb_input_get_device_motion_events_reply.3.gz man/man3/xcb_input_get_device_motion_events_unchecked.3.gz +man/man3/xcb_input_get_device_property.3.gz +man/man3/xcb_input_get_device_property_items.3.gz +man/man3/xcb_input_get_device_property_reply.3.gz +man/man3/xcb_input_get_device_property_unchecked.3.gz man/man3/xcb_input_get_extension_version.3.gz man/man3/xcb_input_get_extension_version_reply.3.gz man/man3/xcb_input_get_extension_version_unchecked.3.gz man/man3/xcb_input_get_feedback_control.3.gz +man/man3/xcb_input_get_feedback_control_feedbacks_iterator.3.gz +man/man3/xcb_input_get_feedback_control_feedbacks_length.3.gz man/man3/xcb_input_get_feedback_control_reply.3.gz man/man3/xcb_input_get_feedback_control_unchecked.3.gz man/man3/xcb_input_get_selected_extension_events.3.gz @@ -970,23 +1025,45 @@ man/man3/xcb_input_grab_device_key.3.gz man/man3/xcb_input_grab_device_key_checked.3.gz man/man3/xcb_input_grab_device_reply.3.gz man/man3/xcb_input_grab_device_unchecked.3.gz +man/man3/xcb_input_hierarchy_event_t.3.gz +man/man3/xcb_input_key_press_event_t.3.gz +man/man3/xcb_input_key_release_event_t.3.gz +man/man3/xcb_input_leave_event_t.3.gz +man/man3/xcb_input_list_device_properties.3.gz +man/man3/xcb_input_list_device_properties_atoms.3.gz +man/man3/xcb_input_list_device_properties_atoms_end.3.gz +man/man3/xcb_input_list_device_properties_atoms_length.3.gz +man/man3/xcb_input_list_device_properties_reply.3.gz +man/man3/xcb_input_list_device_properties_unchecked.3.gz man/man3/xcb_input_list_input_devices.3.gz man/man3/xcb_input_list_input_devices_devices.3.gz man/man3/xcb_input_list_input_devices_devices_iterator.3.gz man/man3/xcb_input_list_input_devices_devices_length.3.gz man/man3/xcb_input_list_input_devices_reply.3.gz man/man3/xcb_input_list_input_devices_unchecked.3.gz +man/man3/xcb_input_motion_event_t.3.gz man/man3/xcb_input_open_device.3.gz man/man3/xcb_input_open_device_class_info.3.gz man/man3/xcb_input_open_device_class_info_iterator.3.gz man/man3/xcb_input_open_device_class_info_length.3.gz man/man3/xcb_input_open_device_reply.3.gz man/man3/xcb_input_open_device_unchecked.3.gz +man/man3/xcb_input_property_event_t.3.gz man/man3/xcb_input_proximity_in_event_t.3.gz man/man3/xcb_input_proximity_out_event_t.3.gz man/man3/xcb_input_query_device_state.3.gz +man/man3/xcb_input_query_device_state_classes_iterator.3.gz +man/man3/xcb_input_query_device_state_classes_length.3.gz man/man3/xcb_input_query_device_state_reply.3.gz man/man3/xcb_input_query_device_state_unchecked.3.gz +man/man3/xcb_input_raw_button_press_event_t.3.gz +man/man3/xcb_input_raw_button_release_event_t.3.gz +man/man3/xcb_input_raw_key_press_event_t.3.gz +man/man3/xcb_input_raw_key_release_event_t.3.gz +man/man3/xcb_input_raw_motion_event_t.3.gz +man/man3/xcb_input_raw_touch_begin_event_t.3.gz +man/man3/xcb_input_raw_touch_end_event_t.3.gz +man/man3/xcb_input_raw_touch_update_event_t.3.gz man/man3/xcb_input_select_extension_event.3.gz man/man3/xcb_input_select_extension_event_checked.3.gz man/man3/xcb_input_send_extension_event.3.gz @@ -1005,12 +1082,84 @@ man/man3/xcb_input_set_device_modifier_mapping_unchecked.3.gz man/man3/xcb_input_set_device_valuators.3.gz man/man3/xcb_input_set_device_valuators_reply.3.gz man/man3/xcb_input_set_device_valuators_unchecked.3.gz +man/man3/xcb_input_touch_begin_event_t.3.gz +man/man3/xcb_input_touch_end_event_t.3.gz +man/man3/xcb_input_touch_ownership_event_t.3.gz +man/man3/xcb_input_touch_update_event_t.3.gz man/man3/xcb_input_ungrab_device.3.gz man/man3/xcb_input_ungrab_device_button.3.gz man/man3/xcb_input_ungrab_device_button_checked.3.gz man/man3/xcb_input_ungrab_device_checked.3.gz man/man3/xcb_input_ungrab_device_key.3.gz man/man3/xcb_input_ungrab_device_key_checked.3.gz +man/man3/xcb_input_xi_allow_events.3.gz +man/man3/xcb_input_xi_allow_events_checked.3.gz +man/man3/xcb_input_xi_barrier_release_pointer.3.gz +man/man3/xcb_input_xi_barrier_release_pointer_checked.3.gz +man/man3/xcb_input_xi_change_cursor.3.gz +man/man3/xcb_input_xi_change_cursor_checked.3.gz +man/man3/xcb_input_xi_change_hierarchy.3.gz +man/man3/xcb_input_xi_change_hierarchy_checked.3.gz +man/man3/xcb_input_xi_change_property.3.gz +man/man3/xcb_input_xi_change_property_checked.3.gz +man/man3/xcb_input_xi_delete_property.3.gz +man/man3/xcb_input_xi_delete_property_checked.3.gz +man/man3/xcb_input_xi_get_client_pointer.3.gz +man/man3/xcb_input_xi_get_client_pointer_reply.3.gz +man/man3/xcb_input_xi_get_client_pointer_unchecked.3.gz +man/man3/xcb_input_xi_get_focus.3.gz +man/man3/xcb_input_xi_get_focus_reply.3.gz +man/man3/xcb_input_xi_get_focus_unchecked.3.gz +man/man3/xcb_input_xi_get_property.3.gz +man/man3/xcb_input_xi_get_property_items.3.gz +man/man3/xcb_input_xi_get_property_reply.3.gz +man/man3/xcb_input_xi_get_property_unchecked.3.gz +man/man3/xcb_input_xi_get_selected_events.3.gz +man/man3/xcb_input_xi_get_selected_events_masks_iterator.3.gz +man/man3/xcb_input_xi_get_selected_events_masks_length.3.gz +man/man3/xcb_input_xi_get_selected_events_reply.3.gz +man/man3/xcb_input_xi_get_selected_events_unchecked.3.gz +man/man3/xcb_input_xi_grab_device.3.gz +man/man3/xcb_input_xi_grab_device_reply.3.gz +man/man3/xcb_input_xi_grab_device_unchecked.3.gz +man/man3/xcb_input_xi_list_properties.3.gz +man/man3/xcb_input_xi_list_properties_properties.3.gz +man/man3/xcb_input_xi_list_properties_properties_end.3.gz +man/man3/xcb_input_xi_list_properties_properties_length.3.gz +man/man3/xcb_input_xi_list_properties_reply.3.gz +man/man3/xcb_input_xi_list_properties_unchecked.3.gz +man/man3/xcb_input_xi_passive_grab_device.3.gz +man/man3/xcb_input_xi_passive_grab_device_modifiers.3.gz +man/man3/xcb_input_xi_passive_grab_device_modifiers_iterator.3.gz +man/man3/xcb_input_xi_passive_grab_device_modifiers_length.3.gz +man/man3/xcb_input_xi_passive_grab_device_reply.3.gz +man/man3/xcb_input_xi_passive_grab_device_unchecked.3.gz +man/man3/xcb_input_xi_passive_ungrab_device.3.gz +man/man3/xcb_input_xi_passive_ungrab_device_checked.3.gz +man/man3/xcb_input_xi_query_device.3.gz +man/man3/xcb_input_xi_query_device_infos_iterator.3.gz +man/man3/xcb_input_xi_query_device_infos_length.3.gz +man/man3/xcb_input_xi_query_device_reply.3.gz +man/man3/xcb_input_xi_query_device_unchecked.3.gz +man/man3/xcb_input_xi_query_pointer.3.gz +man/man3/xcb_input_xi_query_pointer_buttons.3.gz +man/man3/xcb_input_xi_query_pointer_buttons_end.3.gz +man/man3/xcb_input_xi_query_pointer_buttons_length.3.gz +man/man3/xcb_input_xi_query_pointer_reply.3.gz +man/man3/xcb_input_xi_query_pointer_unchecked.3.gz +man/man3/xcb_input_xi_query_version.3.gz +man/man3/xcb_input_xi_query_version_reply.3.gz +man/man3/xcb_input_xi_query_version_unchecked.3.gz +man/man3/xcb_input_xi_select_events.3.gz +man/man3/xcb_input_xi_select_events_checked.3.gz +man/man3/xcb_input_xi_set_client_pointer.3.gz +man/man3/xcb_input_xi_set_client_pointer_checked.3.gz +man/man3/xcb_input_xi_set_focus.3.gz +man/man3/xcb_input_xi_set_focus_checked.3.gz +man/man3/xcb_input_xi_ungrab_device.3.gz +man/man3/xcb_input_xi_ungrab_device_checked.3.gz +man/man3/xcb_input_xi_warp_pointer.3.gz +man/man3/xcb_input_xi_warp_pointer_checked.3.gz man/man3/xcb_install_colormap.3.gz man/man3/xcb_install_colormap_checked.3.gz man/man3/xcb_intern_atom.3.gz @@ -1092,6 +1241,23 @@ man/man3/xcb_poly_text_16.3.gz man/man3/xcb_poly_text_16_checked.3.gz man/man3/xcb_poly_text_8.3.gz man/man3/xcb_poly_text_8_checked.3.gz +man/man3/xcb_present_complete_notify_event_t.3.gz +man/man3/xcb_present_configure_notify_event_t.3.gz +man/man3/xcb_present_generic_event_t.3.gz +man/man3/xcb_present_idle_notify_event_t.3.gz +man/man3/xcb_present_notify_msc.3.gz +man/man3/xcb_present_notify_msc_checked.3.gz +man/man3/xcb_present_pixmap.3.gz +man/man3/xcb_present_pixmap_checked.3.gz +man/man3/xcb_present_query_capabilities.3.gz +man/man3/xcb_present_query_capabilities_reply.3.gz +man/man3/xcb_present_query_capabilities_unchecked.3.gz +man/man3/xcb_present_query_version.3.gz +man/man3/xcb_present_query_version_reply.3.gz +man/man3/xcb_present_query_version_unchecked.3.gz +man/man3/xcb_present_redirect_notify_event_t.3.gz +man/man3/xcb_present_select_input.3.gz +man/man3/xcb_present_select_input_checked.3.gz man/man3/xcb_property_notify_event_t.3.gz man/man3/xcb_put_image.3.gz man/man3/xcb_put_image_checked.3.gz @@ -1135,8 +1301,12 @@ man/man3/xcb_randr_add_output_mode.3.gz man/man3/xcb_randr_add_output_mode_checked.3.gz man/man3/xcb_randr_change_output_property.3.gz man/man3/xcb_randr_change_output_property_checked.3.gz +man/man3/xcb_randr_change_provider_property.3.gz +man/man3/xcb_randr_change_provider_property_checked.3.gz man/man3/xcb_randr_configure_output_property.3.gz man/man3/xcb_randr_configure_output_property_checked.3.gz +man/man3/xcb_randr_configure_provider_property.3.gz +man/man3/xcb_randr_configure_provider_property_checked.3.gz man/man3/xcb_randr_create_mode.3.gz man/man3/xcb_randr_create_mode_reply.3.gz man/man3/xcb_randr_create_mode_unchecked.3.gz @@ -1144,6 +1314,8 @@ man/man3/xcb_randr_delete_output_mode.3.gz man/man3/xcb_randr_delete_output_mode_checked.3.gz man/man3/xcb_randr_delete_output_property.3.gz man/man3/xcb_randr_delete_output_property_checked.3.gz +man/man3/xcb_randr_delete_provider_property.3.gz +man/man3/xcb_randr_delete_provider_property_checked.3.gz man/man3/xcb_randr_destroy_mode.3.gz man/man3/xcb_randr_destroy_mode_checked.3.gz man/man3/xcb_randr_get_crtc_gamma.3.gz @@ -1212,6 +1384,36 @@ man/man3/xcb_randr_get_output_property_unchecked.3.gz man/man3/xcb_randr_get_panning.3.gz man/man3/xcb_randr_get_panning_reply.3.gz man/man3/xcb_randr_get_panning_unchecked.3.gz +man/man3/xcb_randr_get_provider_info.3.gz +man/man3/xcb_randr_get_provider_info_associated_capability.3.gz +man/man3/xcb_randr_get_provider_info_associated_capability_end.3.gz +man/man3/xcb_randr_get_provider_info_associated_capability_length.3.gz +man/man3/xcb_randr_get_provider_info_associated_providers.3.gz +man/man3/xcb_randr_get_provider_info_associated_providers_end.3.gz +man/man3/xcb_randr_get_provider_info_associated_providers_length.3.gz +man/man3/xcb_randr_get_provider_info_crtcs.3.gz +man/man3/xcb_randr_get_provider_info_crtcs_end.3.gz +man/man3/xcb_randr_get_provider_info_crtcs_length.3.gz +man/man3/xcb_randr_get_provider_info_name.3.gz +man/man3/xcb_randr_get_provider_info_name_end.3.gz +man/man3/xcb_randr_get_provider_info_name_length.3.gz +man/man3/xcb_randr_get_provider_info_outputs.3.gz +man/man3/xcb_randr_get_provider_info_outputs_end.3.gz +man/man3/xcb_randr_get_provider_info_outputs_length.3.gz +man/man3/xcb_randr_get_provider_info_reply.3.gz +man/man3/xcb_randr_get_provider_info_unchecked.3.gz +man/man3/xcb_randr_get_provider_property.3.gz +man/man3/xcb_randr_get_provider_property_data.3.gz +man/man3/xcb_randr_get_provider_property_data_end.3.gz +man/man3/xcb_randr_get_provider_property_data_length.3.gz +man/man3/xcb_randr_get_provider_property_reply.3.gz +man/man3/xcb_randr_get_provider_property_unchecked.3.gz +man/man3/xcb_randr_get_providers.3.gz +man/man3/xcb_randr_get_providers_providers.3.gz +man/man3/xcb_randr_get_providers_providers_end.3.gz +man/man3/xcb_randr_get_providers_providers_length.3.gz +man/man3/xcb_randr_get_providers_reply.3.gz +man/man3/xcb_randr_get_providers_unchecked.3.gz man/man3/xcb_randr_get_screen_info.3.gz man/man3/xcb_randr_get_screen_info_rates_iterator.3.gz man/man3/xcb_randr_get_screen_info_rates_length.3.gz @@ -1259,6 +1461,12 @@ man/man3/xcb_randr_list_output_properties_atoms_end.3.gz man/man3/xcb_randr_list_output_properties_atoms_length.3.gz man/man3/xcb_randr_list_output_properties_reply.3.gz man/man3/xcb_randr_list_output_properties_unchecked.3.gz +man/man3/xcb_randr_list_provider_properties.3.gz +man/man3/xcb_randr_list_provider_properties_atoms.3.gz +man/man3/xcb_randr_list_provider_properties_atoms_end.3.gz +man/man3/xcb_randr_list_provider_properties_atoms_length.3.gz +man/man3/xcb_randr_list_provider_properties_reply.3.gz +man/man3/xcb_randr_list_provider_properties_unchecked.3.gz man/man3/xcb_randr_notify_event_t.3.gz man/man3/xcb_randr_query_output_property.3.gz man/man3/xcb_randr_query_output_property_reply.3.gz @@ -1266,6 +1474,12 @@ man/man3/xcb_randr_query_output_property_unchecked.3.gz man/man3/xcb_randr_query_output_property_valid_values.3.gz man/man3/xcb_randr_query_output_property_valid_values_end.3.gz man/man3/xcb_randr_query_output_property_valid_values_length.3.gz +man/man3/xcb_randr_query_provider_property.3.gz +man/man3/xcb_randr_query_provider_property_reply.3.gz +man/man3/xcb_randr_query_provider_property_unchecked.3.gz +man/man3/xcb_randr_query_provider_property_valid_values.3.gz +man/man3/xcb_randr_query_provider_property_valid_values_end.3.gz +man/man3/xcb_randr_query_provider_property_valid_values_length.3.gz man/man3/xcb_randr_query_version.3.gz man/man3/xcb_randr_query_version_reply.3.gz man/man3/xcb_randr_query_version_unchecked.3.gz @@ -1284,6 +1498,10 @@ man/man3/xcb_randr_set_output_primary_checked.3.gz man/man3/xcb_randr_set_panning.3.gz man/man3/xcb_randr_set_panning_reply.3.gz man/man3/xcb_randr_set_panning_unchecked.3.gz +man/man3/xcb_randr_set_provider_offload_sink.3.gz +man/man3/xcb_randr_set_provider_offload_sink_checked.3.gz +man/man3/xcb_randr_set_provider_output_source.3.gz +man/man3/xcb_randr_set_provider_output_source_checked.3.gz man/man3/xcb_randr_set_screen_config.3.gz man/man3/xcb_randr_set_screen_config_reply.3.gz man/man3/xcb_randr_set_screen_config_unchecked.3.gz @@ -1400,6 +1618,11 @@ man/man3/xcb_render_triangles_checked.3.gz man/man3/xcb_reparent_notify_event_t.3.gz man/man3/xcb_reparent_window.3.gz man/man3/xcb_reparent_window_checked.3.gz +man/man3/xcb_res_query_client_ids.3.gz +man/man3/xcb_res_query_client_ids_ids_iterator.3.gz +man/man3/xcb_res_query_client_ids_ids_length.3.gz +man/man3/xcb_res_query_client_ids_reply.3.gz +man/man3/xcb_res_query_client_ids_unchecked.3.gz man/man3/xcb_res_query_client_pixmap_bytes.3.gz man/man3/xcb_res_query_client_pixmap_bytes_reply.3.gz man/man3/xcb_res_query_client_pixmap_bytes_unchecked.3.gz @@ -1415,6 +1638,11 @@ man/man3/xcb_res_query_clients_clients_iterator.3.gz man/man3/xcb_res_query_clients_clients_length.3.gz man/man3/xcb_res_query_clients_reply.3.gz man/man3/xcb_res_query_clients_unchecked.3.gz +man/man3/xcb_res_query_resource_bytes.3.gz +man/man3/xcb_res_query_resource_bytes_reply.3.gz +man/man3/xcb_res_query_resource_bytes_sizes_iterator.3.gz +man/man3/xcb_res_query_resource_bytes_sizes_length.3.gz +man/man3/xcb_res_query_resource_bytes_unchecked.3.gz man/man3/xcb_res_query_version.3.gz man/man3/xcb_res_query_version_reply.3.gz man/man3/xcb_res_query_version_unchecked.3.gz @@ -1596,9 +1824,14 @@ man/man3/xcb_shape_select_input.3.gz man/man3/xcb_shape_select_input_checked.3.gz man/man3/xcb_shm_attach.3.gz man/man3/xcb_shm_attach_checked.3.gz +man/man3/xcb_shm_attach_fd.3.gz +man/man3/xcb_shm_attach_fd_checked.3.gz man/man3/xcb_shm_completion_event_t.3.gz man/man3/xcb_shm_create_pixmap.3.gz man/man3/xcb_shm_create_pixmap_checked.3.gz +man/man3/xcb_shm_create_segment.3.gz +man/man3/xcb_shm_create_segment_reply.3.gz +man/man3/xcb_shm_create_segment_unchecked.3.gz man/man3/xcb_shm_detach.3.gz man/man3/xcb_shm_detach_checked.3.gz man/man3/xcb_shm_get_image.3.gz @@ -1860,6 +2093,8 @@ man/man3/xcb_xfixes_change_save_set.3.gz man/man3/xcb_xfixes_change_save_set_checked.3.gz man/man3/xcb_xfixes_copy_region.3.gz man/man3/xcb_xfixes_copy_region_checked.3.gz +man/man3/xcb_xfixes_create_pointer_barrier.3.gz +man/man3/xcb_xfixes_create_pointer_barrier_checked.3.gz man/man3/xcb_xfixes_create_region.3.gz man/man3/xcb_xfixes_create_region_checked.3.gz man/man3/xcb_xfixes_create_region_from_bitmap.3.gz @@ -1871,6 +2106,8 @@ man/man3/xcb_xfixes_create_region_from_picture_checked.3.gz man/man3/xcb_xfixes_create_region_from_window.3.gz man/man3/xcb_xfixes_create_region_from_window_checked.3.gz man/man3/xcb_xfixes_cursor_notify_event_t.3.gz +man/man3/xcb_xfixes_delete_pointer_barrier.3.gz +man/man3/xcb_xfixes_delete_pointer_barrier_checked.3.gz man/man3/xcb_xfixes_destroy_region.3.gz man/man3/xcb_xfixes_destroy_region_checked.3.gz man/man3/xcb_xfixes_expand_region.3.gz @@ -1971,7 +2208,7 @@ man/man3/xcb_xkb_get_compat_map_group_rtrn_iterator.3.gz man/man3/xcb_xkb_get_compat_map_group_rtrn_length.3.gz man/man3/xcb_xkb_get_compat_map_reply.3.gz man/man3/xcb_xkb_get_compat_map_si_rtrn.3.gz -man/man3/xcb_xkb_get_compat_map_si_rtrn_end.3.gz +man/man3/xcb_xkb_get_compat_map_si_rtrn_iterator.3.gz man/man3/xcb_xkb_get_compat_map_si_rtrn_length.3.gz man/man3/xcb_xkb_get_compat_map_unchecked.3.gz man/man3/xcb_xkb_get_controls.3.gz diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile index aeda4fb51803..304bde7c769c 100644 --- a/x11/libxkbfile/Makefile +++ b/x11/libxkbfile/Makefile @@ -12,4 +12,5 @@ LICENSE= MIT XORG_CAT= lib USE_XORG= x11 kbproto:both + .include <bsd.port.mk> diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile new file mode 100644 index 000000000000..84bfdd3c44d2 --- /dev/null +++ b/x11/libxshmfence/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= libxshmfence +PORTVERSION= 1.1 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= Shared memory 'SyncFence' synchronization primitive + +LICENSE= MIT + +USE_XORG= xproto +XORG_CAT= lib + +test: build + @cd ${WRKSRC} && ${MAKE} check + +.include <bsd.port.mk> diff --git a/x11/libxshmfence/distinfo b/x11/libxshmfence/distinfo new file mode 100644 index 000000000000..3b5cd8708404 --- /dev/null +++ b/x11/libxshmfence/distinfo @@ -0,0 +1,2 @@ +SHA256 (xorg/lib/libxshmfence-1.1.tar.bz2) = dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe +SIZE (xorg/lib/libxshmfence-1.1.tar.bz2) = 291347 diff --git a/x11/libxshmfence/files/patch-config.h.in b/x11/libxshmfence/files/patch-config.h.in new file mode 100644 index 000000000000..bbb52e10cc3a --- /dev/null +++ b/x11/libxshmfence/files/patch-config.h.in @@ -0,0 +1,22 @@ +--- config.h.in 2013-11-27 00:54:40.000000000 -0500 ++++ config.h.in 2013-12-09 16:56:20.000000000 -0500 +@@ -12,6 +12,9 @@ + /* Define to 1 if you have the <memory.h> header file. */ + #undef HAVE_MEMORY_H + ++/* Use mkostemp(3) */ ++#undef HAVE_MKOSTEMP ++ + /* Use pthread primitives */ + #undef HAVE_PTHREAD + +@@ -33,6 +36,9 @@ + /* Define to 1 if you have the <sys/types.h> header file. */ + #undef HAVE_SYS_TYPES_H + ++/* Use umtx */ ++#undef HAVE_UMTX ++ + /* Define to 1 if you have the <unistd.h> header file. */ + #undef HAVE_UNISTD_H + diff --git a/x11/libxshmfence/files/patch-configure b/x11/libxshmfence/files/patch-configure new file mode 100644 index 000000000000..dda82c69cf4f --- /dev/null +++ b/x11/libxshmfence/files/patch-configure @@ -0,0 +1,45 @@ +--- configure 2013-11-27 00:54:35.000000000 -0500 ++++ configure 2013-12-09 15:03:55.000000000 -0500 +@@ -17633,11 +17633,27 @@ + ac_fn_c_check_header_mongrel "$LINENO" "linux/futex.h" "ac_cv_header_linux_futex_h" "$ac_includes_default" + if test "x$ac_cv_header_linux_futex_h" = xyes; then : + FUTEX=yes ++fi ++ ++ ++fi ++ ++if test "x$FUTEX" = "xauto"; then ++ ac_fn_c_check_header_compile "$LINENO" "sys/umtx.h" "ac_cv_header_sys_umtx_h" "#include <errno.h> ++ #include <sys/types.h> ++" ++if test "x$ac_cv_header_sys_umtx_h" = xyes; then : ++ FUTEX=yes + else + FUTEX=no + fi + + ++ if test "x$FUTEX" = "xyes"; then ++ ++$as_echo "#define HAVE_UMTX 1" >>confdefs.h ++ ++ fi + fi + + if test "x$FUTEX" = "xyes"; then +@@ -17717,6 +17733,14 @@ + fi + + ++ac_fn_c_check_func "$LINENO" "mkostemp" "ac_cv_func_mkostemp" ++if test "x$ac_cv_func_mkostemp" = xyes; then : ++ ++$as_echo "#define HAVE_MKOSTEMP 1" >>confdefs.h ++ ++fi ++ ++ + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPROTO" >&5 diff --git a/x11/libxshmfence/files/patch-src__xshmfence_alloc.c b/x11/libxshmfence/files/patch-src__xshmfence_alloc.c new file mode 100644 index 000000000000..df38300fb2a8 --- /dev/null +++ b/x11/libxshmfence/files/patch-src__xshmfence_alloc.c @@ -0,0 +1,20 @@ +--- src/xshmfence_alloc.c 2013-11-20 17:13:08.000000000 -0500 ++++ src/xshmfence_alloc.c 2013-12-09 16:06:17.000000000 -0500 +@@ -41,11 +41,15 @@ + char template[] = SHMDIR "/shmfd-XXXXXX"; + int fd; + +-#ifdef O_TMPFILE ++#if defined(O_CLOEXEC) ++#if defined(HAVE_MKOSTEMP) ++ fd = mkostemp(template, O_CLOEXEC); ++#elif defined(O_TMPFILE) + fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); +- if (fd < 0) + #endif ++ if (fd < 0) + { ++#endif + fd = mkstemp(template); + if (fd < 0) + return fd; diff --git a/x11/libxshmfence/files/patch-src__xshmfence_futex.h b/x11/libxshmfence/files/patch-src__xshmfence_futex.h new file mode 100644 index 000000000000..58c42a9a8b4e --- /dev/null +++ b/x11/libxshmfence/files/patch-src__xshmfence_futex.h @@ -0,0 +1,46 @@ +--- src/xshmfence_futex.h 2013-11-20 17:13:08.000000000 -0500 ++++ src/xshmfence_futex.h 2013-12-09 15:52:29.000000000 -0500 +@@ -1,5 +1,6 @@ + /* + * Copyright © 2013 Keith Packard ++ * Copyright © 2013 Jung-uk Kim <jkim@FreeBSD.org> + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that +@@ -24,6 +25,27 @@ + #define _XSHMFENCE_FUTEX_H_ + + #include <errno.h> ++ ++#ifdef HAVE_UMTX ++ ++#include <sys/types.h> ++#include <sys/umtx.h> ++ ++static inline int sys_futex(void *addr, int op, int32_t val) ++{ ++ return _umtx_op(addr, op, (uint32_t)val, NULL, NULL) == -1 ? errno : 0; ++} ++ ++static inline int futex_wake(int32_t *addr) { ++ return sys_futex(addr, UMTX_OP_WAKE, INT_MAX); ++} ++ ++static inline int futex_wait(int32_t *addr, int32_t value) { ++ return sys_futex(addr, UMTX_OP_WAIT_UINT, value); ++} ++ ++#else ++ + #include <stdint.h> + #include <values.h> + #include <linux/futex.h> +@@ -43,6 +65,8 @@ + return sys_futex(addr, FUTEX_WAIT, value, NULL, NULL, 0); + } + ++#endif ++ + #define barrier() __asm__ __volatile__("": : :"memory") + + static inline void atomic_store(int32_t *f, int32_t v) diff --git a/x11/libxshmfence/files/patch-src__xshmfenceint.h b/x11/libxshmfence/files/patch-src__xshmfenceint.h new file mode 100644 index 000000000000..bc8aead76698 --- /dev/null +++ b/x11/libxshmfence/files/patch-src__xshmfenceint.h @@ -0,0 +1,10 @@ +--- src/xshmfenceint.h 2013-11-20 17:14:05.000000000 -0500 ++++ src/xshmfenceint.h 2013-12-09 15:14:36.000000000 -0500 +@@ -23,6 +23,7 @@ + #ifndef _XSHMFENCEINT_H_ + #define _XSHMFENCEINT_H_ + ++#include <fcntl.h> + #include <stdlib.h> + #include <unistd.h> + #include <sys/mman.h> diff --git a/x11/libxshmfence/pkg-descr b/x11/libxshmfence/pkg-descr new file mode 100644 index 000000000000..fdc1a01f56cc --- /dev/null +++ b/x11/libxshmfence/pkg-descr @@ -0,0 +1,5 @@ +This library offers a CPU-based synchronization primitive compatible +with the X SyncFence objects that can be shared between processes +using file descriptor passing. + +WWW: http://www.freedesktop.org/Software/xlibs diff --git a/x11/libxshmfence/pkg-plist b/x11/libxshmfence/pkg-plist new file mode 100644 index 000000000000..462fda09126c --- /dev/null +++ b/x11/libxshmfence/pkg-plist @@ -0,0 +1,6 @@ +include/X11/xshmfence.h +lib/libxshmfence.a +lib/libxshmfence.la +lib/libxshmfence.so +lib/libxshmfence.so.1 +libdata/pkgconfig/xshmfence.pc diff --git a/x11/listres/Makefile b/x11/listres/Makefile index 37519f599af2..e21396ce6be2 100644 --- a/x11/listres/Makefile +++ b/x11/listres/Makefile @@ -10,9 +10,6 @@ COMMENT= List resources in widgets XORG_CAT= app USE_XORG= xproto xt xmu xaw -PLIST_FILES= bin/listres +PLIST_FILES= bin/listres man/man1/listres.1.gz -MAN1= listres.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/luit/Makefile b/x11/luit/Makefile index 3f36c4796952..bfa31c298f20 100644 --- a/x11/luit/Makefile +++ b/x11/luit/Makefile @@ -12,9 +12,6 @@ USE_XORG= x11 fontenc CONFIGURE_ARGS= --datadir=${LOCALBASE}/lib -PLIST_FILES= bin/luit +PLIST_FILES= bin/luit man/man1/luit.1.gz -MAN1= luit.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile index 907278d6ebe7..0395cc91318d 100644 --- a/x11/mkcomposecache/Makefile +++ b/x11/mkcomposecache/Makefile @@ -10,9 +10,6 @@ COMMENT= Program to create Compose cache files XORG_CAT= app USE_XORG= x11 -PLIST_FILES= sbin/mkcomposecache +PLIST_FILES= sbin/mkcomposecache man/man8/mkcomposecache.8.gz -MAN8= mkcomposecache.8 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index dff8bdf2722c..4787c11a22a1 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pixman -PORTVERSION= 0.30.2 +PORTVERSION= 0.32.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org @@ -12,6 +12,7 @@ USE_PERL5= build XORG_CAT= lib USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-gtk +USE_GNOME= ltverhack:30 OPTIONS_DEFINE= SIMD diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo index 676ffb26f115..a2dcca7a51e8 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/pixman-0.30.2.tar.bz2) = 4fbb51788fe7cbd8abb5f80aed95ec878704e57a06328f7bebe0306e3822c96c -SIZE (xorg/lib/pixman-0.30.2.tar.bz2) = 666281 +SHA256 (xorg/lib/pixman-0.32.4.tar.bz2) = ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c +SIZE (xorg/lib/pixman-0.32.4.tar.bz2) = 701414 diff --git a/x11/presentproto/Makefile b/x11/presentproto/Makefile new file mode 100644 index 000000000000..7afb4cc5161d --- /dev/null +++ b/x11/presentproto/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ + +PORTNAME= presentproto +PORTVERSION= 1.0 +CATEGORIES= x11 + +MAINTAINER= x11@FreeBSD.org +COMMENT= Present protocol specification + +XORG_CAT= proto + +.include <bsd.port.mk> diff --git a/x11/presentproto/distinfo b/x11/presentproto/distinfo new file mode 100644 index 000000000000..a9823e0cff07 --- /dev/null +++ b/x11/presentproto/distinfo @@ -0,0 +1,2 @@ +SHA256 (xorg/proto/presentproto-1.0.tar.bz2) = 812c7d48721f909a0f7a2cb1e91f6eead76159a36c4712f4579ca587552839ce +SIZE (xorg/proto/presentproto-1.0.tar.bz2) = 107998 diff --git a/x11/presentproto/pkg-descr b/x11/presentproto/pkg-descr new file mode 100644 index 000000000000..d047c1d74b59 --- /dev/null +++ b/x11/presentproto/pkg-descr @@ -0,0 +1 @@ +This package contains X.Org Present protocol specification. diff --git a/x11/presentproto/pkg-plist b/x11/presentproto/pkg-plist new file mode 100644 index 000000000000..6b56729a0bd8 --- /dev/null +++ b/x11/presentproto/pkg-plist @@ -0,0 +1,6 @@ +include/X11/extensions/presentproto.h +include/X11/extensions/presenttokens.h +libdata/pkgconfig/presentproto.pc +share/doc/presentproto/presentproto.txt +@dirrm share/doc/presentproto +@dirrmtry include/X11/extensions diff --git a/x11/printproto/Makefile b/x11/printproto/Makefile index 341a851baaa6..f0319f9f46e6 100644 --- a/x11/printproto/Makefile +++ b/x11/printproto/Makefile @@ -10,7 +10,4 @@ COMMENT= Print extension headers XORG_CAT= proto -MAN7= Xprint.7 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/printproto/pkg-plist b/x11/printproto/pkg-plist index 44d872813219..a0fd03bab281 100644 --- a/x11/printproto/pkg-plist +++ b/x11/printproto/pkg-plist @@ -1,4 +1,5 @@ include/X11/extensions/Print.h include/X11/extensions/Printstr.h libdata/pkgconfig/printproto.pc +man/man7/Xprint.7.gz @dirrmtry include/X11/extensions diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile index 391111e40660..b05393a0f589 100644 --- a/x11/rstart/Makefile +++ b/x11/rstart/Makefile @@ -10,7 +10,4 @@ COMMENT= Sample implementation of a Remote Start client XORG_CAT= app USE_XORG= x11 -MAN1= rstart.1 rstartd.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/rstart/pkg-plist b/x11/rstart/pkg-plist index 53445f8d1135..3395861a25c4 100644 --- a/x11/rstart/pkg-plist +++ b/x11/rstart/pkg-plist @@ -15,6 +15,8 @@ lib/X11/rstart/contexts/x lib/X11/rstart/contexts/x11 lib/X11/rstart/contexts/x11r6 lib/X11/rstart/rstartd.real +man/man1/rstart.1.gz +man/man1/rstartd.1.gz @dirrm lib/X11/rstart/contexts @dirrm lib/X11/rstart/commands/x11r6 @dirrm lib/X11/rstart/commands diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile index 61b9706a3eea..1d7caf8492ac 100644 --- a/x11/scripts/Makefile +++ b/x11/scripts/Makefile @@ -10,7 +10,4 @@ COMMENT= Various X related scripts XORG_CAT= app USE_XORG= x11 -MAN1= xon.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/scripts/pkg-plist b/x11/scripts/pkg-plist index 1135a62d4315..976030aa677f 100644 --- a/x11/scripts/pkg-plist +++ b/x11/scripts/pkg-plist @@ -2,3 +2,4 @@ bin/xauth_switch_to_sun-des-1 bin/fontname.sh bin/fontprop.sh bin/xon +man/man1/xon.1.gz diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile index b622b670fa94..3b6fb7f571a3 100644 --- a/x11/sessreg/Makefile +++ b/x11/sessreg/Makefile @@ -10,9 +10,6 @@ COMMENT= Manage utmp/wtmp entries for non-init X clients XORG_CAT= app USE_XORG= x11 -PLIST_FILES= bin/sessreg +PLIST_FILES= bin/sessreg man/man1/sessreg.1.gz -MAN1= sessreg.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile index 8c2dec8c7549..53b369809a67 100644 --- a/x11/setxkbmap/Makefile +++ b/x11/setxkbmap/Makefile @@ -12,9 +12,6 @@ USE_XORG= xkbfile x11 CONFIGURE_ARGS= --with-xkb-config-root=${LOCALBASE}/share/X11/xkb -PLIST_FILES= bin/setxkbmap +PLIST_FILES= bin/setxkbmap man/man1/setxkbmap.1.gz -MAN1= setxkbmap.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile index 3e55c0ac7b4c..78a13ec16c59 100644 --- a/x11/smproxy/Makefile +++ b/x11/smproxy/Makefile @@ -10,9 +10,6 @@ COMMENT= Session Manager Proxy XORG_CAT= app USE_XORG= xt xmu -PLIST_FILES= bin/smproxy +PLIST_FILES= bin/smproxy man/man1/smproxy.1.gz -MAN1= smproxy.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/trapproto/Makefile b/x11/trapproto/Makefile index 29ada379cbac..dd42adb42869 100644 --- a/x11/trapproto/Makefile +++ b/x11/trapproto/Makefile @@ -12,5 +12,4 @@ XORG_CAT= proto USE_XORG= xt:both -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/viewres/Makefile b/x11/viewres/Makefile index 89a7477f1e8c..5088ea648248 100644 --- a/x11/viewres/Makefile +++ b/x11/viewres/Makefile @@ -10,13 +10,11 @@ COMMENT= Graphical class browser for Xt XORG_CAT= app USE_XORG= xt xaw -MAN1= viewres.1 - PLIST_FILES+= bin/viewres \ + man/man1/viewres.1.gz \ share/X11/app-defaults/Viewres \ share/X11/app-defaults/Viewres-color PLIST_DIRS+= share/X11/app-defaults \ share/X11 -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile index f8663f01c0fe..f8a0ee48babd 100644 --- a/x11/x11perf/Makefile +++ b/x11/x11perf/Makefile @@ -12,9 +12,4 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 xmuu xrender xft xext -MAN1= Xmark.1 \ - x11perf.1 \ - x11perfcomp.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/x11perf/pkg-plist b/x11/x11perf/pkg-plist index dd7d17277145..4c9b64afcdc4 100644 --- a/x11/x11perf/pkg-plist +++ b/x11/x11perf/pkg-plist @@ -4,4 +4,7 @@ lib/X11/x11perfcomp/fillblnk lib/X11/x11perfcomp/perfboth lib/X11/x11perfcomp/perfratio lib/X11/x11perfcomp/Xmark +man/man1/Xmark.1.gz +man/man1/x11perf.1.gz +man/man1/x11perfcomp.1.gz @dirrm lib/X11/x11perfcomp diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile index 9e548225d29c..1c79c3cdd2f2 100644 --- a/x11/xcalc/Makefile +++ b/x11/xcalc/Makefile @@ -8,14 +8,11 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Scientific calculator for X RUN_DEPENDS= font-misc-misc>=1.1.2:${PORTSDIR}/x11-fonts/font-misc-misc \ - font-adobe-100dpi>=1.0.3:${PORTSDIR}/x11-fonts/font-adobe-100dpi \ - font-alias>=1.0.3:${PORTSDIR}/x11-fonts/font-alias \ - xbitmaps>=1.1.0:${PORTSDIR}/x11/xbitmaps + font-adobe-100dpi>=1.0.3:${PORTSDIR}/x11-fonts/font-adobe-100dpi \ + font-alias>=1.0.3:${PORTSDIR}/x11-fonts/font-alias \ + xbitmaps>=1.1.0:${PORTSDIR}/x11/xbitmaps XORG_CAT= app USE_XORG= xt xaw -MAN1= xcalc.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xcalc/pkg-plist b/x11/xcalc/pkg-plist index 7c6d17bdc858..21e5d60ced8f 100644 --- a/x11/xcalc/pkg-plist +++ b/x11/xcalc/pkg-plist @@ -1,4 +1,5 @@ bin/xcalc +man/man1/xcalc.1.gz share/X11/app-defaults/XCalc share/X11/app-defaults/XCalc-color @dirrmtry share/X11/app-defaults diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile index 17fb42069f4d..778dcf9da82b 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xcb-proto -PORTVERSION= 1.8 +PORTVERSION= 1.9 CATEGORIES= x11 python MASTER_SITES= http://xcb.freedesktop.org/dist/ @@ -17,4 +17,5 @@ USE_PYTHON= 2.5+ GNU_CONFIGURE= yes DATADIR= ${PREFIX}/share/xcb + .include <bsd.port.mk> diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo index e92e4ee65e2b..27738e9c05c4 100644 --- a/x11/xcb-proto/distinfo +++ b/x11/xcb-proto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xcb-proto-1.8.tar.bz2) = 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0 -SIZE (xcb-proto-1.8.tar.bz2) = 125072 +SHA256 (xcb-proto-1.9.tar.bz2) = 895afe21793e6e26c5ce999b1900c02a5984c201d96d55cc42c182d3c3bde43c +SIZE (xcb-proto-1.9.tar.bz2) = 136421 diff --git a/x11/xcb-proto/files/patch-src_sync.xml b/x11/xcb-proto/files/patch-src_sync.xml new file mode 100644 index 000000000000..cc530683cabc --- /dev/null +++ b/x11/xcb-proto/files/patch-src_sync.xml @@ -0,0 +1,50 @@ +From 9c343995eacdc39db2ec7f93cbeab00c88a55026 Mon Sep 17 00:00:00 2001 +From: Peter Harris <pharris@opentext.com> +Date: Fri, 15 Nov 2013 16:07:39 +0000 +Subject: sync: Add missing namespace for the INT64 struct + +Signed-off-by: Peter Harris <pharris@opentext.com> +Reviewed-By: Daniel Martin <consume.noise@gmail.com> +--- +diff --git a/src/sync.xml b/src/sync.xml +index bc07c5b..dd70a08 100644 +--- src/sync.xml ++++ src/sync.xml +@@ -147,7 +147,7 @@ for licensing information. + </bitcase> + <bitcase> + <enumref ref="CA">Value</enumref> +- <field type="INT64" name="value" /> ++ <field type="sync:INT64" name="value" /> + </bitcase> + <bitcase> + <enumref ref="CA">TestType</enumref> +@@ -155,7 +155,7 @@ for licensing information. + </bitcase> + <bitcase> + <enumref ref="CA">Delta</enumref> +- <field type="INT64" name="delta" /> ++ <field type="sync:INT64" name="delta" /> + </bitcase> + <bitcase> + <enumref ref="CA">Events</enumref> +@@ -179,7 +179,7 @@ for licensing information. + </bitcase> + <bitcase> + <enumref ref="CA">Value</enumref> +- <field type="INT64" name="value" /> ++ <field type="sync:INT64" name="value" /> + </bitcase> + <bitcase> + <enumref ref="CA">TestType</enumref> +@@ -187,7 +187,7 @@ for licensing information. + </bitcase> + <bitcase> + <enumref ref="CA">Delta</enumref> +- <field type="INT64" name="delta" /> ++ <field type="sync:INT64" name="delta" /> + </bitcase> + <bitcase> + <enumref ref="CA">Events</enumref> +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist index 4d3495fbc5f5..7b7cec797e70 100644 --- a/x11/xcb-proto/pkg-plist +++ b/x11/xcb-proto/pkg-plist @@ -4,8 +4,10 @@ libdata/pkgconfig/xcb-proto.pc %%DATADIR%%/damage.xml %%DATADIR%%/dpms.xml %%DATADIR%%/dri2.xml +%%DATADIR%%/dri3.xml %%DATADIR%%/ge.xml %%DATADIR%%/glx.xml +%%DATADIR%%/present.xml %%DATADIR%%/randr.xml %%DATADIR%%/record.xml %%DATADIR%%/render.xml diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile index 082a6848fb4a..312238191293 100644 --- a/x11/xclipboard/Makefile +++ b/x11/xclipboard/Makefile @@ -13,7 +13,4 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xt xaw -MAN1= xclipboard.1 xcutsel.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xclipboard/pkg-plist b/x11/xclipboard/pkg-plist index 92f5f1914b62..6a48976afb30 100644 --- a/x11/xclipboard/pkg-plist +++ b/x11/xclipboard/pkg-plist @@ -1,5 +1,7 @@ bin/xclipboard bin/xcutsel +man/man1/xclipboard.1.gz +man/man1/xcutsel.1.gz share/X11/app-defaults/XClipboard @dirrmtry share/X11/app-defaults @dirrmtry share/X11 diff --git a/x11/xcmsdb/Makefile b/x11/xcmsdb/Makefile index 3888acbb325e..cc6990ce6b04 100644 --- a/x11/xcmsdb/Makefile +++ b/x11/xcmsdb/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 -PLIST_FILES= bin/xcmsdb +PLIST_FILES= bin/xcmsdb man/man1/xcmsdb.1.gz -MAN1= xcmsdb.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile index abf5907770cc..c0a8299e0c82 100644 --- a/x11/xconsole/Makefile +++ b/x11/xconsole/Makefile @@ -10,7 +10,4 @@ COMMENT= Monitor system console messages with X XORG_CAT= app USE_XORG= xt xaw -MAN1= xconsole.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xconsole/pkg-plist b/x11/xconsole/pkg-plist index 0fc9d891afa9..8677613b845e 100644 --- a/x11/xconsole/pkg-plist +++ b/x11/xconsole/pkg-plist @@ -1,4 +1,5 @@ bin/xconsole +man/man1/xconsole.1.gz share/X11/app-defaults/XConsole @dirrmtry share/X11/app-defaults @dirrmtry share/X11 diff --git a/x11/xdbedizzy/Makefile b/x11/xdbedizzy/Makefile index a18b84fe4149..ab970b405a42 100644 --- a/x11/xdbedizzy/Makefile +++ b/x11/xdbedizzy/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xp xext xprintutil xp xau xext -PLIST_FILES= bin/xdbedizzy +PLIST_FILES= bin/xdbedizzy man/man1/xdbedizzy.1.gz -MAN1= xdbedizzy.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile index 41ece9bfbe6f..11df94fbf42f 100644 --- a/x11/xditview/Makefile +++ b/x11/xditview/Makefile @@ -12,7 +12,4 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xt xaw -MAN1= xditview.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xditview/pkg-plist b/x11/xditview/pkg-plist index 484e20afbea9..93d82955f130 100644 --- a/x11/xditview/pkg-plist +++ b/x11/xditview/pkg-plist @@ -1,6 +1,7 @@ bin/xditview include/X11/bitmaps/ldblarrow include/X11/bitmaps/rdblarrow +man/man1/xditview.1.gz share/X11/app-defaults/Xditview share/X11/app-defaults/Xditview-chrtr @dirrmtry share/X11/app-defaults diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile index 8e8de415b1c1..938efb90a030 100644 --- a/x11/xdm/Makefile +++ b/x11/xdm/Makefile @@ -14,20 +14,16 @@ USE_XORG= xmu x11 xau xinerama xpm xdmcp xt xext xaw CONFIGURE_ARGS+= --with-xdmconfigdir=${EXAMPLESDIR} \ --with-xdmscriptdir=${EXAMPLESDIR} -MAN1= xdm.1 - CFFILES= GiveConsole TakeConsole Xaccess Xreset Xresources \ Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config OPTIONS_DEFINE= XDMSHELL XDMSHELL_DESC= Install xdmshell -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MXDMSHELL} CONFIGURE_ARGS+=--enable-xdmshell -MAN1+= xdmshell.1 PLIST_SUB+= XDMSHELL="" .else CONFIGURE_ARGS+=--disable-xdmshell @@ -50,9 +46,9 @@ post-configure: post-install: .for f in ${CFFILES} - ${CP} -n ${EXAMPLESDIR}/$f ${PREFIX}/lib/X11/xdm/$f || ${TRUE} + ${CP} -n ${EXAMPLESDIR}/$f ${STAGEDIR}${PREFIX}/lib/X11/xdm/$f || ${TRUE} .endfor ${MKDIR} /var/lib/xdm/authdir - ${LN} -sf /var/lib/xdm/authdir ${PREFIX}/lib/X11/xdm/authdir + ${LN} -sf /var/lib/xdm/authdir ${STAGEDIR}${PREFIX}/lib/X11/xdm/authdir .include <bsd.port.mk> diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist index 5dcf7e385441..a360f42e8af7 100644 --- a/x11/xdm/pkg-plist +++ b/x11/xdm/pkg-plist @@ -6,6 +6,8 @@ lib/X11/xdm/libXdmGreet.la lib/X11/xdm/libXdmGreet.so lib/X11/xdm/pixmaps/xorg-bw.xpm lib/X11/xdm/pixmaps/xorg.xpm +man/man1/xdm.1.gz +%%XDMSHELL%%man/man1/xmdshell.1.gz share/X11/app-defaults/Chooser @unexec if cmp -s %D/%%EXAMPLESDIR%%/GiveConsole %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi @unexec if cmp -s %D/%%EXAMPLESDIR%%/TakeConsole %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi diff --git a/x11/xdpyinfo/Makefile b/x11/xdpyinfo/Makefile index 3dd1d659e6c2..17da952314cc 100644 --- a/x11/xdpyinfo/Makefile +++ b/x11/xdpyinfo/Makefile @@ -13,9 +13,6 @@ XORG_CAT= app USE_XORG= dmx x11 xcb xcomposite xext xinerama xproto xrender \ xtst xxf86dga xxf86misc xxf86vm -PLIST_FILES= bin/xdpyinfo +PLIST_FILES= bin/xdpyinfo man/man1/xdpyinfo.1.gz -MAN1= xdpyinfo.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile index 11134e0e0923..f792875841fc 100644 --- a/x11/xdriinfo/Makefile +++ b/x11/xdriinfo/Makefile @@ -11,8 +11,6 @@ USE_GL= gl XORG_CAT= app USE_XORG= x11 glproto -MAN1= xdriinfo.1 -PLIST_FILES= bin/xdriinfo +PLIST_FILES= bin/xdriinfo man/man1/xdriinfo.1.gz -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile index 6c43308ee676..8d91fb83230e 100644 --- a/x11/xedit/Makefile +++ b/x11/xedit/Makefile @@ -10,7 +10,4 @@ COMMENT= Simple text editor for X XORG_CAT= app USE_XORG= xt xaw7 -MAN1= xedit.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xedit/pkg-plist b/x11/xedit/pkg-plist index 1bd6252ee24b..47b1f8773128 100644 --- a/x11/xedit/pkg-plist +++ b/x11/xedit/pkg-plist @@ -19,6 +19,7 @@ lib/X11/xedit/lisp/lisp.lsp lib/X11/xedit/lisp/xedit.lsp lib/X11/xedit/lisp/syntax.lsp lib/X11/xedit/lisp/indent.lsp +man/man1/xedit.1.gz share/X11/app-defaults/Xedit-color share/X11/app-defaults/Xedit @dirrmtry share/X11/app-defaults diff --git a/x11/xev/Makefile b/x11/xev/Makefile index a9b5c1f70ed1..3bcf87650c1b 100644 --- a/x11/xev/Makefile +++ b/x11/xev/Makefile @@ -10,9 +10,6 @@ COMMENT= Print contents of X events XORG_CAT= app USE_XORG= x11 xrandr -PLIST_FILES= bin/xev +PLIST_FILES= bin/xev man/man1/xev.1.gz -MAN1= xev.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile index 5eb9744a9a67..98cabf52df7e 100644 --- a/x11/xeyes/Makefile +++ b/x11/xeyes/Makefile @@ -10,9 +10,6 @@ COMMENT= A follow the mouse X demo XORG_CAT= app USE_XORG= x11 xt xext xmu xrender -PLIST_FILES= bin/xeyes +PLIST_FILES= bin/xeyes man/man1/xeyes.1.gz -MAN1= xeyes.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile index 0c5b9faedae2..719a4b1724bf 100644 --- a/x11/xf86dga/Makefile +++ b/x11/xf86dga/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 xxf86dga xt xaw7 xmu -PLIST_FILES= bin/dga +PLIST_FILES= bin/dga man/man1/dga.1.gz -MAN1= dga.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile index 2774d5786026..c954273b1a08 100644 --- a/x11/xfindproxy/Makefile +++ b/x11/xfindproxy/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 ice xt xproxymngproto -PLIST_FILES= bin/xfindproxy +PLIST_FILES= bin/xfindproxy man/man1/xfindproxy.1.gz -MAN1= xfindproxy.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile index 45aae4e0c0f2..d2c8e1ed7e60 100644 --- a/x11/xfwp/Makefile +++ b/x11/xfwp/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 ice xproxymngproto -PLIST_FILES= bin/xfwp +PLIST_FILES= bin/xfwp man/man1/xfwp.1.gz -MAN1= xfwp.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile index a3e96fd70326..af73b7abbe3c 100644 --- a/x11/xgamma/Makefile +++ b/x11/xgamma/Makefile @@ -10,9 +10,6 @@ COMMENT= Gamma correction through the X server. XORG_CAT= app USE_XORG= x11 xxf86vm -PLIST_FILES= bin/xgamma +PLIST_FILES= bin/xgamma man/man1/xgamma.1.gz -MAN1= xgamma.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile index b2aa5276ed92..47f7ae63d9b2 100644 --- a/x11/xgc/Makefile +++ b/x11/xgc/Makefile @@ -12,7 +12,4 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xt xaw -MAN1= xgc.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xgc/pkg-plist b/x11/xgc/pkg-plist index 3dce453f0156..1447f6a353db 100644 --- a/x11/xgc/pkg-plist +++ b/x11/xgc/pkg-plist @@ -1,4 +1,5 @@ bin/xgc +man/man1/xgc.1.gz share/X11/app-defaults/Xgc share/X11/app-defaults/Xgc-color @dirrmtry share/X11/app-defaults diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile index 66a762ecb290..0038cd1aa4b7 100644 --- a/x11/xhost/Makefile +++ b/x11/xhost/Makefile @@ -10,9 +10,6 @@ COMMENT= Server access control program for X XORG_CAT= app USE_XORG= x11 xmuu xau -PLIST_FILES= bin/xhost +PLIST_FILES= bin/xhost man/man1/xhost.1.gz -MAN1= xhost.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index c61f83f85180..37fb950c627a 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -13,9 +13,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 -MAN1= startx.1 xinit.1 - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|hexdump|/usr/bin/hexdump|' ${WRKSRC}/startx.cpp diff --git a/x11/xinit/pkg-plist b/x11/xinit/pkg-plist index d485e2debdfd..c83f92eecef7 100644 --- a/x11/xinit/pkg-plist +++ b/x11/xinit/pkg-plist @@ -1,5 +1,7 @@ bin/startx bin/xinit +man/man1/startx.1.gz +man/man1/xinit.1.gz etc/X11/xinit/xinitrc @dirrm etc/X11/xinit @dirrmtry etc/X11 diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile index 76b5ab893ad7..cc69266bd367 100644 --- a/x11/xinput/Makefile +++ b/x11/xinput/Makefile @@ -11,9 +11,6 @@ COMMENT= Very useful utility for configuring and testing XInput devices XORG_CAT= app USE_XORG= inputproto x11 xi xext xrandr xinerama -PLIST_FILES= bin/xinput +PLIST_FILES= bin/xinput man/man1/xinput.1.gz -MAN1= xinput.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile index 6c569460fb2c..e541ea728d9f 100644 --- a/x11/xkbcomp/Makefile +++ b/x11/xkbcomp/Makefile @@ -14,9 +14,7 @@ USE_XORG= x11 xkbfile USES= pathfix PLIST_FILES= bin/xkbcomp \ - libdata/pkgconfig/xkbcomp.pc + libdata/pkgconfig/xkbcomp.pc \ + man/man1/xkbcomp.1.gz -MAN1= xkbcomp.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xkbevd/Makefile b/x11/xkbevd/Makefile index 35ebe580e078..b683a9600730 100644 --- a/x11/xkbevd/Makefile +++ b/x11/xkbevd/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xkbfile x11 -PLIST_FILES= bin/xkbevd +PLIST_FILES= bin/xkbevd man/man1/xkbevd.1.gz -MAN1= xkbevd.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xkbprint/Makefile b/x11/xkbprint/Makefile index ef020a59f3f5..cf0f6bcfc4a0 100644 --- a/x11/xkbprint/Makefile +++ b/x11/xkbprint/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xkbfile x11 -PLIST_FILES= bin/xkbprint +PLIST_FILES= bin/xkbprint man/man1/xkbprint.1.gz -MAN1= xkbprint.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile index 5674cd59301b..ed4a3361ded7 100644 --- a/x11/xkbutils/Makefile +++ b/x11/xkbutils/Makefile @@ -12,7 +12,4 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xkbfile x11 xaw inputproto -MAN1= xkbbell.1 xkbvleds.1 xkbwatch.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xkbutils/pkg-plist b/x11/xkbutils/pkg-plist index d946aac18f93..8606612d937f 100644 --- a/x11/xkbutils/pkg-plist +++ b/x11/xkbutils/pkg-plist @@ -1,3 +1,6 @@ bin/xkbvleds bin/xkbwatch bin/xkbbell +man/man1/xkbbell.1.gz +man/man1/xkbvleds.1.gz +man/man1/xkbwatch.1.gz diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index ebfa770a8e7a..73c761d034ff 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ PORTNAME= xkeyboard-config -PORTVERSION= 2.9 -PORTREVISION= 1 +PORTVERSION= 2.10.1 CATEGORIES= x11 -MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME} MAINTAINER= x11@FreeBSD.org COMMENT= X Keyboard Configuration Database +MASTER_SITE_SUBDIR= individual/${XORG_CAT}/${PORTNAME} LICENSE= MIT @@ -19,21 +18,13 @@ USE_GNOME= intlhack libxslt:build USES= gmake pathfix perl5 USE_PERL5= build GNU_CONFIGURE= yes -MAKE_JOBS_UNSAFE=yes CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \ --with-xkb-rules-symlink=xorg CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN7= xkeyboard-config.7 - -OPTIONS_DEFINE= ETERSOFT -ETERSOFT_DESC= Add pre-1918 Russian letters to typographic layout -ETERSOFT_EXTRA_PATCHES= ${FILESDIR}/etersoft-patch-symbols-typo - -NO_STAGE= yes -#.include <bsd.port.options.mk> +.include <bsd.port.options.mk> # !nls case doesn't work correctly, comment it out. #.if ${PORT_OPTIONS:MNLS} @@ -49,7 +40,7 @@ post-patch: ${WRKSRC}/rules/merge.sh post-install: - ${MKDIR} /var/lib/xkb - ${LN} -sf /var/lib/xkb ${PREFIX}/share/X11/xkb/compiled + ${MKDIR} ${STAGEDIR}/var/lib/xkb + ${LN} -sf /var/lib/xkb ${STAGEDIR}${PREFIX}/share/X11/xkb/compiled .include <bsd.port.mk> diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo index e147c55fd1b4..f2a7757fb8a8 100644 --- a/x11/xkeyboard-config/distinfo +++ b/x11/xkeyboard-config/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/data/xkeyboard-config-2.9.tar.bz2) = 5e89bc182a10d53c3e83efc6c3546de0fe5504d91c3dbc80d55cc64ddab5643a -SIZE (xorg/data/xkeyboard-config-2.9.tar.bz2) = 912379 +SHA256 (xorg/data/xkeyboard-config-2.10.1.tar.bz2) = 7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b +SIZE (xorg/data/xkeyboard-config-2.10.1.tar.bz2) = 908897 diff --git a/x11/xkeyboard-config/files/etersoft-patch-symbols-typo b/x11/xkeyboard-config/files/etersoft-patch-symbols-typo deleted file mode 100644 index cf04abcf75bd..000000000000 --- a/x11/xkeyboard-config/files/etersoft-patch-symbols-typo +++ /dev/null @@ -1,26 +0,0 @@ -Etersoft version of typographic keyboard layout. It removes Yen symbol `¥' -(can be easily inserted via "Compose Y =") and adds four letters of Russian -orthography that were removed during the reform of 1917-1918. - -Original upstream bugzilla request: - - http://bugs.etersoft.ru/show_bug.cgi?id=5466 - -Description (in Russian) and the picture of keyboard layout: - - http://kb.etersoft.ru/Типографская_раскладка_Etersoft - ---- symbols/typo.orig -+++ symbols/typo -@@ -29,7 +29,10 @@ - key <AD03> { [NoSymbol, NoSymbol, EuroSign] }; // "e" - key <AD04> { [NoSymbol, NoSymbol, registered] }; // "r" - key <AD05> { [NoSymbol, NoSymbol, trademark] }; // "t" -- key <AD06> { [NoSymbol, NoSymbol, yen] }; // "y" -+ key <AD06> { [NoSymbol, NoSymbol, U0463, U0462] }; -+ key <AD07> { [NoSymbol, NoSymbol, U0475, U0474] }; -+ key <AD08> { [NoSymbol, NoSymbol, U0456, U0406] }; -+ key <AD09> { [NoSymbol, NoSymbol, U0473, U0472] }; - key <AD10> { [NoSymbol, NoSymbol, acute, doubleacute] }; // "p" - key <AD11> { [NoSymbol, NoSymbol, bracketleft, braceleft] }; // [ - key <AD12> { [NoSymbol, NoSymbol, bracketright, braceright] }; // ] diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist index bf29a8ae8293..8dc25a892d0c 100644 --- a/x11/xkeyboard-config/pkg-plist +++ b/x11/xkeyboard-config/pkg-plist @@ -1,4 +1,5 @@ libdata/pkgconfig/xkeyboard-config.pc +man/man7/xkeyboard-config.7.gz share/X11/xkb/compat/README share/X11/xkb/compat/accessx share/X11/xkb/compat/basic diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile index 55daade0bb5d..a68108318283 100644 --- a/x11/xkill/Makefile +++ b/x11/xkill/Makefile @@ -10,9 +10,6 @@ COMMENT= Utility for killing a client by its X resource XORG_CAT= app USE_XORG= x11 xmuu -PLIST_FILES= bin/xkill +PLIST_FILES= bin/xkill man/man1/xkill.1.gz -MAN1= xkill.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xload/Makefile b/x11/xload/Makefile index a8c92e4bc826..feaeae0b9d3c 100644 --- a/x11/xload/Makefile +++ b/x11/xload/Makefile @@ -12,7 +12,4 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xt xaw -MAN1= xload.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xload/pkg-plist b/x11/xload/pkg-plist index ab27b78d7852..898cb85d4aee 100644 --- a/x11/xload/pkg-plist +++ b/x11/xload/pkg-plist @@ -1,4 +1,5 @@ bin/xload +man/man1/xload.1.gz share/X11/app-defaults/XLoad @dirrmtry share/X11/app-defaults @dirrmtry share/X11 diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile index 5bddb2544d32..13b340dc89ff 100644 --- a/x11/xlogo/Makefile +++ b/x11/xlogo/Makefile @@ -12,7 +12,4 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xrender xft xext xt xaw xp xprintutil -MAN1= xlogo.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xlogo/pkg-plist b/x11/xlogo/pkg-plist index 79ee77826802..e6aad53dad6f 100644 --- a/x11/xlogo/pkg-plist +++ b/x11/xlogo/pkg-plist @@ -1,4 +1,5 @@ bin/xlogo +man/man1/xlogo.1.gz share/X11/app-defaults/XLogo share/X11/app-defaults/XLogo-color @dirrmtry share/X11/app-defaults diff --git a/x11/xlsatoms/Makefile b/x11/xlsatoms/Makefile index 240bf4abb8c9..4485740100bd 100644 --- a/x11/xlsatoms/Makefile +++ b/x11/xlsatoms/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 xmuu -PLIST_FILES= bin/xlsatoms +PLIST_FILES= bin/xlsatoms man/man1/xlsatoms.1.gz -MAN1= xlsatoms.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile index 1fa64f8301c3..45dc3d3ea192 100644 --- a/x11/xlsclients/Makefile +++ b/x11/xlsclients/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 xmuu -PLIST_FILES= bin/xlsclients +PLIST_FILES= bin/xlsclients man/man1/xlsclients.1.gz -MAN1= xlsclients.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile index 6efac1998527..7f5e20740a3f 100644 --- a/x11/xmag/Makefile +++ b/x11/xmag/Makefile @@ -12,7 +12,4 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xt xaw -MAN1= xmag.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xmag/pkg-plist b/x11/xmag/pkg-plist index 0aa24370b0d3..6fcd389d0987 100644 --- a/x11/xmag/pkg-plist +++ b/x11/xmag/pkg-plist @@ -1,4 +1,5 @@ bin/xmag +man/man1/xmag.1.gz share/X11/app-defaults/Xmag @dirrmtry share/X11/app-defaults @dirrmtry share/X11 diff --git a/x11/xman/Makefile b/x11/xman/Makefile index a741b1882467..aac364526c40 100644 --- a/x11/xman/Makefile +++ b/x11/xman/Makefile @@ -12,7 +12,4 @@ LICENSE= MIT XORG_CAT= app USE_XORG= xt xaw xp xprintutil -MAN1= xman.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xman/pkg-plist b/x11/xman/pkg-plist index 1a196e28303e..6bf595b17e0c 100644 --- a/x11/xman/pkg-plist +++ b/x11/xman/pkg-plist @@ -1,4 +1,5 @@ bin/xman +man/man1/xman.1.gz share/X11/app-defaults/Xman share/X11/xman.help @dirrmtry share/X11/app-defaults diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile index 5eb4ef85fcc6..b3a598548a13 100644 --- a/x11/xmessage/Makefile +++ b/x11/xmessage/Makefile @@ -10,7 +10,4 @@ COMMENT= Display message or query in a X window XORG_CAT= app USE_XORG= xt xaw -MAN1= xmessage.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xmessage/pkg-plist b/x11/xmessage/pkg-plist index e93abc75c414..eaa9bba9c727 100644 --- a/x11/xmessage/pkg-plist +++ b/x11/xmessage/pkg-plist @@ -1,4 +1,5 @@ bin/xmessage +man/man1/xmessage.1.gz share/X11/app-defaults/Xmessage share/X11/app-defaults/Xmessage-color @dirrmtry share/X11/app-defaults diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile index 736c3c84e2b8..563602956e01 100644 --- a/x11/xmh/Makefile +++ b/x11/xmh/Makefile @@ -12,7 +12,4 @@ RUN_DEPENDS+= repl:${PORTSDIR}/mail/nmh XORG_CAT= app USE_XORG= xaw xmu xt xbitmaps -MAN1= xmh.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xmh/pkg-plist b/x11/xmh/pkg-plist index 7def48663490..85ac46442232 100644 --- a/x11/xmh/pkg-plist +++ b/x11/xmh/pkg-plist @@ -1,4 +1,5 @@ bin/xmh +man/man1/xmh.1.gz share/X11/app-defaults/Xmh @dirrmtry share/X11/app-defaults @dirrmtry share/X11 diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile index 84aad25b169c..1bf0d3e5d45b 100644 --- a/x11/xmodmap/Makefile +++ b/x11/xmodmap/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 -PLIST_FILES= bin/xmodmap +PLIST_FILES= bin/xmodmap man/man1/xmodmap.1.gz -MAN1= xmodmap.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile index dceb6e005ae7..b2c131b759b5 100644 --- a/x11/xmore/Makefile +++ b/x11/xmore/Makefile @@ -10,7 +10,4 @@ COMMENT= Plain text display program for X XORG_CAT= app USE_XORG= xt xaw xp xprintutil -MAN1= xmore.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xmore/pkg-plist b/x11/xmore/pkg-plist index ee66b5f19057..61f8ed735ba8 100644 --- a/x11/xmore/pkg-plist +++ b/x11/xmore/pkg-plist @@ -1,4 +1,5 @@ bin/xmore +man/man1/xmore.1.gz share/X11/app-defaults/XMore @dirrmtry share/X11/app-defaults @dirrmtry share/X11 diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile index 1ccd5325eba3..b0710c24e8c2 100644 --- a/x11/xorg-apps/Makefile +++ b/x11/xorg-apps/Makefile @@ -27,10 +27,9 @@ COMPONENTS+= x11-wm/twm:twm x11-clocks/xclock:xclock xinit xterm NO_BUILD= yes -NO_STAGE= yes do-install: - ${MKDIR} ${PREFIX}/libdata/xorg - ${TOUCH} ${PREFIX}/libdata/xorg/apps + ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/xorg + ${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/apps .for comp in ${COMPONENTS} OPTIONS_DEFINE+= ${comp:C/:.*//:C/.*\///:U} diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile index 66422254b5e7..b6549ddcc7a2 100644 --- a/x11/xorg-docs/Makefile +++ b/x11/xorg-docs/Makefile @@ -8,11 +8,8 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X.org documentation files -MAN7= X.7 Standards.7 XProjectTeam.7 Consortium.7 Xsecurity.7 XOrgFoundation.7 - CONFIGURE_ARGS+= --without-xmlto --without-fop --disable-specs XORG_CAT= doc -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xorg-docs/pkg-plist b/x11/xorg-docs/pkg-plist index 43c3bc46582c..dcbfbc2b7372 100644 --- a/x11/xorg-docs/pkg-plist +++ b/x11/xorg-docs/pkg-plist @@ -1,3 +1,9 @@ +man/man7/X.7.gz +man/man7/Standards.7.gz +man/man7/XProjectTeam.7.gz +man/man7/Consortium.7.gz +man/man7/Xsecurity.7.gz +man/man7/XOrgFoundation.7.gz %%DOCSDIR%%/fonts/fonts.xml %%DOCSDIR%%/input/XKB-Config.xml %%DOCSDIR%%/input/XKB-Enhancing.xml diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile index c76f622c71ae..db86bf71a50a 100644 --- a/x11/xorg-libraries/Makefile +++ b/x11/xorg-libraries/Makefile @@ -3,7 +3,6 @@ PORTNAME= xorg-libraries PORTVERSION= 7.7 -PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none @@ -40,7 +39,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ ${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \ - ${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \ ${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \ ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \ ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \ @@ -56,9 +54,8 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \ ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \ ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm -NO_STAGE= yes do-install: - ${MKDIR} ${PREFIX}/libdata/xorg - ${TOUCH} ${PREFIX}/libdata/xorg/libraries + ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/xorg + ${TOUCH} ${STAGEDIR}${PREFIX}/libdata/xorg/libraries .include <bsd.port.mk> diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index 58d594273a56..8ba46be0f4f4 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -12,6 +12,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org complete distribution metaport NO_BUILD= yes +NO_MTREE= yes RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri @@ -19,7 +20,6 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \ ${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes -NO_STAGE= yes .include <bsd.port.options.mk> # doc diff --git a/x11/xplsprinters/Makefile b/x11/xplsprinters/Makefile index e163448a9d22..600dde2391ae 100644 --- a/x11/xplsprinters/Makefile +++ b/x11/xplsprinters/Makefile @@ -10,9 +10,6 @@ COMMENT= Shows a list of Xprint printers XORG_CAT= app USE_XORG= xp xprintutil x11 -PLIST_FILES= bin/xplsprinters +PLIST_FILES= bin/xplsprinters man/man1/xplsprinters.1.gz -MAN1= xplsprinters.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xprehashprinterlist/Makefile b/x11/xprehashprinterlist/Makefile index d47b71024f65..63053a1af6a5 100644 --- a/x11/xprehashprinterlist/Makefile +++ b/x11/xprehashprinterlist/Makefile @@ -10,9 +10,6 @@ COMMENT= Recomputes the list of available printers. XORG_CAT= app USE_XORG= xp x11 -PLIST_FILES= bin/xprehashprinterlist +PLIST_FILES= bin/xprehashprinterlist man/man1/xprehashprinterlist.1.gz -MAN1= xprehashprinterlist.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile index ad0854334539..38acc2efb756 100644 --- a/x11/xprop/Makefile +++ b/x11/xprop/Makefile @@ -10,9 +10,6 @@ COMMENT= Property displayer for X XORG_CAT= app USE_XORG= xmuu x11 -PLIST_FILES= bin/xprop +PLIST_FILES= bin/xprop man/man1/xprop.1.gz -MAN1= xprop.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile index 3fbb50b717af..22dd13cf77aa 100644 --- a/x11/xproto/Makefile +++ b/x11/xproto/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xproto -PORTVERSION= 7.0.24 +PORTVERSION= 7.0.25 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo index 88deba2211c1..9a92725117fd 100644 --- a/x11/xproto/distinfo +++ b/x11/xproto/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/proto/xproto-7.0.24.tar.bz2) = 3698a1c7e3b734bc1139a7eb694ed8c66188658d6b4dea3d567066fe4e88b2fc -SIZE (xorg/proto/xproto-7.0.24.tar.bz2) = 292795 +SHA256 (xorg/proto/xproto-7.0.25.tar.bz2) = 92247485dc4ffc3611384ba84136591923da857212a7dc29f4ad7797e13909fe +SIZE (xorg/proto/xproto-7.0.25.tar.bz2) = 295948 diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile index 52045ba58b25..8d067fa30d73 100644 --- a/x11/xrandr/Makefile +++ b/x11/xrandr/Makefile @@ -11,9 +11,7 @@ XORG_CAT= app USE_XORG= xrandr xrender x11 PLIST_FILES= bin/xrandr \ - bin/xkeystone + bin/xkeystone \ + man/man1/xrandr.1.gz -MAN1= xrandr.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile index eafd3bd5a2c0..810053bc7c2b 100644 --- a/x11/xrdb/Makefile +++ b/x11/xrdb/Makefile @@ -10,9 +10,6 @@ COMMENT= X server resource database utility XORG_CAT= app USE_XORG= xmuu x11 -PLIST_FILES= bin/xrdb +PLIST_FILES= bin/xrdb man/man1/xrdb.1.gz -MAN1= xrdb.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile index 75e016be4c5b..b6c55219516f 100644 --- a/x11/xrefresh/Makefile +++ b/x11/xrefresh/Makefile @@ -12,9 +12,6 @@ LICENSE= MIT XORG_CAT= app USE_XORG= x11 -PLIST_FILES= bin/xrefresh +PLIST_FILES= bin/xrefresh man/man1/xrefresh.1.gz -MAN1= xrefresh.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile index 46b1d1462ae0..db83c048f313 100644 --- a/x11/xrx/Makefile +++ b/x11/xrx/Makefile @@ -12,9 +12,6 @@ USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw ice USE_LDCONFIG= yes USE_AUTOTOOLS= libtool -MAN1= xrx.1 libxrx.1 - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|mozilla-plugin|disabled-libxul-plugin|g' \ ${WRKSRC}/configure diff --git a/x11/xrx/pkg-plist b/x11/xrx/pkg-plist index 783211e4a138..20c708613730 100644 --- a/x11/xrx/pkg-plist +++ b/x11/xrx/pkg-plist @@ -5,4 +5,5 @@ lib/libxrx.so lib/libxrxnest.a lib/libxrxnest.la lib/libxrxnest.so -@dirrmtry include/X11/extensions +man/man1/xrx.1.gz +man/man1/libxrx.1.gz diff --git a/x11/xsetmode/Makefile b/x11/xsetmode/Makefile index 10a2d7bdb07b..19b457a96a67 100644 --- a/x11/xsetmode/Makefile +++ b/x11/xsetmode/Makefile @@ -10,9 +10,6 @@ COMMENT= Set the mode for an X Input Device XORG_CAT= app USE_XORG= xi x11 -PLIST_FILES= bin/xsetmode +PLIST_FILES= bin/xsetmode man/man1/xsetmode.1.gz -MAN1= xsetmode.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xsetpointer/Makefile b/x11/xsetpointer/Makefile index 0589bb5ed681..06667e8400ab 100644 --- a/x11/xsetpointer/Makefile +++ b/x11/xsetpointer/Makefile @@ -10,9 +10,6 @@ COMMENT= Set an X Input device as the main pointer XORG_CAT= app USE_XORG= xi x11 -PLIST_FILES= bin/xsetpointer +PLIST_FILES= bin/xsetpointer man/man1/xsetpointer.1.gz -MAN1= xsetpointer.1 - -NO_STAGE= yes .include <bsd.port.mk> diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile index 6a268d80d78d..f70ecdd1dc27 100644 --- a/x11/xtrans/Makefile +++ b/x11/xtrans/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xtrans -PORTVERSION= 1.2.7 +PORTVERSION= 1.3.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo index 15557067df4c..59088e2cd73a 100644 --- a/x11/xtrans/distinfo +++ b/x11/xtrans/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/lib/xtrans-1.2.7.tar.bz2) = 7f811191ba70a34a9994d165ea11a239e52c527f039b6e7f5011588f075fe1a6 -SIZE (xorg/lib/xtrans-1.2.7.tar.bz2) = 173025 +SHA256 (xorg/lib/xtrans-1.3.2.tar.bz2) = 94177c89b74f594bcddc6a12825e9b464e17ab1977de671d25f67a4ea922cb87 +SIZE (xorg/lib/xtrans-1.3.2.tar.bz2) = 177812 diff --git a/x11/xtrans/files/patch-Xtransint.h b/x11/xtrans/files/patch-Xtransint.h new file mode 100644 index 000000000000..dad289484542 --- /dev/null +++ b/x11/xtrans/files/patch-Xtransint.h @@ -0,0 +1,11 @@ +--- Xtransint.h.orig 2013-11-08 10:46:59.086340096 +0100 ++++ Xtransint.h 2013-11-08 11:02:02.275278727 +0100 +@@ -72,7 +72,7 @@ + # define XTRANSDEBUG 1 + #endif + +-#if XTRANS_SEND_FDS && !(defined(linux) || defined(__sun)) ++#if XTRANS_SEND_FDS && !(defined(linux) || defined(__sun) || defined(__FreeBSD__)) + #error "FD passing support only on Linux & Solaris" + #endif + diff --git a/x11/xtrans/pkg-plist b/x11/xtrans/pkg-plist index e0184a46f275..056a695d5cf5 100644 --- a/x11/xtrans/pkg-plist +++ b/x11/xtrans/pkg-plist @@ -3,7 +3,6 @@ include/X11/Xtrans/Xtrans.h include/X11/Xtrans/Xtransint.h include/X11/Xtrans/Xtranslcl.c include/X11/Xtrans/Xtranssock.c -include/X11/Xtrans/Xtranstli.c include/X11/Xtrans/Xtransutil.c include/X11/Xtrans/transport.c libdata/pkgconfig/xtrans.pc diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile index ec0417552959..6e905ce2f845 100644 --- a/x11/xvidtune/Makefile +++ b/x11/xvidtune/Makefile @@ -9,4 +9,5 @@ COMMENT= Video mode tuner for X XORG_CAT= app USE_XORG= xxf86vm xt xaw + .include <bsd.port.mk> diff --git a/x11/xvmcinfo/Makefile b/x11/xvmcinfo/Makefile index 114dcd5c04ee..a85d9cf19818 100644 --- a/x11/xvmcinfo/Makefile +++ b/x11/xvmcinfo/Makefile @@ -16,15 +16,12 @@ NO_WRKSUBDIR= defined PLIST_FILES= bin/xvmcinfo -NO_MAN= defined - -NO_STAGE= yes do-build: ${CC} ${CFLAGS} ${CPPFLAGS} \ -I${LOCALBASE}/include -L${LOCALBASE}/lib \ -o ${WRKSRC}/xvmcinfo ${FILESDIR}/xvmcinfo.c ${LDFLAGS} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xvmcinfo ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/xvmcinfo ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> |