From owner-svn-ports-head@freebsd.org Tue Jan 1 17:44:59 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2C5F1423362; Tue, 1 Jan 2019 17:44:58 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7160C778E3; Tue, 1 Jan 2019 17:44:58 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6126D2563D; Tue, 1 Jan 2019 17:44:58 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x01Hiwdk057990; Tue, 1 Jan 2019 17:44:58 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x01HivV6057985; Tue, 1 Jan 2019 17:44:57 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201901011744.x01HivV6057985@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Tue, 1 Jan 2019 17:44:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488920 - in head/net-im: hotot licq-qt-gui telepathy-logger-qt4 X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/net-im: hotot licq-qt-gui telepathy-logger-qt4 X-SVN-Commit-Revision: 488920 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7160C778E3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jan 2019 17:44:59 -0000 Author: adridg Date: Tue Jan 1 17:44:57 2019 New Revision: 488920 URL: https://svnweb.freebsd.org/changeset/ports/488920 Log: 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 Modified: head/net-im/hotot/Makefile head/net-im/licq-qt-gui/Makefile head/net-im/licq-qt-gui/pkg-plist head/net-im/telepathy-logger-qt4/Makefile Modified: head/net-im/hotot/Makefile ============================================================================== --- head/net-im/hotot/Makefile Tue Jan 1 17:07:43 2019 (r488919) +++ head/net-im/hotot/Makefile Tue Jan 1 17:44:57 2019 (r488920) @@ -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) Modified: head/net-im/licq-qt-gui/Makefile ============================================================================== --- head/net-im/licq-qt-gui/Makefile Tue Jan 1 17:07:43 2019 (r488919) +++ head/net-im/licq-qt-gui/Makefile Tue Jan 1 17:44:57 2019 (r488920) @@ -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 .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" - -.if ${PORT_OPTIONS:MKDE4} -KDE_SUFFIX= -kde -.endif .include Modified: head/net-im/licq-qt-gui/pkg-plist ============================================================================== --- head/net-im/licq-qt-gui/pkg-plist Tue Jan 1 17:07:43 2019 (r488919) +++ head/net-im/licq-qt-gui/pkg-plist Tue Jan 1 17:44:57 2019 (r488920) @@ -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: head/net-im/telepathy-logger-qt4/Makefile ============================================================================== --- head/net-im/telepathy-logger-qt4/Makefile Tue Jan 1 17:07:43 2019 (r488919) +++ head/net-im/telepathy-logger-qt4/Makefile Tue Jan 1 17:44:57 2019 (r488920) @@ -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