svn commit: r495884 - head/devel/ace

[Tobias C. Berner]

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 <bsd.port.options.mk>
-.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