From owner-svn-ports-head@freebsd.org Thu Jan 17 15:30:52 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 B7581149A380; Thu, 17 Jan 2019 15:30:52 +0000 (UTC) (envelope-from danfe@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 5DCFB6C7F8; Thu, 17 Jan 2019 15:30:52 +0000 (UTC) (envelope-from danfe@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 4BE8A1C27A; Thu, 17 Jan 2019 15:30:52 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0HFUqqe082157; Thu, 17 Jan 2019 15:30:52 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0HFUpjJ082156; Thu, 17 Jan 2019 15:30:51 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201901171530.x0HFUpjJ082156@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 17 Jan 2019 15:30:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490568 - head/x11-toolkits/nucleo X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/x11-toolkits/nucleo X-SVN-Commit-Revision: 490568 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5DCFB6C7F8 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.999,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: Thu, 17 Jan 2019 15:30:53 -0000 Author: danfe Date: Thu Jan 17 15:30:51 2019 New Revision: 490568 URL: https://svnweb.freebsd.org/changeset/ports/490568 Log: With Qt 4.x sadly going away in less than two months, remove the QT4 option earlier to ease the deprecation process and reduce repo churn when the time comes. Modified: head/x11-toolkits/nucleo/Makefile head/x11-toolkits/nucleo/pkg-plist Modified: head/x11-toolkits/nucleo/Makefile ============================================================================== --- head/x11-toolkits/nucleo/Makefile Thu Jan 17 15:12:55 2019 (r490567) +++ head/x11-toolkits/nucleo/Makefile Thu Jan 17 15:30:51 2019 (r490568) @@ -22,12 +22,12 @@ USES= gl gmake jpeg libtool localbase:ldflags \ pathfix pkgconfig python:run shebangfix tar:bzip2 USE_GL= gl glu GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-opencv +CONFIGURE_ARGS= --without-opencv --without-qt USE_LDCONFIG= yes INSTALL_TARGET= install-strip SHEBANG_FILES= docs/MacOSX/nBundle.in -OPTIONS_DEFINE= FFMPEG GD GNUTLS QT4 +OPTIONS_DEFINE= FFMPEG GD GNUTLS OPTIONS_RADIO= DNSSD OPTIONS_RADIO_DNSSD= AVAHI MDNSRESPONDER OPTIONS_SUB= yes @@ -42,8 +42,6 @@ FFMPEG_CONFIGURE_OFF= --without-ffmpeg GD_DESC= Build GD plugin GD_LIB_DEPENDS= libgd.so:graphics/gd - -QT4_DESC= Build Qt 4 plugin GD_CONFIGURE_OFF= --without-gd GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls @@ -51,20 +49,10 @@ GNUTLS_CONFIGURE_OFF= --without-gnutls MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder -QT4_USE= QT=moc_build,corelib -QT4_USES= qmake:no_env qt:4 -QT4_CONFIGURE_OFF= --without-qt -QT4_MAKE_ARGS= QT4MOC="${MOC}" - .include .if ! ${PORT_OPTIONS:MAVAHI} && ! ${PORT_OPTIONS:MMDNSRESPONDER} CONFIGURE_ARGS+= --without-dns-sd -.endif - -.if ${PORT_OPTIONS:MQT4} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 .endif post-install: Modified: head/x11-toolkits/nucleo/pkg-plist ============================================================================== --- head/x11-toolkits/nucleo/pkg-plist Thu Jan 17 15:12:55 2019 (r490567) +++ head/x11-toolkits/nucleo/pkg-plist Thu Jan 17 15:30:51 2019 (r490568) @@ -91,9 +91,6 @@ include/nucleo/network/udp/UdpSender.H include/nucleo/network/udp/UdpSocket.H include/nucleo/network/xmpp/XmppConnection.H include/nucleo/nucleo.H -%%QT4%%include/nucleo/plugins/qt/qtFileKeeper.H -%%QT4%%include/nucleo/plugins/qt/qtReactiveEngine.H -%%QT4%%include/nucleo/plugins/qt/qtTimeKeeper.H include/nucleo/utils/AppUtils.H include/nucleo/utils/Base64.H include/nucleo/utils/ByteOrder.H @@ -111,7 +108,6 @@ lib/libNucleo.so.0 lib/libNucleo.so.0.0.0 %%FFMPEG%%lib/nucleo/nPffmpeg.so %%GD%%lib/nucleo/nPgd.so -%%QT4%%lib/nucleo/nPqt.so libdata/pkgconfig/nucleo.pc %%DATADIR%%/Info.plist.tmpl %%DATADIR%%/fonts/Vera.ttf