mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

- Add USE_QT4 to include bsd.qt.mk

Browse Source 
PR:		165952
Submitted by:	avilla@
Tested by:	phw
This commit is contained in:
Martin Wilke 2012-05-24 07:11:41 +00:00
parent e924662c08
commit 189a4c9099
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=297319
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Mk/bsd.port.mk
View File

@ -460,14 +460,19 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# 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>.
@ -1474,7 +1479,7 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg
.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
@ -2035,7 +2040,7 @@ IGNORE= uses unknown USE_BISON construct
.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

3
Mk/bsd.qt.mk
View File

@ -353,6 +353,9 @@ ${component}_run_RUN_DEPENDS?= ${${component}_RUN_DEPENDS}
_QT_COMPONENTS_ALL_SUFFIXED+= ${component} ${component}_build ${component}_run
.endfor
.if defined(USE_QT4)
QT_COMPONENTS= ${USE_QT4}
.endif
.if defined(QT_COMPONENTS)
. for component in ${QT_COMPONENTS:O:u}
. if ${_QT_COMPONENTS_ALL_SUFFIXED:M${component}}!= ""