Upgrade to 3.3.3

1 files changed, 43 insertions, 26 deletions

diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 529fb3d69b26..d9295c9c8edd 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -3,7 +3,7 @@
 yesno () {
   answ=X;
   while [ $answ = X ]; do
-    echo -n "$1"
+    echo -n "$1 [YES] "
     read answ
     if [ X$answ = X ]; then answ="YES"; fi
     case $answ in
@@ -15,6 +15,21 @@ yesno () {
     esac
   done
 }
+noyes() {
+  answ=X;
+  while [ $answ = X ]; do
+    echo -n "$1 [NO] "
+    read answ
+    if [ X$answ = X ]; then answ="NO"; fi
+    case $answ in
+      y|yes|Y|YES) answ=YES;;
+      n|no|N|NO)   answ=NO;;
+      *) echo invalid answer
+      answ=X
+      ;;
+    esac
+  done
+}
 F=$WRKDIR/.config
 configure () {
 rm -f $F
@@ -73,14 +88,14 @@ if [ X"${MACHINE}" = X"pc98" ]; then
     servers="GA968 GANBWAP MGA NEC480 NECS3 NKVNEC PWLB PWSKB SVGA TGUI WABEP WABS WSNA"
     selected=EGC
     for i in $servers; do
-	yesno "Do you want to build the $i server? [YES] "
+	yesno "Do you want to build the $i server?"
 	if [ $answ = YES ]; then selected="$selected $i"; fi
 	echo "#undef XF98${i}Server"           >>$F
 	echo "#define XF98${i}Server   $answ"  >>$F
     done
     echo "#undef XF86SVGAServer"           >>$F
     echo "#define XF86SVGAServer     NO"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
     for i in $servers; do
 	echo "#undef XF86${i}Server"           >>$F
     echo "#define XF86${i}Server   NO"  >>$F
@@ -89,10 +104,10 @@ else
 # force the compilation of the SVGA server.
     echo "#undef XF86SVGAServer"           >>$F
     echo "#define XF86SVGAServer     YES"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
     selected=SVGA
     for i in $servers; do
-	yesno "Do you want to build the $i server? [YES] "
+	yesno "Do you want to build the $i server?"
 	if [ $answ = YES ]; then selected="$selected $i"; fi
 	echo "#undef XF86${i}Server"           >>$F
 	echo "#define XF86${i}Server   $answ"  >>$F
@@ -119,7 +134,7 @@ while [ $ok != 1 ]; do
   if [ $ok = 0 ]; then echo you must choose a server among $selected; fi  
 done
 echo
-yesno "Do you want to build Xvfb? [YES] "
+yesno "Do you want to build Xvfb?"
 echo "#define XVirtualFramebufferServer $answ" >>$F
 
 if [ X"${MACHINE}" != X"pc98" ]; then
@@ -149,20 +164,20 @@ cat <<END
  and files that you may be currently using.  This would only be required
  on a first time build.
 END
-yesno "Install xdm config? [YES] "
+yesno "Install xdm config?"
 if [ $answ = YES ]; then
   echo "#define InstallXdmConfig	$answ" >> $F
 fi
-yesno "Install xinit config? [YES] "
+yesno "Install xinit config?"
 if [ $answ = YES ]; then
   echo "#define InstallXinitConfig $answ" >> $F
 fi
-yesno "Install xfs config? [YES] "
+yesno "Install xfs config?"
 if [ $answ = YES ]; then
   echo "#define InstallFSConfig $answ" >> $F
 fi
 
-yesno "Do you want to include support for the FontServer? [YES] "
+yesno "Do you want to include support for the FontServer?"
 echo "#undef BuildFontServer" >>$F
 echo "#define  BuildFontServer $answ" >>$F
 echo "#undef InstallFSConfig" >>$F
@@ -173,11 +188,11 @@ cat <<'END'
  fonts once, if this is a first time install you will want to build the
  fonts)
 END
-yesno "Build fonts? [YES] "
+yesno "Build fonts?"
 if [ $answ = NO ]; then
   echo "#define BuildFonts		NO" >> $F
 fi
-yesno "Build the servers with Extended input devices? [YES] "
+yesno "Build the servers with Extended input devices?"
 if [ $answ = NO ]; then
   echo "#undef BuildXInputExt" >> $F
   echo "#define BuildXInputExt		NO" >> $F
@@ -185,20 +200,30 @@ else
   echo "#define JoystickSupport		YES" >> $F
 fi
 
-yesno "Build PEX? [YES] "
+yesno "Build PEX?"
 if [ $answ = NO ]; then
   echo "#define BuildPexExt		NO" >> $F
 fi
-yesno "Build XIE? [YES] "
+yesno "Build XIE?"
 if [ $answ = NO ]; then
   echo "#define BuildXIE		NO" >> $F
 fi
 echo
 
-yesno "Build static libraries in addition to shared libraries? [YES] "
+yesno "Build static libraries in addition to shared libraries?"
 if [ $answ = YES ]; then
   echo "#define ForceNormalLib		YES" >> $F
 fi
+# ELF detection
+if [ `sysctl -n kern.osreldate` -ge 300004 -a  X`objformat` = Xelf ]; then
+  ELF=yes
+  noyes "Do you want to build and install a.out compatibility libraries?"
+  if [ $answ = YES ]; then
+    echo "#define BuildAoutLibraries		YES" >> $F
+  fi
+else
+  ELF=no
+fi
 
 if [ ! `uname -r|grep ^2` ]; then
 cat <<'END'
@@ -209,7 +234,7 @@ cat <<'END'
  some countries restrict the use of strong cryptography.
 
 END
-yesno "Build with Secure RPC? [YES] "
+yesno "Build with Secure RPC?"
 if [ $answ = YES ]; then
   echo "#define HasSecureRPC		YES" >> $F
 fi
@@ -236,7 +261,7 @@ cat <<'END'
  the option controling this is contained the file xc/config/cf/xf86site.def.
 
 END
-yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] "
+yesno "Do you want to enable XDM-AUTHORIZATION-1 support?"
 cpwh=NO
 if [ $answ = YES ]; then
     WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
@@ -258,14 +283,6 @@ if [ $cpwh != NO ]; then
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
-# ELF detection
-if [ `sysctl -n kern.osreldate` -ge 300004 -a  X`objformat` = Xelf ]; then
-  ELF=yes
-  echo "#define UseElfFormat		YES" >> $F
-else
-  ELF=no
-fi
-
 cat <<'END'
 
  XDM can be built so that it will get a KerberosIV TGT for your users
@@ -282,7 +299,7 @@ cat <<'END'
  will not be enabled if the kerberos libraries are unavailable.
 
 END
-yesno "Do you want to enable KerberosIV support? [YES] "
+yesno "Do you want to enable KerberosIV support?"
 cpkb=NO
 if [ $answ = YES ]; then
     if [ $ELF = yes ]; then