From 4b8cc1be7dc3edcfcfa30190e1531c1679a56608 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 1 Jan 2019 17:44:57 +0000 Subject: Cleanup net-im after KDE4 removal. - hotot drops option KDE4 - lice-qt-gui drops option KDE4 - telepathy-logger-qt4 probably didn't need kde:4 anyway Reported by: antoine MFH: 2019Q1 --- net-im/hotot/Makefile | 13 ++++--------- net-im/licq-qt-gui/Makefile | 16 ++-------------- net-im/licq-qt-gui/pkg-plist | 5 ++--- net-im/telepathy-logger-qt4/Makefile | 4 ++-- 4 files changed, 10 insertions(+), 28 deletions(-) (limited to 'net-im') diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile index 6abf9e2a4bbd..145687bb4675 100644 --- a/net-im/hotot/Makefile +++ b/net-im/hotot/Makefile @@ -3,7 +3,7 @@ PORTNAME= hotot PORTVERSION= 0.9.8.14 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im www MAINTAINER= danfe@FreeBSD.org @@ -22,9 +22,8 @@ INSTALLS_ICONS= yes CFLAGS+= -I${LOCALBASE}/include # does not uphold CPPFLAGS LDFLAGS+= -L${LOCALBASE}/lib -lintl -OPTIONS_DEFINE= GTK2 QT4 KDE4 +OPTIONS_DEFINE= GTK2 QT4 OPTIONS_DEFAULT= GTK2 -KDE4_DESC= KDE 4 integration (implies Qt 4) .include @@ -37,10 +36,10 @@ CMAKE_ARGS+= -DWITH_GTK=off PLIST_SUB+= GTK2="@comment " .endif -.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MKDE4} +.if ${PORT_OPTIONS:MQT4} DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE= 2019-03-15 -USES+= kde:4 qt:4 +USES+= qt:4 USE_QT= moc_build qmake_build rcc_build uic_build \ corelib gui sql webkit PLIST_SUB+= QT4="" @@ -50,11 +49,7 @@ INSTALL_TARGET= install PLIST_SUB+= QT4="@comment " .endif -.if ${PORT_OPTIONS:MKDE4} -USE_KDE= automoc4 kdelibs -.else CMAKE_ARGS+= -DWITH_KDE=off -.endif post-patch: # Fix hardcoded platform name (it is not always Linux) diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile index ef3cf202984d..96e496562ec7 100644 --- a/net-im/licq-qt-gui/Makefile +++ b/net-im/licq-qt-gui/Makefile @@ -3,7 +3,7 @@ PORTNAME= qt4-gui PORTVERSION= 1.8.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net-im PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2} @@ -23,7 +23,7 @@ USES= cmake qt:4 USE_QT= qmake_build moc_build rcc_build uic_build linguisttools_build \ corelib xml gui network dbus svg -OPTIONS_DEFINE= HUNSPELL KDE4 +OPTIONS_DEFINE= HUNSPELL OPTIONS_DEFAULT=HUNSPELL LICQ_PORT?= net-im/licq @@ -34,20 +34,8 @@ HUNSPELL_CMAKE_ON= -DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \ -DHUNSPELL_FOUND:BOOL=ON HUNSPELL_CMAKE_OFF= -DHUNSPELL_FOUND:BOOL=OFF -KDE4_USES= kde:4 -KDE4_USE= KDE=kdelibs,automoc4 -KDE4_PREVENTS= HUNSPELL -KDE4_CMAKE_ON= -DWITH_KDE:BOOL=ON -KDE4_CMAKE_OFF= -DWITH_KDE:BOOL=OFF -KDE4_PLIST_SUB= GUI_NAME=kde4 WITH_KDE="" WITH_QT="@comment " -KDE4_PLIST_SUB_OFF= GUI_NAME=qt4 WITH_KDE="@comment " WITH_QT="" - .include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" -.if ${PORT_OPTIONS:MKDE4} -KDE_SUFFIX= -kde -.endif - .include diff --git a/net-im/licq-qt-gui/pkg-plist b/net-im/licq-qt-gui/pkg-plist index 31c30a8b0399..63a2d8d0b14e 100644 --- a/net-im/licq-qt-gui/pkg-plist +++ b/net-im/licq-qt-gui/pkg-plist @@ -1,6 +1,5 @@ -lib/licq/licq_%%GUI_NAME%%-gui.so -%%WITH_KDE%%share/applications/kde4/licq.desktop -%%WITH_QT%%share/applications/licq.desktop +lib/licq/licq_qt4-gui.so +share/applications/licq.desktop share/licq/qt4-gui/dock/console/away.xpm share/licq/qt4-gui/dock/console/bothmsg.xpm share/licq/qt4-gui/dock/console/console.dock diff --git a/net-im/telepathy-logger-qt4/Makefile b/net-im/telepathy-logger-qt4/Makefile index 7e5cd1cce048..289cdf402c36 100644 --- a/net-im/telepathy-logger-qt4/Makefile +++ b/net-im/telepathy-logger-qt4/Makefile @@ -2,6 +2,7 @@ PORTNAME= telepathy-logger-qt4 PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= KDE/stable/${PORTNAME:C/4$//}/${PORTVERSION}/src DISTNAME= ${PORTNAME:C/4$//}-${PORTVERSION} @@ -20,10 +21,9 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libtelepathy-logger.so:net-im/telepathy-logger \ libtelepathy-qt4.so:net-im/telepathy-qt@qt4 -USES= bison:build cmake kde:4 pkgconfig python:2.7,build qt:4 tar:bzip2 +USES= bison:build cmake pkgconfig python:2.7,build qt:4 tar:bzip2 USE_GNOME= glib20 libxml2 USE_GSTREAMER= qt4 -USE_KDE= # empty USE_QT= corelib dbus moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DUSE_COMMON_CMAKE_PACKAGE_CONFIG_DIR:BOOL=True USE_LDCONFIG= yes -- cgit v1.2.3