Remove the parts of the patch that was committed to the XFree86 port.

1 files changed, 0 insertions, 496 deletions

diff --git a/release/scripts/X11/XF86.patch b/release/scripts/X11/XF86.patch
index 1a4084e..f3eee73 100644
--- a/release/scripts/X11/XF86.patch
+++ b/release/scripts/X11/XF86.patch
@@ -1,65 +1,3 @@
-Index: Makefile
-===================================================================
-RCS file: /host/ares/usr/home/ncvs/ports/x11/XFree86/Makefile,v
-retrieving revision 1.89
-diff -u -r1.89 Makefile
---- Makefile	2000/10/27 22:47:07	1.89
-+++ Makefile	2000/11/09 01:04:42
-@@ -11,7 +11,7 @@
- CATEGORIES=	x11
- MASTER_SITES=	${MASTER_SITE_XFREE}
- MASTER_SITE_SUBDIR=	${PORTVERSION}
--DISTFILES=	X336src-1.tgz X336src-2.tgz
-+DISTFILES=	X336src-1.tgz X336src-2.tgz X336src-3.tgz
- 
- PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
- 		ftp://ftp.freesoftware.com/pub/XFree86/3.3.6/fixes/ \
-@@ -29,19 +29,18 @@
- #NO_PACKAGE=	package available from XFree86
- .endif
- ALL_TARGET=	World
--INSTALL_TARGET=	install install.man
-+INSTALL_TARGET=	install install.man install.linkkit
- DIST_SUBDIR=	xc
- PATCH_DIST_ARGS=-p2 -E -d ${WRKDIR}/xc/programs --quiet
--SCRIPTS_ENV=	OSVERSION=${OSVERSION}
-+SCRIPTS_ENV=	OSVERSION=${OSVERSION} MACHINE=${MACHINE} \
-+		MACHINE_ARCH=${MACHINE_ARCH}
- # can't use USE_X_PREFIX here -- it will cause a circular dependency
- PREFIX=		${X11BASE}
- MTREE_FILE=	/etc/mtree/BSD.x11.dist
- .if (${MACHINE} == "pc98")
--SCRIPTS_ENV+=	MACHINE=pc98
- PLIST=		${PKGDIR}/pkg-plist.pc98
- .endif
- .if (${MACHINE} == "alpha")
--SCRIPTS_ENV+=	MACHINE=alpha
- PLIST=		${PKGDIR}/pkg-plist.alpha
- .endif
- 
-@@ -69,6 +68,8 @@
- 
- post-extract:
- 	@${MV} ${WRKSRC}/programs/Xserver/hw/xfree86/vga256/drivers/i810/os-support/linux/agpgart.h ${WRKSRC}/programs/Xserver/hw/xfree86/vga256/drivers/i810/
-+	@${CP} ${WRKSRC}/programs/Xserver/hw/xfree86/LinkKit/README \
-+		${WRKSRC}/programs/Xserver/hw/xfree86/doc/sgml
- 	@if [ -r ${FILESDIR}/config ]; then \
- 		${ECHO} Using your existing ${FILESDIR}/config ; \
- 		${CP} ${FILESDIR}/config ${WRKDIR}/config ; \
-Index: distinfo
-===================================================================
-RCS file: /host/ares/usr/home/ncvs/ports/x11/XFree86/distinfo,v
-retrieving revision 1.24
-diff -u -r1.24 distinfo
---- distinfo	2000/10/10 10:40:08	1.24
-+++ distinfo	2000/11/09 00:51:06
-@@ -1,5 +1,6 @@
- MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
- MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
-+MD5 (xc/X336src-3.tgz) = 4b1d9d353f8b4cba678f7c156b872330
- MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
- MD5 (xc/fix-04-s3trio3d2x) = 75569a9d49bb45b8ecb311ab3f8c2469
- MD5 (xc/fix-05-s3trio3d) = eb8fd33328c8b5fbd0410472339dee44
 Index: files/patch-r01
 ===================================================================
 RCS file: patch-r01
@@ -154,437 +92,3 @@ diff -N patch-r04
 + 
 + ## MISCDOCS = ServersOnly /*LbxproxyOnly*/ $(REPORTFORM) README.DGA
 + MISCDOCS = VGADriver.doc modelines.txt
-Index: scripts/configure
-===================================================================
-RCS file: /host/ares/usr/home/ncvs/ports/x11/XFree86/scripts/configure,v
-retrieving revision 1.60
-diff -u -r1.60 configure
---- scripts/configure	2000/07/31 12:30:45	1.60
-+++ scripts/configure	2000/11/09 01:00:48
-@@ -1,35 +1,5 @@
- #!/bin/sh
- 
--yesno () {
--  answ=X;
--  while [ $answ = X ]; do
--    echo -n "$1 [YES] "
--    read answ
--    if [ X$answ = X ]; then answ="YES"; fi
--    case $answ in
--      y|yes|Y|YES) answ=YES;;
--      n|no|N|NO)   answ=NO;;
--      *) echo invalid answer
--      answ=X
--      ;;
--    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
- WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
- configure () {
-@@ -37,7 +7,7 @@
- 
- # Tk detection
- tkversion=
--for v in 42 80 81 82 83 42jp 80jp; do
-+for v in 42 80 81 82 83; do
-   if [ -f /usr/local/lib/libtk$v.a ]; then
-     tkversion=$v
-     case $tkversion in
-@@ -51,16 +21,6 @@
-         tclLversion=8.0
-         tkLversion=8.0
-         ;;
--      42jp)
--        tclversion=76jp
--        tclLversion=7.6jp
--        tkLversion=4.2jp
--        ;;
--      80jp)
--        tclversion=80jp
--        tclLversion=8.0jp
--        tkLversion=8.0jp
--        ;;
-       81)
-         tclversion=81
-         tclLversion=8.1
-@@ -79,31 +39,39 @@
-     esac
-   fi
- done
--if [ X$tkversion != X ]; then
--  case $tkversion in
--  *jp)
-+
-+# Japanese Tk detection
-+jptkversion=
-+for v in 42jp 80jp; do
-+  if [ -f /usr/local/lib/libtk$v.a ]; then
-+    jptkversion=$v
-+    case $jptkversion in
-+      42jp)
-+        jptclversion=76jp
-+        jptclLversion=7.6jp
-+        jptkLversion=4.2jp
-+        ;;
-+      80jp)
-+        jptclversion=80jp
-+        jptclLversion=8.0jp
-+        jptkLversion=8.0jp
-+        ;;
-+    esac
-+  fi
-+done
-+if [ X$jptkversion != X ]; then
-     echo "Using Japanized tk-$jptkLversion"
--    if [ X"${MACHINE}" = X"pc98" ]; then
- 	echo "#define HasJpTk			YES" >>$F
- 	echo "#define JpTkLibDir		/usr/local/lib" >>$F
--	echo "#define JpTkIncDir		/usr/local/include/tk$tkLversion" >>$F
--	echo "#define JpTkLibName		tk$tkversion" >>$F
-+	echo "#define JpTkIncDir		/usr/local/include/tk$jptkLversion" >>$F
-+	echo "#define JpTkLibName		tk$jptkversion" >>$F
- 	echo "#define HasJpTcl		YES" >>$F
- 	echo "#define JpTclLibDir		/usr/local/lib" >>$F
--	echo "#define JpTclIncDir		/usr/local/include/tcl$tclLversion" >>$F
--	echo "#define JpTclLibName		tcl$tclversion" >>$F
--    else
--	echo "#define HasTk			YES" >>$F
--	echo "#define TkLibDir		/usr/local/lib" >>$F
--	echo "#define TkIncDir		/usr/local/include/tk$tkLversion" >>$F
--	echo "#define TkLibName		tk$tkversion" >>$F
--	echo "#define HasTcl			YES" >>$F
--	echo "#define TclLibDir		/usr/local/lib" >>$F
--	echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
--	echo "#define TclLibName		tcl$tclversion" >>$F
--    fi
--    ;;
--  *)
-+	echo "#define JpTclIncDir		/usr/local/include/tcl$jptclLversion" >>$F
-+	echo "#define JpTclLibName		tcl$jptclversion" >>$F
-+fi
-+
-+if [ X$tkversion != X ]; then
-     echo "Using tk-$tkLversion"
-     echo "#define HasTk			YES" >>$F
-     echo "#define TkLibDir		/usr/local/lib" >>$F
-@@ -113,9 +81,12 @@
-     echo "#define TclLibDir		/usr/local/lib" >>$F
-     echo "#define TclIncDir		/usr/local/include/tcl$tclLversion" >>$F
-     echo "#define TclLibName		tcl$tclversion" >>$F
--    ;;
--  esac
-+fi
-+
-+if [ X$tkversion != X -a X$jptkversion != X ]; then
-   echo "#define BuildXF86Setup		YES" >>$F
-+  echo "#define XF86SetupUsesStaticTk	YES" >>$F
-+  echo "#define XF86SetupUsesStaticTcl	YES" >>$F
- else
- cat <<EOF
- *** I don't see the static library for tk version $tkversion in /usr/local/lib.
-@@ -125,90 +96,33 @@
- EOF
- fi
- 
--cat <<END
-- Which servers do you wish to build, you can save a lot of disk space
-- by only compiling the server you will be using.  It will also save you
-- considerable compile time.
--END
--if [ X$tkversion != X ]; then
--  echo "*** If you want to use XF86Setup to set the INITIAL configuration,"
--  echo "*** then you must build the VGA server"
--fi
--# force the compilation of the EGC server for pc98.
--if [ X"${MACHINE}" = X"pc98" ]; then
-+# Build the default server set for each machine
-+
-+if [ X"${MACHINE_ARCH}" = X"i386" ]; then
-     echo "#define BuildPC98Servers	YES"  >>$F
--    echo "#undef XF98EGCServer"           >>$F
--    echo "#define XF98EGCServer     YES"  >>$F
--    servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
--    selected=EGC
--    for i in $servers; do
--	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
-+
-+  if [ X"${MACHINE}" = X"pc98" ]; then
-+    # Don't build normal i386 servers on PC98
-     echo "#undef XF86SVGAServer"           >>$F
-     echo "#define XF86SVGAServer     NO"  >>$F
-     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
--    done
--elif [ X"${MACHINE}" = X"alpha" ]; then
--# force the compilation of the SVGA server.
--    echo "#undef XF86SVGAServer"           >>$F
--    echo "#define XF86SVGAServer     YES"  >>$F
--    servers="Mono S3 S3V Mach64 P9000 I128 GLINT TGA"
--    selected=SVGA
--    for i in $servers; do
--	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
--    done
--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 GLINT"
--    selected=SVGA
--    for i in $servers; do
--	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
-+        echo "#define XF86${i}Server   NO"  >>$F
-     done
-+  fi
-+elif [ X"${MACHINE}" == X"alpha" ]; then
-+  # force the VGA16 driver on the Alpha
-+  echo "#define XF86VGA16Server		YES" >>$F
- fi
- 
--echo
--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  
--      if [ X"${MACHINE}" = X"pc98" ]; then
--      echo "#define ServerToInstall		XF98_$answ" >>$F
--      else
--      echo "#define ServerToInstall		XF86_$answ" >>$F
--      fi
--      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?"
--echo "#define XVirtualFramebufferServer $answ" >>$F
-+echo "#define XVirtualFramebufferServer YES" >>$F
- 
- if [ X"${MACHINE}" != X"pc98" ]; then
- if [ X"${MACHINE}" = X"alpha" ]; then
- cat >> $F <<END
--#define XF86SvgaDrivers         nv mga s3v generic
--
--#define XF86MonoDrivers		hgc1280 sigma apollo hercules
-+#define XF86SvgaDrivers         nv mga tvga8900 s3v generic
-+#define XF86Vga16Drivers	tvga8900 generic
- END
- else
- cat >> $F <<END
-@@ -217,144 +131,38 @@
-                                 cl64xx video7 ark mx realtek apm s3_savage s3v \
-                                 s3_svga neo chips cyrix rendition p9x00 \
- 				spc8110 i740 i810 tdfx smi generic
--
--#define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
--				cl64xx generic 
--
--#define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati sis tvga8900 \
--				cirrus ncr77c22 oak cl64xx generic
--
--#define XF86MonoDrivers		hgc1280 sigma apollo hercules
--
--#define XF86W32Drivers		et4000w32
--
- END
- fi
- fi
--
--
--cat <<END
- 
-+echo "#define InstallXdmConfig	YES" >> $F
-+echo "#define InstallXinitConfig YES" >> $F
-+echo "#define InstallFSConfig YES" >> $F
- 
-- Do you want to install the default system config files, this will overwrite
-- and files that you may be currently using.  This would only be required
-- on a first time build.
--END
--yesno "Install xdm config?"
--if [ $answ = YES ]; then
--  echo "#define InstallXdmConfig	$answ" >> $F
--fi
--yesno "Install xinit config?"
--if [ $answ = YES ]; then
--  echo "#define InstallXinitConfig $answ" >> $F
--fi
--yesno "Install xfs config?"
--if [ $answ = YES ]; then
--  echo "#define InstallFSConfig $answ" >> $F
--fi
--
--yesno "Do you want to include support for the FontServer?"
- echo "#undef BuildFontServer" >>$F
--echo "#define  BuildFontServer $answ" >>$F
-+echo "#define  BuildFontServer YES" >>$F
- echo "#undef InstallFSConfig" >>$F
--echo "#define   InstallFSConfig $answ" >>$F
-+echo "#define   InstallFSConfig YES" >>$F
- 
--cat <<'END'
-- Do you want to Build Fonts (Usually you only want to build and install
-- fonts once, if this is a first time install you will want to build the
-- fonts)
--END
--yesno "Build fonts?"
--if [ $answ = NO ]; then
--  echo "#define BuildFonts		NO" >> $F
--fi
--yesno "Build the servers with Extended input devices?"
--if [ $answ = NO ]; then
--  echo "#undef BuildXInputExt" >> $F
--  echo "#define BuildXInputExt		NO" >> $F
--else
--  if [ X${MACHINE} != X"alpha" ]; then
--    echo "#define JoystickSupport		YES" >> $F
--  fi
-+if [ X${MACHINE} != X"alpha" ]; then
-+  echo "#define JoystickSupport		YES" >> $F
- fi
- 
--yesno "Build PEX?"
--if [ $answ = NO ]; then
--  echo "#define BuildPexExt		NO" >> $F
--fi
--yesno "Build XIE?"
--if [ $answ = NO ]; then
--  echo "#define BuildXIE		NO" >> $F
--fi
--echo
--
--yesno "Build static libraries in addition to shared libraries?"
--if [ $answ = YES ]; then
--  echo "#define ForceNormalLib		YES" >> $F
--fi
-+echo "#define ForceNormalLib		YES" >> $F
-+
- # ELF detection
- if [ `sysctl -n kern.osreldate` -ge 300004 -a  X`objformat` = Xelf ]; then
-   ELF=yes
--cat <<'END'
--
-- Some programs still require a.out X libraries.  Most noteable amongst
-- these is Nestcape, but it is reported to work best with older X libraries. 
-- You can build a.out libraries here, using the lastest sources and
-- compiler, or you can use the XFree86-aoutlibs port, which installs older
-- a.out compatibility libraries.
-- 
-- If you decide to build the libraries here they will not be uninstalled by
-- this port, and they will be overwritten by the XFree86-aoutlibs port, if
-- for some reason you install it.
--
--END
--  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 [ ${OSVERSION} -ge 300000 ]; then
--cat <<'END'
--
-- FreeBSD-3.x has support for Secure RPC.
--
-- While this scheme is not used for general purpose encryption, 
-- some countries restrict the use of strong cryptography.
--
--END
--yesno "Build with Secure RPC?"
--if [ $answ = YES ]; then
-   echo "#define HasSecureRPC		YES" >> $F
- fi
--fi
--cat <<'END'
--
-- MIT supplies an authentication mechanism that relies upon DES, this is
-- called XDM-AUTHORIZATION-1.
- 
-- Source code for this authentication mechanism may not be exported from
-- the United States, however, there are compatible replacements for this
-- mechanism available elsewhere.  Also, while this scheme is not used for
-- general purpose encryption,  some countries restrict the use of strong
-- cryptography.
--
-- If you have aquired a copy of "Wraphelp.c" and it currently resides in
-- the same location as the XFree86 source or in the ports "files"
-- subdirectory,  it will be copied into the right place in the X11 source
-- distribution and support for this feature will be enabled if you answer
-- YES to the following question.
--
-- If you do not have a copy of this file, even if you answer YES to this
-- question, support will not be enabled.  If you wish to change this later,
-- the option controling this is contained the file xc/config/cf/xf86site.def.
--
--END
--yesno "Do you want to enable XDM-AUTHORIZATION-1 support?"
- cpwh=NO
--if [ $answ = YES ]; then
-+
-     if [ -f $WH ] ; then
- 	echo "==> $WH found in source distribution."
-     elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
-@@ -367,23 +175,16 @@
-       echo "==> Wraphelp.c not found, DES support NOT enabled."
-       cpwh=NO
-     fi
--fi
- if [ $cpwh != NO ]; then
--  echo "#define	HasXdmAuth		$answ"	>> $F
-+  echo "#define	HasXdmAuth		YES"	>> $F
- fi
- 
--echo
--yesno "Do you want to compile with PAM support?"
--if [ $answ = YES ]; then
--  echo "#define	HasPam			YES"	>> $F
--else
--  echo "#define	HasPam			NO"	>> $F
-+echo "#define	HasPam			YES"	>> $F
-+if [ X${MACHINE} != X"alpha" ]; then
-+echo "#define	InstallJapaneseDocs	YES"	>> $F
-+echo "#define	HasSgmlFmt		YES"	>> $F
-+echo "#define	BuildAllDocs		YES"	>> $F
- fi
--
--echo
--echo
--echo "End of configuration questions. No more user input required"
--echo
- }
- 
- if [ ! -r $F ]; then