[Midnightbsd-cvs] mports: x11-servers/xorg-vfbserver: Update to xorg 7.3

[ctriv at midnightbsd.org]

Log Message:
-----------
Update to xorg 7.3

Modified Files:
--------------
    mports/x11-servers/xorg-vfbserver:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1.1.1 -> r1.2)

Removed Files:
-------------
    mports/x11-servers/xorg-vfbserver:
        pkg-plist
    mports/x11-servers/xorg-vfbserver/scripts:
        configure

-------------- next part --------------
--- x11-servers/xorg-vfbserver/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/Xvfb
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-vfbserver/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lx11-servers/xorg-vfbserver/Makefile -Lx11-servers/xorg-vfbserver/Makefile -u -r1.2 -r1.3
--- x11-servers/xorg-vfbserver/Makefile
+++ x11-servers/xorg-vfbserver/Makefile
@@ -2,39 +2,37 @@
 # Date created:		17 June 2004
 # Whom:			anholt at FreeBSD.org
 #
-# $MidnightBSD$
-# $FreeBSD: ports/x11-servers/xorg-vfbserver/Makefile,v 1.10 2006/08/25 21:52:49 lesi Exp $
+# $FreeBSD: ports/x11-servers/xorg-vfbserver/Makefile,v 1.12 2007/09/13 19:44:56 flz Exp $
 #
 
 PORTNAME=	xorg-vfbserver
-PORTVERSION=	6.9.0
-PORTREVISION=	2
+PORTVERSION=	1.4
+PORTEPOCH=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
 
-MAINTAINER=	ports at MidnightBSD.org
+MAINTAINER=	x11 at FreeBSD.org
 COMMENT=	X virtual framebuffer server from X.Org
 
 CONFLICTS=	XFree86-VirtualFramebufferServer-*
 
-EXTRA_PATCHES=	${CF_PATCHES} ${SERVER_PATCHES}
+XORG_CAT=	xserver
 
-USE_XLIB=	yes
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
+USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
+		damageproto xcmiscproto xextproto xf86miscproto \
+		xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+		resourceproto fontsproto xf86dgaproto videoproto \
+		compositeproto trapproto recordproto resourceproto \
+		xineramaproto evieproto xkbfile xfont fontenc xkbui xxf86misc \
+		xxf86vm xaw7 xmu xpm xext pixman
 
-XBUILD_DIRS=	lib/font programs/Xserver/miext/damage programs/Xserver
-XINCLUDE_DIRS=	lib/xtrans
-XMAN_DIRS=	programs/Xserver
+CONFIGURE_ARGS=	--disable-dmx --disable-xnest --disable-xorg --disable-xprint \
+		--localstatedir=/var
 
+PLIST_FILES=	bin/Xvfb
 MAN1=		Xvfb.1
 
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-.include <bsd.port.post.mk>
+do-install:
+	cd ${WRKSRC}/hw/vfb; ${MAKE} ${FAKE_MAKEARGS} install
+
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-vfbserver/distinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-vfbserver/distinfo -Lx11-servers/xorg-vfbserver/distinfo -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-vfbserver/distinfo
+++ x11-servers/xorg-vfbserver/distinfo
@@ -1,6 +1,3 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
+SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
+SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
--- x11-servers/xorg-vfbserver/scripts/configure
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer YES"			>> $LOCALDEF
-echo "#define BuildServersOnly YES"		>> $LOCALDEF
-echo "#define XprtServer NO"			>> $LOCALDEF
-echo "#define BuildXprint NO"			>> $LOCALDEF
-echo "#define XnestServer NO"			>> $LOCALDEF
-echo "#define XorgServer NO"			>> $LOCALDEF
-echo "#define XVirtualFramebufferServer YES"	>> $LOCALDEF
-echo "#define XF86Server NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"		>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define BuildXF86DRI NO"			>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
-echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-echo "#define InstallSecurityConfig NO"		>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen