math/plplot: Update to 5.12.0

Changes this release:
  https://sourceforge.net/p/plplot/news/2017/01/plplot-5120-has-been-released/

1 files changed, 33 insertions, 39 deletions

diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 87c90647a0bc..8ac80c334f5f 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	plplot
-PORTVERSION=	5.11.1
-PORTREVISION=	6
+PORTVERSION=	5.12.0
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 
@@ -15,14 +14,15 @@ LICENSE=	LGPL21+
 BUILD_DEPENDS=	bash:shells/bash \
 		${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf
 LIB_DEPENDS=	libLASi.so:devel/lasi \
-		libltdl.so:devel/libltdl \
-		libfreetype.so:print/freetype2
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libltdl.so:devel/libltdl
 RUN_DEPENDS=	bash:shells/bash \
 		${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf
 
-USE_GNOME=	pango
+USE_GNOME=	cairo pango
 USE_PERL5=	build
-USES=		cmake ghostscript localbase perl5 pathfix pkgconfig
+USES=		cmake:outsource gettext-runtime ghostscript localbase perl5 pathfix pkgconfig
 CMAKE_ARGS=	-DENABLE_java:BOOL=OFF \
 		-DENABLE_octave:BOOL=OFF \
 		-DENABLE_pdl:BOOL=OFF \
@@ -38,47 +38,49 @@ USE_LDCONFIG=	yes
 
 FREEFONT_DIR=	${LOCALBASE}/share/fonts/freefont-ttf
 
-OPTIONS_DEFINE=	FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 DOCS
-OPTIONS_RADIO=	QHULL
+OPTIONS_DEFINE=		DOCS FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11
+OPTIONS_RADIO=		QHULL
 OPTIONS_RADIO_QHULL=	QHULL2015 QHULL2003
 OPTIONS_DEFAULT=	QHULL2015 THREADS X11
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
 FORTRAN_USES=		fortran
+FORTRAN_CMAKE_BOOL=	ENABLE_f95
 FORTRAN_CONFIGURE_ENV=	CMAKE_Fortran_COMPILER="${FC}"
-FORTRAN_CMAKE_ON=	-DENABLE_f95:BOOL=ON
-FORTRAN_CMAKE_OFF=	-DENABLE_f95:BOOL=OFF
 
-GD_LIB_DEPENDS=		libgd.so:graphics/gd
-GD_CMAKE_ON=		-DPLD_png:BOOL=ON
+GD_LIB_DEPENDS=		libgd.so:graphics/gd \
+			libpng16.so:graphics/png
+GD_USES=		jpeg
+GD_CMAKE_BOOL=		PLD_png
 
 LUA_USES=		lua:51
+LUA_CMAKE_BOOL=		ENABLE_lua
 LUA_CMAKE_ON=		-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
-LUA_CMAKE_OFF=		-DENABLE_lua:BOOL=OFF
 
 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	swig:devel/swig13 \
 			${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
+PYTHON_CMAKE_BOOL=	ENABLE_python
 PYTHON_CONFIGURE_ENV=	PYTHON_VERSION="${PYTHON_VERSION}"
-PYTHON_CMAKE_OFF=	-DENABLE_python:BOOL=OFF
 
 QHULL2003_DESC=		Legacy Qhull support
 QHULL2015_DESC=		Latest Qhull support
 QHULL2015_LIB_DEPENDS=	libqhull.so.7:math/qhull
 QHULL2003_LIB_DEPENDS=	libqhull.so.5:math/qhull5
-QHULL2015_CMAKE_ON=	-DQHULL_INCLUDE_DIRS="${LOCALBASE}/include/libqhull"
-QHULL2015_2FIX=		lib/nn/delaunay.c src/plgridd.c
+QHULL2015_CMAKE_ON=	-DQHULL_INCLUDE_DIRS:PATH="${LOCALBASE}/include/libqhull"
 
 TCLTK_LIB_DEPENDS=	libitk.so:x11-toolkits/itk
 TCLTK_RUN_DEPENDS=	iwidgets>0:x11-toolkits/iwidgets
 TCLTK_USES=		tk
-ITCL_VER=		3.4
+TCLTK_CMAKE_BOOL=	ENABLE_tcl
+TCLTK_IMPLIES=		X11
+ITCL_VER=		3.4.1
 ITK_VER=		3.3
 IWIDGETS_VER=		4.0.1
-TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION="${TK_VER}" \
-			-DPLPLOT_ITCL_VERSION="${ITCL_VER}" \
-			-DPLPLOT_ITK_VERSION="${ITK_VER}" \
+TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION:STRING="${TK_VER}" \
+			-DPLPLOT_ITCL_VERSION:STRING="${ITCL_VER}" \
+			-DPLPLOT_ITK_VERSION:STRING="${ITK_VER}" \
 			-DIWIDGETS_VERSIONS_LIST:STRING="${IWIDGETS_VER};${ITK_VER};${ITCL_VER}" \
 			-DTCL_TCLSH:FILEPATH="${TCLSH}" \
 			-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
@@ -87,38 +89,30 @@ TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION="${TK_VER}" \
 			-DTK_INCLUDE_PATH:PATH="${TK_INCLUDEDIR}" \
 			-DITK_INCLUDE_PATH:PATH="${LOCALBASE}/include/itk${ITK_VER}" \
 			-DITK_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitk.so"
-TCLTK_CMAKE_OFF=	-DENABLE_tcl:BOOL=OFF
 
-THREADS_CMAKE_OFF=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
+THREADS_CMAKE_BOOL=	THREADS_HAVE_PTHREAD_ARG
 
 QT4_USE=		QT4=corelib,gui,svg,xml,moc_build,qmake_build,rcc_build,uic_build
-QT4_CMAKE_OFF=		-DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON
+QT4_CMAKE_BOOL=		ENABLE_qt
+QT4_CMAKE_BOOL_OFF=	DEFAULT_NO_QT_DEVICES
 
 WXGTK_LIB_DEPENDS=	libagg.so:graphics/agg
-WXGTK_USE=		WX=2.6+
+WXGTK_USE=		WX=3.0+
+WXGTK_CMAKE_BOOL=	ENABLE_wxwidgets
 WXGTK_CMAKE_ON=		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
-WXGTK_CMAKE_OFF=	-DENABLE_wxwidgets:BOOL=OFF
 
 X11_USE=		XORG=ice,sm,x11,xext
-X11_CMAKE_OFF=		-DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF
+X11_CMAKE_BOOL=		PLD_xcairo PLD_xwin
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTCLTK} && empty(PORT_OPTIONS:MX11)
-IGNORE=		option TCLTK needs X11 support
-.endif
-
-pre-configure:
+post-patch:
 	${REINPLACE_CMD} -e \
 		's|dl dlopen|c dlopen|' \
 		${WRKSRC}/cmake/modules/FindLTDL.cmake
 	${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'
-.if ${PORT_OPTIONS:MQHULL2015}
-. for src in ${QHULL2015_2FIX}
+post-patch-QHULL2015:
 	${REINPLACE_CMD} -e 's|qhull/qhull_a|libqhull/qhull_a|'	\
-		${WRKSRC}/${src}
-. endfor
-.endif
+		${WRKSRC}/lib/nn/delaunay.c \
+		${WRKSRC}/src/plgridd.c
 
 .include <bsd.port.mk>