From 5f473f46bdf5e2d17831f2b87cf8ba42ecb6154c Mon Sep 17 00:00:00 2001
From: Jean-Marc Zucconi <jmz@FreeBSD.org>
Date: Wed, 12 Jan 2000 03:50:04 +0000
Subject: Upgrade to version 3.3.6

---
 x11-servers/XFree86-4-Server-snap/scripts/configure | 15 ++-------------
 x11-servers/XFree86-4-Server/scripts/configure      | 15 ++-------------
 2 files changed, 4 insertions(+), 26 deletions(-)

(limited to 'x11-servers')

diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index e9d18f564837..af314e7ba471 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -205,11 +205,11 @@ cat >> $F <<END
 END
 else
 cat >> $F <<END
-#define XF86SvgaDrivers         nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
+#define XF86SvgaDrivers         nv et4000 et3000 pvga1 gvga r128 ati sis tvga8900 \
                                 cirrus ncr77c22 compaq mga oak al2101 ali \
                                 cl64xx video7 ark mx realtek apm s3_savage s3v \
                                 s3_svga neo chips cyrix rendition p9x00 \
-				spc8110 i740 tdfx generic
+				spc8110 i740 tdfx i810 smi generic
 
 #define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
 				cl64xx generic 
@@ -363,12 +363,6 @@ else
 fi
 
 echo
-yesno "Do you want to compile with threads support? (experimental)"
-if [ $answ = YES ]; then
-    THREADS_PATCH=$FILESDIR/BSD-threads.diff
-else
-    THREADS_PATCH=
-fi
 echo
 echo "End of configuration questions. No more user input required"
 echo
@@ -380,11 +374,6 @@ if [ X$cpwh != XNO ]; then
   cp $cpwh $WH
 fi
 
-if [ X$THREADS_PATCH != X ]; then
-    echo "===>  Applying threads patches"
-    patch -s -d $WRKDIR  -E -p0 <  $THREADS_PATCH
-fi
-
 cat $F >>  $WRKDIR/xc/config/cf/xf86site.def
 
 exit 0
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index e9d18f564837..af314e7ba471 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -205,11 +205,11 @@ cat >> $F <<END
 END
 else
 cat >> $F <<END
-#define XF86SvgaDrivers         nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
+#define XF86SvgaDrivers         nv et4000 et3000 pvga1 gvga r128 ati sis tvga8900 \
                                 cirrus ncr77c22 compaq mga oak al2101 ali \
                                 cl64xx video7 ark mx realtek apm s3_savage s3v \
                                 s3_svga neo chips cyrix rendition p9x00 \
-				spc8110 i740 tdfx generic
+				spc8110 i740 tdfx i810 smi generic
 
 #define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
 				cl64xx generic 
@@ -363,12 +363,6 @@ else
 fi
 
 echo
-yesno "Do you want to compile with threads support? (experimental)"
-if [ $answ = YES ]; then
-    THREADS_PATCH=$FILESDIR/BSD-threads.diff
-else
-    THREADS_PATCH=
-fi
 echo
 echo "End of configuration questions. No more user input required"
 echo
@@ -380,11 +374,6 @@ if [ X$cpwh != XNO ]; then
   cp $cpwh $WH
 fi
 
-if [ X$THREADS_PATCH != X ]; then
-    echo "===>  Applying threads patches"
-    patch -s -d $WRKDIR  -E -p0 <  $THREADS_PATCH
-fi
-
 cat $F >>  $WRKDIR/xc/config/cf/xf86site.def
 
 exit 0
-- 
cgit v1.2.3