aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>1995-05-17 13:07:28 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>1995-05-17 13:07:28 +0000
commit4665c9e7e08081892f37575482569aceef907e38 (patch)
treea59896ae758045ec1a83143baef5c2f8052c7136
parent8146415fdd9532e76f5d08a64c22305094ddc423 (diff)
downloadports-4665c9e7e08081892f37575482569aceef907e38.tar.gz
ports-4665c9e7e08081892f37575482569aceef907e38.zip
Bug fixes for compilation from the O'Reilly and Associates CDROM
Reviewed by: jmz Submitted by: Mark Murray <mark@grondar.za>
Notes
Notes: svn path=/head/; revision=1772
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile21
-rw-r--r--x11-servers/XFree86-4-Server-snap/scripts/configure7
-rw-r--r--x11-servers/XFree86-4-Server/Makefile21
-rw-r--r--x11-servers/XFree86-4-Server/scripts/configure7
-rw-r--r--x11/XFree86-4-clients/Makefile21
-rw-r--r--x11/XFree86-4-clients/scripts/configure7
-rw-r--r--x11/XFree86-4-libraries/Makefile21
-rw-r--r--x11/XFree86-4-libraries/scripts/configure7
-rw-r--r--x11/XFree86-4/Makefile21
-rw-r--r--x11/XFree86-4/scripts/configure7
-rw-r--r--x11/XFree86/Makefile21
-rw-r--r--x11/XFree86/scripts/configure7
12 files changed, 36 insertions, 132 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 8ba40811febe..1f2cb0c30561 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -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:
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 3fc623a55508..d4d42ca025ac 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -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
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 8ba40811febe..1f2cb0c30561 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -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:
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 3fc623a55508..d4d42ca025ac 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -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
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 8ba40811febe..1f2cb0c30561 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -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:
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 3fc623a55508..d4d42ca025ac 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -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
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 8ba40811febe..1f2cb0c30561 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -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:
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 3fc623a55508..d4d42ca025ac 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -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
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 8ba40811febe..1f2cb0c30561 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -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:
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 3fc623a55508..d4d42ca025ac 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -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
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 8ba40811febe..1f2cb0c30561 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -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:
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 3fc623a55508..d4d42ca025ac 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -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