aboutsummaryrefslogtreecommitdiffstats
path: root/x11/XFree86-4-libraries/Makefile
diff options
context:
space:
mode:
authorjmz <jmz@FreeBSD.org>1995-05-17 21:07:28 +0800
committerjmz <jmz@FreeBSD.org>1995-05-17 21:07:28 +0800
commita1affde034adeec14efb856af8688ea92ab44c84 (patch)
tree653aaad75fd0c4fdf61a0fc76fbeeb103510f649 /x11/XFree86-4-libraries/Makefile
parent75e20d60930e7835e5fa1e640e38f19b34ad6fe5 (diff)
downloadfreebsd-ports-gnome-a1affde034adeec14efb856af8688ea92ab44c84.tar.gz
freebsd-ports-gnome-a1affde034adeec14efb856af8688ea92ab44c84.tar.zst
freebsd-ports-gnome-a1affde034adeec14efb856af8688ea92ab44c84.zip
Bug fixes for compilation from the O'Reilly and Associates CDROM
Reviewed by: jmz Submitted by: Mark Murray <mark@grondar.za>
Diffstat (limited to 'x11/XFree86-4-libraries/Makefile')
-rw-r--r--x11/XFree86-4-libraries/Makefile21
1 files changed, 5 insertions, 16 deletions
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: