From owner-svn-ports-all@freebsd.org Sat Mar 16 15:24:14 2019 Return-Path: Delivered-To: svn-ports-all@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 0393E1530B14; Sat, 16 Mar 2019 15:24:14 +0000 (UTC) (envelope-from tcberner@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 9F8158CBDB; Sat, 16 Mar 2019 15:24:13 +0000 (UTC) (envelope-from tcberner@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 94F2523E53; Sat, 16 Mar 2019 15:24:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2GFOD2X059703; Sat, 16 Mar 2019 15:24:13 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2GFODFg059701; Sat, 16 Mar 2019 15:24:13 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201903161524.x2GFODFg059701@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 16 Mar 2019 15:24:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495884 - head/devel/ace X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/devel/ace X-SVN-Commit-Revision: 495884 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9F8158CBDB 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.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 15:24:14 -0000 Author: tcberner Date: Sat Mar 16 15:24:12 2019 New Revision: 495884 URL: https://svnweb.freebsd.org/changeset/ports/495884 Log: devel/ace: remove QT4 option (Qt4 deprecation) - untested as build is broken already Approved by: portmgr (implicit) Modified: head/devel/ace/Makefile head/devel/ace/pkg-plist Modified: head/devel/ace/Makefile ============================================================================== --- head/devel/ace/Makefile Sat Mar 16 15:22:50 2019 (r495883) +++ head/devel/ace/Makefile Sat Mar 16 15:24:12 2019 (r495884) @@ -3,6 +3,7 @@ PORTNAME= ace PORTVERSION= 6.5.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \ http://download.dre.vanderbilt.edu/previous_versions/ @@ -35,18 +36,13 @@ PLIST_SUB= VERSION="${PORTVERSION}" CONFLICTS= ace+tao-5* -OPTIONS_DEFINE= FLTK QT4 SSL TK TRIO X11 +OPTIONS_DEFINE= FLTK SSL TK TRIO X11 OPTIONS_DEFAULT= SSL OPTIONS_SUB= yes FLTK_DESC= FLTK GUI toolkit FLTK_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk FLTK_MAKE_ENV= fl=1 -QT4_USES= qt:4 -QT4_USE= QT=corelib,gui,moc_build -QT4_MAKE_ENV= qt=1 qt4=1 QTDIR="${PREFIX}" -QT4_CPPFLAGS= -I${QT_INCDIR} -QT4_LDFLAGS= -L${QT_LIBDIR} SSL_USES= ssl SSL_MAKE_ENV= ssl=1 TK_USES= tk @@ -58,12 +54,6 @@ X11_USE= XORG=xt X11_MAKE_ENV= xt=1 CPPFLAGS+= -D_WANT_SEMUN - -.include -.if ${PORT_OPTIONS:MQT4} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 -.endif post-patch: @${REINPLACE_CMD} -e \ Modified: head/devel/ace/pkg-plist ============================================================================== --- head/devel/ace/pkg-plist Sat Mar 16 15:22:50 2019 (r495883) +++ head/devel/ace/pkg-plist Sat Mar 16 15:24:12 2019 (r495884) @@ -753,8 +753,6 @@ include/ace/Process_Semaphore.h include/ace/Process_Semaphore.inl include/ace/Profile_Timer.h include/ace/Profile_Timer.inl -%%QT4%%include/ace/QtReactor/ACE_QtReactor_export.h -%%QT4%%include/ace/QtReactor/QtReactor.h include/ace/RB_Tree.cpp include/ace/RB_Tree.h include/ace/RB_Tree.inl @@ -1302,9 +1300,6 @@ lib/libACE_INet.so.%%VERSION%% lib/libACE_Monitor_Control.so lib/libACE_Monitor_Control.so.6 lib/libACE_Monitor_Control.so.%%VERSION%% -%%QT4%%lib/libACE_QtReactor.so -%%QT4%%lib/libACE_QtReactor.so.6 -%%QT4%%lib/libACE_QtReactor.so.%%VERSION%% lib/libACE_RLECompression.so lib/libACE_RLECompression.so.6 lib/libACE_RLECompression.so.%%VERSION%% @@ -1339,7 +1334,6 @@ libdata/pkgconfig/ACE_ETCL_Parser.pc libdata/pkgconfig/ACE_HTBP.pc libdata/pkgconfig/ACE_INet.pc %%SSL%%libdata/pkgconfig/ACE_INet_SSL.pc -%%QT4%%libdata/pkgconfig/ACE_QtReactor.pc libdata/pkgconfig/ACE_RMCast.pc %%SSL%%libdata/pkgconfig/ACE_SSL.pc libdata/pkgconfig/ACE_TMCast.pc