Upgrade to version 3.3.1

14 files changed, 52 insertions, 40 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index f93111d88309..b15170a8f25c 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3
+# Version required:     3.3.1
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.33 1997/07/14 06:36:30 asami Exp $
+# $Id: Makefile,v 1.34 1997/07/17 15:12:59 max Exp $
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3
+PKGNAME= 	XFree86-3.3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3/source/ \
 		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3/source/ \
 		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3/source/
-DISTFILES=	X33src-1.tgz X33src-2.tgz
+DISTFILES=	X331src-1.tgz X331src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.ORG
 
@@ -24,6 +24,8 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
+pre-install:
+	${MKDIR} /usr/X11R6
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index 6388ee56e717..d8780699e5f6 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779
-MD5 (xc/X33src-2.tgz) = d2726957568ff82419f44cc01755d2ca
+MD5 (xc/X331src-1.tgz) = cfc429a7ffb656406ac798391832d754
+MD5 (xc/X331src-2.tgz) = a48d3b6696ee8acac5c50faac4dd9470
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index f93111d88309..b15170a8f25c 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3
+# Version required:     3.3.1
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.33 1997/07/14 06:36:30 asami Exp $
+# $Id: Makefile,v 1.34 1997/07/17 15:12:59 max Exp $
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3
+PKGNAME= 	XFree86-3.3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3/source/ \
 		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3/source/ \
 		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3/source/
-DISTFILES=	X33src-1.tgz X33src-2.tgz
+DISTFILES=	X331src-1.tgz X331src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.ORG
 
@@ -24,6 +24,8 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
+pre-install:
+	${MKDIR} /usr/X11R6
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index 6388ee56e717..d8780699e5f6 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779
-MD5 (xc/X33src-2.tgz) = d2726957568ff82419f44cc01755d2ca
+MD5 (xc/X331src-1.tgz) = cfc429a7ffb656406ac798391832d754
+MD5 (xc/X331src-2.tgz) = a48d3b6696ee8acac5c50faac4dd9470
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index f93111d88309..b15170a8f25c 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3
+# Version required:     3.3.1
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.33 1997/07/14 06:36:30 asami Exp $
+# $Id: Makefile,v 1.34 1997/07/17 15:12:59 max Exp $
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3
+PKGNAME= 	XFree86-3.3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3/source/ \
 		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3/source/ \
 		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3/source/
-DISTFILES=	X33src-1.tgz X33src-2.tgz
+DISTFILES=	X331src-1.tgz X331src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.ORG
 
@@ -24,6 +24,8 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
+pre-install:
+	${MKDIR} /usr/X11R6
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index 6388ee56e717..d8780699e5f6 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779
-MD5 (xc/X33src-2.tgz) = d2726957568ff82419f44cc01755d2ca
+MD5 (xc/X331src-1.tgz) = cfc429a7ffb656406ac798391832d754
+MD5 (xc/X331src-2.tgz) = a48d3b6696ee8acac5c50faac4dd9470
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index f93111d88309..b15170a8f25c 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3
+# Version required:     3.3.1
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.33 1997/07/14 06:36:30 asami Exp $
+# $Id: Makefile,v 1.34 1997/07/17 15:12:59 max Exp $
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3
+PKGNAME= 	XFree86-3.3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3/source/ \
 		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3/source/ \
 		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3/source/
-DISTFILES=	X33src-1.tgz X33src-2.tgz
+DISTFILES=	X331src-1.tgz X331src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.ORG
 
@@ -24,6 +24,8 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
+pre-install:
+	${MKDIR} /usr/X11R6
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo
index 6388ee56e717..d8780699e5f6 100644
--- a/x11/XFree86-4-libraries/distinfo
+++ b/x11/XFree86-4-libraries/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779
-MD5 (xc/X33src-2.tgz) = d2726957568ff82419f44cc01755d2ca
+MD5 (xc/X331src-1.tgz) = cfc429a7ffb656406ac798391832d754
+MD5 (xc/X331src-2.tgz) = a48d3b6696ee8acac5c50faac4dd9470
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index f93111d88309..b15170a8f25c 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3
+# Version required:     3.3.1
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.33 1997/07/14 06:36:30 asami Exp $
+# $Id: Makefile,v 1.34 1997/07/17 15:12:59 max Exp $
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3
+PKGNAME= 	XFree86-3.3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3/source/ \
 		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3/source/ \
 		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3/source/
-DISTFILES=	X33src-1.tgz X33src-2.tgz
+DISTFILES=	X331src-1.tgz X331src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.ORG
 
@@ -24,6 +24,8 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
+pre-install:
+	${MKDIR} /usr/X11R6
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/x11/XFree86-4/distinfo b/x11/XFree86-4/distinfo
index 6388ee56e717..d8780699e5f6 100644
--- a/x11/XFree86-4/distinfo
+++ b/x11/XFree86-4/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779
-MD5 (xc/X33src-2.tgz) = d2726957568ff82419f44cc01755d2ca
+MD5 (xc/X331src-1.tgz) = cfc429a7ffb656406ac798391832d754
+MD5 (xc/X331src-2.tgz) = a48d3b6696ee8acac5c50faac4dd9470
diff --git a/x11/XFree86-contrib/Makefile b/x11/XFree86-contrib/Makefile
index 7da08a96822e..36c8f0a98e43 100644
--- a/x11/XFree86-contrib/Makefile
+++ b/x11/XFree86-contrib/Makefile
@@ -3,16 +3,16 @@
 # Date created:         7 November 1996
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.4 1997/06/09 22:42:16 jmz Exp $
+# $Id: Makefile,v 1.5 1997/07/17 15:12:59 max Exp $
 #
 
-DISTNAME=	XFree86-contrib-3.3
+DISTNAME=	XFree86-contrib-3.3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3/source/ \
 		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3/source/
-DISTFILES=	X33contrib.tgz
+DISTFILES=	X331contrib.tgz
 
 MAINTAINER=	jmz@FreeBSD.ORG
 
diff --git a/x11/XFree86-contrib/distinfo b/x11/XFree86-contrib/distinfo
index 9f46b940abeb..8b9785980b43 100644
--- a/x11/XFree86-contrib/distinfo
+++ b/x11/XFree86-contrib/distinfo
@@ -1 +1 @@
-MD5 (xc/X33contrib.tgz) = c91151bbfd032de8ebbb5a2b06737c8b
+MD5 (xc/X331contrib.tgz) = c91151bbfd032de8ebbb5a2b06737c8b
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index f93111d88309..b15170a8f25c 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3
+# Version required:     3.3.1
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.33 1997/07/14 06:36:30 asami Exp $
+# $Id: Makefile,v 1.34 1997/07/17 15:12:59 max Exp $
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3
+PKGNAME= 	XFree86-3.3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3/source/ \
 		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3/source/ \
 		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3/source/
-DISTFILES=	X33src-1.tgz X33src-2.tgz
+DISTFILES=	X331src-1.tgz X331src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.ORG
 
@@ -24,6 +24,8 @@ ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 
+pre-install:
+	${MKDIR} /usr/X11R6
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
diff --git a/x11/XFree86/distinfo b/x11/XFree86/distinfo
index 6388ee56e717..d8780699e5f6 100644
--- a/x11/XFree86/distinfo
+++ b/x11/XFree86/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779
-MD5 (xc/X33src-2.tgz) = d2726957568ff82419f44cc01755d2ca
+MD5 (xc/X331src-1.tgz) = cfc429a7ffb656406ac798391832d754
+MD5 (xc/X331src-2.tgz) = a48d3b6696ee8acac5c50faac4dd9470