svn commit: r495905 - head/math/plplot

[Tobias C. Berner]

Author: tcberner
Date: Sat Mar 16 16:17:08 2019
New Revision: 495905
URL: https://svnweb.freebsd.org/changeset/ports/495905

Log:
  math/plplot: remove QT4 option (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/math/plplot/Makefile
  head/math/plplot/pkg-plist

Modified: head/math/plplot/Makefile
==============================================================================
--- head/math/plplot/Makefile	Sat Mar 16 16:12:55 2019	(r495904)
+++ head/math/plplot/Makefile	Sat Mar 16 16:17:08 2019	(r495905)
@@ -3,7 +3,7 @@
 
 PORTNAME=	plplot
 PORTVERSION=	5.12.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
@@ -37,10 +37,11 @@ CMAKE_ARGS=	-DENABLE_java:BOOL=OFF \
 		-DPLD_plmeta:BOOL=OFF
 CFLAGS+=	-D_IS_BUILDING_PLPLOT_PORT_
 USE_LDCONFIG=	yes
+CMAKE_OFF=		DEFAULT_NO_QT_DEVICES
 
 FREEFONT_DIR=	${LOCALBASE}/share/fonts/freefont-ttf
 
-OPTIONS_DEFINE=		DOCS FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11
+OPTIONS_DEFINE=		DOCS FORTRAN GD LUA PYTHON TCLTK THREADS WXGTK X11
 OPTIONS_RADIO=		QHULL
 OPTIONS_RADIO_QHULL=	QHULL2015 QHULL2003
 OPTIONS_DEFAULT=	QHULL2015 THREADS X11
@@ -96,10 +97,6 @@ TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION:STRING="${TK_VER}
 
 THREADS_CMAKE_BOOL=	THREADS_HAVE_PTHREAD_ARG
 
-QT4_USES=		qt:4
-QT4_USE=		QT=corelib,gui,svg,xml,moc_build,qmake_build,rcc_build,uic_build
-QT4_CMAKE_BOOL=		ENABLE_qt
-QT4_CMAKE_BOOL_OFF=	DEFAULT_NO_QT_DEVICES
 
 WXGTK_LIB_DEPENDS=	libagg.so:graphics/agg
 WXGTK_USE=		WX=3.0+
@@ -108,13 +105,6 @@ WXGTK_CMAKE_ON=		-DwxWidgets_CONFIG_EXECUTABLE:FILEPAT
 
 X11_USE=		XORG=ice,sm,x11,xext
 X11_CMAKE_BOOL=		PLD_xcairo PLD_xwin
-
-.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/math/plplot/pkg-plist
==============================================================================
--- head/math/plplot/pkg-plist	Sat Mar 16 16:12:55 2019	(r495904)
+++ head/math/plplot/pkg-plist	Sat Mar 16 16:17:08 2019	(r495905)
@@ -19,7 +19,6 @@ include/plplot/plstrm.h
 include/plplot/plxwd.h
 include/plplot/qsastime.h
 include/plplot/qsastimedll.h
-%%QT4%%include/plplot/qt.h
 %%TCLTK%%include/plplot/tclMatrix.h
 %%WXGTK%%include/plplot/wxPLplot_nanosec.h
 %%WXGTK%%include/plplot/wxPLplotstream.h
@@ -51,9 +50,6 @@ lib/libplplotcxx.so.13.0.0
 %%FORTRAN%%lib/libplplotf95.so
 %%FORTRAN%%lib/libplplotf95.so.13
 %%FORTRAN%%lib/libplplotf95.so.13.0.0
-%%QT4%%lib/libplplotqt.so
-%%QT4%%lib/libplplotqt.so.2
-%%QT4%%lib/libplplotqt.so.2.0.2
 %%TCLTK%%lib/libplplottcltk.so
 %%TCLTK%%lib/libplplottcltk.so.13
 %%TCLTK%%lib/libplplottcltk.so.13.0.0
@@ -71,7 +67,6 @@ lib/libqsastime.so.0.0.1
 %%TCLTK%%lib/libtclmatrix.so.10.3.0
 libdata/pkgconfig/plplot-c++.pc
 %%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
-%%QT4%%libdata/pkgconfig/plplot-qt.pc
 %%TCLTK%%libdata/pkgconfig/plplot-tcl.pc
 %%TCLTK%%libdata/pkgconfig/plplot-tcl_Main.pc
 %%WXGTK%%libdata/pkgconfig/plplot-wxwidgets.pc
@@ -91,8 +86,6 @@ lib/plplot/drivers/ps.driver_info
 lib/plplot/drivers/ps.so
 lib/plplot/drivers/psttf.driver_info
 lib/plplot/drivers/psttf.so
-%%QT4%%lib/plplot/drivers/qt.driver_info
-%%QT4%%lib/plplot/drivers/qt.so
 lib/plplot/drivers/svg.driver_info
 lib/plplot/drivers/svg.so
 %%TCLTK%%lib/plplot/drivers/tk.driver_info
@@ -148,11 +141,7 @@ man/man1/pltek.1.gz
 %%DATADIR%%/examples/Makefile
 %%DATADIR%%/examples/c++/CMakeLists.txt
 %%DATADIR%%/examples/c++/Makefile
-%%QT4%%%%DATADIR%%/examples/c++/README.qt_example
 %%DATADIR%%/examples/c++/plc++demos.h
-%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp
-%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
-%%QT4%%%%DATADIR%%/examples/c++/qt_example.cpp
 %%WXGTK%%%%DATADIR%%/examples/c++/wxPLplotDemo.cpp
 %%DATADIR%%/examples/c++/x00.cc
 %%DATADIR%%/examples/c++/x01.cc
@@ -233,7 +222,6 @@ man/man1/pltek.1.gz
 %%DATADIR%%/examples/c/x33c.c
 %%DATADIR%%/examples/c/x34c.c
 %%DATADIR%%/examples/cmake/modules/language_support.cmake
-%%QT4%%%%DATADIR%%/examples/cmake/modules/ndp_UseQt4.cmake
 %%DATADIR%%/examples/cmake/modules/pkg-config.cmake
 %%DATADIR%%/examples/cmake/modules/plplot_configure.cmake
 %%DATADIR%%/examples/cmake/modules/plplot_functions.cmake