diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2018-07-31 18:41:30 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2018-07-31 18:41:30 +0000 |
| commit | 15dac70c75ad7e5286c80ca05c69fbfc1061905c (patch) | |
| tree | 71f4780cd34e184b043831e0db99b92f22e0da0d /x11-servers | |
| parent | e81287c37b3d7ec77e4687a96e63839a01baeb30 (diff) | |
| download | ports-15dac70c75ad7e5286c80ca05c69fbfc1061905c.tar.gz ports-15dac70c75ad7e5286c80ca05c69fbfc1061905c.zip | |
Switch to xorgproto instead of individual packages
Upstream used to distribute protocol headers as separate packages, but has
decided to merge those to a common package, named xorgproto. This update
tracks that change.
* Add a new port, x11/xorgproto, with are protocol headers for xorg.
* Hook the new protocol port to the build and to infrastructure in
bsd.xorg.mk.
* Update all ports with a dependency on any of the old *proto packages to
instead depend on xorgproto. Bump portrevision.
* Delete the old *proto packages, update MOVED.
PR: 230023
Submitted by: zeising
Approved by: portmgr (antoine)
exp-run by: antoine
Notes
Notes:
svn path=/head/; revision=476013
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/Xfstt/Makefile | 3 | ||||
| -rw-r--r-- | x11-servers/xorg-dmx/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 11 |
3 files changed, 6 insertions, 10 deletions
diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile index b4990285ef75..2788a4b6874d 100644 --- a/x11-servers/Xfstt/Makefile +++ b/x11-servers/Xfstt/Makefile @@ -3,6 +3,7 @@ PORTNAME= xfstt PORTVERSION= 1.9.2 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= http://archive.hadrons.org/software/xfstt/ @@ -13,7 +14,7 @@ LICENSE= LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING.LIB USES= pkgconfig tar:xz -USE_XORG= fontsproto xproto +USE_XORG= xorgproto USE_RC_SUBR= xfstt GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-nls diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile index ff7c3a1096b6..5e13159778cf 100644 --- a/x11-servers/xorg-dmx/Makefile +++ b/x11-servers/xorg-dmx/Makefile @@ -13,7 +13,7 @@ DESCR= ${.CURDIR}/pkg-descr SLAVE_PORT= yes OPTIONS_EXCLUDE=DEVD HAL SUID -USE_XORG= dmx dmxproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst +USE_XORG= dmx xorgproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst CONFIGURE_ARGS+=--enable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ --disable-xwayland diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 1763b0b525a7..fbe4f78f5263 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION?= 1.18.4 -PORTREVISION?= 8 +PORTREVISION?= 9 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver @@ -36,12 +36,7 @@ OPTIONS_EXCLUDE_sparc64= HAL USES= gmake libtool perl5 ssl tar:bzip2 USE_PERL5= build USE_GL+= gl -USE_XORG+= bigreqsproto compositeproto damageproto dri2proto dri3proto \ - fixesproto fontsproto glproto inputproto kbproto pixman \ - presentproto randrproto recordproto renderproto \ - resourceproto scrnsaverproto videoproto xau \ - xcmiscproto xdmcp xextproto xf86driproto xfont \ - xineramaproto xkbfile xproto xshmfence xtrans +USE_XORG+= pixman xau xdmcp xfont xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ --localstatedir=/var --with-shared-memory-dir=/tmp \ --disable-config-udev --disable-config-udev-kms \ @@ -57,7 +52,7 @@ BUILD_DEPENDS+= libepoxy>0:graphics/libepoxy # only for configure .if ${SLAVE_PORT} == "no" USE_GL+= gbm -USE_XORG+= pciaccess xf86dgaproto xf86vidmodeproto +USE_XORG+= pciaccess CONFIGURE_ARGS+=--disable-dmx --disable-xephyr --disable-xnest --disable-xvfb \ --disable-xwayland --enable-xcsecurity SUB_FILES= pkg-install pkg-deinstall |