Date: Wed, 17 May 1995 08:32:30 +0200 From: Mark Murray <mark@grondar.za> To: jmz@cabri.obs-besancon.fr (Jean-Marc Zucconi) Cc: ports@FreeBSD.org, bugs@FreeBSD.org Subject: Re: Late fix for XFree86 port Message-ID: <199505170632.IAA23386@grumble.grondar.za>
next in thread | raw e-mail | index | archive | help
> There is no need to compile lndir in this case - look 3 lines below your
> long line how I did it!!! You should have used my script from the
> begining...
How true. There is a patch at the end of this that backs out _all_ my
crap. If this is OK, could you please apply it?
(And while you are about it please pass the silly hat and hurl a
convenient custard pie?)
----------------------8<-----------Patch relative to ports/x11-------
diff -cdPr XFree86.MM/Makefile XFree86/Makefile
*** XFree86.MM/Makefile Tue May 16 20:55:31 1995
--- XFree86/Makefile Wed May 17 08:21:35 1995
***************
*** 12,21 ****
# #
#######################################################################
#
! # 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
--- 12,20 ----
# #
#######################################################################
#
! # uncomment one of the 2 lines below!
! #(X-Consortium CDROM/O'Reilly 'X-Companion' CDROM, or X by FTP (_*BIG*_)
! #X11_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
***************
*** 35,44 ****
MAINTAINER= jmz@FreeBSD.ORG
- .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)
do-build:
--- 34,39 ----
***************
*** 70,87 ****
@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"
.else
do-fetch:
! @echo Please set one of the 3 variables X11_ON_X_CDROM, X11_ON_OR_CDROM, or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
--- 65,76 ----
@mkdir -p ${WRKDIR}
@echo ${X11FIXES} > ${WRKDIR}/.cdrom
@${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}
.elif defined(X11_VIA_FTP)
.include "Makefile.ftp"
.else
do-fetch:
! @echo Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
***************
*** 89,95 ****
do-configure:
@echo -n
do-build:
! @echo Please set one of the 3 variables X11_ON_X_CDROM, X11_ON_OR_CDROM, or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:
--- 78,84 ----
do-configure:
@echo -n
do-build:
! @echo Please set one of the 2 variables X11_ON_CDROM, or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:
Only in XFree86: makefile
diff -cdPr XFree86/scripts/configure XFree86.MM/scripts/configure
*** XFree86/scripts/configure Tue May 16 20:53:20 1995
--- XFree86.MM/scripts/configure Wed May 17 08:22:48 1995
***************
*** 35,46 ****
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=12
--- 35,41 ----
pl=01
fi
echo "==> building the tree (please wait)"
! (cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12
----------------------8<-----------Patch relative to ports/x11-------
--
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?199505170632.IAA23386>