aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>2001-07-26 02:10:16 +0800
committerSteve Price <steve@FreeBSD.org>2001-07-26 02:10:16 +0800
commit27f71f8f05f020b62b0a5b82b7ec265bc276b6ef (patch)
treeaa6563d6c645958fd0bea48cc3ad9b889f297175 /Mk
parent4774b924d59afb3410afa8804085f7a7d46ddfff (diff)
downloadfreebsd-ports-27f71f8f05f020b62b0a5b82b7ec265bc276b6ef.tar.gz
freebsd-ports-27f71f8f05f020b62b0a5b82b7ec265bc276b6ef.tar.zst
freebsd-ports-27f71f8f05f020b62b0a5b82b7ec265bc276b6ef.zip
(1) Fix a typo becuase -> because.
Submitted by: Thierry Thomas <thierry@thomas.as> (2) Allow USE_X_PREFIX to be set to NO so that ports can use imake and not have to be installed in ${X11BASE}. Submitted by: Masafumi NAKANE <max@wide.ad.jp>
Notes
Notes: svn path=/head/; revision=45488
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index aa3e80a7b5d8..9a65bdfe19d8 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -325,7 +325,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# a major can of worms.
#
# Set these variables if your port doesn't need some of the steps.
-# Note that there are no NO_PATCH or NO_CONFIGURE variables becuase
+# Note that there are no NO_PATCH or NO_CONFIGURE variables because
# those steps are empty by default. NO_EXTRACT is not allowed anymore
# since we need to at least create ${WRKDIR}. Also, NO_CHECKSUM is a user
# variable and is not to be set in a port's Makefile. See above for NO_PACKAGE.
@@ -633,9 +633,12 @@ FILESDIR?= ${MASTERDIR}/files
SCRIPTDIR?= ${MASTERDIR}/scripts
PKGDIR?= ${MASTERDIR}
-.if defined(USE_IMAKE)
+.if defined(USE_IMAKE) && !defined(USE_X_PREFIX)
USE_X_PREFIX= yes
.endif
+.if defined(USE_X_PREFIX) && ${USE_X_PREFIX} == "no"
+.undef USE_X_PREFIX
+.endif
.if defined(USE_X_PREFIX)
USE_XLIB= yes
.endif