Date: Mon, 12 Mar 2012 00:03:43 GMT From: Alberto Villa <avilla@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/165952: [patch] bsd.port.mk: add USE_QT4 to include bsd.qt.mk Message-ID: <201203120003.q2C03h5D026968@red.freebsd.org> Resent-Message-ID: <201203120010.q2C0A9jx025982@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 12 00:10:09 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203120003.q2C03h5D026968>