[Midnightbsd-cvs] mports [24921] update xorg servers
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 9 11:30:51 EST 2019
Revision: 24921
http://svnweb.midnightbsd.org/mports/?rev=24921
Author: laffer1
Date: 2019-02-09 11:30:50 -0500 (Sat, 09 Feb 2019)
Log Message:
-----------
update xorg servers
Modified Paths:
--------------
trunk/x11-servers/Xfstt/Makefile
trunk/x11-servers/x2vnc/Makefile
trunk/x11-servers/x2x/Makefile
trunk/x11-servers/x2x/distinfo
trunk/x11-servers/xorg-dmx/Makefile
trunk/x11-servers/xorg-dmx/pkg-descr
trunk/x11-servers/xorg-nestserver/Makefile
trunk/x11-servers/xorg-nestserver/distinfo
trunk/x11-servers/xorg-nestserver/pkg-descr
trunk/x11-servers/xorg-server/Makefile
Added Paths:
-----------
trunk/x11-servers/x2x/files/patch-configure.ac
Removed Paths:
-------------
trunk/x11-servers/x2x/files/patch-aa
Property Changed:
----------------
trunk/x11-servers/x2vnc/pkg-descr
trunk/x11-servers/x2x/pkg-descr
trunk/x11-servers/xorg-dmx/pkg-descr
trunk/x11-servers/xorg-nestserver/pkg-descr
trunk/x11-servers/xorg-server/pkg-descr
Modified: trunk/x11-servers/Xfstt/Makefile
===================================================================
--- trunk/x11-servers/Xfstt/Makefile 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/Xfstt/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
@@ -2,6 +2,7 @@
PORTNAME= xfstt
PORTVERSION= 1.9.2
+PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= http://archive.hadrons.org/software/xfstt/
@@ -12,7 +13,7 @@
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
Modified: trunk/x11-servers/x2vnc/Makefile
===================================================================
--- trunk/x11-servers/x2vnc/Makefile 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/x2vnc/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
@@ -1,11 +1,10 @@
# $MidnightBSD$
PORTNAME= x2vnc
-PORTVERSION= 1.72
-PORTREVISION= 3
+PORTVERSION= 1.7.2
+PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= http://fredrik.hubbe.net/x2vnc/
-DISTNAME= ${PORTNAME}-1.7.2
MAINTAINER= ports at MidnightBSD.org
COMMENT= Program to link multiple X and VNC servers together
Index: trunk/x11-servers/x2vnc/pkg-descr
===================================================================
--- trunk/x11-servers/x2vnc/pkg-descr 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/x2vnc/pkg-descr 2019-02-09 16:30:50 UTC (rev 24921)
Property changes on: trunk/x11-servers/x2vnc/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-servers/x2x/Makefile
===================================================================
--- trunk/x11-servers/x2x/Makefile 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/x2x/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
@@ -1,10 +1,8 @@
# $MidnightBSD$
PORTNAME= x2x
-PORTVERSION= 1.27
-PORTREVISION= 5
+PORTVERSION= 1.30.20180709
CATEGORIES= x11-servers
-MASTER_SITES= GHC
MAINTAINER= ports at MidnightBSD.org
COMMENT= A program to link multiple X servers together
@@ -11,23 +9,19 @@
LICENSE= unknown
LICENSE= mit
+LICENSE_FILE= ${WRKSRC}/COPYING
+USES= autoreconf gmake pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= dottedmag
+GH_TAGNAME= e62a535
+GNU_CONFIGURE= yes
+USE_XORG= x11 xext xtst
-WRKSRC= ${WRKDIR}/${DISTNAME}
+OPTIONS_DEFINE= DOCS
-USES= imake
-USE_XORG= x11 xext xtst
+PORTDOCS= *
PLIST_FILES= bin/x2x man/man1/x2x.1.gz
-post-extract:
- @${LN} -sf x2x.1 ${WRKSRC}/x2x.man
-
-post-patch:
- @${REINPLACE_CMD} -e \
- '/CC =/s|^|XCOMM| ; \
- /CDEBUGFLAGS =/s|^|XCOMM|' ${WRKSRC}/Imakefile
-
.include <bsd.port.mk>
Modified: trunk/x11-servers/x2x/distinfo
===================================================================
--- trunk/x11-servers/x2x/distinfo 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/x2x/distinfo 2019-02-09 16:30:50 UTC (rev 24921)
@@ -1,2 +1,3 @@
-SHA256 (x2x-1.27.tar.gz) = d27ffc37d801934e79a91aa8f413d9d6466297995bf7c88156842d1aec040a36
-SIZE (x2x-1.27.tar.gz) = 16776
+TIMESTAMP = 1531643384
+SHA256 (dottedmag-x2x-1.30.20180709-e62a535_GH0.tar.gz) = 26f9b43e982a64daf13dcad0be694d4687032e914c3d0b3e9baad8b51f08d41d
+SIZE (dottedmag-x2x-1.30.20180709-e62a535_GH0.tar.gz) = 47678
Deleted: trunk/x11-servers/x2x/files/patch-aa
===================================================================
--- trunk/x11-servers/x2x/files/patch-aa 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/x2x/files/patch-aa 2019-02-09 16:30:50 UTC (rev 24921)
@@ -1,10 +0,0 @@
---- Imakefile~ Thu Aug 21 01:44:52 1997
-+++ Imakefile Sun Sep 3 16:44:47 2000
-@@ -10,3 +10,7 @@
- CDEBUGFLAGS = -O
-
- ComplexProgramTarget(x2x)
-+# Added by Greg Lehey <grog at FreeBSD.org> for FreeBSD port
-+x2x.man: x2x.1
-+ rm -f x2x.man
-+ ln x2x.1 x2x.man
Added: trunk/x11-servers/x2x/files/patch-configure.ac
===================================================================
--- trunk/x11-servers/x2x/files/patch-configure.ac (rev 0)
+++ trunk/x11-servers/x2x/files/patch-configure.ac 2019-02-09 16:30:50 UTC (rev 24921)
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2018-07-15 08:54:28 UTC
++++ configure.ac
+@@ -15,7 +15,7 @@ AC_CONFIG_HEADERS([config.h])
+ AC_PROG_CC
+ AC_PROG_INSTALL
+
+-AX_CFLAGS_WARN_ALL
++#AX_CFLAGS_WARN_ALL
+
+ ## This PKG_CHECK_MODULES can be replaced by the following three
+ ## AC_SEARCH_LIBSs and the non-Cygwin setting of AM_LDFLAGS and
Property changes on: trunk/x11-servers/x2x/files/patch-configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/x11-servers/x2x/pkg-descr
===================================================================
--- trunk/x11-servers/x2x/pkg-descr 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/x2x/pkg-descr 2019-02-09 16:30:50 UTC (rev 24921)
Property changes on: trunk/x11-servers/x2x/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-servers/xorg-dmx/Makefile
===================================================================
--- trunk/x11-servers/xorg-dmx/Makefile 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/xorg-dmx/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= xorg-dmx
-PORTREVISION= 0
+PORTREVISION= 1
MAINTAINER= ports at MidnightBSD.org
COMMENT= Distributed Multihead X from X.Org
@@ -10,18 +10,12 @@
MASTERDIR= ${.CURDIR}/../xorg-server
DESCR= ${.CURDIR}/pkg-descr
-USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
- dri2proto damageproto xcmiscproto xextproto xf86miscproto \
- xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
- resourceproto fontsproto xf86dgaproto videoproto \
- compositeproto trapproto recordproto resourceproto \
- xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
- xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
- xau dmx xtst xres pixman xtrans
+USE_XORG= dmx xorgproto x11 xaw7 xext xfixes xi xmu xpm xrender xres xt xtst
-CONFIGURE_ARGS= --disable-xvfb --disable-xnest \
+CONFIGURE_ARGS= --disable-xephyr --disable-xvfb --disable-xnest \
--without-xmlto --disable-docs --disable-devel-docs \
- --enable-dmx --localstatedir=/var --without-dtrace
+ --enable-dmx --localstatedir=/var --without-dtrace \
+ --disable-xwayland
SLAVE_PORT= yes
Modified: trunk/x11-servers/xorg-dmx/pkg-descr
===================================================================
--- trunk/x11-servers/xorg-dmx/pkg-descr 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/xorg-dmx/pkg-descr 2019-02-09 16:30:50 UTC (rev 24921)
@@ -3,4 +3,4 @@
When Xinerama is used with Xdmx, the multiple displays on multiple machines
are presented to the user as a single unified screen.
-WWW: http://www.x.org/
+WWW: https://www.x.org/
Property changes on: trunk/x11-servers/xorg-dmx/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/x11-servers/xorg-nestserver/Makefile
===================================================================
--- trunk/x11-servers/xorg-nestserver/Makefile 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/xorg-nestserver/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
@@ -1,60 +1,43 @@
# $MidnightBSD$
PORTNAME= xorg-nestserver
-PORTVERSION= 1.14.7
-PORTREVISION= 2
-PORTEPOCH= 1
-CATEGORIES= x11-servers
-MASTER_SITES= XORG/individual/xserver
-DISTNAME= xorg-server-${PORTVERSION}
-DIST_SUBDIR= xorg/xserver
+PORTVERSION= 1.19.1
+PORTEPOCH= 2
MAINTAINER= ports at MidnightBSD.org
COMMENT= Nesting X server from X.Org
+
LICENSE= mit
-USES= tar:bzip2 pkgconfig
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-dmx \
- --disable-xephyr \
- --enable-xnest \
- --disable-xfbdev \
- --disable-kdrive \
- --disable-xfake \
- --disable-screensaver \
- --disable-xwin \
- --disable-xwayland \
- --disable-xorg \
- --without-xmlto \
- --disable-docs \
- --disable-devel-docs \
- --localstatedir=/var \
- --without-dtrace \
- --without-doxygen \
- --disable-libpciaccess \
- --disable-glx \
- --disable-dri \
- --disable-config-hal \
- --disable-libdrm \
- --disable-glx-tls \
- --disable-vbe \
- --disable-vgahw \
- --disable-xvfb \
- --with-fontrootdir=${PREFIX}/share/fonts
+MASTERDIR= ${.CURDIR}/../xorg-server
+DESCR= ${.CURDIR}/pkg-descr
+DISTINFO_FILE= ${.CURDIR}/distinfo
+PATCHDIR= ${.CURDIR}/files
-USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
- damageproto xcmiscproto xextproto xf86miscproto inputproto \
- xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
- dri2proto resourceproto fontsproto xf86dgaproto videoproto \
- compositeproto trapproto recordproto resourceproto \
- xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
- xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
+RUN_DEPENDS= xkeyboard-config>=2.5:x11/xkeyboard-config
-PLIST_FILES= bin/Xnest \
- man/man1/Xnest.1.gz
+SLAVE_PORT= yes
+OPTIONS_EXCLUDE=DEVD HAL SUID
+USE_XORG= x11 xext xfont2
+
+CONFIGURE_ARGS+=--enable-xnest --disable-dmx --disable-xephyr --disable-xvfb \
+ --disable-xwayland
+
+PLIST_FILES= bin/Xnest man/man1/Xnest.1.gz
+
+EXTRA_PATCHES= ${MASTERDIR}/files/patch-CVE-2017-12176 \
+ ${MASTERDIR}/files/patch-CVE-2017-12177 \
+ ${MASTERDIR}/files/patch-CVE-2017-12178 \
+ ${MASTERDIR}/files/patch-CVE-2017-12179 \
+ ${MASTERDIR}/files/patch-CVE-2017-12183 \
+ ${MASTERDIR}/files/patch-CVE-2017-1218x \
+ ${MASTERDIR}/files/patch-CVE-2017-1218y \
+ ${MASTERDIR}/files/patch-CVE-2017-13721 \
+ ${MASTERDIR}/files/patch-CVE-2017-13723 \
+ ${MASTERDIR}/files/patch-os_io.c
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${STAGEDIR}${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/hw/xnest/man/Xnest.1 ${STAGEDIR}${PREFIX}/man/man1/
+ cd ${WRKSRC}/hw/xnest; DESTDIR=${FAKE_DESTDIR} ${MAKE} ${FAKE_MAKEARGS} install
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Modified: trunk/x11-servers/xorg-nestserver/distinfo
===================================================================
--- trunk/x11-servers/xorg-nestserver/distinfo 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/xorg-nestserver/distinfo 2019-02-09 16:30:50 UTC (rev 24921)
@@ -1,2 +1,3 @@
-SHA256 (xorg/xserver/xorg-server-1.14.7.tar.bz2) = fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f
-SIZE (xorg/xserver/xorg-server-1.14.7.tar.bz2) = 5520884
+TIMESTAMP = 1484388904
+SHA256 (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb
+SIZE (xorg/xserver/xorg-server-1.19.1.tar.bz2) = 6041792
Modified: trunk/x11-servers/xorg-nestserver/pkg-descr
===================================================================
--- trunk/x11-servers/xorg-nestserver/pkg-descr 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/xorg-nestserver/pkg-descr 2019-02-09 16:30:50 UTC (rev 24921)
@@ -1,3 +1,3 @@
This package contains Xnest, a nesting X Server that displays on an X Server.
-WWW: http://www.x.org/
+WWW: https://www.x.org/
Property changes on: trunk/x11-servers/xorg-nestserver/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-servers/xorg-server/Makefile
===================================================================
--- trunk/x11-servers/xorg-server/Makefile 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/xorg-server/Makefile 2019-02-09 16:30:50 UTC (rev 24921)
@@ -2,7 +2,7 @@
PORTNAME?= xorg-server
PORTVERSION?= 1.18.4
-PORTREVISION?= 2
+PORTREVISION?= 3
PORTEPOCH?= 1
CATEGORIES= x11-servers
MASTER_SITES= XORG/individual/xserver
@@ -35,12 +35,7 @@
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 @@
.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
Index: trunk/x11-servers/xorg-server/pkg-descr
===================================================================
--- trunk/x11-servers/xorg-server/pkg-descr 2019-02-09 04:48:44 UTC (rev 24920)
+++ trunk/x11-servers/xorg-server/pkg-descr 2019-02-09 16:30:50 UTC (rev 24921)
Property changes on: trunk/x11-servers/xorg-server/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list