1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00

Bug fixes for compilation from the O'Reilly and Associates CDROM

Reviewed by:	jmz
Submitted by:	Mark Murray <mark@grondar.za>
This commit is contained in:
Jean-Marc Zucconi 1995-05-17 13:07:28 +00:00
parent 8146415fdd
commit 4665c9e7e0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=1772
12 changed files with 36 additions and 132 deletions

View File

@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.8 1995/04/26 14:45:15 jmz Exp $
# $Id: Makefile,v 1.9 1995/05/13 05:42:15 asami Exp $
#
#######################################################################
@ -12,10 +12,9 @@
# #
#######################################################################
#
# uncomment one of the 3 lines below!
# uncomment one of the 2 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_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
@ -35,10 +34,6 @@ IS_INTERACTIVE= yes
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:
@ -70,18 +65,12 @@ do-extract:
@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 Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@ -89,7 +78,7 @@ do-extract:
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 Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:

View File

@ -35,12 +35,7 @@ if [ -f $WRKDIR/.cdrom ]; then
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
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12

View File

@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.8 1995/04/26 14:45:15 jmz Exp $
# $Id: Makefile,v 1.9 1995/05/13 05:42:15 asami Exp $
#
#######################################################################
@ -12,10 +12,9 @@
# #
#######################################################################
#
# uncomment one of the 3 lines below!
# uncomment one of the 2 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_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
@ -35,10 +34,6 @@ IS_INTERACTIVE= yes
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:
@ -70,18 +65,12 @@ do-extract:
@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 Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@ -89,7 +78,7 @@ do-extract:
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 Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:

View File

@ -35,12 +35,7 @@ if [ -f $WRKDIR/.cdrom ]; then
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
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12

View File

@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.8 1995/04/26 14:45:15 jmz Exp $
# $Id: Makefile,v 1.9 1995/05/13 05:42:15 asami Exp $
#
#######################################################################
@ -12,10 +12,9 @@
# #
#######################################################################
#
# uncomment one of the 3 lines below!
# uncomment one of the 2 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_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
@ -35,10 +34,6 @@ IS_INTERACTIVE= yes
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:
@ -70,18 +65,12 @@ do-extract:
@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 Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@ -89,7 +78,7 @@ do-extract:
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 Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:

View File

@ -35,12 +35,7 @@ if [ -f $WRKDIR/.cdrom ]; then
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
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12

View File

@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.8 1995/04/26 14:45:15 jmz Exp $
# $Id: Makefile,v 1.9 1995/05/13 05:42:15 asami Exp $
#
#######################################################################
@ -12,10 +12,9 @@
# #
#######################################################################
#
# uncomment one of the 3 lines below!
# uncomment one of the 2 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_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
@ -35,10 +34,6 @@ IS_INTERACTIVE= yes
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:
@ -70,18 +65,12 @@ do-extract:
@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 Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@ -89,7 +78,7 @@ do-extract:
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 Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:

View File

@ -35,12 +35,7 @@ if [ -f $WRKDIR/.cdrom ]; then
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
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12

View File

@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.8 1995/04/26 14:45:15 jmz Exp $
# $Id: Makefile,v 1.9 1995/05/13 05:42:15 asami Exp $
#
#######################################################################
@ -12,10 +12,9 @@
# #
#######################################################################
#
# uncomment one of the 3 lines below!
# uncomment one of the 2 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_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
@ -35,10 +34,6 @@ IS_INTERACTIVE= yes
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:
@ -70,18 +65,12 @@ do-extract:
@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 Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@ -89,7 +78,7 @@ do-extract:
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 Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:

View File

@ -35,12 +35,7 @@ if [ -f $WRKDIR/.cdrom ]; then
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
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12

View File

@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.8 1995/04/26 14:45:15 jmz Exp $
# $Id: Makefile,v 1.9 1995/05/13 05:42:15 asami Exp $
#
#######################################################################
@ -12,10 +12,9 @@
# #
#######################################################################
#
# uncomment one of the 3 lines below!
# uncomment one of the 2 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_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
@ -35,10 +34,6 @@ IS_INTERACTIVE= yes
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:
@ -70,18 +65,12 @@ do-extract:
@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 Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@ -89,7 +78,7 @@ do-extract:
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 Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:

View File

@ -35,12 +35,7 @@ if [ -f $WRKDIR/.cdrom ]; then
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
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12