Here is a patch for XFree86 to allow the proud owner of "The X Companion

CD for R6" from O'Reilly and Associates, Inc, to mount and compile X on
this CD. I have tried to create this patch in such a way that if any other
CD's come along, they can be kluged in too.
Submitted by:	Mark Murray <mark@grondar.za>

4 files changed, 46 insertions, 12 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index ebda54445823..e759bd496fd9 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -1,10 +1,12 @@
-# uncomment one of the 2 lines below!
-#X11_ON_CDROM	=	yes
-X11_VIA_FTP	=	yes
+# uncomment one of the 3 lines below!
+#(X-Consortium CDROM, O'Reilly 'X-Companion' CDROM, or X by FTP (_*BIG*_)
+#X11_ON_X_CDROM	=	yes
+#X11_ON_OR_CDROM	=	yes
+#X11_VIA_FTP	=	yes
 
 #if you are compiling from a cdrom, set the directory where the
 # the patch files are
-#X11FIXES = /home/X11R6
+X11FIXES = /usr/ports/distfiles/xc
 
 #define this if you are short of space - save ~28 Mbytes
 #REMOVE_NOT_ESSENTIAL	=	yes
@@ -17,6 +19,10 @@ BUILD_COOKIE?=		${WRKDIR}/.build_done
 EXTRACT_COOKIE?=	${WRKDIR}/.extract_done
 IS_INTERACTIVE=		yes
 
+.if defined(X11_ON_X_CDROM) || defined(X11_ON_OR_CDROM)
+X11_ON_CDROM	=	yes
+.endif
+
 .if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
 
 build: configure ${BUILD_COOKIE}
@@ -51,6 +57,12 @@ ${EXTRACT_COOKIE}:
 	@mkdir -p ${WRKDIR}
 	@echo ${X11FIXES} > ${WRKDIR}/.cdrom
 	@${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}
+.if defined(X11_ON_X_CDROM)
+	${TOUCH} ${TOUCH_FLAGS} ${WRKDIR}/.cd_X
+.endif
+.if defined(X11_ON_OR_CDROM)
+	${TOUCH} ${TOUCH_FLAGS} ${WRKDIR}/.cd_OR
+.endif
 
 .elif defined(X11_VIA_FTP)
 .include "Makefile.ftp"
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 6c7d84ec2671..7fead4cae3d8 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -28,14 +28,19 @@ if [ -f $WRKDIR/.cdrom ]; then
   yesno "Is your cdrom distibution already patched? [y] ";
   if [ $answ = YES ]; then
     echo -n "What is the patchlevel of the distribution? [3] ";
-    read pl; if [ X$pl = X ]; then pl=3; fi
+    read pl; if [ X$pl = X ]; then pl=5; fi
     pl=`expr $pl + 1`
     if [ $pl -lt 10 ]; then pl=0$pl; fi
   else
     pl=01
   fi
   echo "==> building the tree (please wait)"
-  (cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
+  if [ -f ${WRKDIR}/.cd_OR ] ; then
+    (cd $WRKDIR; cp $X11R6/xc/config/util/lndir.c .; cc -o lndir lndir.c; mkdir ./xc; ./lndir $X11R6/xc ./xc)
+  fi
+  if [ -f ${WRKDIR}/.cd_X ] ; then
+    (cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
+  fi
 else
   X11FIXES=`cat $WRKDIR/.ftp`
   pl=01
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index ebda54445823..e759bd496fd9 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -1,10 +1,12 @@
-# uncomment one of the 2 lines below!
-#X11_ON_CDROM	=	yes
-X11_VIA_FTP	=	yes
+# uncomment one of the 3 lines below!
+#(X-Consortium CDROM, O'Reilly 'X-Companion' CDROM, or X by FTP (_*BIG*_)
+#X11_ON_X_CDROM	=	yes
+#X11_ON_OR_CDROM	=	yes
+#X11_VIA_FTP	=	yes
 
 #if you are compiling from a cdrom, set the directory where the
 # the patch files are
-#X11FIXES = /home/X11R6
+X11FIXES = /usr/ports/distfiles/xc
 
 #define this if you are short of space - save ~28 Mbytes
 #REMOVE_NOT_ESSENTIAL	=	yes
@@ -17,6 +19,10 @@ BUILD_COOKIE?=		${WRKDIR}/.build_done
 EXTRACT_COOKIE?=	${WRKDIR}/.extract_done
 IS_INTERACTIVE=		yes
 
+.if defined(X11_ON_X_CDROM) || defined(X11_ON_OR_CDROM)
+X11_ON_CDROM	=	yes
+.endif
+
 .if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
 
 build: configure ${BUILD_COOKIE}
@@ -51,6 +57,12 @@ ${EXTRACT_COOKIE}:
 	@mkdir -p ${WRKDIR}
 	@echo ${X11FIXES} > ${WRKDIR}/.cdrom
 	@${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}
+.if defined(X11_ON_X_CDROM)
+	${TOUCH} ${TOUCH_FLAGS} ${WRKDIR}/.cd_X
+.endif
+.if defined(X11_ON_OR_CDROM)
+	${TOUCH} ${TOUCH_FLAGS} ${WRKDIR}/.cd_OR
+.endif
 
 .elif defined(X11_VIA_FTP)
 .include "Makefile.ftp"
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 6c7d84ec2671..7fead4cae3d8 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -28,14 +28,19 @@ if [ -f $WRKDIR/.cdrom ]; then
   yesno "Is your cdrom distibution already patched? [y] ";
   if [ $answ = YES ]; then
     echo -n "What is the patchlevel of the distribution? [3] ";
-    read pl; if [ X$pl = X ]; then pl=3; fi
+    read pl; if [ X$pl = X ]; then pl=5; fi
     pl=`expr $pl + 1`
     if [ $pl -lt 10 ]; then pl=0$pl; fi
   else
     pl=01
   fi
   echo "==> building the tree (please wait)"
-  (cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
+  if [ -f ${WRKDIR}/.cd_OR ] ; then
+    (cd $WRKDIR; cp $X11R6/xc/config/util/lndir.c .; cc -o lndir lndir.c; mkdir ./xc; ./lndir $X11R6/xc ./xc)
+  fi
+  if [ -f ${WRKDIR}/.cd_X ] ; then
+    (cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
+  fi
 else
   X11FIXES=`cat $WRKDIR/.ftp`
   pl=01