Date: Wed, 22 Apr 2015 20:16:04 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384520 - in head: math/plplot math/plplot-ada math/plplot/files science/gnudatalanguage science/gnudatalanguage/files Message-ID: <201504222016.t3MKG4Lx094065@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Wed Apr 22 20:16:04 2015 New Revision: 384520 URL: https://svnweb.freebsd.org/changeset/ports/384520 Log: - Upgrade math/plplot to 5.11.0 Announcement at <https://sourceforge.net/p/plplot/plplot/ci/plplot-5.11.0/tree/README.release>; - Take maintainership - Chase dependencies. PR: ports/199539 Submitted by: Ben Woods <woodsb02 (at) gmail.com> Approved by: marino (for plplot-ada), /me (for gnudatalanguage) Added: head/math/plplot/files/patch-include_plConfig.h.in (contents, props changed) head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake (contents, props changed) head/science/gnudatalanguage/files/patch-src_plotting__contour.cpp (contents, props changed) Deleted: head/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c head/math/plplot/files/patch-bindings__tk__plframe.c head/math/plplot/files/patch-bindings__tk__plserver.c head/math/plplot/files/patch-examples__tk__xtk01.c head/math/plplot/files/patch-examples__tk__xtk02.c head/math/plplot/files/patch-examples__tk__xtk04.c head/math/plplot/files/patch-include_plConfig.h head/math/plplot/files/patch-plplot_test__CMakeLists.txt head/math/plplot/files/patch-util__plrender.c Modified: head/math/plplot-ada/Makefile head/math/plplot/Makefile head/math/plplot/distinfo head/math/plplot/files/patch-bindings__tk__tkMain.c head/math/plplot/files/patch-cmake_modules_FindVGA.cmake head/math/plplot/files/patch-cmake_modules_csiro.cmake head/math/plplot/files/patch-cmake_modules_instdirs.cmake head/math/plplot/files/patch-cmake_modules_linuxvga.cmake head/math/plplot/files/patch-cmake_modules_pkg-config.cmake head/math/plplot/files/patch-doc__docbook__src__tcl.xml head/math/plplot/files/patch-examples__python__CMakeLists.txt head/math/plplot/files/patch-scripts__CMakeLists.txt head/math/plplot/pkg-plist head/science/gnudatalanguage/Makefile head/science/gnudatalanguage/files/patch-CMakeLists.txt head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake head/science/gnudatalanguage/files/patch-src__base64.hpp head/science/gnudatalanguage/files/patch-src__basic_fun.cpp head/science/gnudatalanguage/files/patch-src__gshhs.cpp head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp head/science/gnudatalanguage/files/patch-src__str.cpp Modified: head/math/plplot-ada/Makefile ============================================================================== --- head/math/plplot-ada/Makefile Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot-ada/Makefile Wed Apr 22 20:16:04 2015 (r384520) @@ -3,6 +3,7 @@ PORTNAME= plplot PORTVERSION= ${RELEASE} +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source PKGNAMESUFFIX= -ada @@ -12,7 +13,7 @@ COMMENT= Ada bindings for PLplot LICENSE= LGPL3 -LIB_DEPENDS= libplplotd.so:${PORTSDIR}/math/plplot +LIB_DEPENDS= libplplot.so:${PORTSDIR}/math/plplot USES= ada Modified: head/math/plplot/Makefile ============================================================================== --- head/math/plplot/Makefile Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/Makefile Wed Apr 22 20:16:04 2015 (r384520) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= plplot -PORTVERSION= 5.10.0 -PORTREVISION= 3 +PORTVERSION= 5.11.0 CATEGORIES= math science MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source -MAINTAINER= ports@FreeBSD.org +MAINTAINER= woodsb02@gmail.com COMMENT= Scientific plotting package LICENSE= LGPL21 # (or later) @@ -21,16 +20,16 @@ LIB_DEPENDS= libLASi.so:${PORTSDIR}/deve RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ ${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf -OPTIONS_DEFINE= FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 DOCS -OPTIONS_DEFAULT=THREADS X11 - USE_GNOME= pango USE_PERL5= build USE_GHOSTSCRIPT=yes USES= cmake gmake perl5 pkgconfig -CMAKE_ARGS= -DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \ - -DENABLE_pdl:BOOL=OFF -DENABLE_ada:BOOL=OFF \ - -DENABLE_d:BOOL=OFF -DENABLE_ocaml:BOOL=OFF \ +CMAKE_ARGS= -DENABLE_java:BOOL=OFF \ + -DENABLE_octave:BOOL=OFF \ + -DENABLE_pdl:BOOL=OFF \ + -DENABLE_ada:BOOL=OFF \ + -DENABLE_d:BOOL=OFF \ + -DENABLE_ocaml:BOOL=OFF \ -DENABLE_pyqt4:BOOL=OFF \ -DPL_FREETYPE_FONT_PATH:PATH="${FREEFONT_DIR}" \ -DPLD_plmeta:BOOL=OFF @@ -39,96 +38,65 @@ USE_LDCONFIG= yes FREEFONT_DIR= ${LOCALBASE}/share/fonts/freefont-ttf -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MFORTRAN} -USES+= fortran -CONFIGURE_ENV+= CMAKE_Fortran_COMPILER="${FC}" -CMAKE_ARGS+= -DENABLE_f95:BOOL=ON -DENABLE_f77:BOOL=ON -PLIST_SUB+= FORTRAN="" -.else -CMAKE_ARGS+= -DENABLE_f95:BOOL=OFF -DENABLE_f77:BOOL=OFF -PLIST_SUB+= FORTRAN="@comment " -.endif - -.if ${PORT_OPTIONS:MGD} -LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd -CMAKE_ARGS+= -DPLD_png:BOOL=ON -PLIST_SUB+= GD="" -.else -PLIST_SUB+= GD="@comment " -.endif - -.if ${PORT_OPTIONS:MLUA} -USES+= lua:51 -CMAKE_ARGS+= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" -PLIST_SUB+= LUA="" LUA_MODLIBDIR="${LUA_MODLIBDIR:S,${LUA_PREFIX}/,,}" -.else -CMAKE_ARGS+= -DENABLE_lua:BOOL=OFF -PLIST_SUB+= LUA="@comment " -.endif - -.if ${PORT_OPTIONS:MPYTHON} -BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13 \ - ${PYNUMPY} -RUN_DEPENDS+= ${PYNUMPY} -USES+= python -PLIST_SUB+= PYTHON="" -CONFIGURE_ENV+= PYTHON_VERSION="${PYTHON_VERSION}" -.else -CMAKE_ARGS+= -DENABLE_python:BOOL=OFF -PLIST_SUB+= PYTHON="@comment " -.endif - -.if ${PORT_OPTIONS:MTCLTK} -.if empty(PORT_OPTIONS:MX11) -IGNORE= TCLTK needs X11 support -.endif -LIB_DEPENDS+= libitk.so:${PORTSDIR}/x11-toolkits/itk -USES+= tk -CMAKE_ARGS+= -DTCL_TCLSH:FILEPATH="${TCLSH}" \ - -DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \ - -DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl3.4" \ - -DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \ - -DTK_INCLUDE_PATH:PATH="${TK_INCLUDEDIR}" \ - -DITK_INCLUDE_PATH:PATH="${LOCALBASE}/include/itk3.3" \ - -DITK_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitk.so" -PLIST_SUB+= TCLTK="" -.else -CMAKE_ARGS+= -DENABLE_tcl:BOOL=OFF -PLIST_SUB+= TCLTK="@comment " -.endif +OPTIONS_DEFINE= FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 DOCS +OPTIONS_DEFAULT=THREADS X11 +OPTIONS_SUB= yes -.if empty(PORT_OPTIONS:MTHREADS) -CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF -.endif +FORTRAN_USES= fortran +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:${PORTSDIR}/graphics/gd +GD_CMAKE_ON= -DPLD_png:BOOL=ON + +LUA_USES= lua:51 +LUA_CMAKE_ON= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" +LUA_CMAKE_OFF= -DENABLE_lua:BOOL=OFF + +PYTHON_USES= python +PYTHON_BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 \ + ${PYNUMPY} +PYTHON_RUN_DEPENDS= ${PYNUMPY} +PYTHON_CONFIGURE_ENV= PYTHON_VERSION="${PYTHON_VERSION}" +PYTHON_CMAKE_OFF= -DENABLE_python:BOOL=OFF + +TCLTK_LIB_DEPENDS= libitk.so:${PORTSDIR}/x11-toolkits/itk +TCLTK_RUN_DEPENDS= iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets +TCLTK_USES= tk +ITCL_VER= 3.4 +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}" \ + -DIWIDGETS_VERSIONS_LIST:STRING="${IWIDGETS_VER};${ITK_VER};${ITCL_VER}" \ + -DTCL_TCLSH:FILEPATH="${TCLSH}" \ + -DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \ + -DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl${ITCL_VER}" \ + -DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \ + -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 + +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 + +WXGTK_LIB_DEPENDS= libagg.so:${PORTSDIR}/graphics/agg +WXGTK_USE= WX=2.6+ +WXGTK_CMAKE_ON= -DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}" +WXGTK_CMAKE_OFF= -DENABLE_wxwidgets:BOOL=OFF -.if ${PORT_OPTIONS:MQT4} -USE_QT4= corelib gui svg xml \ - moc_build qmake_build rcc_build uic_build -PLIST_SUB+= QT4="" -.else -CMAKE_ARGS+= -DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON -PLIST_SUB+= QT4="@comment " -.endif +X11_USE= XORG=ice,sm,x11,xext +X11_CMAKE_OFF= -DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF -.if ${PORT_OPTIONS:MWXGTK} -LIB_DEPENDS+= libagg.so:${PORTSDIR}/graphics/agg -USE_WX= 2.6+ -CMAKE_ARGS+= -DPLD_wxpng:BOOL=ON \ - -DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}" -PLIST_SUB+= WXGTK="" -.else -CMAKE_ARGS+= -DENABLE_wxwidgets:BOOL=OFF -PLIST_SUB+= WXGTK="@comment " -.endif +.include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MX11} -USE_XORG= ice sm x11 xext -PLIST_SUB+= X11="" -.else -CMAKE_ARGS+= -DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF -PLIST_SUB+= X11="@comment " +.if ${PORT_OPTIONS:MTCLTK} && empty(PORT_OPTIONS:MX11) +IGNORE= option TCLTK needs X11 support .endif pre-configure: @@ -136,7 +104,6 @@ pre-configure: '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' + ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' .include <bsd.port.mk> Modified: head/math/plplot/distinfo ============================================================================== --- head/math/plplot/distinfo Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/distinfo Wed Apr 22 20:16:04 2015 (r384520) @@ -1,2 +1,2 @@ -SHA256 (plplot-5.10.0.tar.gz) = d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5 -SIZE (plplot-5.10.0.tar.gz) = 14766687 +SHA256 (plplot-5.11.0.tar.gz) = bfa8434e6e1e7139a5651203ec1256c8581e2fac3122f907f7d8d25ed3bd5f7e +SIZE (plplot-5.11.0.tar.gz) = 15892751 Modified: head/math/plplot/files/patch-bindings__tk__tkMain.c ============================================================================== --- head/math/plplot/files/patch-bindings__tk__tkMain.c Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/files/patch-bindings__tk__tkMain.c Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- bindings/tk/tkMain.c.orig 2013-12-18 20:25:14.000000000 -0500 +--- bindings/tk/tkMain.c.orig 2015-04-12 10:08:04 UTC +++ bindings/tk/tkMain.c -@@ -92,10 +92,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl +@@ -90,10 +90,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl int allowOverwrite ) ); #endif Modified: head/math/plplot/files/patch-cmake_modules_FindVGA.cmake ============================================================================== --- head/math/plplot/files/patch-cmake_modules_FindVGA.cmake Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/files/patch-cmake_modules_FindVGA.cmake Wed Apr 22 20:16:04 2015 (r384520) @@ -1,5 +1,5 @@ ---- cmake/modules/FindVGA.cmake.orig 2009-09-06 21:04:43.000000000 +0200 -+++ cmake/modules/FindVGA.cmake 2009-12-25 20:27:51.000000000 +0100 +--- cmake/modules/FindVGA.cmake.orig 2015-04-12 10:08:04 UTC ++++ cmake/modules/FindVGA.cmake @@ -6,7 +6,6 @@ # VGA_LIBRARIES, the libraries to link against to use the vga library # VGA_LIBRARY_DIRS, the directory where the vga library is found. @@ -8,7 +8,7 @@ find_path(VGA_INCLUDE_DIR vga.h /usr/local/include /usr/include) if(VGA_INCLUDE_DIR) -@@ -33,4 +32,3 @@ +@@ -33,4 +32,3 @@ else(VGA_FOUND) message(FATAL_ERROR "FindVGA: Could not find vga.h and/or the vga library") endif(VGA_FIND_REQUIRED) endif(VGA_FOUND) Modified: head/math/plplot/files/patch-cmake_modules_csiro.cmake ============================================================================== --- head/math/plplot/files/patch-cmake_modules_csiro.cmake Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/files/patch-cmake_modules_csiro.cmake Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- cmake/modules/csiro.cmake.orig 2009-09-06 21:04:43.000000000 +0200 -+++ cmake/modules/csiro.cmake 2009-12-30 21:10:58.000000000 +0100 -@@ -36,6 +36,10 @@ +--- cmake/modules/csiro.cmake.orig 2015-04-12 10:08:04 UTC ++++ cmake/modules/csiro.cmake +@@ -36,6 +36,10 @@ if(PL_HAVE_QHULL OR WITH_CSA) else(CMAKE_C_COMPILER MATCHES "gcc") set(NAN_CFLAGS "${NAN_CFLAGS} -ieee") endif(CMAKE_C_COMPILER MATCHES "gcc") Modified: head/math/plplot/files/patch-cmake_modules_instdirs.cmake ============================================================================== --- head/math/plplot/files/patch-cmake_modules_instdirs.cmake Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/files/patch-cmake_modules_instdirs.cmake Wed Apr 22 20:16:04 2015 (r384520) @@ -1,4 +1,4 @@ ---- cmake/modules/instdirs.cmake.orig 2013-11-11 19:54:54.000000000 -0500 +--- cmake/modules/instdirs.cmake.orig 2015-04-12 10:08:04 UTC +++ cmake/modules/instdirs.cmake @@ -61,13 +61,13 @@ CACHE PATH "install location for C heade @@ -35,11 +35,11 @@ # Ada source files (*.adb, *.ads) (following recommendations in # http://www.ada-france.org/debian/debian-ada-policy.html @@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA - set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada${LIB_TAG}) + set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada) # Drivers. --set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers${LIB_TAG}) -+set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers${LIB_TAG}) +-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers) ++set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers) # Documentation. set(DOC_DIR ${CMAKE_INSTALL_DATADIR}/doc/${PACKAGE}) Modified: head/math/plplot/files/patch-cmake_modules_linuxvga.cmake ============================================================================== --- head/math/plplot/files/patch-cmake_modules_linuxvga.cmake Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/files/patch-cmake_modules_linuxvga.cmake Wed Apr 22 20:16:04 2015 (r384520) @@ -1,5 +1,5 @@ ---- ./cmake/modules/linuxvga.cmake.orig 2009-09-06 21:04:43.000000000 +0200 -+++ ./cmake/modules/linuxvga.cmake 2009-12-26 23:58:37.000000000 +0100 +--- cmake/modules/linuxvga.cmake.orig 2015-04-12 10:08:04 UTC ++++ cmake/modules/linuxvga.cmake @@ -35,7 +35,6 @@ # set the environment variable CMAKE_LIBRARY_PATH. # See cmake documentation for further details. @@ -8,7 +8,7 @@ if(PLD_linuxvga) find_package(VGA) if(VGA_FOUND) -@@ -50,6 +49,3 @@ +@@ -50,6 +49,3 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE) endif(VGA_FOUND) endif(PLD_linuxvga) Modified: head/math/plplot/files/patch-cmake_modules_pkg-config.cmake ============================================================================== --- head/math/plplot/files/patch-cmake_modules_pkg-config.cmake Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/files/patch-cmake_modules_pkg-config.cmake Wed Apr 22 20:16:04 2015 (r384520) @@ -1,43 +1,5 @@ -Includes the following upstream commit to make the port work with CMake 3.1.0: - -commit 772223c638ecf5dc740c9f3dd7a6883c6d2c83d2 -Author: Alan W. Irwin <airwin@users.sourceforge.net> -Date: Sun Dec 7 09:06:08 2014 -0800 - - Adjust for internal CMake-3.1 pkg-config change. - - There is a report from Greg Jung <gvjung@gmail.com> that the - internal CMake command - - _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") - - must be changed to - - _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") - - for CMake-3.1 in order to build the cairo device properly. Accordingly, I have made that adjustment. - - Tested by Alan W. Irwin <airwin@users> on Linux using CMake-3.0.2 - by building the cairo device. - - N.B. currently untested for CMake-3.1. - - ToDo: - - Extensive tests on CMake-3.1 (once that version is closer to release) - still need to be done since the change in the pkg-config support by - CMake may need other adjustments as well. - ---- cmake/modules/pkg-config.cmake.orig 2014-02-06 00:06:07.000000000 -0500 +--- cmake/modules/pkg-config.cmake.orig 2015-04-12 10:08:04 UTC +++ cmake/modules/pkg-config.cmake -@@ -1,6 +1,6 @@ - # cmake/modules/pkg-config.cmake - # --# Copyright (C) 2006 Alan W. Irwin -+# Copyright (C) 2006-2015 Alan W. Irwin - # - # This file is part of PLplot. - # @@ -39,7 +39,7 @@ include(FindPkgConfig) if(PKG_CONFIG_EXECUTABLE) @@ -47,17 +9,3 @@ Date: Sun Dec 7 09:06:08 2014 -0800 set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH}) # Will likely need WIN32 and CYGWIN stanzas as well -@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v - set(_xprefix ${_prefix}) - endif(FORCE_EXTERNAL_STATIC) - -- _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") -+ if(CMAKE_VERSION VERSION_LESS "3.1") -+ _pkg_check_modules_internal(0 0 ${_prefix} "${_package}") -+ else(CMAKE_VERSION VERSION_LESS "3.1") -+ _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}") -+ endif(CMAKE_VERSION VERSION_LESS "3.1") -+ - if(${_prefix}_FOUND) - cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}") - # If libraries cannot be not found, then that is equivalent to whole Modified: head/math/plplot/files/patch-doc__docbook__src__tcl.xml ============================================================================== --- head/math/plplot/files/patch-doc__docbook__src__tcl.xml Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/files/patch-doc__docbook__src__tcl.xml Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- doc/docbook/src/tcl.xml.orig +--- doc/docbook/src/tcl.xml.orig 2015-04-12 10:08:04 UTC +++ doc/docbook/src/tcl.xml -@@ -576,7 +576,7 @@ +@@ -576,7 +576,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU if (pm->fdata[i] > max) max = pm->fdata[i]; @@ -9,7 +9,7 @@ return TCL_OK; } -@@ -589,7 +589,7 @@ +@@ -589,7 +589,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU if (pm->fdata[i] < min) min = pm->fdata[i]; Modified: head/math/plplot/files/patch-examples__python__CMakeLists.txt ============================================================================== --- head/math/plplot/files/patch-examples__python__CMakeLists.txt Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/files/patch-examples__python__CMakeLists.txt Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- examples/python/CMakeLists.txt.orig +--- examples/python/CMakeLists.txt.orig 2015-04-12 10:08:04 UTC +++ examples/python/CMakeLists.txt -@@ -241,7 +241,7 @@ +@@ -245,7 +245,7 @@ if(CORE_BUILD) @ONLY ) Added: head/math/plplot/files/patch-include_plConfig.h.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/plplot/files/patch-include_plConfig.h.in Wed Apr 22 20:16:04 2015 (r384520) @@ -0,0 +1,12 @@ +--- include/plConfig.h.in.orig 2015-04-12 10:08:04 UTC ++++ include/plConfig.h.in +@@ -43,7 +43,8 @@ + #ifndef __PLCONFIG_H__ + #define __PLCONFIG_H__ + +-#ifdef PLPLOT_HAVE_CONFIG_H ++// plplot_config.h won't be installed: don't let it be used by consumers ++#if defined(PLPLOT_HAVE_CONFIG_H) && defined(_IS_BUILDING_PLPLOT_PORT_) + # include <plplot_config.h> + #endif + Modified: head/math/plplot/files/patch-scripts__CMakeLists.txt ============================================================================== --- head/math/plplot/files/patch-scripts__CMakeLists.txt Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/files/patch-scripts__CMakeLists.txt Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2012-01-04 16:45:07.000000000 +0100 -+++ scripts/CMakeLists.txt 2013-10-01 23:16:18.000000000 +0200 -@@ -28,7 +28,7 @@ +--- scripts/CMakeLists.txt.orig 2015-04-12 10:08:04 UTC ++++ scripts/CMakeLists.txt +@@ -28,7 +28,7 @@ if(HAVE_BASH) ) endif(PLD_plmeta) if(PLD_pstex) Modified: head/math/plplot/pkg-plist ============================================================================== --- head/math/plplot/pkg-plist Wed Apr 22 20:14:51 2015 (r384519) +++ head/math/plplot/pkg-plist Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,7 @@ %%TCLTK%%bin/plserver %%TCLTK%%bin/pltcl bin/pltek +%%WXGTK%%bin/wxPLViewer include/plplot/disptab.h include/plplot/drivers.h include/plplot/gcw.h @@ -21,13 +22,18 @@ 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/wxPLplotstream.h %%WXGTK%%include/plplot/wxPLplotwindow.h -%%TCLTK%%include/plplot/tclMatrix.h -%%FORTRAN%%lib/fortran/include/plplot/plplot_parameters.h +lib/cmake/plplot/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/plplot/export_plplot.cmake +lib/cmake/plplot/plplotConfig.cmake %%FORTRAN%%lib/fortran/modules/plplot/plf95demolib.mod %%FORTRAN%%lib/fortran/modules/plplot/plplot.mod -%%FORTRAN%%lib/fortran/modules/plplot/plplot_flt.mod +%%FORTRAN%%lib/fortran/modules/plplot/plplot_graphics.mod +%%FORTRAN%%lib/fortran/modules/plplot/plplot_str.mod +%%FORTRAN%%lib/fortran/modules/plplot/plplot_strutils.mod +%%FORTRAN%%lib/fortran/modules/plplot/plplot_types.mod %%FORTRAN%%lib/fortran/modules/plplot/plplotp.mod lib/libcsirocsa.so lib/libcsirocsa.so.0 @@ -35,80 +41,79 @@ lib/libcsirocsa.so.0.0.1 lib/libcsironn.so lib/libcsironn.so.0 lib/libcsironn.so.0.0.1 -%%FORTRAN%%lib/libplf95demolibd.a -lib/libplplotcxxd.so -lib/libplplotcxxd.so.11 -lib/libplplotcxxd.so.11.0.0 -lib/libplplotd.so -lib/libplplotd.so.12 -lib/libplplotd.so.12.0.1 -%%FORTRAN%%lib/libplplotf77cd.so -%%FORTRAN%%lib/libplplotf77cd.so.9 -%%FORTRAN%%lib/libplplotf77cd.so.9.1.1 -%%FORTRAN%%lib/libplplotf77d.so -%%FORTRAN%%lib/libplplotf77d.so.9 -%%FORTRAN%%lib/libplplotf77d.so.9.1.1 -%%FORTRAN%%lib/libplplotf95cd.so -%%FORTRAN%%lib/libplplotf95cd.so.10 -%%FORTRAN%%lib/libplplotf95cd.so.10.0.0 -%%FORTRAN%%lib/libplplotf95d.so -%%FORTRAN%%lib/libplplotf95d.so.10 -%%FORTRAN%%lib/libplplotf95d.so.10.0.0 -%%QT4%%lib/libplplotqtd.so -%%QT4%%lib/libplplotqtd.so.1 -%%QT4%%lib/libplplotqtd.so.1.0.0 -%%TCLTK%%lib/libplplottcltkd.so -%%TCLTK%%lib/libplplottcltkd.so.10 -%%TCLTK%%lib/libplplottcltkd.so.10.0.0 -%%WXGTK%%lib/libplplotwxwidgetsd.so -%%WXGTK%%lib/libplplotwxwidgetsd.so.0 -%%WXGTK%%lib/libplplotwxwidgetsd.so.0.0.0 +%%FORTRAN%%lib/libplf95demolib.a +lib/libplplot.so +lib/libplplot.so.13 +lib/libplplot.so.13.0.1 +lib/libplplotcxx.so +lib/libplplotcxx.so.12 +lib/libplplotcxx.so.12.0.0 +%%FORTRAN%%lib/libplplotf95.so +%%FORTRAN%%lib/libplplotf95.so.12 +%%FORTRAN%%lib/libplplotf95.so.12.0.0 +%%FORTRAN%%lib/libplplotf95c.so +%%FORTRAN%%lib/libplplotf95c.so.12 +%%FORTRAN%%lib/libplplotf95c.so.12.0.0 +%%QT4%%lib/libplplotqt.so +%%QT4%%lib/libplplotqt.so.2 +%%QT4%%lib/libplplotqt.so.2.0.0 +%%TCLTK%%lib/libplplottcltk.so +%%TCLTK%%lib/libplplottcltk.so.12 +%%TCLTK%%lib/libplplottcltk.so.12.1.0 +%%TCLTK%%lib/libplplottcltk_Main.so +%%TCLTK%%lib/libplplottcltk_Main.so.1 +%%TCLTK%%lib/libplplottcltk_Main.so.1.0.0 +%%WXGTK%%lib/libplplotwxwidgets.so +%%WXGTK%%lib/libplplotwxwidgets.so.1 +%%WXGTK%%lib/libplplotwxwidgets.so.1.0.0 lib/libqsastime.so lib/libqsastime.so.0 lib/libqsastime.so.0.0.1 -%%TCLTK%%lib/libtclmatrixd.so -%%TCLTK%%lib/libtclmatrixd.so.9 -%%TCLTK%%lib/libtclmatrixd.so.9.2.0 +%%TCLTK%%lib/libtclmatrix.so +%%TCLTK%%lib/libtclmatrix.so.10 +%%TCLTK%%lib/libtclmatrix.so.10.2.0 %%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so -lib/plplot/driversd/cairo.driver_info -lib/plplot/driversd/cairo.so -%%GD%%lib/plplot/driversd/gd.driver_info -%%GD%%lib/plplot/driversd/gd.so -lib/plplot/driversd/mem.driver_info -lib/plplot/driversd/mem.so -lib/plplot/driversd/null.driver_info -lib/plplot/driversd/null.so -lib/plplot/driversd/ps.driver_info -lib/plplot/driversd/ps.so -lib/plplot/driversd/psttf.driver_info -lib/plplot/driversd/psttf.so -%%QT4%%lib/plplot/driversd/qt.driver_info -%%QT4%%lib/plplot/driversd/qt.so -lib/plplot/driversd/svg.driver_info -lib/plplot/driversd/svg.so -%%TCLTK%%lib/plplot/driversd/tk.driver_info -%%TCLTK%%lib/plplot/driversd/tk.so -%%TCLTK%%lib/plplot/driversd/tkwin.driver_info -%%TCLTK%%lib/plplot/driversd/tkwin.so -%%WXGTK%%lib/plplot/driversd/wxwidgets.driver_info -%%WXGTK%%lib/plplot/driversd/wxwidgets.so -lib/plplot/driversd/xfig.driver_info -lib/plplot/driversd/xfig.so -%%X11%%lib/plplot/driversd/xwin.driver_info -%%X11%%lib/plplot/driversd/xwin.so +lib/plplot/drivers/cairo.driver_info +lib/plplot/drivers/cairo.so +%%GD%%lib/plplot/drivers/gd.driver_info +%%GD%%lib/plplot/drivers/gd.so +lib/plplot/drivers/mem.driver_info +lib/plplot/drivers/mem.so +%%TCLTK%%lib/plplot/drivers/ntk.driver_info +%%TCLTK%%lib/plplot/drivers/ntk.so +lib/plplot/drivers/null.driver_info +lib/plplot/drivers/null.so +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 +%%TCLTK%%lib/plplot/drivers/tk.so +%%TCLTK%%lib/plplot/drivers/tkwin.driver_info +%%TCLTK%%lib/plplot/drivers/tkwin.so +%%WXGTK%%lib/plplot/drivers/wxwidgets.driver_info +%%WXGTK%%lib/plplot/drivers/wxwidgets.so +lib/plplot/drivers/xfig.driver_info +lib/plplot/drivers/xfig.so +%%X11%%lib/plplot/drivers/xwin.driver_info +%%X11%%lib/plplot/drivers/xwin.so %%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py %%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot_widgetmodule.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py -libdata/pkgconfig/plplotd-c++.pc -%%FORTRAN%%libdata/pkgconfig/plplotd-f77.pc -%%FORTRAN%%libdata/pkgconfig/plplotd-f95.pc -%%QT4%%libdata/pkgconfig/plplotd-qt.pc -%%TCLTK%%libdata/pkgconfig/plplotd-tcl.pc -%%WXGTK%%libdata/pkgconfig/plplotd-wxwidgets.pc -libdata/pkgconfig/plplotd.pc +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 +libdata/pkgconfig/plplot.pc %%TCLTK%%man/man1/plserver.1.gz %%TCLTK%%man/man1/pltcl.1.gz man/man1/pltek.1.gz @@ -192,6 +197,7 @@ man/man1/pltek.1.gz %%DATADIR%%/examples/c/ext-cairo-test.c %%X11%%%%DATADIR%%/examples/c/extXdrawable_demo.c %%DATADIR%%/examples/c/plcdemos.h +%%DATADIR%%/examples/c/test_plbuf.c %%DATADIR%%/examples/c/test_plend.c %%DATADIR%%/examples/c/tutor.c %%DATADIR%%/examples/c/x00c.c @@ -229,48 +235,11 @@ man/man1/pltek.1.gz %%DATADIR%%/examples/c/x32c.c %%DATADIR%%/examples/c/x33c.c %%DATADIR%%/examples/c/x34c.c -%%DATADIR%%/examples/cmake/modules/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake -%%DATADIR%%/examples/cmake/modules/export_plplot.cmake %%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 -%%FORTRAN%%%%DATADIR%%/examples/f77/CMakeLists.txt -%%FORTRAN%%%%DATADIR%%/examples/f77/Makefile -%%FORTRAN%%%%DATADIR%%/examples/f77/plf77demos.inc -%%FORTRAN%%%%DATADIR%%/examples/f77/x01f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x02f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x03f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x04f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x05f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x06f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x07f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x08f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x09f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x10f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x11f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x12f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x13f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x14f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x15f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x16af.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x16f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x17f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x18f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x19f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x20f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x21f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x22f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x23f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x24f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x25f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x26f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x27f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x28f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x29f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x30f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x31f.f -%%FORTRAN%%%%DATADIR%%/examples/f77/x33f.f %%FORTRAN%%%%DATADIR%%/examples/f95/CMakeLists.txt %%FORTRAN%%%%DATADIR%%/examples/f95/Makefile %%FORTRAN%%%%DATADIR%%/examples/f95/plf95demos.inc @@ -459,11 +428,12 @@ man/man1/pltek.1.gz %%TCLTK%%%%DATADIR%%/examples/tcl/plgrid.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/plot.dat %%TCLTK%%%%DATADIR%%/examples/tcl/plot.tcl +%%TCLTK%%%%DATADIR%%/examples/tcl/pltcl_standard_examples.in %%TCLTK%%%%DATADIR%%/examples/tcl/r.dat -%%TCLTK%%%%DATADIR%%/examples/tcl/standard_examples.in %%TCLTK%%%%DATADIR%%/examples/tcl/stats.log %%TCLTK%%%%DATADIR%%/examples/tcl/tclIndex %%TCLTK%%%%DATADIR%%/examples/tcl/tcldemos.tcl +%%TCLTK%%%%DATADIR%%/examples/tcl/tclsh_standard_examples.in %%TCLTK%%%%DATADIR%%/examples/tcl/x00 %%TCLTK%%%%DATADIR%%/examples/tcl/x00.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x01 @@ -534,7 +504,6 @@ man/man1/pltek.1.gz %%DATADIR%%/examples/test_c_interactive.sh %%DATADIR%%/examples/test_cxx.sh %%DATADIR%%/examples/test_diff.sh -%%FORTRAN%%%%DATADIR%%/examples/test_f77.sh %%FORTRAN%%%%DATADIR%%/examples/test_f95.sh %%LUA%%%%DATADIR%%/examples/test_lua.sh %%PYTHON%%%%DATADIR%%/examples/test_python.sh @@ -545,10 +514,12 @@ man/man1/pltek.1.gz %%TCLTK%%%%DATADIR%%/examples/tk/plgrid %%TCLTK%%%%DATADIR%%/examples/tk/plgrid.in %%TCLTK%%%%DATADIR%%/examples/tk/plgrid.tcl +%%TCLTK%%%%DATADIR%%/examples/tk/plserver_runAllDemos +%%TCLTK%%%%DATADIR%%/examples/tk/plserver_runAllDemos.in +%%TCLTK%%%%DATADIR%%/examples/tk/plserver_standard_examples +%%TCLTK%%%%DATADIR%%/examples/tk/plserver_standard_examples.in %%TCLTK%%%%DATADIR%%/examples/tk/runAllDemos.tcl %%TCLTK%%%%DATADIR%%/examples/tk/runExtendedDemos.tcl -%%TCLTK%%%%DATADIR%%/examples/tk/standard_examples -%%TCLTK%%%%DATADIR%%/examples/tk/standard_examples.in %%TCLTK%%%%DATADIR%%/examples/tk/tclIndex %%TCLTK%%%%DATADIR%%/examples/tk/tk01 %%TCLTK%%%%DATADIR%%/examples/tk/tk01.in @@ -559,6 +530,10 @@ man/man1/pltek.1.gz %%TCLTK%%%%DATADIR%%/examples/tk/tk04 %%TCLTK%%%%DATADIR%%/examples/tk/tk04.in %%TCLTK%%%%DATADIR%%/examples/tk/tkdemos.tcl +%%TCLTK%%%%DATADIR%%/examples/tk/wish_runAllDemos +%%TCLTK%%%%DATADIR%%/examples/tk/wish_runAllDemos.in +%%TCLTK%%%%DATADIR%%/examples/tk/wish_standard_examples +%%TCLTK%%%%DATADIR%%/examples/tk/wish_standard_examples.in %%TCLTK%%%%DATADIR%%/examples/tk/x00.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x01.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x02.tcl Modified: head/science/gnudatalanguage/Makefile ============================================================================== --- head/science/gnudatalanguage/Makefile Wed Apr 22 20:14:51 2015 (r384519) +++ head/science/gnudatalanguage/Makefile Wed Apr 22 20:16:04 2015 (r384520) @@ -3,7 +3,7 @@ PORTNAME= gnudatalanguage DISTVERSION= 0.9.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${DISTVERSION} .if defined(BUILD_PYTHON_MODULE) @@ -16,7 +16,7 @@ COMMENT?= GDL, a free IDL compatible inc LICENSE= GPLv2 -LIB_DEPENDS+= libplplotd.so:${PORTSDIR}/math/plplot \ +LIB_DEPENDS+= libplplot.so:${PORTSDIR}/math/plplot \ libpng.so:${PORTSDIR}/graphics/png \ libps.so:${PORTSDIR}/print/pslib \ libgsl.so:${PORTSDIR}/math/gsl Modified: head/science/gnudatalanguage/files/patch-CMakeLists.txt ============================================================================== --- head/science/gnudatalanguage/files/patch-CMakeLists.txt Wed Apr 22 20:14:51 2015 (r384519) +++ head/science/gnudatalanguage/files/patch-CMakeLists.txt Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-10-09 22:46:06.000000000 +0200 -+++ CMakeLists.txt 2014-10-09 22:46:06.000000000 +0200 -@@ -871,7 +871,7 @@ +--- CMakeLists.txt.orig 2015-04-22 19:37:22 UTC ++++ CMakeLists.txt +@@ -871,7 +871,7 @@ if(NOT PYTHON_MODULE) endif(NOT PYTHON_MODULE) install(FILES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/README DESTINATION ${CMAKE_INSTALL_PREFIX}/${GDL_DATA_DIR}) Added: head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake Wed Apr 22 20:16:04 2015 (r384520) @@ -0,0 +1,13 @@ +--- CMakeModules/FindPlplot.cmake.orig 2015-04-22 19:37:22 UTC ++++ CMakeModules/FindPlplot.cmake +@@ -9,8 +9,8 @@ + # + + +-find_library(PLPLOT_LIBRARY NAMES plplotd) +-find_library(PLPLOTCXX_LIBRARY NAMES plplotcxxd) ++find_library(PLPLOT_LIBRARY NAMES plplot) ++find_library(PLPLOTCXX_LIBRARY NAMES plplotcxx) + set(PLPLOT_LIBRARIES ${PLPLOT_LIBRARY} ${PLPLOTCXX_LIBRARY}) + find_path(PLPLOT_INCLUDE_DIR NAMES plplot/plplot.h) + include(FindPackageHandleStandardArgs) Modified: head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake ============================================================================== --- head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake Wed Apr 22 20:14:51 2015 (r384519) +++ head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake Wed Apr 22 20:16:04 2015 (r384520) @@ -1,5 +1,5 @@ ---- ./CMakeModules/Findlibps.cmake.orig 2013-01-03 00:26:23.000000000 +0100 -+++ ./CMakeModules/Findlibps.cmake 2013-09-30 13:27:07.000000000 +0200 +--- CMakeModules/Findlibps.cmake.orig 2015-04-22 19:37:22 UTC ++++ CMakeModules/Findlibps.cmake @@ -1,4 +1,4 @@ -find_path(LIBPSPKG libps.pc PATH_SUFFIXES lib lib/pkgconfig lib64/pkgconfig) +find_path(LIBPSPKG libps.pc PATH_SUFFIXES lib libdata/pkgconfig lib/pkgconfig lib64/pkgconfig) Modified: head/science/gnudatalanguage/files/patch-src__base64.hpp ============================================================================== --- head/science/gnudatalanguage/files/patch-src__base64.hpp Wed Apr 22 20:14:51 2015 (r384519) +++ head/science/gnudatalanguage/files/patch-src__base64.hpp Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- src/base64.hpp.orig 2014-10-10 23:11:19.000000000 +0200 -+++ src/base64.hpp 2014-10-10 23:17:21.000000000 +0200 -@@ -147,7 +147,7 @@ +--- src/base64.hpp.orig 2015-04-22 19:37:22 UTC ++++ src/base64.hpp +@@ -147,7 +147,7 @@ namespace base64 { Warning("base64 decode error: unexpected fill char -- offset read?"); return false; } @@ -9,7 +9,7 @@ //cerr << "base 64 decode error: illegal character '" << data[i-1] << "' (0x" << std::hex << (int)data[i-1] << std::dec << ")" << endl; Warning("base 64 decode error: illegal character"); return false; -@@ -165,7 +165,7 @@ +@@ -165,7 +165,7 @@ namespace base64 { Warning("base64 decode error: unexpected fill char -- offset read?"); return false; } @@ -18,7 +18,7 @@ //cerr << "base 64 decode error: illegal character '" << data[i-1] << '\'' << endl; Warning("base 64 decode error: illegal character"); return false; -@@ -190,7 +190,7 @@ +@@ -190,7 +190,7 @@ namespace base64 { if(fillchar == data[i-1]) { return true; } @@ -27,7 +27,7 @@ //cerr << "base 64 decode error: illegal character '" << data[i-1] << '\'' << endl; Warning("base 64 decode error: illegal character"); return false; -@@ -215,7 +215,7 @@ +@@ -215,7 +215,7 @@ namespace base64 { if(fillchar == data[i-1]) { return true; } Modified: head/science/gnudatalanguage/files/patch-src__basic_fun.cpp ============================================================================== --- head/science/gnudatalanguage/files/patch-src__basic_fun.cpp Wed Apr 22 20:14:51 2015 (r384519) +++ head/science/gnudatalanguage/files/patch-src__basic_fun.cpp Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- src/basic_fun.cpp.orig 2014-10-10 23:18:05.000000000 +0200 -+++ src/basic_fun.cpp 2014-10-10 23:21:54.000000000 +0200 -@@ -6483,7 +6483,7 @@ +--- src/basic_fun.cpp.orig 2015-04-22 19:37:22 UTC ++++ src/basic_fun.cpp +@@ -6483,7 +6483,7 @@ BaseGDL* strtok_fun(EnvT* e) { while (p < e) { // scheme = 1*[ lowalpha | digit | "+" | "-" | "." ] @@ -9,7 +9,7 @@ { if (e + 1 < ue) goto parse_port; else goto just_path; -@@ -6501,7 +6501,7 @@ +@@ -6501,7 +6501,7 @@ BaseGDL* strtok_fun(EnvT* e) { { // check if the data we get is a port this allows us to correctly parse things like a.com:80 p = e + 1; Modified: head/science/gnudatalanguage/files/patch-src__gshhs.cpp ============================================================================== --- head/science/gnudatalanguage/files/patch-src__gshhs.cpp Wed Apr 22 20:14:51 2015 (r384519) +++ head/science/gnudatalanguage/files/patch-src__gshhs.cpp Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- src/gshhs.cpp.orig 2014-10-11 19:11:00.000000000 +0200 -+++ src/gshhs.cpp 2014-10-11 19:37:17.000000000 +0200 -@@ -175,7 +175,7 @@ +--- src/gshhs.cpp.orig 2015-04-22 19:37:22 UTC ++++ src/gshhs.cpp +@@ -175,7 +175,7 @@ private: double ss = h.south * GSHHS_SCL; double nn = h.north * GSHHS_SCL; char source = (src == 1) ? 'W' : 'C'; // Either WVS or CIA (WDBII) pedigree Modified: head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp ============================================================================== --- head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp Wed Apr 22 20:14:51 2015 (r384519) +++ head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- src/gsl_fun.cpp.orig 2014-10-09 22:55:52.000000000 +0200 -+++ src/gsl_fun.cpp 2014-10-09 22:55:52.000000000 +0200 -@@ -3183,7 +3183,7 @@ +--- src/gsl_fun.cpp.orig 2015-04-22 19:37:22 UTC ++++ src/gsl_fun.cpp +@@ -3183,7 +3183,7 @@ namespace lib { e->AssureScalarPar<DStringGDL>(0, tmpname); name.reserve(tmpname.length()); for (string::iterator it = tmpname.begin(); it < tmpname.end(); it++) Modified: head/science/gnudatalanguage/files/patch-src__str.cpp ============================================================================== --- head/science/gnudatalanguage/files/patch-src__str.cpp Wed Apr 22 20:14:51 2015 (r384519) +++ head/science/gnudatalanguage/files/patch-src__str.cpp Wed Apr 22 20:16:04 2015 (r384520) @@ -1,6 +1,6 @@ ---- ./src/str.cpp.orig 2014-04-08 16:53:53.954118000 +0200 -+++ ./src/str.cpp 2014-04-08 16:58:59.524163473 +0200 -@@ -180,7 +180,7 @@ +--- src/str.cpp.orig 2015-04-22 19:37:22 UTC ++++ src/str.cpp +@@ -178,7 +178,7 @@ string StrUpCase(const string& s) ArrayGuard<char> guard( r); r[len]=0; for(unsigned i=0;i<len;i++) @@ -9,7 +9,7 @@ return string(r); } void StrUpCaseInplace( string& s) -@@ -191,7 +191,7 @@ +@@ -189,7 +189,7 @@ void StrUpCaseInplace( string& s) // ArrayGuard<char> guard( r); // r[len]=0; for(unsigned i=0;i<len;i++) @@ -18,7 +18,7 @@ // return string(r); } -@@ -203,7 +203,7 @@ +@@ -201,7 +201,7 @@ string StrLowCase(const string& s) ArrayGuard<char> guard( r); r[len]=0; for(unsigned i=0;i<len;i++) @@ -27,7 +27,7 @@ return string(r); } void StrLowCaseInplace(string& s) -@@ -211,7 +211,7 @@ +@@ -209,7 +209,7 @@ void StrLowCaseInplace(string& s) unsigned len=s.length(); // char const *sCStr=s.c_str(); for(unsigned i=0;i<len;i++) Added: head/science/gnudatalanguage/files/patch-src_plotting__contour.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/gnudatalanguage/files/patch-src_plotting__contour.cpp Wed Apr 22 20:16:04 2015 (r384520) @@ -0,0 +1,75 @@ +--- src/plotting_contour.cpp.orig 2015-04-22 19:37:22 UTC ++++ src/plotting_contour.cpp +@@ -789,8 +789,8 @@ namespace lib + 1, value, + static_cast<PLFLT>(( *thick )[i%thick->N_Elements()]), + 0,0,0,0, +- (plstream::fill), (oneDim), +- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); ++ (plcallback::fill), (oneDim), ++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); + } + actStream->psty(0); + // if (docolors) gdlSetGraphicsForegroundColorFromKw( e, actStream ); +@@ -808,8 +808,8 @@ namespace lib + clevel[i], maxmax, + 1,value, + 0,0,0,0,0, +- plstream::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc +- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); ++ plcallback::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc ++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); + } + } else { //every other case of fill + // note that plshades is not protected against 1 level (color formula is +@@ -818,8 +818,8 @@ namespace lib + if (nlevel>2 && !(docolors)) { //acceleration with shades when no c_colors are given. use continuous table1, decomposed or not. + //acceleration is most sensible when a (x,y) transform (rotate, stretch) is in place since plplot does not recompute the map. + actStream->shades( map, xEl, yEl, isLog?doIt:NULL, xStart, xEnd, yStart, yEnd, +- clevel, nlevel, 1, 0, 0, plstream::fill, (oneDim), +- (oneDim)?(plstream::tr1):(plstream::tr2), ++ clevel, nlevel, 1, 0, 0, plcallback::fill, (oneDim), ++ (oneDim)?(plcallback::tr1):(plcallback::tr2), + (oneDim)?(void *)&cgrid1:(void *)&cgrid2); + } + else { //fill with colors defined with c_colors or n<=2 +@@ -832,8 +832,8 @@ namespace lib + clevel[i], maxmax, + 1,value, + 0,0,0,0,0, +- plstream::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc +- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); ++ plcallback::fill, (oneDim), //Onedim is accelerator since rectangles are kept rectangles see plplot doc ++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); + } else + printf(" Problem, sorry! plplot doesn't like to FILL with a single level!"); + } +@@ -854,7 +854,7 @@ namespace lib + if (doT3d) { //no label in T3D , bug in plplot... + actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING, 0 ); + actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1, +- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); ++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); + } else { + if (dolabels && i<labels->N_Elements()) + { +@@ -862,16 +862,16 @@ namespace lib + //else (lables thicker than contours) impossible with plplot... + actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING, 0 ); + actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1, +- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); //thick contours, no label ++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); //thick contours, no label + actStream->Thick(label_thick); + } + actStream->setcontlabelparam ( LABELOFFSET, (PLFLT) label_size, LABELSPACING*sqrt(label_size),(PLINT)(*labels)[i] ); + actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1, +- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); ++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); + if (!dothick) gdlSetPenThickness(e, actStream); + } else { + actStream->cont ( map, xEl, yEl, 1, xEl, 1, yEl, &( clevel[i] ), 1, +- (oneDim)?(plstream::tr1):(plstream::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); ++ (oneDim)?(plcallback::tr1):(plcallback::tr2), (oneDim)?(void *)&cgrid1:(void *)&cgrid2); + } + } + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504222016.t3MKG4Lx094065>