svn commit: r495886 - head/devel/thrift-cpp

[Tobias C. Berner]

Author: tcberner
Date: Sat Mar 16 15:39:43 2019
New Revision: 495886
URL: https://svnweb.freebsd.org/changeset/ports/495886

Log:
  devel/thrift-cpp: remove QT4 option (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/devel/thrift-cpp/Makefile
  head/devel/thrift-cpp/pkg-plist

Modified: head/devel/thrift-cpp/Makefile
==============================================================================
--- head/devel/thrift-cpp/Makefile	Sat Mar 16 15:38:16 2019	(r495885)
+++ head/devel/thrift-cpp/Makefile	Sat Mar 16 15:39:43 2019	(r495886)
@@ -3,7 +3,7 @@
 
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION} # to keep in sync with thrift
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
@@ -29,13 +29,6 @@ USE_LDCONFIG=		yes
 MAKE_JOBS_UNSAFE=	yes
 PLIST_SUB=		PORTVERSION="${THRIFT_PORTVERSION}"
 
-OPTIONS_DEFINE=		QT4
-QT4_CONFIGURE_WITH=	qt4
-QT4_USES=		qt:4
-QT4_USE=		QT=network,moc_build,qmake_build,rcc_build,uic_build
-
-OPTIONS_SUB=		yes
-
 CONFIGURE_ARGS+=	\
 		--without-c_glib \
 		--with-cpp \
@@ -54,13 +47,6 @@ CONFIGURE_ARGS+=	\
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
@@ -72,9 +58,6 @@ post-install:
 	${LN} -sf libthrift-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthrift.so.0
 	${LN} -sf libthriftnb-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftnb.so.0
 	${LN} -sf libthriftz-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftz.so.0
-
-post-install-QT4-on:
-	${LN} -sf libthriftqt-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftqt.so.0
 
 .include "../thrift/bsd.thrift.mk"
 .include <bsd.port.post.mk>

Modified: head/devel/thrift-cpp/pkg-plist
==============================================================================
--- head/devel/thrift-cpp/pkg-plist	Sat Mar 16 15:38:16 2019	(r495885)
+++ head/devel/thrift-cpp/pkg-plist	Sat Mar 16 15:39:43 2019	(r495886)
@@ -94,15 +94,10 @@ lib/libthriftnb-%%PORTVERSION%%.so
 lib/libthriftnb.a
 lib/libthriftnb.so
 lib/libthriftnb.so.0
-%%QT4%%lib/libthriftqt-%%PORTVERSION%%.so
-%%QT4%%lib/libthriftqt.a
-%%QT4%%lib/libthriftqt.so
-%%QT4%%lib/libthriftqt.so.0
 lib/libthriftz-%%PORTVERSION%%.so
 lib/libthriftz.a
 lib/libthriftz.so
 lib/libthriftz.so.0
 libdata/pkgconfig/thrift-nb.pc
-%%QT4%%libdata/pkgconfig/thrift-qt.pc
 libdata/pkgconfig/thrift-z.pc
 libdata/pkgconfig/thrift.pc