Date: Thu, 3 Jan 2019 10:22:58 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r489154 - in branches/2019Q1/net-im: hotot licq-qt-gui telepathy-logger-qt4 Message-ID: <201901031022.x03AMwLm051263@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Thu Jan 3 10:22:57 2019 New Revision: 489154 URL: https://svnweb.freebsd.org/changeset/ports/489154 Log: MFH: r488920 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 Approved by: portmgr (miwi) Modified: branches/2019Q1/net-im/hotot/Makefile branches/2019Q1/net-im/licq-qt-gui/Makefile branches/2019Q1/net-im/licq-qt-gui/pkg-plist branches/2019Q1/net-im/telepathy-logger-qt4/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/net-im/hotot/Makefile ============================================================================== --- branches/2019Q1/net-im/hotot/Makefile Thu Jan 3 10:06:45 2019 (r489153) +++ branches/2019Q1/net-im/hotot/Makefile Thu Jan 3 10:22:57 2019 (r489154) @@ -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 <bsd.port.options.mk> @@ -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) Modified: branches/2019Q1/net-im/licq-qt-gui/Makefile ============================================================================== --- branches/2019Q1/net-im/licq-qt-gui/Makefile Thu Jan 3 10:06:45 2019 (r489153) +++ branches/2019Q1/net-im/licq-qt-gui/Makefile Thu Jan 3 10:22:57 2019 (r489154) @@ -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 -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 <bsd.port.options.mk> .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" - -.if ${PORT_OPTIONS:MKDE4} -KDE_SUFFIX= -kde -.endif .include <bsd.port.mk> Modified: branches/2019Q1/net-im/licq-qt-gui/pkg-plist ============================================================================== --- branches/2019Q1/net-im/licq-qt-gui/pkg-plist Thu Jan 3 10:06:45 2019 (r489153) +++ branches/2019Q1/net-im/licq-qt-gui/pkg-plist Thu Jan 3 10:22:57 2019 (r489154) @@ -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 Modified: branches/2019Q1/net-im/telepathy-logger-qt4/Makefile ============================================================================== --- branches/2019Q1/net-im/telepathy-logger-qt4/Makefile Thu Jan 3 10:06:45 2019 (r489153) +++ branches/2019Q1/net-im/telepathy-logger-qt4/Makefile Thu Jan 3 10:22:57 2019 (r489154) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901031022.x03AMwLm051263>