From owner-svn-ports-head@FreeBSD.ORG  Fri Nov 22 10:59:03 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EB83F6B3;
 Fri, 22 Nov 2013 10:59:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BFDD42A15;
 Fri, 22 Nov 2013 10:59:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAMAx3l3043463;
 Fri, 22 Nov 2013 10:59:03 GMT (envelope-from makc@svn.freebsd.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAMAx3nc043462;
 Fri, 22 Nov 2013 10:59:03 GMT (envelope-from makc@svn.freebsd.org)
Message-Id: <201311221059.rAMAx3nc043462@svn.freebsd.org>
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Fri, 22 Nov 2013 10:59:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334572 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Nov 2013 10:59:04 -0000

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