svn commit: r415531 - head/Mk

[Bryan Drewery]

Author: bdrewery
Date: Thu May 19 22:24:59 2016
New Revision: 415531
URL: https://svnweb.freebsd.org/changeset/ports/415531

Log:
  Disable the change in r415530 until an exp-run is done.
  
  Passing things in MAKE_ARGS tends to break some obscure ports.
  
  Reported by:	antoine
  PR:		D6271

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu May 19 22:06:28 2016	(r415530)
+++ head/Mk/bsd.port.mk	Thu May 19 22:24:59 2016	(r415531)
@@ -1641,9 +1641,9 @@ 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) || \
+.if 0 && ((${OSVERSION} >= 903510 && ${OSVERSION} < 1000000) || \
     (${OSVERSION} >= 1003503 && ${OSVERSION} < 1100000) || \
-    ${OSVERSION} >= 1100000
+    ${OSVERSION} >= 1100000)
 # 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_ARGS+=	MK_DEBUG_FILES=no