svn commit: r349407 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Fri Mar 28 11:04:54 2014
New Revision: 349407
URL: http://svnweb.freebsd.org/changeset/ports/349407
QAT: https://qat.redports.org/buildarchive/r349407/

Log:
  Make option DEBUG work like WITH_DEBUG

Modified:
  head/Mk/bsd.options.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Fri Mar 28 10:34:51 2014	(r349406)
+++ head/Mk/bsd.options.mk	Fri Mar 28 11:04:54 2014	(r349407)
@@ -391,6 +391,10 @@ NOPORTDOCS=	yes
 NOPORTEXAMPLES=	yes
 .endif
 
+.if ${PORT_OPTIONS:MDEBUG}
+WITH_DEBUG=	yes
+.endif
+
 .if defined(NO_OPTIONS_SORT)
 ALL_OPTIONS=	${OPTIONS_DEFINE}
 .endif

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Mar 28 10:34:51 2014	(r349406)
+++ head/Mk/bsd.port.mk	Fri Mar 28 11:04:54 2014	(r349407)
@@ -1311,12 +1311,6 @@ WITH_DEBUG=	yes
 .endif
 .endif
 
-# Reset value from bsd.own.mk.
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
-STRIP=	#none
-MAKE_ENV+=	DONTSTRIP=yes
-.endif
-
 .include "${PORTSDIR}/Mk/bsd.options.mk"
 
 # Start of pre-makefile section.
@@ -1596,7 +1590,10 @@ CFLAGS:=	${CFLAGS:C/${_CPUCFLAGS}//}
 .endif
 .endif
 
+# Reset value from bsd.own.mk.
 .if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+STRIP=	#none
+MAKE_ENV+=	DONTSTRIP=yes
 STRIP_CMD=	${TRUE}
 DEBUG_FLAGS?=	-g
 CFLAGS:=		${CFLAGS:N-O*:N-fno-strict*} ${DEBUG_FLAGS}