- Update X.org ports to 7.3.

- Mark XFree86-4 as DEPRECATED with EXPIRATION_DATE set to 2007-12-25.
I hope that nobody will be bored enough on Christmas to remove them on
that day.

Tested by:	vehemens, Rene Ladan, Beech Rintoul, sarek on x11@

15 files changed, 29 insertions, 11 deletions

diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile
index 6e3f9089a526..a0da8d3a53cc 100644
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@@ -22,6 +22,9 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-100dpi-*
 
+DEPRECATED=	isn't maintained anymore
+EXPIRATION_DATE=	2007-12-25
+
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile
index fa9713170876..b3436e7392dd 100644
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@@ -22,6 +22,9 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-75dpi-*
 
+DEPRECATED=	isn't maintained anymore
+EXPIRATION_DATE=	2007-12-25
+
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index 21b62333608d..1fe0f66bac69 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -22,6 +22,9 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-cyrillic-*
 
+DEPRECATED=	isn't maintained anymore
+EXPIRATION_DATE=	2007-12-25
+
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index 02eeb9f273d1..a1145f180cc9 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -24,6 +24,9 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-miscbitmaps-*
 
+DEPRECATED=	isn't maintained anymore
+EXPIRATION_DATE=	2007-12-25
+
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile
index e5ea1d9c07c0..e995c2967fa7 100644
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@@ -21,6 +21,9 @@ BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 
 CONFLICTS=	encodings-*
 
+DEPRECATED=	isn't maintained anymore
+EXPIRATION_DATE=	2007-12-25
+
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index d1120c797035..0627355ace99 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -24,6 +24,9 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-type1-* xorg-fonts-truetype-*
 
+DEPRECATED=	isn't maintained anymore
+EXPIRATION_DATE=	2007-12-25
+
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile
index c3075b0fea39..d255b420bc3a 100644
--- a/x11-fonts/libXfont/Makefile
+++ b/x11-fonts/libXfont/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libXfont
-PORTVERSION=	1.2.8
+PORTVERSION=	1.3.1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
diff --git a/x11-fonts/libXfont/distinfo b/x11-fonts/libXfont/distinfo
index 234774a23667..bf35c32dadf0 100644
--- a/x11-fonts/libXfont/distinfo
+++ b/x11-fonts/libXfont/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/lib/libXfont-1.2.8.tar.bz2) = 83b8e21f6ee22512a8f72ba51e2d74f6
-SHA256 (xorg/lib/libXfont-1.2.8.tar.bz2) = 374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8
-SIZE (xorg/lib/libXfont-1.2.8.tar.bz2) = 583236
+MD5 (xorg/lib/libXfont-1.3.1.tar.bz2) = b2f396b62633819bbdd9748383876e21
+SHA256 (xorg/lib/libXfont-1.3.1.tar.bz2) = dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1
+SIZE (xorg/lib/libXfont-1.3.1.tar.bz2) = 564235
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index 25e9c1654bab..2b345487b28c 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-100dpi
-PORTVERSION=	7.2
+PORTVERSION=	7.3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index f7d2be831c5a..8d2ddf05908a 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-75dpi
-PORTVERSION=	7.2
+PORTVERSION=	7.3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index e80346d7a92e..8c3d28922f2b 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-cyrillic
-PORTVERSION=	7.2
+PORTVERSION=	7.3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 709c1d774105..9045889143a8 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-miscbitmaps
-PORTVERSION=	7.2
+PORTVERSION=	7.3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index e12139ca914e..aceaeecb6bb2 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-truetype
-PORTVERSION=	7.2
+PORTVERSION=	7.3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index 1352145f0c5d..25e1141e3f50 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts-type1
-PORTVERSION=	7.2
+PORTVERSION=	7.3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index 1ececd434bdd..eb3137a0bfa1 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-fonts
-PORTVERSION=	7.2
+PORTVERSION=	7.3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none