svn commit: r367647 - head/x11-servers/xorg-nestserver

[Baptiste Daroussin]

Author: bapt
Date: Mon Sep  8 16:10:24 2014
New Revision: 367647
URL: http://svnweb.freebsd.org/changeset/ports/367647
QAT: https://qat.redports.org/buildarchive/r367647/

Log:
  Update to 1.14.7
  - changes:
  * Do not make it a slave of xorg-server anymore so it doesn't change depending
    on NEW_XORG
  * Update to the highest version able to deal with dependencies of the oldest
    xorg supported

Modified:
  head/x11-servers/xorg-nestserver/Makefile
  head/x11-servers/xorg-nestserver/distinfo

Modified: head/x11-servers/xorg-nestserver/Makefile
==============================================================================
--- head/x11-servers/xorg-nestserver/Makefile	Mon Sep  8 16:09:46 2014	(r367646)
+++ head/x11-servers/xorg-nestserver/Makefile	Mon Sep  8 16:10:24 2014	(r367647)
@@ -2,11 +2,45 @@
 # $FreeBSD$
 
 PORTNAME=	xorg-nestserver
+PORTVERSION=	1.14.7
+PORTEPOCH=	1
+CATEGORIES=	x11-servers
+MASTER_SITES=	XORG
+MASTER_SITE_SUBDIR=	individual/xserver
+DISTNAME=	xorg-server-${PORTVERSION}
+DIST_SUBDIR=	xorg/xserver
 
+MAINTAINER=	x11 at FreeBSD.org
 COMMENT=	Nesting X server from X.Org
 
-MASTERDIR=	${.CURDIR}/../xorg-server
-DESCR=		${.CURDIR}/pkg-descr
+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
+
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		damageproto xcmiscproto xextproto xf86miscproto inputproto \
 		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
@@ -15,21 +49,11 @@ USE_XORG=	x11 xf86driproto glproto randr
 		xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
 		xxf86misc xxf86vm xaw7 xmu xpm xext pixman xtrans
 
-CONFIGURE_ARGS=	--disable-dmx --disable-xvfb \
-		--without-xmlto --disable-docs --disable-devel-docs \
-		--localstatedir=/var --without-dtrace
-
-SLAVE_PORT=	yes
-PLIST_FILES=	bin/Xnest man/man1/Xnest.1.gz
-
-.include <bsd.port.options.mk>
+PLIST_FILES=	bin/Xnest \
+		man/man1/Xnest.1.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hw/xnest/Xnest ${STAGEDIR}${PREFIX}/bin/
-.if defined(WITH_NEW_XORG)
 	${INSTALL_MAN} ${WRKSRC}/hw/xnest/man/Xnest.1 ${STAGEDIR}${PREFIX}/man/man1/
-.else
-	${INSTALL_MAN} ${WRKSRC}/hw/xnest/Xnest.1 ${STAGEDIR}${PREFIX}/man/man1/
-.endif
 
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>

Modified: head/x11-servers/xorg-nestserver/distinfo
==============================================================================
--- head/x11-servers/xorg-nestserver/distinfo	Mon Sep  8 16:09:46 2014	(r367646)
+++ head/x11-servers/xorg-nestserver/distinfo	Mon Sep  8 16:10:24 2014	(r367647)
@@ -1,2 +1,2 @@
-SHA256 (xorg/xserver/xorg-server-1.10.4.tar.bz2) = fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
-SIZE (xorg/xserver/xorg-server-1.10.4.tar.bz2) = 5386174
+SHA256 (xorg/xserver/xorg-server-1.14.7.tar.bz2) = fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f
+SIZE (xorg/xserver/xorg-server-1.14.7.tar.bz2) = 5520884