diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-10-07 13:43:14 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-10-07 13:43:14 +0000 |
| commit | cea9dea6a2a128111c4e4a41dc7680c430787db6 (patch) | |
| tree | 2f76ef74739401ab834313101e858436005a32e7 /net-im | |
| parent | b05f3ff1aca4a3c49313864145ed0c1301425d36 (diff) | |
| download | ports-cea9dea6a2a128111c4e4a41dc7680c430787db6.tar.gz ports-cea9dea6a2a128111c4e4a41dc7680c430787db6.zip | |
net-im/telepathy-qt[45]: falvorize
Flavorize the ports:
* telepathy-qt4 -> telepathy-qt@qt4
* telepathy-qt5 -> telepathy-qt@qt5
While here, also clean up the Makefile a bit.
Approved by: portmgr (mat)
Differential Revision: https://reviews.freebsd.org/D17445
Notes
Notes:
svn path=/head/; revision=481446
Diffstat (limited to 'net-im')
30 files changed, 42 insertions, 56 deletions
diff --git a/net-im/Makefile b/net-im/Makefile index 58fca138f68e..65410bfec841 100644 --- a/net-im/Makefile +++ b/net-im/Makefile @@ -199,8 +199,7 @@ SUBDIR += telepathy-logger-qt5 SUBDIR += telepathy-mission-control SUBDIR += telepathy-python - SUBDIR += telepathy-qt4 - SUBDIR += telepathy-qt5 + SUBDIR += telepathy-qt SUBDIR += telepathy-rakia SUBDIR += telepathy-salut SUBDIR += telepathy-sofiasip diff --git a/net-im/ktp-accounts-kcm-kde4/Makefile b/net-im/ktp-accounts-kcm-kde4/Makefile index 659ec3e5286f..f7ddeb47bf7b 100644 --- a/net-im/ktp-accounts-kcm-kde4/Makefile +++ b/net-im/ktp-accounts-kcm-kde4/Makefile @@ -13,7 +13,7 @@ COMMENT= KDE instant messaging account management module DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4 diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile index bc9c58654ce8..eab8cd351dd9 100644 --- a/net-im/ktp-accounts-kcm/Makefile +++ b/net-im/ktp-accounts-kcm/Makefile @@ -9,7 +9,7 @@ COMMENT= KDE instant messaging account management module LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt5 \ libkaccounts.so:net-im/kaccounts-integration \ - libtelepathy-qt5.so:net-im/telepathy-qt5 \ + libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals \ libKF5AkonadiPrivate.so:databases/akonadi \ diff --git a/net-im/ktp-approver-kde4/Makefile b/net-im/ktp-approver-kde4/Makefile index b3efeb46cb4d..f63b1a29901f 100644 --- a/net-im/ktp-approver-kde4/Makefile +++ b/net-im/ktp-approver-kde4/Makefile @@ -13,7 +13,7 @@ COMMENT= KDE instant messaging notifier DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4 diff --git a/net-im/ktp-approver/Makefile b/net-im/ktp-approver/Makefile index 1362ea87d920..f12d261b4c78 100644 --- a/net-im/ktp-approver/Makefile +++ b/net-im/ktp-approver/Makefile @@ -7,7 +7,7 @@ CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging notifier -LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ +LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list diff --git a/net-im/ktp-auth-handler-kde4/Makefile b/net-im/ktp-auth-handler-kde4/Makefile index e62e9628b384..dec140b052ba 100644 --- a/net-im/ktp-auth-handler-kde4/Makefile +++ b/net-im/ktp-auth-handler-kde4/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-31 LIB_DEPENDS= libqjson.so:devel/qjson \ libqca.so:devel/qca \ - libtelepathy-qt4.so:net-im/telepathy-qt4 \ + libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 USES= cmake gettext kde:4 qt:4 tar:bzip2 diff --git a/net-im/ktp-auth-handler/Makefile b/net-im/ktp-auth-handler/Makefile index faa51062d6d3..f0ea8110ecd9 100644 --- a/net-im/ktp-auth-handler/Makefile +++ b/net-im/ktp-auth-handler/Makefile @@ -8,7 +8,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KWallet integration module for KDE Telepathy LIB_DEPENDS= libqca-qt5.so:devel/qca@qt5 \ - libtelepathy-qt5.so:net-im/telepathy-qt5 \ + libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals \ libaccounts-qt5.so:net-im/libaccounts-qt5 \ libkaccounts.so:net-im/kaccounts-integration \ diff --git a/net-im/ktp-call-ui/Makefile b/net-im/ktp-call-ui/Makefile index 290e61ba7d18..b24fce9d968a 100644 --- a/net-im/ktp-call-ui/Makefile +++ b/net-im/ktp-call-ui/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libKTpCommonInternals.so:net-im/ktp-common-internals \ libfarstream-0.2.so:net-im/farstream \ libtelepathy-farstream.so:net-im/telepathy-farstream \ libtelepathy-glib.so:net-im/telepathy-glib \ - libtelepathy-qt5-farstream.so:net-im/telepathy-qt5 + libtelepathy-qt5-farstream.so:net-im/telepathy-qt@qt5 USES= cmake:outsource compiler:c++11-lang gettext kde:5 pkgconfig \ python:2.7 qt:5 tar:xz diff --git a/net-im/ktp-common-internals-kde4/Makefile b/net-im/ktp-common-internals-kde4/Makefile index 02d6ecc5b5b4..6e443b5b6806 100644 --- a/net-im/ktp-common-internals-kde4/Makefile +++ b/net-im/ktp-common-internals-kde4/Makefile @@ -13,7 +13,7 @@ COMMENT= KDE Telepathy internal library DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 RUN_DEPENDS= ${LOCALBASE}/libexec/mission-control-5:net-im/telepathy-mission-control diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile index 0de901f12ec8..f754ef3b4f39 100644 --- a/net-im/ktp-common-internals/Makefile +++ b/net-im/ktp-common-internals/Makefile @@ -9,7 +9,7 @@ COMMENT= KDE Telepathy internal library LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libsignon-qt5.so:sysutils/signon-qt5 \ - libtelepathy-qt5.so:net-im/telepathy-qt5 \ + libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \ libotr.so:security/libotr \ libaccounts-qt5.so:net-im/libaccounts-qt5 \ diff --git a/net-im/ktp-contact-list-kde4/Makefile b/net-im/ktp-contact-list-kde4/Makefile index 9dd8e2b77ab4..e4436d83876c 100644 --- a/net-im/ktp-contact-list-kde4/Makefile +++ b/net-im/ktp-contact-list-kde4/Makefile @@ -13,7 +13,7 @@ COMMENT= KDE instant messaging contact list application DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 diff --git a/net-im/ktp-contact-list/Makefile b/net-im/ktp-contact-list/Makefile index 73ac7955a3b5..ebfe7912f58f 100644 --- a/net-im/ktp-contact-list/Makefile +++ b/net-im/ktp-contact-list/Makefile @@ -7,7 +7,7 @@ CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging contact list application -LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ +LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals diff --git a/net-im/ktp-contact-runner-kde4/Makefile b/net-im/ktp-contact-runner-kde4/Makefile index 5fd9cecc6c2a..3c3ea6465e43 100644 --- a/net-im/ktp-contact-runner-kde4/Makefile +++ b/net-im/ktp-contact-runner-kde4/Makefile @@ -13,7 +13,7 @@ COMMENT= KRunner integration module for KDE Telepathy DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 USES= cmake gettext kde:4 qt:4 tar:bzip2 diff --git a/net-im/ktp-contact-runner/Makefile b/net-im/ktp-contact-runner/Makefile index 8ad683526983..afd9079cb1ac 100644 --- a/net-im/ktp-contact-runner/Makefile +++ b/net-im/ktp-contact-runner/Makefile @@ -7,7 +7,7 @@ CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KRunner integration module for KDE Telepathy -LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ +LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals USES= cmake:outsource gettext kde:5 qt:5 tar:xz diff --git a/net-im/ktp-filetransfer-handler-kde4/Makefile b/net-im/ktp-filetransfer-handler-kde4/Makefile index 95b59baf4078..4a3e96274381 100644 --- a/net-im/ktp-filetransfer-handler-kde4/Makefile +++ b/net-im/ktp-filetransfer-handler-kde4/Makefile @@ -13,7 +13,7 @@ COMMENT= KDE instant messaging file transfer handler DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 USES= cmake gettext kde:4 qt:4 tar:bzip2 diff --git a/net-im/ktp-filetransfer-handler/Makefile b/net-im/ktp-filetransfer-handler/Makefile index 99b2471d00d9..d116dbe2e674 100644 --- a/net-im/ktp-filetransfer-handler/Makefile +++ b/net-im/ktp-filetransfer-handler/Makefile @@ -7,7 +7,7 @@ CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging file transfer handler -LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ +LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals USES= cmake:outsource gettext kde:5 qt:5 tar:xz diff --git a/net-im/ktp-kded-integration-module-kde4/Makefile b/net-im/ktp-kded-integration-module-kde4/Makefile index 70239a72371e..030d3f2e94ae 100644 --- a/net-im/ktp-kded-integration-module-kde4/Makefile +++ b/net-im/ktp-kded-integration-module-kde4/Makefile @@ -13,7 +13,7 @@ COMMENT= Module for integration of instant messaging into KDE Workspaces DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 USES= cmake gettext kde:4 qt:4 tar:bzip2 diff --git a/net-im/ktp-kded-module/Makefile b/net-im/ktp-kded-module/Makefile index 74c55782fbd3..f37de4737487 100644 --- a/net-im/ktp-kded-module/Makefile +++ b/net-im/ktp-kded-module/Makefile @@ -7,7 +7,7 @@ CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Module for integration of instant messaging into KDE Workspaces -LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ +LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals USES= cmake:outsource gettext kde:5 qt:5 tar:xz diff --git a/net-im/ktp-send-file-kde4/Makefile b/net-im/ktp-send-file-kde4/Makefile index 16eb28fd220c..ea2fb14abf19 100644 --- a/net-im/ktp-send-file-kde4/Makefile +++ b/net-im/ktp-send-file-kde4/Makefile @@ -13,7 +13,7 @@ COMMENT= KDE instant messaging file transfer application DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler-kde4 \ ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4 diff --git a/net-im/ktp-send-file/Makefile b/net-im/ktp-send-file/Makefile index 12eff9f09f55..02c67da93d51 100644 --- a/net-im/ktp-send-file/Makefile +++ b/net-im/ktp-send-file/Makefile @@ -7,7 +7,7 @@ CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging file transfer application -LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ +LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals RUN_DEPENDS= ${KDE_PREFIX}/lib/libexec/ktp-filetransfer-handler:net-im/ktp-filetransfer-handler \ ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list diff --git a/net-im/ktp-text-ui-kde4/Makefile b/net-im/ktp-text-ui-kde4/Makefile index 6d5290efd945..f489888f3e1f 100644 --- a/net-im/ktp-text-ui-kde4/Makefile +++ b/net-im/ktp-text-ui-kde4/Makefile @@ -13,7 +13,7 @@ COMMENT= KDE chat window application DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libtelepathy-logger-qt4.so:net-im/telepathy-logger-qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list-kde4 diff --git a/net-im/ktp-text-ui/Makefile b/net-im/ktp-text-ui/Makefile index 85aeb6835ab9..571aaabe99f6 100644 --- a/net-im/ktp-text-ui/Makefile +++ b/net-im/ktp-text-ui/Makefile @@ -7,7 +7,7 @@ CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE chat window application -LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5 \ +LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libtelepathy-logger-qt.so:net-im/telepathy-logger-qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list diff --git a/net-im/plasma-applet-ktp-kde4/Makefile b/net-im/plasma-applet-ktp-kde4/Makefile index 56461ca1e318..360b4727074c 100644 --- a/net-im/plasma-applet-ktp-kde4/Makefile +++ b/net-im/plasma-applet-ktp-kde4/Makefile @@ -15,7 +15,7 @@ COMMENT= KDE instant messaging Plasma applets DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt4 \ +LIB_DEPENDS= libtelepathy-qt4.so:net-im/telepathy-qt@qt4 \ libktpcommoninternalsprivate.so:net-im/ktp-common-internals-kde4 USES= cmake gettext kde:4 qt:4 tar:bzip2 diff --git a/net-im/telepathy-logger-qt4/Makefile b/net-im/telepathy-logger-qt4/Makefile index 5495d805778c..894e88b49c7d 100644 --- a/net-im/telepathy-logger-qt4/Makefile +++ b/net-im/telepathy-logger-qt4/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libtelepathy-glib.so:net-im/telepathy-glib \ libtelepathy-logger.so:net-im/telepathy-logger \ - libtelepathy-qt4.so:net-im/telepathy-qt4 + libtelepathy-qt4.so:net-im/telepathy-qt@qt4 USES= bison:build cmake kde:4 pkgconfig python:2.7,build qt:4 tar:bzip2 USE_GNOME= glib20 libxml2 diff --git a/net-im/telepathy-logger-qt5/Makefile b/net-im/telepathy-logger-qt5/Makefile index dd52122f16f8..d4a1565a2914 100644 --- a/net-im/telepathy-logger-qt5/Makefile +++ b/net-im/telepathy-logger-qt5/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libtelepathy-glib.so:net-im/telepathy-glib \ libtelepathy-logger.so:net-im/telepathy-logger \ - libtelepathy-qt5.so:net-im/telepathy-qt5 + libtelepathy-qt5.so:net-im/telepathy-qt@qt5 USES= bison:build cmake:outsource kde:5 pkgconfig python:2.7,build qt:5 tar:xz USE_GNOME= glib20 libxml2 diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt/Makefile index 4141c0767455..5664cb3780b6 100644 --- a/net-im/telepathy-qt4/Makefile +++ b/net-im/telepathy-qt/Makefile @@ -3,10 +3,9 @@ PORTNAME= telepathy-qt PORTVERSION= 0.9.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= https://telepathy.freedesktop.org/releases/${PORTNAME}/ -PKGNAMESUFFIX?= 4 MAINTAINER= kde@FreeBSD.org COMMENT= High-level Qt binding for Telepathy @@ -18,21 +17,26 @@ LIB_DEPENDS= libtelepathy-farstream.so:net-im/telepathy-farstream \ libtelepathy-glib.so:net-im/telepathy-glib RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus@${PY_FLAVOR} -OPTIONS_DEFINE= DOCS +FLAVORS= qt4 qt5 +FLAVOR?= ${FLAVORS:[1]} +qt4_PKGNAMESUFFIX= 4 +qt5_PKGNAMESUFFIX= 5 + +USES= cmake:outsource gettext gnome localbase:ldflags pathfix pkgconfig python:2.7,build USE_GNOME= glib20 libxslt:build USE_GSTREAMER= yes -USES= cmake:outsource gettext pathfix pkgconfig python:2.7,build -CMAKE_ARGS= -DENABLE_EXAMPLES:BOOL=False \ - -DENABLE_FARSIGHT:BOOL=False \ - -DENABLE_FARSTREAM:BOOL=True \ - -DENABLE_TESTS:BOOL=False \ - -DDESIRED_QT_VERSION:STRING=${PKGNAMESUFFIX} \ +USE_LDCONFIG= yes + +CMAKE_ON= ENABLE_FARSTREAM CMAKE_DISABLE_FIND_PACKAGE_Doxygen +CMAKE_OFF= ENABLE_EXAMPLES ENABLE_FARSIGHT ENABLE_TESTS +CMAKE_ARGS= -DDESIRED_QT_VERSION:STRING=${PKGNAMESUFFIX} \ -DQT_QMAKE_EXECUTABLE:FILEPATH=${QMAKE} -. if ${PKGNAMESUFFIX:M4} + +. if ${FLAVOR} == qt4 USES+= qt:4 -USE_QT= corelib dbus gui network qtestlib_build xml \ - moc_build qmake_build rcc_build uic_build +USE_QT= corelib dbus gui network xml \ + moc_build qmake_build qtestlib_build rcc_build uic_build SHLIB_SUFFIX= 2 . else USES+= qt:5 @@ -41,16 +45,7 @@ USE_QT= core dbus gui network xml \ SHLIB_SUFFIX= 0 . endif -USE_LDCONFIG= yes - -# Required because FindGObject.cmake is too old and uses the pkg-config values -# directly (-lgobject-2.0 instead of /path/to/libgobject-2.0.so). -CXXFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -# We do not need Doxygen because the tarball already ships with prebuilt -# documentation. -CMAKE_ARGS+= -DDOXYGEN_EXECUTABLE:FILEPATH="" +OPTIONS_DEFINE= DOCS PLIST_SUB= PORTVERSION="${PORTVERSION}" \ QTVER_SUFFIX="${PKGNAMESUFFIX}" \ diff --git a/net-im/telepathy-qt4/distinfo b/net-im/telepathy-qt/distinfo index f85590c9561e..f85590c9561e 100644 --- a/net-im/telepathy-qt4/distinfo +++ b/net-im/telepathy-qt/distinfo diff --git a/net-im/telepathy-qt4/pkg-descr b/net-im/telepathy-qt/pkg-descr index bfeedb6a5f5f..bfeedb6a5f5f 100644 --- a/net-im/telepathy-qt4/pkg-descr +++ b/net-im/telepathy-qt/pkg-descr diff --git a/net-im/telepathy-qt4/pkg-plist b/net-im/telepathy-qt/pkg-plist index ef79244c7157..ef79244c7157 100644 --- a/net-im/telepathy-qt4/pkg-plist +++ b/net-im/telepathy-qt/pkg-plist diff --git a/net-im/telepathy-qt5/Makefile b/net-im/telepathy-qt5/Makefile deleted file mode 100644 index 569cd6347576..000000000000 --- a/net-im/telepathy-qt5/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 1 -PKGNAMESUFFIX= 5 - -MASTERDIR= ${.CURDIR:H}/telepathy-qt4 - -.include "${MASTERDIR}/Makefile" |