- Update to 1.7.7

- Remove conflict with xfree
- Cleanup $FreeBSD$ header



git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-dev@221 058c260c-8361-11dd-a0ac-aa2bafec7d09

10 files changed, 16 insertions, 26 deletions

diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index d6f75e0..1acc4d7 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -2,11 +2,11 @@
 # Date created:				2008-05-18
 # Whom:					Max Brazhnikov <makc@issp.ac.ru>
 #
-# $FreeBSD: ports/x11-servers/xephyr/Makefile,v 1.10 2010/05/01 11:41:04 miwi Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	xephyr
-PORTVERSION=	1.7.5
+PORTVERSION=	1.7.7
 CATEGORIES=	x11-servers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo
index d31dc3f..86aaea9 100644
--- a/x11-servers/xephyr/distinfo
+++ b/x11-servers/xephyr/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
-SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
-SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 655865d..75d5794 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	xorg-dmx
-PORTVERSION=	1.7.5
+PORTVERSION=	1.7.7
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Distributed Multihead X from X.Org
 
-CONFLICTS=	XFree86-dmx-[0-9]*
-
 XORG_CAT=	xserver
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index d31dc3f..86aaea9 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
-SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
-SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 8334135..d4cd90a 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	xorg-nestserver
-PORTVERSION=	1.7.5
+PORTVERSION=	1.7.7
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Nesting X server from X.Org
 
-CONFLICTS=	XFree86-NestServer-*
-
 XORG_CAT=	xserver
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index d31dc3f..86aaea9 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
-SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
-SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 1216a38..4f3a472 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -2,19 +2,17 @@
 # Date created:		17 June 2004
 # Whom:			anholt@FreeBSD.org
 #
-# $FreeBSD: ports/x11-servers/xorg-vfbserver/Makefile,v 1.20 2010/05/01 11:41:06 miwi Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	xorg-vfbserver
-PORTVERSION=	1.7.5
+PORTVERSION=	1.7.7
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X virtual framebuffer server from X.Org
 
-CONFLICTS=	XFree86-VirtualFramebufferServer-*
-
 XORG_CAT=	xserver
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
index d31dc3f..86aaea9 100644
--- a/x11-servers/xorg-vfbserver/distinfo
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -1,3 +1,2 @@
-MD5 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 2856130aebf56e3df7b7d9be419bfb28
-SHA256 (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 91e5f3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa
-SIZE (xorg/xserver/xorg-server-1.7.5.tar.bz2) = 4926990
+SHA256 (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff
+SIZE (xorg/xserver/xorg-server-1.7.7.tar.bz2) = 4939257
diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile
index 7e1e054..e7bc81d 100644
--- a/x11-toolkits/libXt/Makefile
+++ b/x11-toolkits/libXt/Makefile
@@ -2,7 +2,7 @@
 # Date Created:			25 Jan, 2003
 # Whom:				Eric Anholt <anholt@FreeBSD.org>
 #
-# $FreeBSD: ports/x11-toolkits/libXt/Makefile,v 1.24 2010/05/01 11:41:06 miwi Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	libXt
diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile
index 98df107..9bffd93 100644
--- a/x11-wm/twm/Makefile
+++ b/x11-wm/twm/Makefile
@@ -2,7 +2,7 @@
 # Date Created:				17 Feb 2006
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
-# $FreeBSD: ports/x11-wm/twm/Makefile,v 1.2 2009/01/23 16:28:09 flz Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	twm