diff options
author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 1997-06-09 12:45:41 +0000 |
---|---|---|
committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 1997-06-09 12:45:41 +0000 |
commit | c4804f1ee1ef98f2d3da1ba8767c50ac420e9308 (patch) | |
tree | 08bfee7900e467a5898252f961a9b84d980da0f2 | |
parent | Upgrade to 4.2, from the GNU master site, since the gnu directory (diff) |
Upgrade to 3.3
Package not tested - I will upgrade PLIST later.
Notes
Notes:
svn path=/head/; revision=6815
-rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 29 | ||||
-rw-r--r-- | x11-servers/XFree86-4-Server-snap/distinfo | 3 | ||||
-rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 15 | ||||
-rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 29 | ||||
-rw-r--r-- | x11-servers/XFree86-4-Server/distinfo | 3 | ||||
-rw-r--r-- | x11-servers/XFree86-4-Server/scripts/configure | 15 | ||||
-rw-r--r-- | x11/XFree86-4-clients/Makefile | 29 | ||||
-rw-r--r-- | x11/XFree86-4-clients/distinfo | 3 | ||||
-rw-r--r-- | x11/XFree86-4-clients/scripts/configure | 15 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/Makefile | 29 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/distinfo | 3 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/scripts/configure | 15 | ||||
-rw-r--r-- | x11/XFree86-4/Makefile | 29 | ||||
-rw-r--r-- | x11/XFree86-4/distinfo | 3 | ||||
-rw-r--r-- | x11/XFree86-4/scripts/configure | 15 | ||||
-rw-r--r-- | x11/XFree86/Makefile | 29 | ||||
-rw-r--r-- | x11/XFree86/distinfo | 3 | ||||
-rw-r--r-- | x11/XFree86/scripts/configure | 15 |
18 files changed, 72 insertions, 210 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index 42fc7313bc4a..67a2f67bf281 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -1,28 +1,20 @@ # New ports collection makefile for: XFree86 -# Version required: 3.2 +# Version required: 3.3 # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.28 1997/02/05 02:57:10 jmz Exp $ +# $Id: Makefile,v 1.29 1997/02/06 07:53:04 asami Exp $ # DISTNAME= xc -PKGNAME= XFree86-3.2 +PKGNAME= XFree86-3.3 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/source/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/source/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/source/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/source/ -DISTFILES= X32src-1.tgz X32src-2.tgz - -PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/fixes/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/fixes/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/fixes/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/fixes/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/fixes/ -PATCHFILES= 3.2-fix-01 -PATCH_DIST_STRIP= -p1 +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 X32src-2.tgz MAINTAINER= jmz@FreeBSD.ORG @@ -37,9 +29,6 @@ pre-install: ${PKGNAME} PRE-INSTALL post-install: - if [ -e ${PREFIX}/bin/SuperProbe ]; then \ - chmod u-s ${PREFIX}/bin/SuperProbe; \ - fi /sbin/ldconfig -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo index c83175453e6b..ba495424486d 100644 --- a/x11-servers/XFree86-4-Server-snap/distinfo +++ b/x11-servers/XFree86-4-Server-snap/distinfo @@ -1,3 +1,2 @@ -MD5 (xc/X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e +MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779 MD5 (xc/X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a -MD5 (xc/3.2-fix-01) = 124de02821f9ca57d8fe5a8c4da26d2a diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index 92f41430e4c4..d62698dbe851 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -64,7 +64,7 @@ echo "#define XVirtualFramebufferServer $answ" >>$F cat >> $F <<END #define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 mga oak al2101 ali cl64xx \ - video7 chips ark mx realtek apm generic + video7 chips ark mx realtek apm s3v generic #define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \ cl64xx generic @@ -72,7 +72,7 @@ cat >> $F <<END #define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 oak cl64xx generic -#define XF86MonoDrivers hgc1280 sigma apollo +#define XF86MonoDrivers hgc1280 sigma apollo hercules #define XF86W32Drivers et4000w32 @@ -192,15 +192,4 @@ fi cat $F >> $WRKSRC/config/cf/xf86site.def -cd $WRKSRC/config/cf/ || exit 1; - -version=`uname -r` -set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'` -mv FreeBSD.cf FreeBSD.cf.old -sed -e "s/2.1.5/$version/" \ - -e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \ - -e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \ - -e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \ - <FreeBSD.cf.old >FreeBSD.cf - exit 0 diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 42fc7313bc4a..67a2f67bf281 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -1,28 +1,20 @@ # New ports collection makefile for: XFree86 -# Version required: 3.2 +# Version required: 3.3 # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.28 1997/02/05 02:57:10 jmz Exp $ +# $Id: Makefile,v 1.29 1997/02/06 07:53:04 asami Exp $ # DISTNAME= xc -PKGNAME= XFree86-3.2 +PKGNAME= XFree86-3.3 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/source/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/source/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/source/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/source/ -DISTFILES= X32src-1.tgz X32src-2.tgz - -PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/fixes/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/fixes/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/fixes/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/fixes/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/fixes/ -PATCHFILES= 3.2-fix-01 -PATCH_DIST_STRIP= -p1 +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 X32src-2.tgz MAINTAINER= jmz@FreeBSD.ORG @@ -37,9 +29,6 @@ pre-install: ${PKGNAME} PRE-INSTALL post-install: - if [ -e ${PREFIX}/bin/SuperProbe ]; then \ - chmod u-s ${PREFIX}/bin/SuperProbe; \ - fi /sbin/ldconfig -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo index c83175453e6b..ba495424486d 100644 --- a/x11-servers/XFree86-4-Server/distinfo +++ b/x11-servers/XFree86-4-Server/distinfo @@ -1,3 +1,2 @@ -MD5 (xc/X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e +MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779 MD5 (xc/X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a -MD5 (xc/3.2-fix-01) = 124de02821f9ca57d8fe5a8c4da26d2a diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 92f41430e4c4..d62698dbe851 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -64,7 +64,7 @@ echo "#define XVirtualFramebufferServer $answ" >>$F cat >> $F <<END #define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 mga oak al2101 ali cl64xx \ - video7 chips ark mx realtek apm generic + video7 chips ark mx realtek apm s3v generic #define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \ cl64xx generic @@ -72,7 +72,7 @@ cat >> $F <<END #define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 oak cl64xx generic -#define XF86MonoDrivers hgc1280 sigma apollo +#define XF86MonoDrivers hgc1280 sigma apollo hercules #define XF86W32Drivers et4000w32 @@ -192,15 +192,4 @@ fi cat $F >> $WRKSRC/config/cf/xf86site.def -cd $WRKSRC/config/cf/ || exit 1; - -version=`uname -r` -set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'` -mv FreeBSD.cf FreeBSD.cf.old -sed -e "s/2.1.5/$version/" \ - -e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \ - -e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \ - -e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \ - <FreeBSD.cf.old >FreeBSD.cf - exit 0 diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 42fc7313bc4a..67a2f67bf281 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -1,28 +1,20 @@ # New ports collection makefile for: XFree86 -# Version required: 3.2 +# Version required: 3.3 # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.28 1997/02/05 02:57:10 jmz Exp $ +# $Id: Makefile,v 1.29 1997/02/06 07:53:04 asami Exp $ # DISTNAME= xc -PKGNAME= XFree86-3.2 +PKGNAME= XFree86-3.3 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/source/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/source/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/source/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/source/ -DISTFILES= X32src-1.tgz X32src-2.tgz - -PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/fixes/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/fixes/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/fixes/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/fixes/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/fixes/ -PATCHFILES= 3.2-fix-01 -PATCH_DIST_STRIP= -p1 +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 X32src-2.tgz MAINTAINER= jmz@FreeBSD.ORG @@ -37,9 +29,6 @@ pre-install: ${PKGNAME} PRE-INSTALL post-install: - if [ -e ${PREFIX}/bin/SuperProbe ]; then \ - chmod u-s ${PREFIX}/bin/SuperProbe; \ - fi /sbin/ldconfig -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo index c83175453e6b..ba495424486d 100644 --- a/x11/XFree86-4-clients/distinfo +++ b/x11/XFree86-4-clients/distinfo @@ -1,3 +1,2 @@ -MD5 (xc/X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e +MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779 MD5 (xc/X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a -MD5 (xc/3.2-fix-01) = 124de02821f9ca57d8fe5a8c4da26d2a diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure index 92f41430e4c4..d62698dbe851 100644 --- a/x11/XFree86-4-clients/scripts/configure +++ b/x11/XFree86-4-clients/scripts/configure @@ -64,7 +64,7 @@ echo "#define XVirtualFramebufferServer $answ" >>$F cat >> $F <<END #define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 mga oak al2101 ali cl64xx \ - video7 chips ark mx realtek apm generic + video7 chips ark mx realtek apm s3v generic #define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \ cl64xx generic @@ -72,7 +72,7 @@ cat >> $F <<END #define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 oak cl64xx generic -#define XF86MonoDrivers hgc1280 sigma apollo +#define XF86MonoDrivers hgc1280 sigma apollo hercules #define XF86W32Drivers et4000w32 @@ -192,15 +192,4 @@ fi cat $F >> $WRKSRC/config/cf/xf86site.def -cd $WRKSRC/config/cf/ || exit 1; - -version=`uname -r` -set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'` -mv FreeBSD.cf FreeBSD.cf.old -sed -e "s/2.1.5/$version/" \ - -e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \ - -e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \ - -e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \ - <FreeBSD.cf.old >FreeBSD.cf - exit 0 diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 42fc7313bc4a..67a2f67bf281 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -1,28 +1,20 @@ # New ports collection makefile for: XFree86 -# Version required: 3.2 +# Version required: 3.3 # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.28 1997/02/05 02:57:10 jmz Exp $ +# $Id: Makefile,v 1.29 1997/02/06 07:53:04 asami Exp $ # DISTNAME= xc -PKGNAME= XFree86-3.2 +PKGNAME= XFree86-3.3 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/source/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/source/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/source/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/source/ -DISTFILES= X32src-1.tgz X32src-2.tgz - -PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/fixes/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/fixes/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/fixes/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/fixes/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/fixes/ -PATCHFILES= 3.2-fix-01 -PATCH_DIST_STRIP= -p1 +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 X32src-2.tgz MAINTAINER= jmz@FreeBSD.ORG @@ -37,9 +29,6 @@ pre-install: ${PKGNAME} PRE-INSTALL post-install: - if [ -e ${PREFIX}/bin/SuperProbe ]; then \ - chmod u-s ${PREFIX}/bin/SuperProbe; \ - fi /sbin/ldconfig -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index c83175453e6b..ba495424486d 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -1,3 +1,2 @@ -MD5 (xc/X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e +MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779 MD5 (xc/X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a -MD5 (xc/3.2-fix-01) = 124de02821f9ca57d8fe5a8c4da26d2a diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index 92f41430e4c4..d62698dbe851 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -64,7 +64,7 @@ echo "#define XVirtualFramebufferServer $answ" >>$F cat >> $F <<END #define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 mga oak al2101 ali cl64xx \ - video7 chips ark mx realtek apm generic + video7 chips ark mx realtek apm s3v generic #define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \ cl64xx generic @@ -72,7 +72,7 @@ cat >> $F <<END #define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 oak cl64xx generic -#define XF86MonoDrivers hgc1280 sigma apollo +#define XF86MonoDrivers hgc1280 sigma apollo hercules #define XF86W32Drivers et4000w32 @@ -192,15 +192,4 @@ fi cat $F >> $WRKSRC/config/cf/xf86site.def -cd $WRKSRC/config/cf/ || exit 1; - -version=`uname -r` -set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'` -mv FreeBSD.cf FreeBSD.cf.old -sed -e "s/2.1.5/$version/" \ - -e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \ - -e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \ - -e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \ - <FreeBSD.cf.old >FreeBSD.cf - exit 0 diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index 42fc7313bc4a..67a2f67bf281 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -1,28 +1,20 @@ # New ports collection makefile for: XFree86 -# Version required: 3.2 +# Version required: 3.3 # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.28 1997/02/05 02:57:10 jmz Exp $ +# $Id: Makefile,v 1.29 1997/02/06 07:53:04 asami Exp $ # DISTNAME= xc -PKGNAME= XFree86-3.2 +PKGNAME= XFree86-3.3 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/source/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/source/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/source/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/source/ -DISTFILES= X32src-1.tgz X32src-2.tgz - -PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/fixes/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/fixes/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/fixes/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/fixes/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/fixes/ -PATCHFILES= 3.2-fix-01 -PATCH_DIST_STRIP= -p1 +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 X32src-2.tgz MAINTAINER= jmz@FreeBSD.ORG @@ -37,9 +29,6 @@ pre-install: ${PKGNAME} PRE-INSTALL post-install: - if [ -e ${PREFIX}/bin/SuperProbe ]; then \ - chmod u-s ${PREFIX}/bin/SuperProbe; \ - fi /sbin/ldconfig -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/x11/XFree86-4/distinfo b/x11/XFree86-4/distinfo index c83175453e6b..ba495424486d 100644 --- a/x11/XFree86-4/distinfo +++ b/x11/XFree86-4/distinfo @@ -1,3 +1,2 @@ -MD5 (xc/X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e +MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779 MD5 (xc/X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a -MD5 (xc/3.2-fix-01) = 124de02821f9ca57d8fe5a8c4da26d2a diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure index 92f41430e4c4..d62698dbe851 100644 --- a/x11/XFree86-4/scripts/configure +++ b/x11/XFree86-4/scripts/configure @@ -64,7 +64,7 @@ echo "#define XVirtualFramebufferServer $answ" >>$F cat >> $F <<END #define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 mga oak al2101 ali cl64xx \ - video7 chips ark mx realtek apm generic + video7 chips ark mx realtek apm s3v generic #define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \ cl64xx generic @@ -72,7 +72,7 @@ cat >> $F <<END #define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 oak cl64xx generic -#define XF86MonoDrivers hgc1280 sigma apollo +#define XF86MonoDrivers hgc1280 sigma apollo hercules #define XF86W32Drivers et4000w32 @@ -192,15 +192,4 @@ fi cat $F >> $WRKSRC/config/cf/xf86site.def -cd $WRKSRC/config/cf/ || exit 1; - -version=`uname -r` -set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'` -mv FreeBSD.cf FreeBSD.cf.old -sed -e "s/2.1.5/$version/" \ - -e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \ - -e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \ - -e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \ - <FreeBSD.cf.old >FreeBSD.cf - exit 0 diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile index 42fc7313bc4a..67a2f67bf281 100644 --- a/x11/XFree86/Makefile +++ b/x11/XFree86/Makefile @@ -1,28 +1,20 @@ # New ports collection makefile for: XFree86 -# Version required: 3.2 +# Version required: 3.3 # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.28 1997/02/05 02:57:10 jmz Exp $ +# $Id: Makefile,v 1.29 1997/02/06 07:53:04 asami Exp $ # DISTNAME= xc -PKGNAME= XFree86-3.2 +PKGNAME= XFree86-3.3 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/source/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/source/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/source/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/source/ -DISTFILES= X32src-1.tgz X32src-2.tgz - -PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/fixes/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.2/fixes/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/fixes/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.2/fixes/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/fixes/ -PATCHFILES= 3.2-fix-01 -PATCH_DIST_STRIP= -p1 +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 X32src-2.tgz MAINTAINER= jmz@FreeBSD.ORG @@ -37,9 +29,6 @@ pre-install: ${PKGNAME} PRE-INSTALL post-install: - if [ -e ${PREFIX}/bin/SuperProbe ]; then \ - chmod u-s ${PREFIX}/bin/SuperProbe; \ - fi /sbin/ldconfig -m ${PREFIX}/lib .include <bsd.port.mk> diff --git a/x11/XFree86/distinfo b/x11/XFree86/distinfo index c83175453e6b..ba495424486d 100644 --- a/x11/XFree86/distinfo +++ b/x11/XFree86/distinfo @@ -1,3 +1,2 @@ -MD5 (xc/X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e +MD5 (xc/X33src-1.tgz) = 7e9afbcd6d4292c74a485f91fc762779 MD5 (xc/X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a -MD5 (xc/3.2-fix-01) = 124de02821f9ca57d8fe5a8c4da26d2a diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure index 92f41430e4c4..d62698dbe851 100644 --- a/x11/XFree86/scripts/configure +++ b/x11/XFree86/scripts/configure @@ -64,7 +64,7 @@ echo "#define XVirtualFramebufferServer $answ" >>$F cat >> $F <<END #define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 mga oak al2101 ali cl64xx \ - video7 chips ark mx realtek apm generic + video7 chips ark mx realtek apm s3v generic #define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \ cl64xx generic @@ -72,7 +72,7 @@ cat >> $F <<END #define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \ cirrus ncr77c22 oak cl64xx generic -#define XF86MonoDrivers hgc1280 sigma apollo +#define XF86MonoDrivers hgc1280 sigma apollo hercules #define XF86W32Drivers et4000w32 @@ -192,15 +192,4 @@ fi cat $F >> $WRKSRC/config/cf/xf86site.def -cd $WRKSRC/config/cf/ || exit 1; - -version=`uname -r` -set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'` -mv FreeBSD.cf FreeBSD.cf.old -sed -e "s/2.1.5/$version/" \ - -e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \ - -e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \ - -e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \ - <FreeBSD.cf.old >FreeBSD.cf - exit 0 |