From nobody@FreeBSD.org  Mon Mar 12 00:03:44 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0B217106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Mar 2012 00:03:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id D14148FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Mar 2012 00:03:43 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q2C03hQ3026977
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Mar 2012 00:03:43 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q2C03h5D026968;
	Mon, 12 Mar 2012 00:03:43 GMT
	(envelope-from nobody)
Message-Id: <201203120003.q2C03h5D026968@red.freebsd.org>
Date: Mon, 12 Mar 2012 00:03:43 GMT
From: Alberto Villa <avilla@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] bsd.port.mk: add USE_QT4 to include bsd.qt.mk
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         165952
>Category:       ports
>Synopsis:       [patch] bsd.port.mk: add USE_QT4 to include bsd.qt.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 12 00:10:09 UTC 2012
>Closed-Date:    Thu May 24 07:11:54 UTC 2012
>Last-Modified:  Thu May 24 07:20:02 UTC 2012
>Originator:     Alberto Villa
>Release:        FreeBSD 10.0-CURRENT
>Organization:
>Environment:
FreeBSD woodstock.peanuts 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r231328M: Fri Feb 10 04:17:47 CET 2012     root@woodstock.peanuts:/usr/obj/usr/src/sys/HPDV6  amd64
>Description:
Currently, to depend on Qt 4 ports one has to define both USE_QT_VER and QT_COMPONENTS. We (kde@) would like to add support for the KDE-like USE_QT4, obviously leaving compatibility with current system.

While here, I also reformatted a bit the descriptions of our own variables.

This is with my kde@ hat on.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.707
diff -u -r1.707 bsd.port.mk
--- bsd.port.mk	11 Mar 2012 21:30:49 -0000	1.707
+++ bsd.port.mk	11 Mar 2012 23:57:34 -0000
@@ -452,14 +452,19 @@
 # USE_KDELIBS_VER		- Set to 3 to use the KDE libraries.
 #				  Implies inclusion of bsd.kde.mk.
 #
-# USE_KDE4			- A list of the KDE4 dependencies the port has (e.g.,
+# USE_KDE4		- A list of the KDE4 dependencies the port has (e.g.,
 #				  kdelibs, kdebase).  Implies that the port needs KDE.
 #				  Implies inclusion of bsd.kde4.mk.  See bsd.kde4.mk
 #				  for more details.
 #
-# USE_QT_VER			- Set to 3 or 4 to use the respective version
-#				  of the QT libraries.
-#				  Implies inclusion of bsd.kde.mk.
+# USE_QT_VER	- Set to 3 or 4 to use the respective version
+#				  of the Qt libraries.
+#				  Implies inclusion of bsd.kde.mk or bsd.qt.mk.
+#
+# USE_QT4		- A list of the QT4 dependencies the port has (e.g,
+#				  corelib, webkit).  Implies that the port needs Qt.
+#				  Implies the inclusion of bsd.qt.mk.  See bsd.qt.mk
+#				  for more details.
 #
 # USE_LINUX		- Set to yes to say the port needs the default linux base port.
 #				  Set to value <X>, if the port needs emulators/linux_base-<X>.
@@ -1466,7 +1471,7 @@
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
 .endif
 
-.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+.if defined(USE_QT_VER) && ${USE_QT_VER:L} == 4 || defined(USE_QT4)
 .include "${PORTSDIR}/Mk/bsd.qt.mk"
 .endif
 
@@ -2027,7 +2032,7 @@
 .include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
 .endif
 
-.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+.if defined(USE_QT_VER) && ${USE_QT_VER:L} == 4 || defined(USE_QT4)
 .include "${PORTSDIR}/Mk/bsd.qt.mk"
 .endif
 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Mar 12 00:10:19 UTC 2012 
Responsible-Changed-Why:  
bsd.port.mk is portmgr territory (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165952 
Responsible-Changed-From-To: portmgr->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Tue May 22 07:01:57 UTC 2012 
Responsible-Changed-Why:  
take for exprun 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165952 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Tue May 22 07:04:46 UTC 2012 
State-Changed-Why:  
waiting for some example :). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165952 
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Thu May 24 07:11:53 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165952 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/165952: commit references a PR
Date: Thu, 24 May 2012 07:11:50 +0000 (UTC)

 miwi        2012-05-24 07:11:41 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.port.mk bsd.qt.mk 
   Log:
   - Add USE_QT4 to include bsd.qt.mk
   
   PR:             165952
   Submitted by:   avilla@
   Tested by:      phw
   
   Revision  Changes    Path
   1.711     +12 -7     ports/Mk/bsd.port.mk
   1.31      +4 -1      ports/Mk/bsd.qt.mk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
