diff options
Diffstat (limited to 'math/plplot/files')
19 files changed, 36 insertions, 191 deletions
diff --git a/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c b/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c deleted file mode 100644 index 89323144928a..000000000000 --- a/math/plplot/files/patch-bindings__tk-x-plat__plolotter.c +++ /dev/null @@ -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. diff --git a/math/plplot/files/patch-bindings__tk__plframe.c b/math/plplot/files/patch-bindings__tk__plframe.c deleted file mode 100644 index 3b668d512ab3..000000000000 --- a/math/plplot/files/patch-bindings__tk__plframe.c +++ /dev/null @@ -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. diff --git a/math/plplot/files/patch-bindings__tk__plserver.c b/math/plplot/files/patch-bindings__tk__plserver.c deleted file mode 100644 index 1822c2943dc9..000000000000 --- a/math/plplot/files/patch-bindings__tk__plserver.c +++ /dev/null @@ -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. diff --git a/math/plplot/files/patch-bindings__tk__tkMain.c b/math/plplot/files/patch-bindings__tk__tkMain.c index 41fd34f6ece2..fdcbc798ec23 100644 --- a/math/plplot/files/patch-bindings__tk__tkMain.c +++ b/math/plplot/files/patch-bindings__tk__tkMain.c @@ -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 diff --git a/math/plplot/files/patch-cmake_modules_FindVGA.cmake b/math/plplot/files/patch-cmake_modules_FindVGA.cmake index 6299240cc2a5..b2f3e84b8694 100644 --- a/math/plplot/files/patch-cmake_modules_FindVGA.cmake +++ b/math/plplot/files/patch-cmake_modules_FindVGA.cmake @@ -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) diff --git a/math/plplot/files/patch-cmake_modules_csiro.cmake b/math/plplot/files/patch-cmake_modules_csiro.cmake index ab1d76d810a6..c9ca2793f084 100644 --- a/math/plplot/files/patch-cmake_modules_csiro.cmake +++ b/math/plplot/files/patch-cmake_modules_csiro.cmake @@ -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") diff --git a/math/plplot/files/patch-cmake_modules_instdirs.cmake b/math/plplot/files/patch-cmake_modules_instdirs.cmake index 389c9836f889..9887aebee869 100644 --- a/math/plplot/files/patch-cmake_modules_instdirs.cmake +++ b/math/plplot/files/patch-cmake_modules_instdirs.cmake @@ -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}) diff --git a/math/plplot/files/patch-cmake_modules_linuxvga.cmake b/math/plplot/files/patch-cmake_modules_linuxvga.cmake index 7b4144171a59..cf0835cd456d 100644 --- a/math/plplot/files/patch-cmake_modules_linuxvga.cmake +++ b/math/plplot/files/patch-cmake_modules_linuxvga.cmake @@ -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) diff --git a/math/plplot/files/patch-cmake_modules_pkg-config.cmake b/math/plplot/files/patch-cmake_modules_pkg-config.cmake index fda575952580..da792e85d1f7 100644 --- a/math/plplot/files/patch-cmake_modules_pkg-config.cmake +++ b/math/plplot/files/patch-cmake_modules_pkg-config.cmake @@ -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 diff --git a/math/plplot/files/patch-doc__docbook__src__tcl.xml b/math/plplot/files/patch-doc__docbook__src__tcl.xml index c3f332b423b7..de06f7a87e2d 100644 --- a/math/plplot/files/patch-doc__docbook__src__tcl.xml +++ b/math/plplot/files/patch-doc__docbook__src__tcl.xml @@ -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]; diff --git a/math/plplot/files/patch-examples__python__CMakeLists.txt b/math/plplot/files/patch-examples__python__CMakeLists.txt index 521744516269..188b64b29d05 100644 --- a/math/plplot/files/patch-examples__python__CMakeLists.txt +++ b/math/plplot/files/patch-examples__python__CMakeLists.txt @@ -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 ) diff --git a/math/plplot/files/patch-examples__tk__xtk01.c b/math/plplot/files/patch-examples__tk__xtk01.c deleted file mode 100644 index e68c359c70a0..000000000000 --- a/math/plplot/files/patch-examples__tk__xtk01.c +++ /dev/null @@ -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. diff --git a/math/plplot/files/patch-examples__tk__xtk02.c b/math/plplot/files/patch-examples__tk__xtk02.c deleted file mode 100644 index a645e472b0ef..000000000000 --- a/math/plplot/files/patch-examples__tk__xtk02.c +++ /dev/null @@ -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. diff --git a/math/plplot/files/patch-examples__tk__xtk04.c b/math/plplot/files/patch-examples__tk__xtk04.c deleted file mode 100644 index 9664d1eb2454..000000000000 --- a/math/plplot/files/patch-examples__tk__xtk04.c +++ /dev/null @@ -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. diff --git a/math/plplot/files/patch-include_plConfig.h b/math/plplot/files/patch-include_plConfig.h deleted file mode 100644 index 8b6a45fd788b..000000000000 --- a/math/plplot/files/patch-include_plConfig.h +++ /dev/null @@ -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 <plplot_config.h> - #endif - diff --git a/math/plplot/files/patch-include_plConfig.h.in b/math/plplot/files/patch-include_plConfig.h.in new file mode 100644 index 000000000000..48a203f8be17 --- /dev/null +++ b/math/plplot/files/patch-include_plConfig.h.in @@ -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 + diff --git a/math/plplot/files/patch-plplot_test__CMakeLists.txt b/math/plplot/files/patch-plplot_test__CMakeLists.txt deleted file mode 100644 index 20f9802423e0..000000000000 --- a/math/plplot/files/patch-plplot_test__CMakeLists.txt +++ /dev/null @@ -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 diff --git a/math/plplot/files/patch-scripts__CMakeLists.txt b/math/plplot/files/patch-scripts__CMakeLists.txt index ae54f7657cf2..5ada9cffaf29 100644 --- a/math/plplot/files/patch-scripts__CMakeLists.txt +++ b/math/plplot/files/patch-scripts__CMakeLists.txt @@ -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) diff --git a/math/plplot/files/patch-util__plrender.c b/math/plplot/files/patch-util__plrender.c deleted file mode 100644 index 0d47db22bf27..000000000000 --- a/math/plplot/files/patch-util__plrender.c +++ /dev/null @@ -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; - } - - //-------------------------------------------------------------------------- |