diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-06-28 17:39:53 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-06-28 17:39:53 +0000 |
| commit | b1a1d38bf9ef78334b640d30046388a9c055c3a9 (patch) | |
| tree | 7b9785f1f0c244da1f5b69a2a610e3f37eb786a8 /japanese | |
| parent | bc77780d41178cf3d0327c79ac10737af704f236 (diff) | |
| download | ports-b1a1d38bf9ef78334b640d30046388a9c055c3a9.tar.gz ports-b1a1d38bf9ef78334b640d30046388a9c055c3a9.zip | |
Replace bsd.qt.mk by Uses/qt.mk and Uses/qt-dist.mk
From now on, ports that depend on Qt4 will have to set
USES= qt:4
USE_QT= foo bar
ports depending on Qt5 will use
USES= qt:5
USE_QT= foo bar
PR: 229225
Exp-run by: antoine
Reviewed by: mat
Approved by: portmgr (antoine)
Differential Revision: →https://reviews.freebsd.org/D15540
Notes
Notes:
svn path=/head/; revision=473503
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/fcitx-skk/Makefile | 3 | ||||
| -rw-r--r-- | japanese/kiten-kde4/Makefile | 4 | ||||
| -rw-r--r-- | japanese/kiten/Makefile | 4 | ||||
| -rw-r--r-- | japanese/mozc-server/Makefile | 3 | ||||
| -rw-r--r-- | japanese/qt4-codecs-jp/Makefile | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/japanese/fcitx-skk/Makefile b/japanese/fcitx-skk/Makefile index 8cb4c07027b8..20381a5684ee 100644 --- a/japanese/fcitx-skk/Makefile +++ b/japanese/fcitx-skk/Makefile @@ -27,7 +27,8 @@ QT4_DESC= Enable Qt for GUI configuration .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MQT4} -USE_QT4= qmake_build moc_build rcc_build uic_build gui +USES+= qt:4 +USE_QT= qmake_build moc_build rcc_build uic_build gui USE_LDCONFIG= ${PREFIX}/lib/fcitx/qt PLIST_SUB+= QT4="" .else diff --git a/japanese/kiten-kde4/Makefile b/japanese/kiten-kde4/Makefile index 80269512f29b..9bf4e6ec8467 100644 --- a/japanese/kiten-kde4/Makefile +++ b/japanese/kiten-kde4/Makefile @@ -8,9 +8,9 @@ CATEGORIES= japanese kde kde-kde4 MAINTAINER= kde@FreeBSD.org COMMENT= Japanese reference/study tool for KDE 4 -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 qt:4 tar:xz USE_KDE= kdelibs automoc4 -USE_QT4= corelib moc_build qmake_build rcc_build uic_build +USE_QT= corelib moc_build qmake_build rcc_build uic_build USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile index 5ef93491d6ff..53d00f16c0cf 100644 --- a/japanese/kiten/Makefile +++ b/japanese/kiten/Makefile @@ -7,11 +7,11 @@ CATEGORIES= japanese kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Japanese reference/study tool for KDE -USES= cmake:outsource gettext kde:5 tar:xz +USES= cmake:outsource gettext kde:5 qt:5 tar:xz USE_KDE= auth archive codecs completion config configwidgets coreaddons \ crash doctools ecm i18n jobwidgets js khtml kio parts service \ sonnet textwidgets widgetsaddons xmlgui -USE_QT5= core dbus gui network widgets xml \ +USE_QT= core dbus gui network widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 04fcf8a4c14f..18ef63d4330f 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -48,8 +48,9 @@ LICENSE_PERMS_NAISTL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_FILE_NAISTL= ${WRKSRC}/src/data/dictionary_oss/README.txt LICENSE_DISTFILES_NAISTL=${DISTNAME}${EXTRACT_SUFX} .elif ${BUILD_MOZC_LIST:Mmozc_tool} == "mozc_tool" +USES+= qt:5 USE_GNOME= glib20 gtk20 -USE_QT5= buildtools core gui widgets +USE_QT= buildtools core gui widgets .elif ${BUILD_MOZC_LIST:Mibus_mozc} == "ibus_mozc" USES+= gettext-runtime USE_XORG= xcb diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile index 7af7f68cffea..349d7411fc01 100644 --- a/japanese/qt4-codecs-jp/Makefile +++ b/japanese/qt4-codecs-jp/Makefile @@ -11,8 +11,8 @@ PKGNAMESUFFIX= -jp MAINTAINER= kde@FreeBSD.org COMMENT= Qt EUC-JP/JIS codec plugins -USE_QT4= qmake_build corelib -QT_DIST= yes +USES= qmake:no_env qt-dist:4 +USE_QT= corelib HAS_CONFIGURE= yes |