[Midnightbsd-cvs] mports [17508] trunk/Mk/components/options.mk: add guard and strip optional with parameter from argument if OPTION is to off

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 26 18:56:53 EDT 2014


Revision: 17508
          http://svnweb.midnightbsd.org/mports/?rev=17508
Author:   laffer1
Date:     2014-09-26 18:56:49 -0400 (Fri, 26 Sep 2014)
Log Message:
-----------
add guard and strip optional with parameter from argument if OPTION is to off

Modified Paths:
--------------
    trunk/Mk/components/options.mk

Modified: trunk/Mk/components/options.mk
===================================================================
--- trunk/Mk/components/options.mk	2014-09-26 22:18:54 UTC (rev 17507)
+++ trunk/Mk/components/options.mk	2014-09-26 22:56:49 UTC (rev 17508)
@@ -5,7 +5,8 @@
 # options.mk -- The options component
 #
 
-.if !defined(AFTERPORTMK)
+.if !defined(OPTIONSMKINCLUDED) && !defined(AFTERPORTMK)
+OPTIONSMKINCLUDED=	options.mk
 
 OPTIONS_NAME?=	${PKGORIGIN:S/\//_/}
 OPTIONSFILE?=	${PORT_DBDIR}/${UNIQUENAME}/options
@@ -242,7 +243,7 @@
 .    endif
 .    if defined(${opt}_CONFIGURE_WITH)
 .      for iopt in ${${opt}_CONFIGURE_WITH}
-CONFIGURE_ARGS+=	--with-${iopt}
+CONFIGURE_ARGS+=	--with-${iopt:C/=.*//}
 .      endfor
 .    endif
 .    for configure in CONFIGURE CMAKE QMAKE



More information about the Midnightbsd-cvs mailing list