Index: head/math/plplot/Makefile =================================================================== --- head/math/plplot/Makefile (revision 384519) +++ head/math/plplot/Makefile (revision 384520) @@ -1,142 +1,109 @@ # Created by: Thomas Gellekum # $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) BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ ${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf LIB_DEPENDS= libLASi.so:${PORTSDIR}/devel/lasi \ libltdl.so:${PORTSDIR}/devel/libltdl \ libqhull.so:${PORTSDIR}/math/qhull5 \ libfreetype.so:${PORTSDIR}/print/freetype2 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 CFLAGS+= -D_IS_BUILDING_PLPLOT_PORT_ USE_LDCONFIG= yes FREEFONT_DIR= ${LOCALBASE}/share/fonts/freefont-ttf -.include +OPTIONS_DEFINE= FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 DOCS +OPTIONS_DEFAULT=THREADS X11 +OPTIONS_SUB= yes -.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 +FORTRAN_USES= fortran +FORTRAN_CONFIGURE_ENV= CMAKE_Fortran_COMPILER="${FC}" +FORTRAN_CMAKE_ON= -DENABLE_f95:BOOL=ON +FORTRAN_CMAKE_OFF= -DENABLE_f95:BOOL=OFF -.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 +GD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd +GD_CMAKE_ON= -DPLD_png:BOOL=ON -.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 +LUA_USES= lua:51 +LUA_CMAKE_ON= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" +LUA_CMAKE_OFF= -DENABLE_lua:BOOL=OFF -.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 +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 -.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 +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 -.if empty(PORT_OPTIONS:MTHREADS) -CMAKE_ARGS+= -DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF -.endif +THREADS_CMAKE_OFF= -DTHREADS_HAVE_PTHREAD_ARG: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 +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 -.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 +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: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 " +X11_USE= XORG=ice,sm,x11,xext +X11_CMAKE_OFF= -DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF + +.include + +.if ${PORT_OPTIONS:MTCLTK} && empty(PORT_OPTIONS:MX11) +IGNORE= option TCLTK needs X11 support .endif pre-configure: ${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' + ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' .include Index: head/math/plplot/distinfo =================================================================== --- head/math/plplot/distinfo (revision 384519) +++ head/math/plplot/distinfo (revision 384520) @@ -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 Index: head/math/plplot/files/patch-examples__tk__xtk01.c =================================================================== --- head/math/plplot/files/patch-examples__tk__xtk01.c (revision 384519) +++ head/math/plplot/files/patch-examples__tk__xtk01.c (nonexistent) @@ -1,11 +0,0 @@ ---- examples/tk/xtk01.c.orig -+++ examples/tk/xtk01.c -@@ -53,7 +53,7 @@ - // - // Results: - // Returns a standard Tcl completion code, and leaves an error --// message in interp->result if an error occurs. -+// message in Tcl_GetStringResult(interp) if an error occurs. - // - // Side effects: - // Depends on the startup script. Property changes on: head/math/plplot/files/patch-examples__tk__xtk01.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/plplot/files/patch-examples__tk__xtk02.c =================================================================== --- head/math/plplot/files/patch-examples__tk__xtk02.c (revision 384519) +++ head/math/plplot/files/patch-examples__tk__xtk02.c (nonexistent) @@ -1,11 +0,0 @@ ---- examples/tk/xtk02.c.orig 2011-11-30 23:04:42.000000000 +0100 -+++ examples/tk/xtk02.c 2013-10-01 23:06:58.000000000 +0200 -@@ -85,7 +85,7 @@ - // - // Results: - // Returns a standard Tcl completion code, and leaves an error --// message in interp->result if an error occurs. -+// message in Tcl_GetStringResult(interp) if an error occurs. - // - // Side effects: - // Depends on the startup script. Property changes on: head/math/plplot/files/patch-examples__tk__xtk02.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c =================================================================== --- head/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c (revision 384519) +++ head/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c (nonexistent) @@ -1,11 +0,0 @@ ---- bindings/tk-x-plat/plplotter.c.orig 2012-08-14 00:14:23.000000000 +0200 -+++ bindings/tk-x-plat/plplotter.c 2013-10-01 22:42:16.000000000 +0200 -@@ -2024,7 +2024,7 @@ - // - // Results: - // The return value is a standard Tcl result. If TCL_ERROR is --// returned, then interp->result contains an error message. -+// returned, then Tcl_GetStringResult(interp) contains an error message. - // - // Side effects: - // Configuration information, such as text string, colors, font, etc. Property changes on: head/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/plplot/files/patch-examples__tk__xtk04.c =================================================================== --- head/math/plplot/files/patch-examples__tk__xtk04.c (revision 384519) +++ head/math/plplot/files/patch-examples__tk__xtk04.c (nonexistent) @@ -1,11 +0,0 @@ ---- examples/tk/xtk04.c.orig 2011-11-30 23:04:42.000000000 +0100 -+++ examples/tk/xtk04.c 2013-10-01 23:08:24.000000000 +0200 -@@ -87,7 +87,7 @@ - // - // Results: - // Returns a standard Tcl completion code, and leaves an error --// message in interp->result if an error occurs. -+// message in Tcl_GetStringResult(interp) if an error occurs. - // - // Side effects: - // Depends on the startup script. Property changes on: head/math/plplot/files/patch-examples__tk__xtk04.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/plplot/files/patch-plplot_test__CMakeLists.txt =================================================================== --- head/math/plplot/files/patch-plplot_test__CMakeLists.txt (revision 384519) +++ head/math/plplot/files/patch-plplot_test__CMakeLists.txt (nonexistent) @@ -1,17 +0,0 @@ ---- plplot_test/CMakeLists.txt.orig 2013-07-09 21:27:35.000000000 +0200 -+++ plplot_test/CMakeLists.txt 2013-10-01 23:12:09.000000000 +0200 -@@ -452,14 +452,6 @@ - list(APPEND test_output_files_LIST ${output_list}) - endif(PLD_pdfqt) - -- if(PLD_pdf) -- add_test(examples_pdf -- ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf" -- ) -- list_example_files(. pdf c output_list) -- list(APPEND test_output_files_LIST ${output_list}) -- endif(PLD_pdf) -- - if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE) - configure_file( - test_diff.sh.in Property changes on: head/math/plplot/files/patch-plplot_test__CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/plplot/files/patch-bindings__tk__plframe.c =================================================================== --- head/math/plplot/files/patch-bindings__tk__plframe.c (revision 384519) +++ head/math/plplot/files/patch-bindings__tk__plframe.c (nonexistent) @@ -1,11 +0,0 @@ ---- bindings/tk/plframe.c.orig 2012-08-14 00:14:23.000000000 +0200 -+++ bindings/tk/plframe.c 2013-10-01 22:47:19.000000000 +0200 -@@ -2218,7 +2218,7 @@ - // - // Results: - // The return value is a standard Tcl result. If TCL_ERROR is --// returned, then interp->result contains an error message. -+// returned, then Tcl_GetStringResult(interp) contains an error message. - // - // Side effects: - // Configuration information, such as text string, colors, font, etc. Property changes on: head/math/plplot/files/patch-bindings__tk__plframe.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/plplot/files/patch-include_plConfig.h =================================================================== --- head/math/plplot/files/patch-include_plConfig.h (revision 384519) +++ head/math/plplot/files/patch-include_plConfig.h (nonexistent) @@ -1,12 +0,0 @@ ---- include/plConfig.h.in.orig 2013-12-29 21:11:07.000000000 +0100 -+++ include/plConfig.h.in 2014-03-06 15:35:44.000000000 +0100 -@@ -44,7 +44,8 @@ - #ifndef __PLCONFIG_H__ - #define __PLCONFIG_H__ - --#ifdef HAVE_CONFIG_H -+// plplot_config.h won't be installed: don't let it be used by consumers -+#if defined(HAVE_CONFIG_H) && defined(_IS_BUILDING_PLPLOT_PORT_) - # include - #endif - Property changes on: head/math/plplot/files/patch-include_plConfig.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/plplot/files/patch-bindings__tk__plserver.c =================================================================== --- head/math/plplot/files/patch-bindings__tk__plserver.c (revision 384519) +++ head/math/plplot/files/patch-bindings__tk__plserver.c (nonexistent) @@ -1,11 +0,0 @@ ---- bindings/tk/plserver.c.orig 2013-04-26 12:02:06.000000000 +0200 -+++ bindings/tk/plserver.c 2013-10-01 22:49:59.000000000 +0200 -@@ -158,7 +158,7 @@ - // - // Results: - // Returns a standard Tcl completion code, and leaves an error --// message in interp->result if an error occurs. -+// message in Tcl_GetStringResult(interp) if an error occurs. - // - // Side effects: - // Depends on the startup script. Property changes on: head/math/plplot/files/patch-bindings__tk__plserver.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/plplot/files/patch-util__plrender.c =================================================================== --- head/math/plplot/files/patch-util__plrender.c (revision 384519) +++ head/math/plplot/files/patch-util__plrender.c (nonexistent) @@ -1,20 +0,0 @@ ---- utils/plrender.c.orig -+++ utils/plrender.c -@@ -834,7 +834,7 @@ - if ( code ) { fprintf( stderr, \ - "Unable to read in %s at line %d, bytecount %d\n\ - Bytes requested: %d\n", __FILE__, __LINE__, \ -- (int) pdfs->bp, (int) 2 * n ); return -1; } -+ (int) pdfs->bp, (int) 2 * n ); return; } - - static void - get_ncoords( PLFLT *x, PLFLT *y, PLINT n ) -@@ -869,7 +869,7 @@ - free( ys ); - } - -- return 0; -+ return; - } - - //-------------------------------------------------------------------------- Property changes on: head/math/plplot/files/patch-util__plrender.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/plplot/files/patch-bindings__tk__tkMain.c =================================================================== --- head/math/plplot/files/patch-bindings__tk__tkMain.c (revision 384519) +++ head/math/plplot/files/patch-bindings__tk__tkMain.c (revision 384520) @@ -1,13 +1,13 @@ ---- 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 -#ifndef Tcl_GetGlobalNamespace_TCL_DECLARE -EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( ( - Tcl_Interp * interp ) ); -#endif // // Declarations for various library procedures and variables (don't want Index: head/math/plplot/files/patch-cmake_modules_FindVGA.cmake =================================================================== --- head/math/plplot/files/patch-cmake_modules_FindVGA.cmake (revision 384519) +++ head/math/plplot/files/patch-cmake_modules_FindVGA.cmake (revision 384520) @@ -1,15 +1,15 @@ ---- 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. -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") 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) -endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") Index: head/math/plplot/files/patch-cmake_modules_csiro.cmake =================================================================== --- head/math/plplot/files/patch-cmake_modules_csiro.cmake (revision 384519) +++ head/math/plplot/files/patch-cmake_modules_csiro.cmake (revision 384520) @@ -1,13 +1,13 @@ ---- 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") + else(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*") + if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64") + set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp") + endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64") endif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*") endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86") if(NOT DEFINED NaNAwareCCompiler) Index: head/math/plplot/files/patch-cmake_modules_instdirs.cmake =================================================================== --- head/math/plplot/files/patch-cmake_modules_instdirs.cmake (revision 384519) +++ head/math/plplot/files/patch-cmake_modules_instdirs.cmake (revision 384520) @@ -1,45 +1,45 @@ ---- 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 set( CMAKE_INSTALL_INFODIR -${CMAKE_INSTALL_DATADIR}/info +${CMAKE_INSTALL_PREFIX}/info CACHE PATH "install location for info documentation" ) set( CMAKE_INSTALL_MANDIR -${CMAKE_INSTALL_DATADIR}/man +${CMAKE_INSTALL_PREFIX}/man CACHE PATH "install location for man documentation" ) @@ -75,7 +75,7 @@ CACHE PATH "install location for man doc # cached values above. # Data. -set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION}) +set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}) # Libraries. set(LIB_DIR ${CMAKE_INSTALL_LIBDIR}) @@ -90,7 +90,7 @@ set(BIN_DIR ${CMAKE_INSTALL_BINDIR}) set(SHLIB_DIR ${CMAKE_INSTALL_LIBDIR}) # Tcl files. -set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION}/tcl) +set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}/tcl) # 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}) Index: head/math/plplot/files/patch-cmake_modules_linuxvga.cmake =================================================================== --- head/math/plplot/files/patch-cmake_modules_linuxvga.cmake (revision 384519) +++ head/math/plplot/files/patch-cmake_modules_linuxvga.cmake (revision 384520) @@ -1,17 +1,17 @@ ---- ./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. -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") 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) -else(CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE) -endif(CMAKE_SYSTEM_NAME STREQUAL "Linux") Index: head/math/plplot/files/patch-cmake_modules_pkg-config.cmake =================================================================== --- head/math/plplot/files/patch-cmake_modules_pkg-config.cmake (revision 384519) +++ head/math/plplot/files/patch-cmake_modules_pkg-config.cmake (revision 384520) @@ -1,63 +1,11 @@ -Includes the following upstream commit to make the port work with CMake 3.1.0: - -commit 772223c638ecf5dc740c9f3dd7a6883c6d2c83d2 -Author: Alan W. Irwin -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 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 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) message(STATUS "Looking for pkg-config - found") - set(PKG_CONFIG_DIR "${LIB_DIR}/pkgconfig") + set(PKG_CONFIG_DIR "${LIB_DIR}data/pkgconfig") 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 Index: head/math/plplot/files/patch-doc__docbook__src__tcl.xml =================================================================== --- head/math/plplot/files/patch-doc__docbook__src__tcl.xml (revision 384519) +++ head/math/plplot/files/patch-doc__docbook__src__tcl.xml (revision 384520) @@ -1,20 +1,20 @@ ---- 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]; - sprintf( interp->result, "%f", max ); + sprintf( Tcl_GetStringResult(interp), "%f", max ); 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]; - sprintf( interp->result, "%f", min ); + sprintf( Tcl_GetStringResult(interp), "%f", min ); return TCL_OK; } Index: head/math/plplot/files/patch-examples__python__CMakeLists.txt =================================================================== --- head/math/plplot/files/patch-examples__python__CMakeLists.txt (revision 384519) +++ head/math/plplot/files/patch-examples__python__CMakeLists.txt (revision 384520) @@ -1,11 +1,11 @@ ---- 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 ) - set(python_location1 ${PYTHON_INSTDIR}) + set(python_location1) set(python_location2) set(python_location3) set(python_location4) Index: head/math/plplot/files/patch-include_plConfig.h.in =================================================================== --- head/math/plplot/files/patch-include_plConfig.h.in (nonexistent) +++ head/math/plplot/files/patch-include_plConfig.h.in (revision 384520) @@ -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 + #endif + Property changes on: head/math/plplot/files/patch-include_plConfig.h.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/plplot/files/patch-scripts__CMakeLists.txt =================================================================== --- head/math/plplot/files/patch-scripts__CMakeLists.txt (revision 384519) +++ head/math/plplot/files/patch-scripts__CMakeLists.txt (revision 384520) @@ -1,11 +1,11 @@ ---- 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) - set(scripts_SCRIPTS ${scripts_SCRIPTS} pstex2eps) + set(scripts_SCRIPTS "${scripts_SCRIPTS}" pstex2eps) endif(PLD_pstex) if (NOT "${scripts_SCRIPTS}" STREQUAL "") install(PROGRAMS ${scripts_SCRIPTS} DESTINATION ${BIN_DIR}) Index: head/math/plplot/pkg-plist =================================================================== --- head/math/plplot/pkg-plist (revision 384519) +++ head/math/plplot/pkg-plist (revision 384520) @@ -1,626 +1,601 @@ %%TCLTK%%bin/plserver %%TCLTK%%bin/pltcl bin/pltek +%%WXGTK%%bin/wxPLViewer include/plplot/disptab.h include/plplot/drivers.h include/plplot/gcw.h include/plplot/pdf.h include/plplot/plConfig.h include/plplot/plDevs.h include/plplot/pldebug.h include/plplot/pldll.h include/plplot/plevent.h include/plplot/plplot.h include/plplot/plplotP.h include/plplot/plplotcanvas.h include/plplot/plstream.h include/plplot/plstrm.h %%TCLTK%%include/plplot/pltcl.h %%TCLTK%%include/plplot/pltk.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/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 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 %%PORTDOCS%%%%DOCSDIR%%/ABOUT %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.release %%PORTDOCS%%%%DOCSDIR%%/Copyright %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/PROBLEMS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.1st.csa %%PORTDOCS%%%%DOCSDIR%%/README.1st.nn %%PORTDOCS%%%%DOCSDIR%%/README.csa %%PORTDOCS%%%%DOCSDIR%%/README.drivers %%PORTDOCS%%%%DOCSDIR%%/README.nn %%PORTDOCS%%%%DOCSDIR%%/README.pkg-config %%PORTDOCS%%%%DOCSDIR%%/README.release %%PORTDOCS%%%%DOCSDIR%%/README.testing %%PORTDOCS%%%%DOCSDIR%%/README.wxwidgets %%DATADIR%%/cglobe.map %%DATADIR%%/cmap0_alternate.pal %%DATADIR%%/cmap0_black_on_white.pal %%DATADIR%%/cmap0_default.pal %%DATADIR%%/cmap0_white_bg.pal %%DATADIR%%/cmap1_blue_red.pal %%DATADIR%%/cmap1_blue_yellow.pal %%DATADIR%%/cmap1_default.pal %%DATADIR%%/cmap1_gray.pal %%DATADIR%%/cmap1_highfreq.pal %%DATADIR%%/cmap1_lowfreq.pal %%DATADIR%%/cmap1_radar.pal %%DATADIR%%/examples/CMakeLists.txt %%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 %%DATADIR%%/examples/c++/x01cc.cc %%DATADIR%%/examples/c++/x02.cc %%DATADIR%%/examples/c++/x03.cc %%DATADIR%%/examples/c++/x04.cc %%DATADIR%%/examples/c++/x05.cc %%DATADIR%%/examples/c++/x06.cc %%DATADIR%%/examples/c++/x07.cc %%DATADIR%%/examples/c++/x08.cc %%DATADIR%%/examples/c++/x09.cc %%DATADIR%%/examples/c++/x10.cc %%DATADIR%%/examples/c++/x11.cc %%DATADIR%%/examples/c++/x12.cc %%DATADIR%%/examples/c++/x13.cc %%DATADIR%%/examples/c++/x14.cc %%DATADIR%%/examples/c++/x15.cc %%DATADIR%%/examples/c++/x16.cc %%DATADIR%%/examples/c++/x17.cc %%DATADIR%%/examples/c++/x18.cc %%DATADIR%%/examples/c++/x19.cc %%DATADIR%%/examples/c++/x20.cc %%DATADIR%%/examples/c++/x21.cc %%DATADIR%%/examples/c++/x22.cc %%DATADIR%%/examples/c++/x23.cc %%DATADIR%%/examples/c++/x24.cc %%DATADIR%%/examples/c++/x25.cc %%DATADIR%%/examples/c++/x26.cc %%DATADIR%%/examples/c++/x27.cc %%DATADIR%%/examples/c++/x28.cc %%DATADIR%%/examples/c++/x29.cc %%DATADIR%%/examples/c++/x30.cc %%DATADIR%%/examples/c++/x31.cc %%DATADIR%%/examples/c++/x33.cc %%DATADIR%%/examples/c/CMakeLists.txt %%DATADIR%%/examples/c/Makefile %%DATADIR%%/examples/c/README.cairo %%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 %%DATADIR%%/examples/c/x01c.c %%DATADIR%%/examples/c/x02c.c %%DATADIR%%/examples/c/x03c.c %%DATADIR%%/examples/c/x04c.c %%DATADIR%%/examples/c/x05c.c %%DATADIR%%/examples/c/x06c.c %%DATADIR%%/examples/c/x07c.c %%DATADIR%%/examples/c/x08c.c %%DATADIR%%/examples/c/x09c.c %%DATADIR%%/examples/c/x10c.c %%DATADIR%%/examples/c/x11c.c %%DATADIR%%/examples/c/x12c.c %%DATADIR%%/examples/c/x13c.c %%DATADIR%%/examples/c/x14c.c %%DATADIR%%/examples/c/x15c.c %%DATADIR%%/examples/c/x16c.c %%DATADIR%%/examples/c/x17c.c %%DATADIR%%/examples/c/x18c.c %%DATADIR%%/examples/c/x19c.c %%DATADIR%%/examples/c/x20c.c %%DATADIR%%/examples/c/x21c.c %%DATADIR%%/examples/c/x22c.c %%DATADIR%%/examples/c/x23c.c %%DATADIR%%/examples/c/x24c.c %%DATADIR%%/examples/c/x25c.c %%DATADIR%%/examples/c/x26c.c %%DATADIR%%/examples/c/x27c.c %%DATADIR%%/examples/c/x28c.c %%DATADIR%%/examples/c/x29c.c %%DATADIR%%/examples/c/x30c.c %%DATADIR%%/examples/c/x31c.c %%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 %%FORTRAN%%%%DATADIR%%/examples/f95/x00f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x01f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x02f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x03f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x04f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x05f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x06f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x07f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x08f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x09f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x10f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x11f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x12f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x13f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x14f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x15f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x16af.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x16f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x17f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x18f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x19f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x20f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x21f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x22f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x23f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x24f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x25f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x26f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x27f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x28f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x29f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x30f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x31f.f90 %%FORTRAN%%%%DATADIR%%/examples/f95/x33f.f90 %%DATADIR%%/examples/lena.pgm %%LUA%%%%DATADIR%%/examples/lua/CMakeLists.txt %%LUA%%%%DATADIR%%/examples/lua/plplot_examples.lua %%LUA%%%%DATADIR%%/examples/lua/x00.lua %%LUA%%%%DATADIR%%/examples/lua/x01.lua %%LUA%%%%DATADIR%%/examples/lua/x02.lua %%LUA%%%%DATADIR%%/examples/lua/x03.lua %%LUA%%%%DATADIR%%/examples/lua/x04.lua %%LUA%%%%DATADIR%%/examples/lua/x05.lua %%LUA%%%%DATADIR%%/examples/lua/x06.lua %%LUA%%%%DATADIR%%/examples/lua/x07.lua %%LUA%%%%DATADIR%%/examples/lua/x08.lua %%LUA%%%%DATADIR%%/examples/lua/x09.lua %%LUA%%%%DATADIR%%/examples/lua/x10.lua %%LUA%%%%DATADIR%%/examples/lua/x11.lua %%LUA%%%%DATADIR%%/examples/lua/x12.lua %%LUA%%%%DATADIR%%/examples/lua/x13.lua %%LUA%%%%DATADIR%%/examples/lua/x14.lua %%LUA%%%%DATADIR%%/examples/lua/x15.lua %%LUA%%%%DATADIR%%/examples/lua/x16.lua %%LUA%%%%DATADIR%%/examples/lua/x17.lua %%LUA%%%%DATADIR%%/examples/lua/x18.lua %%LUA%%%%DATADIR%%/examples/lua/x19.lua %%LUA%%%%DATADIR%%/examples/lua/x20.lua %%LUA%%%%DATADIR%%/examples/lua/x21.lua %%LUA%%%%DATADIR%%/examples/lua/x22.lua %%LUA%%%%DATADIR%%/examples/lua/x23.lua %%LUA%%%%DATADIR%%/examples/lua/x24.lua %%LUA%%%%DATADIR%%/examples/lua/x25.lua %%LUA%%%%DATADIR%%/examples/lua/x26.lua %%LUA%%%%DATADIR%%/examples/lua/x27.lua %%LUA%%%%DATADIR%%/examples/lua/x28.lua %%LUA%%%%DATADIR%%/examples/lua/x29.lua %%LUA%%%%DATADIR%%/examples/lua/x30.lua %%LUA%%%%DATADIR%%/examples/lua/x31.lua %%LUA%%%%DATADIR%%/examples/lua/x33.lua %%DATADIR%%/examples/plplot-test-interactive.sh %%DATADIR%%/examples/plplot-test.sh %%PYTHON%%%%DATADIR%%/examples/python/CMakeLists.txt %%PYTHON%%%%DATADIR%%/examples/python/README.logo %%PYTHON%%%%DATADIR%%/examples/python/README.pythondemos %%PYTHON%%%%DATADIR%%/examples/python/README.rendering_tests %%PYTHON%%%%DATADIR%%/examples/python/plplot_logo.py %%PYTHON%%%%DATADIR%%/examples/python/plplot_py_demos.py %%PYTHON%%%%DATADIR%%/examples/python/plplot_python_start.py %%PYTHON%%%%DATADIR%%/examples/python/pythondemos.py %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/pytkdemo %%PYTHON%%%%DATADIR%%/examples/python/test_axis_precision.py %%PYTHON%%%%DATADIR%%/examples/python/test_circle.py %%PYTHON%%%%DATADIR%%/examples/python/test_fill.py %%PYTHON%%%%DATADIR%%/examples/python/test_gradient.py %%PYTHON%%%%DATADIR%%/examples/python/test_hebrew_diacritic.py %%PYTHON%%%%DATADIR%%/examples/python/test_linebreak.py %%PYTHON%%%%DATADIR%%/examples/python/test_plplot_encodings.py %%PYTHON%%%%DATADIR%%/examples/python/test_plsmem.py %%PYTHON%%%%DATADIR%%/examples/python/test_style.py %%PYTHON%%%%DATADIR%%/examples/python/test_superscript_subscript.py %%PYTHON%%%%DATADIR%%/examples/python/test_symbol_clip.py %%PYTHON%%%%DATADIR%%/examples/python/test_type1.py %%PYTHON%%%%DATADIR%%/examples/python/testh.py %%PYTHON%%%%DATADIR%%/examples/python/x00 %%PYTHON%%%%DATADIR%%/examples/python/x01 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x01.py %%PYTHON%%%%DATADIR%%/examples/python/x02 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x02.py %%PYTHON%%%%DATADIR%%/examples/python/x03 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x03.py %%PYTHON%%%%DATADIR%%/examples/python/x04 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x04.py %%PYTHON%%%%DATADIR%%/examples/python/x05 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x05.py %%PYTHON%%%%DATADIR%%/examples/python/x06 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x06.py %%PYTHON%%%%DATADIR%%/examples/python/x07 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x07.py %%PYTHON%%%%DATADIR%%/examples/python/x08 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x08.py %%PYTHON%%%%DATADIR%%/examples/python/x09 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x09.py %%PYTHON%%%%DATADIR%%/examples/python/x10 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x10.py %%PYTHON%%%%DATADIR%%/examples/python/x11 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x11.py %%PYTHON%%%%DATADIR%%/examples/python/x12 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x12.py %%PYTHON%%%%DATADIR%%/examples/python/x13 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x13.py %%PYTHON%%%%DATADIR%%/examples/python/x14 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x14.py %%PYTHON%%%%DATADIR%%/examples/python/x15 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x15.py %%PYTHON%%%%DATADIR%%/examples/python/x16 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x16.py %%PYTHON%%%%DATADIR%%/examples/python/x17 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x17.py %%PYTHON%%%%DATADIR%%/examples/python/x18 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x18.py %%PYTHON%%%%DATADIR%%/examples/python/x19 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x19.py %%PYTHON%%%%DATADIR%%/examples/python/x20 %%PYTHON%%%%DATADIR%%/examples/python/x21 %%PYTHON%%%%DATADIR%%/examples/python/x22 %%PYTHON%%%%DATADIR%%/examples/python/x23 %%PYTHON%%%%DATADIR%%/examples/python/x24 %%PYTHON%%%%DATADIR%%/examples/python/x25 %%PYTHON%%%%DATADIR%%/examples/python/x26 %%PYTHON%%%%DATADIR%%/examples/python/x27 %%PYTHON%%%%DATADIR%%/examples/python/x28 %%PYTHON%%%%DATADIR%%/examples/python/x29 %%PYTHON%%%%DATADIR%%/examples/python/x30 %%PYTHON%%%%DATADIR%%/examples/python/x31 %%PYTHON%%%%DATADIR%%/examples/python/x33 %%PYTHON%%%%DATADIR%%/examples/python/xw00.py %%PYTHON%%%%DATADIR%%/examples/python/xw01.py %%PYTHON%%%%DATADIR%%/examples/python/xw02.py %%PYTHON%%%%DATADIR%%/examples/python/xw03.py %%PYTHON%%%%DATADIR%%/examples/python/xw04.py %%PYTHON%%%%DATADIR%%/examples/python/xw05.py %%PYTHON%%%%DATADIR%%/examples/python/xw06.py %%PYTHON%%%%DATADIR%%/examples/python/xw07.py %%PYTHON%%%%DATADIR%%/examples/python/xw08.py %%PYTHON%%%%DATADIR%%/examples/python/xw09.py %%PYTHON%%%%DATADIR%%/examples/python/xw10.py %%PYTHON%%%%DATADIR%%/examples/python/xw11.py %%PYTHON%%%%DATADIR%%/examples/python/xw12.py %%PYTHON%%%%DATADIR%%/examples/python/xw13.py %%PYTHON%%%%DATADIR%%/examples/python/xw14.py %%PYTHON%%%%DATADIR%%/examples/python/xw15.py %%PYTHON%%%%DATADIR%%/examples/python/xw16.py %%PYTHON%%%%DATADIR%%/examples/python/xw17.py %%PYTHON%%%%DATADIR%%/examples/python/xw18.py %%PYTHON%%%%DATADIR%%/examples/python/xw19.py %%PYTHON%%%%DATADIR%%/examples/python/xw20.py %%PYTHON%%%%DATADIR%%/examples/python/xw21.py %%PYTHON%%%%DATADIR%%/examples/python/xw22.py %%PYTHON%%%%DATADIR%%/examples/python/xw23.py %%PYTHON%%%%DATADIR%%/examples/python/xw24.py %%PYTHON%%%%DATADIR%%/examples/python/xw25.py %%PYTHON%%%%DATADIR%%/examples/python/xw26.py %%PYTHON%%%%DATADIR%%/examples/python/xw27.py %%PYTHON%%%%DATADIR%%/examples/python/xw28.py %%PYTHON%%%%DATADIR%%/examples/python/xw29.py %%PYTHON%%%%DATADIR%%/examples/python/xw30.py %%PYTHON%%%%DATADIR%%/examples/python/xw31.py %%PYTHON%%%%DATADIR%%/examples/python/xw33.py %%TCLTK%%%%DATADIR%%/examples/tcl/CMakeLists.txt %%TCLTK%%%%DATADIR%%/examples/tcl/README.tcldemos %%TCLTK%%%%DATADIR%%/examples/tcl/mktclIndex %%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 %%TCLTK%%%%DATADIR%%/examples/tcl/x01.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x02 %%TCLTK%%%%DATADIR%%/examples/tcl/x02.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x03 %%TCLTK%%%%DATADIR%%/examples/tcl/x03.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x04 %%TCLTK%%%%DATADIR%%/examples/tcl/x04.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x05 %%TCLTK%%%%DATADIR%%/examples/tcl/x05.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x06 %%TCLTK%%%%DATADIR%%/examples/tcl/x06.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x07 %%TCLTK%%%%DATADIR%%/examples/tcl/x07.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x08 %%TCLTK%%%%DATADIR%%/examples/tcl/x08.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x09 %%TCLTK%%%%DATADIR%%/examples/tcl/x09.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x10 %%TCLTK%%%%DATADIR%%/examples/tcl/x10.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x11 %%TCLTK%%%%DATADIR%%/examples/tcl/x11.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x12 %%TCLTK%%%%DATADIR%%/examples/tcl/x12.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x13 %%TCLTK%%%%DATADIR%%/examples/tcl/x13.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x14 %%TCLTK%%%%DATADIR%%/examples/tcl/x14.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x15 %%TCLTK%%%%DATADIR%%/examples/tcl/x15.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x16 %%TCLTK%%%%DATADIR%%/examples/tcl/x16.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x17 %%TCLTK%%%%DATADIR%%/examples/tcl/x17.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x18 %%TCLTK%%%%DATADIR%%/examples/tcl/x18.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x19 %%TCLTK%%%%DATADIR%%/examples/tcl/x19.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x20 %%TCLTK%%%%DATADIR%%/examples/tcl/x20.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x21 %%TCLTK%%%%DATADIR%%/examples/tcl/x21.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x22 %%TCLTK%%%%DATADIR%%/examples/tcl/x22.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x23 %%TCLTK%%%%DATADIR%%/examples/tcl/x23.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x24 %%TCLTK%%%%DATADIR%%/examples/tcl/x24.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x25 %%TCLTK%%%%DATADIR%%/examples/tcl/x25.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x26 %%TCLTK%%%%DATADIR%%/examples/tcl/x26.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x27 %%TCLTK%%%%DATADIR%%/examples/tcl/x27.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x28 %%TCLTK%%%%DATADIR%%/examples/tcl/x28.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x29 %%TCLTK%%%%DATADIR%%/examples/tcl/x29.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x30 %%TCLTK%%%%DATADIR%%/examples/tcl/x30.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x31 %%TCLTK%%%%DATADIR%%/examples/tcl/x31.tcl %%TCLTK%%%%DATADIR%%/examples/tcl/x33 %%TCLTK%%%%DATADIR%%/examples/tcl/x33.tcl %%DATADIR%%/examples/test_c.sh %%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 %%TCLTK%%%%DATADIR%%/examples/test_tcl.sh %%TCLTK%%%%DATADIR%%/examples/tk/CMakeLists.txt %%TCLTK%%%%DATADIR%%/examples/tk/Makefile %%TCLTK%%%%DATADIR%%/examples/tk/README.tkdemos %%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 %%TCLTK%%%%DATADIR%%/examples/tk/tk02 %%TCLTK%%%%DATADIR%%/examples/tk/tk02.in %%TCLTK%%%%DATADIR%%/examples/tk/tk03 %%TCLTK%%%%DATADIR%%/examples/tk/tk03.in %%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 %%TCLTK%%%%DATADIR%%/examples/tk/x03.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x04.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x05.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x06.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x07.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x08.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x09.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x10.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x11.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x12.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x13.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x14.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x15.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x16.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x17.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x18.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x19.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x20.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x21.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x22.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x23.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x24.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x25.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x26.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x27.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x28.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x29.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x30.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x31.tcl %%TCLTK%%%%DATADIR%%/examples/tk/x33.tcl %%TCLTK%%%%DATADIR%%/examples/tk/xtk01.c %%TCLTK%%%%DATADIR%%/examples/tk/xtk02.c %%TCLTK%%%%DATADIR%%/examples/tk/xtk04.c %%DATADIR%%/globe.map %%TCLTK%%%%DATADIR%%/pkgIndex.tcl %%DATADIR%%/plstnd5.fnt %%DATADIR%%/plxtnd5.fnt %%TCLTK%%%%DATADIR%%/tcl/FileSelector.tcl %%TCLTK%%%%DATADIR%%/tcl/PLWin.itk %%TCLTK%%%%DATADIR%%/tcl/PLXWin.itk %%TCLTK%%%%DATADIR%%/tcl/Pltkwin.tcl %%TCLTK%%%%DATADIR%%/tcl/about.tcl %%TCLTK%%%%DATADIR%%/tcl/cmap0a.pal %%TCLTK%%%%DATADIR%%/tcl/cmap1a.pal %%TCLTK%%%%DATADIR%%/tcl/cmap1a1.pal %%TCLTK%%%%DATADIR%%/tcl/cmap1b.pal %%TCLTK%%%%DATADIR%%/tcl/cmap1c.pal %%TCLTK%%%%DATADIR%%/tcl/cmap1d.pal %%TCLTK%%%%DATADIR%%/tcl/help_gui.tcl %%TCLTK%%%%DATADIR%%/tcl/help_keys.tcl %%TCLTK%%%%DATADIR%%/tcl/help_tcltk.tcl %%TCLTK%%%%DATADIR%%/tcl/plclient.tcl %%TCLTK%%%%DATADIR%%/tcl/plcolor.tcl %%TCLTK%%%%DATADIR%%/tcl/plconfig.tcl %%TCLTK%%%%DATADIR%%/tcl/pldefaults.tcl %%TCLTK%%%%DATADIR%%/tcl/plplot.tcl %%TCLTK%%%%DATADIR%%/tcl/plserver.tcl %%TCLTK%%%%DATADIR%%/tcl/pltools.tcl %%TCLTK%%%%DATADIR%%/tcl/plwidget.tcl %%TCLTK%%%%DATADIR%%/tcl/tclIndex %%DATADIR%%/usa.map %%DATADIR%%/usaglobe.map Index: head/math/plplot-ada/Makefile =================================================================== --- head/math/plplot-ada/Makefile (revision 384519) +++ head/math/plplot-ada/Makefile (revision 384520) @@ -1,30 +1,31 @@ # Created by: John Marino # $FreeBSD$ PORTNAME= plplot PORTVERSION= ${RELEASE} +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source PKGNAMESUFFIX= -ada MAINTAINER= marino@FreeBSD.org COMMENT= Ada bindings for PLplot LICENSE= LGPL3 -LIB_DEPENDS= libplplotd.so:${PORTSDIR}/math/plplot +LIB_DEPENDS= libplplot.so:${PORTSDIR}/math/plplot USES= ada DISTINFO_FILE= ${.CURDIR}/../plplot/distinfo RELEASE!= awk '/SHA/ {split($$2,a,"."); print substr(a[1], 9) "." a[2] "." a[3];}' ${DISTINFO_FILE} BUILD_WRKSRC= ${WRKSRC}/bindings INSTALL_WRKSRC= ${WRKSRC}/bindings post-extract: ${CP} ${FILESDIR}/build_plplot.gpr ${FILESDIR}/Makefile \ ${BUILD_WRKSRC} ${CAT} ${FILESDIR}/plplot.gpr.in | \ ${SED} -e "s|@PREFIX@|${PREFIX}|g" > ${BUILD_WRKSRC}/plplot.gpr .include Index: head/science/gnudatalanguage/Makefile =================================================================== --- head/science/gnudatalanguage/Makefile (revision 384519) +++ head/science/gnudatalanguage/Makefile (revision 384520) @@ -1,126 +1,126 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= gnudatalanguage DISTVERSION= 0.9.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science lang MASTER_SITES= SF/${PORTNAME}/gdl/${DISTVERSION} .if defined(BUILD_PYTHON_MODULE) PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} .endif DISTNAME= gdl-${DISTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT?= GDL, a free IDL compatible incremental compiler 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 USE_WX= 2.8 WX_UNICODE= yes USE_XORG= x11 sm ice xext USES= cmake:outsource compiler:gcc-c++11-lib dos2unix ncurses pkgconfig readline # Disable ncurses and readline from ports # Disable ImageMagick (does'nt work with plplot because dynamic drivers # are enabled by default) # TODO: add a slave port for mpich CMAKE_ARGS= -DREADLINEDIR:STRING="/usr" \ -DNCURSESDIR:STRING="/usr" \ -DMPICH:BOOL=NO \ -DMAGICK:BOOL=NO CPPFLAGS+= ${CFLAGS} -fno-inline LDFLAGS+= -lpthread -L${LOCALBASE}/lib SLAVEDIRS= science/py-gnudatalanguage OPTIONS_DEFINE= EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NETCDF PYTHON UDUNITS OPTIONS_DEFAULT=EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS EIGEN_DESC= Eigen3 support (boost performance) EIGEN_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3 EIGEN_CMAKE_ON= -DEIGEN3:BOOL=YES EIGEN_CMAKE_OFF= -DEIGEN3:BOOL=NO FFTW_LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 \ libfftw3f.so:${PORTSDIR}/math/fftw3-float FFTW_CMAKE_ON= -DFFTW:BOOL=YES FFTW_CMAKE_OFF= -DFFTW:BOOL=NO GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagick.so:${PORTSDIR}/graphics/GraphicsMagick GRAPHICSMAGICK_CMAKE_ON= -DGRAPHICSMAGICK:BOOL=YES GRAPHICSMAGICK_CMAKE_OFF= -DGRAPHICSMAGICK:BOOL=NO GRIB_DESC= Support GRIB messages GRIB_LIB_DEPENDS= libgrib_api.so:${PORTSDIR}/science/grib_api GRIB_CMAKE_ON= -DGRIB:BOOL=YES GRIB_CMAKE_OFF= -DGRIB:BOOL=NO HDF5_LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 HDF5_CMAKE_ON= -DHDF5:BOOL=YES HDF5_CMAKE_OFF= -DHDF5:BOOL=NO -DHDF:BOOL=NO LIBPROJ4_DESC= Support cartographic processes LIBPROJ4_LIB_DEPENDS= libproj4.so:${PORTSDIR}/math/libproj4 LIBPROJ4_CMAKE_ON= -DLIBPROJ4:BOOL=YES LIBPROJ4_CMAKE_OFF= -DLIBPROJ4:BOOL=NO MPICH2_LIB_DEPENDS= libmpich.so.8:${PORTSDIR}/net/mpich2 MPICH2_CMAKE_ON= -DMPICH:BOOL=YES MPICH2_CMAKE_OFF= -DMPICH:BOOL=NO NETCDF_LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf NETCDF_CMAKE_ON= -DNETCDF:BOOL=YES -DHDF:BOOL=NO NETCDF_CMAKE_OFF= -DNETCDF:BOOL=NO PYTHON_USES= python PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib PYTHON_CMAKE_ON= -DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}" PYTHON_CMAKE_OFF= -DPYTHON:BOOL=NO UDUNITS_LIB_DEPENDS= libudunits2.so:${PORTSDIR}/science/udunits UDUNITS_CMAKE_ON= -DUDUNITS:BOOL=YES UDUNITS_CMAKE_OFF= -DUDUNITS:BOOL=NO .if defined(BUILD_PYTHON_MODULE) CATEGORIES+= python CMAKE_ARGS+= -DPYTHON_MODULE:BOOL=YES -DOPENMP:BOOL=NO PLIST= pkg-plist.pymod .else CMAKE_ARGS+= -DPYTHON_MODULE:BOOL=NO .endif .if defined(BUILD_PYTHON_MODULE) do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libgdl.so ${STAGEDIR}${PYTHON_SITELIBDIR}/GDL.so .endif .if !defined(BUILD_PYTHON_MODULE) post-stage: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite (cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/) .endif .if defined(MAINTAINER_MODE) regression-test: install . if defined(BUILD_PYTHON_MODULE) @${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py @${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py ${PYTHON_CMD} ${WRKDIR}/testgdl.py . else @${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro" \ > ${WRKDIR}/testgdl @${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl ${PREFIX}/bin/gdl < ${WRKDIR}/testgdl . endif .endif .include Index: head/science/gnudatalanguage/files/patch-CMakeLists.txt =================================================================== --- head/science/gnudatalanguage/files/patch-CMakeLists.txt (revision 384519) +++ head/science/gnudatalanguage/files/patch-CMakeLists.txt (revision 384520) @@ -1,11 +1,11 @@ ---- 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}) -install(FILES ${CMAKE_SOURCE_DIR}/doc/gdl.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1) +install(FILES ${CMAKE_SOURCE_DIR}/doc/gdl.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1) # substitute variables in configure.h.cmake and move it to configure.h configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) Index: head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake =================================================================== --- head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake (nonexistent) +++ head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake (revision 384520) @@ -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) Property changes on: head/science/gnudatalanguage/files/patch-CMakeModules_FindPlplot.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake =================================================================== --- head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake (revision 384519) +++ head/science/gnudatalanguage/files/patch-CMakeModules_Findlibps.cmake (revision 384520) @@ -1,8 +1,8 @@ ---- ./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) include(FindPackageHandleStandardArgs) if(LIBPSPKG) set(ENV{PKG_CONFIG_PATH} ${LIBPSPKG}) # pkg search path Index: head/science/gnudatalanguage/files/patch-src__base64.hpp =================================================================== --- head/science/gnudatalanguage/files/patch-src__base64.hpp (revision 384519) +++ head/science/gnudatalanguage/files/patch-src__base64.hpp (revision 384520) @@ -1,38 +1,38 @@ ---- 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; } - if(!(isspace(data[i-1]))) { + if(!(std::isspace(data[i-1]))) { //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; } - if(!(isspace(data[i-1]))) { + if(!(std::isspace(data[i-1]))) { //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; } - if((!isspace(data[i-1]))) { + if((!std::isspace(data[i-1]))) { //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; } - if(!(isspace(data[i-1]))) { + if(!(std::isspace(data[i-1]))) { //cerr << "base 64 decode error: illegal character '" << data[i-1] << '\'' << endl; Warning("base 64 decode error: illegal character"); return false; Index: head/science/gnudatalanguage/files/patch-src__basic_fun.cpp =================================================================== --- head/science/gnudatalanguage/files/patch-src__basic_fun.cpp (revision 384519) +++ head/science/gnudatalanguage/files/patch-src__basic_fun.cpp (revision 384520) @@ -1,20 +1,20 @@ ---- 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 | "+" | "-" | "." ] - if (!(isalpha(*p)) && !(isdigit(*p)) && (*p != '+') && (*p != '.') && (*p != '-')) + if (!(std::isalpha(*p)) && !(std::isdigit(*p)) && (*p != '+') && (*p != '.') && (*p != '-')) { 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; - while (isdigit(*p)) p++; + while (std::isdigit(*p)) p++; if ((*p == '\0' || *p == '/') && (p - e) < 7) goto parse_port; urlstru->InitTag("SCHEME", DStringGDL(string(s, (e - s)))); length -= ++e - s; Index: head/science/gnudatalanguage/files/patch-src__gshhs.cpp =================================================================== --- head/science/gnudatalanguage/files/patch-src__gshhs.cpp (revision 384519) +++ head/science/gnudatalanguage/files/patch-src__gshhs.cpp (revision 384520) @@ -1,11 +1,11 @@ ---- 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 - if ( river ) source = tolower( (int) source ); // Lower case c means river-lake + if ( river ) source = std::tolower( (int) source ); // Lower case c means river-lake int line = (h.area) ? 0 : 1; // Either Polygon (0) or Line (1) (if no area) Index: head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp =================================================================== --- head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp (revision 384519) +++ head/science/gnudatalanguage/files/patch-src__gsl_fun.cpp (revision 384520) @@ -1,11 +1,11 @@ ---- 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(0, tmpname); name.reserve(tmpname.length()); for (string::iterator it = tmpname.begin(); it < tmpname.end(); it++) - if (*it != ' ' && *it != '_') name.append(1, (char)tolower(*it)); + if (*it != ' ' && *it != '_') name.append(1, (char)std::tolower(*it)); } #ifdef USE_UDUNITS Index: head/science/gnudatalanguage/files/patch-src__str.cpp =================================================================== --- head/science/gnudatalanguage/files/patch-src__str.cpp (revision 384519) +++ head/science/gnudatalanguage/files/patch-src__str.cpp (revision 384520) @@ -1,38 +1,38 @@ ---- ./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 guard( r); r[len]=0; for(unsigned i=0;i guard( r); // r[len]=0; for(unsigned i=0;i guard( r); r[len]=0; for(unsigned i=0;i(( *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 && iN_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); + } + } + } Property changes on: head/science/gnudatalanguage/files/patch-src_plotting__contour.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property