Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Nov 2013 10:59:03 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r334572 - head/Mk
Message-ID:  <201311221059.rAMAx3nc043462@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Fri Nov 22 10:59:03 2013
New Revision: 334572
URL: http://svnweb.freebsd.org/changeset/ports/334572

Log:
  Add support for ${opt}_QMAKE_ON/${opt}_QMAKE_OFF
  
  Approved by:	portmgr (bapt)

Modified:
  head/Mk/bsd.options.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Fri Nov 22 10:58:20 2013	(r334571)
+++ head/Mk/bsd.options.mk	Fri Nov 22 10:59:03 2013	(r334572)
@@ -93,6 +93,11 @@
 # ${opt}_CMAKE_OFF			When option is disabled, it will add its content to
 #							the CMAKE_ARGS.
 #
+# ${opt}_QMAKE_ON			When option is enabled, it will add its content to
+#							the QMAKE_ARGS.
+# ${opt}_QMAKE_OFF			When option is disabled, it will add its content to
+#							the QMAKE_ARGS.
+#
 # ${opt}_USE=	FOO=bar		When option is enabled, it will  enable
 #							USE_FOO+= bar
 #							If you need more than one option, you can do
@@ -398,12 +403,11 @@ CONFIGURE_ARGS+=	--enable-${iopt}
 CONFIGURE_ARGS+=	--with-${iopt}
 .      endfor
 .    endif
-.    if defined(${opt}_CONFIGURE_ON)
-CONFIGURE_ARGS+=	${${opt}_CONFIGURE_ON}
-.    endif
-.    if defined(${opt}_CMAKE_ON)
-CMAKE_ARGS+=	${${opt}_CMAKE_ON}
-.    endif
+.    for configure in CONFIGURE CMAKE QMAKE
+.      if defined(${opt}_${configure}_ON)
+${configure}_ARGS+=	${${opt}_${configure}_ON}
+.      endif
+.    endfor
 .    for flags in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS \
          MAKE_ENV ALL_TARGET INSTALL_TARGET USES DISTFILES PLIST_FILES \
          PLIST_DIRS PLIST_DIRSTRY EXTRA_PATCHES PATCHFILES PATCH_SITES CATEGORIES
@@ -427,12 +431,11 @@ CONFIGURE_ARGS+=	--disable-${iopt}
 CONFIGURE_ARGS+=	--without-${iopt}
 .      endfor
 .    endif
-.    if defined(${opt}_CONFIGURE_OFF)
-CONFIGURE_ARGS+=	${${opt}_CONFIGURE_OFF}
-.    endif
-.    if defined(${opt}_CMAKE_OFF)
-CMAKE_ARGS+=	${${opt}_CMAKE_OFF}
-.    endif
+.    for configure in CONFIGURE CMAKE QMAKE
+.      if defined(${opt}_${configure}_OFF)
+${configure}_ARGS+=	${${opt}_${configure}_OFF}
+.      endif
+.    endfor
 .  endif
 .endfor
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311221059.rAMAx3nc043462>