Date: Thu, 23 Mar 1995 22:58:21 +0200 From: Mark Murray <mark@grondar.za> To: ports@FreeBSD.org Subject: Update for X11 port Message-ID: <199503232058.WAA24453@grunt.grondar.za>
next in thread | raw e-mail | index | archive | help
Hello All
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.
(This CD comes with a book (~100 pages), and I recommend it highly!)
-------------------------8<-----------------------------------
diff -cdPr XFree86/Makefile XFMM/Makefile
*** XFree86/Makefile Wed Mar 22 22:14:36 1995
--- XFMM/Makefile Thu Mar 23 22:06:53 1995
***************
*** 1,10 ****
! # uncomment one of the 2 lines below!
! #X11_ON_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
#define this if you are short of space - save ~28 Mbytes
#REMOVE_NOT_ESSENTIAL = yes
--- 1,12 ----
! # 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 = /usr/ports/distfiles/xc
#define this if you are short of space - save ~28 Mbytes
#REMOVE_NOT_ESSENTIAL = yes
***************
*** 17,22 ****
--- 19,28 ----
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,56 ****
--- 57,68 ----
@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 -cdPr XFree86/scripts/configure XFMM/scripts/configure
*** XFree86/scripts/configure Wed Mar 22 22:14:05 1995
--- XFMM/scripts/configure Thu Mar 23 21:51:02 1995
***************
*** 27,41 ****
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
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)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=01
--- 27,46 ----
yesno "Is your cdrom distibution already patched? [y] ";
if [ $answ = YES ]; then
! echo -n "What is the patchlevel of the distribution? [5] ";
! 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)"
! 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
Only in XFree86: work
-------------------------8<-----------------------------------
M
--
Mark Murray
46 Harvey Rd, Claremont, Cape Town 7700, South Africa
+27 21 61-3768 GMT+0200
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199503232058.WAA24453>