aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.port.mk
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2017-01-03 07:24:49 +0000
committerRene Ladan <rene@FreeBSD.org>2017-01-03 07:24:49 +0000
commit6f019c90b38cefb0b798496384e88067b3bb87a9 (patch)
tree9171a32031ba4f5598a8ae32c75b45077e8a9480 /Mk/bsd.port.mk
parentaeee7ad9207f3da27d26d0eadd3953679b061ceb (diff)
downloadports-6f019c90b38cefb0b798496384e88067b3bb87a9.tar.gz
ports-6f019c90b38cefb0b798496384e88067b3bb87a9.zip
Notes
Diffstat (limited to 'Mk/bsd.port.mk')
-rw-r--r--Mk/bsd.port.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 17e607cfef3b..f67c12b5d037 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1633,9 +1633,7 @@ MAKE_ENV+= NO_PIE=yes
# We prefer to pass MK_*=no but it was only supported after a certain
# revision. Passing WITHOUT_* may conflict with a make.conf or src.conf's
# WITH_* value. Note that ports *do* pull in src.conf.
-.if (${OSVERSION} >= 903510 && ${OSVERSION} < 1000000) || \
- (${OSVERSION} >= 1003503 && ${OSVERSION} < 1100000) || \
- ${OSVERSION} >= 1100000
+.if ${OSVERSION} >= 1003503
# We will control debug files. Don't let builds that use /usr/share/mk
# split out debug symbols since the plist won't know to expect it.
MAKE_ENV+= MK_DEBUG_FILES=no
@@ -3150,7 +3148,7 @@ do-patch:
.if !target(run-autotools-fixup)
run-autotools-fixup:
# Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x.
-.if ${OSVERSION} >= 1000000 && !defined(WITHOUT_FBSD10_FIX)
+.if !defined(WITHOUT_FBSD10_FIX)
-@for f in `${FIND} ${WRKDIR} -type f \( -name config.libpath -o \
-name config.rpath -o -name configure -o -name libtool.m4 -o \
-name ltconfig -o -name libtool -o -name aclocal.m4 -o \