diff options
Diffstat (limited to 'x11/XFree86')
| -rw-r--r-- | x11/XFree86/Makefile | 18 | ||||
| -rw-r--r-- | x11/XFree86/distinfo | 4 | ||||
| -rw-r--r-- | x11/XFree86/scripts/configure | 32 |
3 files changed, 32 insertions, 22 deletions
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile index b7347b77888e..336feb66a126 100644 --- a/x11/XFree86/Makefile +++ b/x11/XFree86/Makefile @@ -1,20 +1,20 @@ # New ports collection makefile for: XFree86 -# Version required: 3.3.1 +# Version required: 3.3.2 # Date created: 5 January 1995 # Whom: jmz # -# $Id: Makefile,v 1.36 1997/08/23 20:37:17 jmz Exp $ +# $Id: Makefile,v 1.37 1997/12/04 10:52:50 asami Exp $ # DISTNAME= xc -PKGNAME= XFree86-3.3.1 +PKGNAME= XFree86-3.3.2 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.1/source/ \ - ftp://xfree86.cdrom.com/pub/XFree86/3.3.1/source/ \ - ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.1/source/ \ - ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.1/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.1/source/ -DISTFILES= X331src-1.tgz X331src-2.tgz +MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.2/source/ \ + ftp://xfree86.cdrom.com/pub/XFree86/3.3.2/source/ \ + ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.2/source/ \ + ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.2/source/ \ + ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.2/source/ +DISTFILES= X332src-1.tgz X332src-2.tgz MAINTAINER= jmz@FreeBSD.ORG diff --git a/x11/XFree86/distinfo b/x11/XFree86/distinfo index d8780699e5f6..b1738b48754e 100644 --- a/x11/XFree86/distinfo +++ b/x11/XFree86/distinfo @@ -1,2 +1,2 @@ -MD5 (xc/X331src-1.tgz) = cfc429a7ffb656406ac798391832d754 -MD5 (xc/X331src-2.tgz) = a48d3b6696ee8acac5c50faac4dd9470 +MD5 (xc/X332src-1.tgz) = 61c0340f91c883e214886fb81d1eefc3 +MD5 (xc/X332src-2.tgz) = d7b5370405afaf1097952911d1b5303d diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure index fdac66d27e98..24ae1683d3b4 100644 --- a/x11/XFree86/scripts/configure +++ b/x11/XFree86/scripts/configure @@ -65,28 +65,38 @@ fi echo "#undef XF86SVGAServer" >>$F echo "#define XF86SVGAServer YES" >>$F servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128" +selected=SVGA for i in $servers; do yesno "Do you want to build the $i server? [YES] " + if [ $answ = YES ]; then selected="$selected $i"; fi echo "#undef XF86${i}Server" >>$F echo "#define XF86${i}Server $answ" >>$F done echo -echo -n "default server to install. [none] " -read answ -if [ X$answ = X ]; then answ=none; fi -if [ $answ != none ]; then - echo "#define ServerToInstall XF86_$answ" >>$F -fi - +ok=0 +while [ $ok != 1 ]; do + echo -n "default server to install. [none] " + read answ + if [ X$answ = X ]; then answ=none; ok=1; fi + if [ $answ != none ]; then + for i in $selected; do if [ $i = $answ ]; then + ok=1 + echo "#define ServerToInstall XF86_$answ" >>$F + fi + done + fi + if [ $ok = 0 ]; then echo you must choose a server among $selected; fi +done echo yesno "Do you want to build Xvfb? [YES] " 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 s3v generic +#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ + cirrus ncr77c22 compaq mga oak al2101 ali \ + cl64xx video7 ark mx realtek apm \ + s3v s3_svga chips generic #define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \ cl64xx generic @@ -153,7 +163,7 @@ if [ $answ = NO ]; then fi echo -echo "Build static libraries in addition to shared libraries? [YES] " +yesno "Build static libraries in addition to shared libraries? [YES] " if [ $answ = YES ]; then echo "#define ForceNormalLib YES" >> $F fi |