1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

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
This commit is contained in:
Tobias C. Berner 2018-10-07 13:43:14 +00:00
parent b05f3ff1ac
commit cea9dea6a2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=481446
36 changed files with 49 additions and 62 deletions

3
MOVED
View File

@ -5199,7 +5199,6 @@ audio/rubygem-ogginfo|audio/rubygem-ruby-ogginfo|2013-11-30|Rename to match upst
x11-fm/xnc||2013-12-01|Has expired: Latest release from 2005, upstream disappeared, does not build
audio/liteamp||2013-12-01|Has expired: Dead upstream since 2004, does not build with clang
net-im/tapioca-qt||2013-12-01|Has expired: Unmaintained upstream since 2007, not used by anything
net-im/telepathy-qt|net-im/telepathy-qt4|2013-12-01|Has expired: Unmaintained upstream since 2007, use net-im/telepathy-qt4
x11-toolkits/linux-f10-gtk||2013-12-01|Has expired: GTK1 is deprecated
net-im/linux-ymessenger||2013-12-01|Has expired: Depends on deprecated Linux GTK1
emulators/linux-pete-mesagpu||2013-12-01|Has expired: Depends on deprecated Linux GTK1
@ -10567,3 +10566,5 @@ editors/latexila|editors/gnome-latex|2018-10-05|Project was renamed
math/arpack|math/arpack-ng|2018-10-06|math/arpack is the old, unmaintained version, math/arpack-ng should be used instead
net-p2p/libtorrent-rasterbar-python|net-p2p/py-libtorrent-rasterbar|2018-10-06|Rename to the canonical name for a python port
biology/tinker|science/tinker|2018-10-06|Move to proper category
net-im/telepathy-qt4|net-im/telepathy-qt@qt4|2018-10-07|Moved to flavored version
net-im/telepathy-qt5|net-im/telepathy-qt@qt5|2018-10-07|Moved to flavored version

View File

@ -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

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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}" \

View File

@ -1,8 +0,0 @@
# $FreeBSD$
PORTREVISION= 1
PKGNAMESUFFIX= 5
MASTERDIR= ${.CURDIR:H}/telepathy-qt4
.include "${MASTERDIR}/Makefile"

View File

@ -12,7 +12,7 @@ DEPRECATED= KDE4 is EOL upstream
EXPIRATION_DATE= 2018-12-31
LIB_DEPENDS= libvncserver.so:net/libvncserver \
libtelepathy-qt4.so:net-im/telepathy-qt4
libtelepathy-qt4.so:net-im/telepathy-qt@qt4
USES= cmake:outsource kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4

View File

@ -11,7 +11,7 @@ COMMENT= VNC server for KDE
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
USES= alias cmake:outsource jpeg kde:4 qt:4 tar:xz
USE_KDE= kdelibs automoc4

View File

@ -22,6 +22,6 @@ USE_XORG= x11 xcb xdamage xext xtst
OPTIONS_DEFINE= TELEPATHY DOCS
OPTIONS_SUB= yes
TELEPATHY_DESC= Support for Telepathy Tubes
TELEPATHY_LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt5
TELEPATHY_LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt@qt5
.include <bsd.port.mk>

View File

@ -19,7 +19,7 @@ EXPIRATION_DATE= 2018-12-31
LIB_DEPENDS= libqjson.so:devel/qjson@qt4 \
libqoauth.so:net/qoauth \
libtelepathy-qt4.so:net-im/telepathy-qt4
libtelepathy-qt4.so:net-im/telepathy-qt@qt4
USES= cmake gettext kde:4 qt:4 tar:xz
USE_KDE= attica automoc4 kdelibs

View File

@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqjson-qt5.so:devel/qjson@qt5 \
libqca-qt5.so:devel/qca@qt5 \
libqoauth-qt5.so:net/qoauth-qt5 \
libtelepathy-qt5.so:net-im/telepathy-qt5
libtelepathy-qt5.so:net-im/telepathy-qt@qt5
USES= cmake:outsource compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz
USE_KDE= attica auth bookmarks codecs completion config configwidgets \