View | Details | Raw Unified | Return to bug 199539 | Differences between
and this patch

Collapse All | Expand All

(-)math/plplot/Makefile (-6 / +11 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	plplot
4
PORTNAME=	plplot
5
PORTVERSION=	5.10.0
5
PORTVERSION=	5.11.0
6
PORTREVISION=	3
7
CATEGORIES=	math science
6
CATEGORIES=	math science
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
9
8
Lines 44-53 Link Here
44
.if ${PORT_OPTIONS:MFORTRAN}
43
.if ${PORT_OPTIONS:MFORTRAN}
45
USES+=		fortran
44
USES+=		fortran
46
CONFIGURE_ENV+=	CMAKE_Fortran_COMPILER="${FC}"
45
CONFIGURE_ENV+=	CMAKE_Fortran_COMPILER="${FC}"
47
CMAKE_ARGS+=	-DENABLE_f95:BOOL=ON -DENABLE_f77:BOOL=ON
46
CMAKE_ARGS+=	-DENABLE_f95:BOOL=ON
48
PLIST_SUB+=	FORTRAN=""
47
PLIST_SUB+=	FORTRAN=""
49
.else
48
.else
50
CMAKE_ARGS+=	-DENABLE_f95:BOOL=OFF -DENABLE_f77:BOOL=OFF
49
CMAKE_ARGS+=	-DENABLE_f95:BOOL=OFF
51
PLIST_SUB+=	FORTRAN="@comment "
50
PLIST_SUB+=	FORTRAN="@comment "
52
.endif
51
.endif
53
52
Lines 84-92 Link Here
84
.if empty(PORT_OPTIONS:MX11)
83
.if empty(PORT_OPTIONS:MX11)
85
IGNORE=		TCLTK needs X11 support
84
IGNORE=		TCLTK needs X11 support
86
.endif
85
.endif
86
IGNORE=		itcl and itk should be coherent # See PR ports/199521
87
BUILD_DEPENDS+=	${LOCALBASE}/lib/iwidgets:${PORTSDIR}/x11-toolkits/iwidgets
88
RUN_DEPENDS+=	${LOCALBASE}/lib/iwidgets:${PORTSDIR}/x11-toolkits/iwidgets
87
LIB_DEPENDS+=	libitk.so:${PORTSDIR}/x11-toolkits/itk
89
LIB_DEPENDS+=	libitk.so:${PORTSDIR}/x11-toolkits/itk
88
USES+=		tk
90
USES+=		tk
89
CMAKE_ARGS+=	-DTCL_TCLSH:FILEPATH="${TCLSH}" \
91
CMAKE_ARGS+=	-DTCL_TCLSH:FILEPATH="${TCLSH}" \
92
		-DPLPLOT_TK_VERSION:STRING="${TK_VER}" \
93
		-DPLPLOT_ITK_VERSION:STRING="3.3" \
94
		-DIWIDGETS_VERSIONS_LIST:STRING="4.0.1; 3.3; 3.4" \
90
		-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
95
		-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
91
		-DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl3.4" \
96
		-DITCL_INCLUDE_PATH:PATH="${LOCALBASE}/include/itcl3.4" \
92
		-DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \
97
		-DITCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitcl.so" \
Lines 114-121 Link Here
114
119
115
.if ${PORT_OPTIONS:MWXGTK}
120
.if ${PORT_OPTIONS:MWXGTK}
116
LIB_DEPENDS+=	libagg.so:${PORTSDIR}/graphics/agg
121
LIB_DEPENDS+=	libagg.so:${PORTSDIR}/graphics/agg
117
USE_WX=		2.6+
122
USE_WX=		2.8+
118
CMAKE_ARGS+=	-DPLD_wxpng:BOOL=ON \
123
CMAKE_ARGS+=	-DPLD_wxpng:BOOL=ON -DOLD_WXWIDGETS:BOOL=ON \
119
		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
124
		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
120
PLIST_SUB+=	WXGTK=""
125
PLIST_SUB+=	WXGTK=""
121
.else
126
.else
(-)math/plplot/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (plplot-5.10.0.tar.gz) = d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5
1
SHA256 (plplot-5.11.0.tar.gz) = bfa8434e6e1e7139a5651203ec1256c8581e2fac3122f907f7d8d25ed3bd5f7e
2
SIZE (plplot-5.10.0.tar.gz) = 14766687
2
SIZE (plplot-5.11.0.tar.gz) = 15892751
(-)math/plplot/files/patch-bindings__tk-x-plat__plolotter.c (-11 lines)
Lines 1-11 Link Here
1
--- bindings/tk-x-plat/plplotter.c.orig	2012-08-14 00:14:23.000000000 +0200
2
+++ bindings/tk-x-plat/plplotter.c	2013-10-01 22:42:16.000000000 +0200
3
@@ -2024,7 +2024,7 @@
4
 //
5
 // Results:
6
 //      The return value is a standard Tcl result.  If TCL_ERROR is
7
-//      returned, then interp->result contains an error message.
8
+//      returned, then Tcl_GetStringResult(interp) contains an error message.
9
 //
10
 // Side effects:
11
 //      Configuration information, such as text string, colors, font, etc.
(-)math/plplot/files/patch-bindings__tk__plframe.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- bindings/tk/plframe.c.orig	2012-08-14 00:14:23.000000000 +0200
1
--- bindings/tk/plframe.c.orig	2015-04-12 10:08:04 UTC
2
+++ bindings/tk/plframe.c	2013-10-01 22:47:19.000000000 +0200
2
+++ bindings/tk/plframe.c
3
@@ -2218,7 +2218,7 @@
3
@@ -2230,7 +2230,7 @@ Cmd( Tcl_Interp *interp, register PlFram
4
 //
4
 //
5
 // Results:
5
 // Results:
6
 //	The return value is a standard Tcl result.  If TCL_ERROR is
6
 //	The return value is a standard Tcl result.  If TCL_ERROR is
(-)math/plplot/files/patch-bindings__tk__plserver.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- bindings/tk/plserver.c.orig	2013-04-26 12:02:06.000000000 +0200
1
--- bindings/tk/plserver.c.orig	2015-04-12 10:08:04 UTC
2
+++ bindings/tk/plserver.c	2013-10-01 22:49:59.000000000 +0200
2
+++ bindings/tk/plserver.c
3
@@ -158,7 +158,7 @@
3
@@ -177,7 +177,7 @@ PLplot/Tk driver.\n\n(wish) " );
4
 //
4
 //
5
 // Results:
5
 // Results:
6
 //	Returns a standard Tcl completion code, and leaves an error
6
 //	Returns a standard Tcl completion code, and leaves an error
(-)math/plplot/files/patch-bindings__tk__tkMain.c (-2 / +2 lines)
Lines 1-6 Link Here
1
--- bindings/tk/tkMain.c.orig	2013-12-18 20:25:14.000000000 -0500
1
--- bindings/tk/tkMain.c.orig	2015-04-12 10:08:04 UTC
2
+++ bindings/tk/tkMain.c
2
+++ bindings/tk/tkMain.c
3
@@ -92,10 +92,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl
3
@@ -90,10 +90,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl
4
                                      int allowOverwrite ) );
4
                                      int allowOverwrite ) );
5
 #endif
5
 #endif
6
 
6
 
(-)math/plplot/files/patch-cmake_modules_FindVGA.cmake (-3 / +3 lines)
Lines 1-5 Link Here
1
--- cmake/modules/FindVGA.cmake.orig	2009-09-06 21:04:43.000000000 +0200
1
--- cmake/modules/FindVGA.cmake.orig	2015-04-12 10:08:04 UTC
2
+++ cmake/modules/FindVGA.cmake	2009-12-25 20:27:51.000000000 +0100
2
+++ cmake/modules/FindVGA.cmake
3
@@ -6,7 +6,6 @@
3
@@ -6,7 +6,6 @@
4
 #  VGA_LIBRARIES, the libraries to link against to use the vga library
4
 #  VGA_LIBRARIES, the libraries to link against to use the vga library
5
 #  VGA_LIBRARY_DIRS, the directory where the vga library is found.
5
 #  VGA_LIBRARY_DIRS, the directory where the vga library is found.
Lines 8-14 Link Here
8
 find_path(VGA_INCLUDE_DIR vga.h /usr/local/include /usr/include)
8
 find_path(VGA_INCLUDE_DIR vga.h /usr/local/include /usr/include)
9
 
9
 
10
 if(VGA_INCLUDE_DIR)
10
 if(VGA_INCLUDE_DIR)
11
@@ -33,4 +32,3 @@
11
@@ -33,4 +32,3 @@ else(VGA_FOUND)
12
     message(FATAL_ERROR "FindVGA: Could not find vga.h and/or the vga library")
12
     message(FATAL_ERROR "FindVGA: Could not find vga.h and/or the vga library")
13
   endif(VGA_FIND_REQUIRED)
13
   endif(VGA_FIND_REQUIRED)
14
 endif(VGA_FOUND)
14
 endif(VGA_FOUND)
(-)math/plplot/files/patch-cmake_modules_csiro.cmake (-3 / +3 lines)
Lines 1-6 Link Here
1
--- cmake/modules/csiro.cmake.orig	2009-09-06 21:04:43.000000000 +0200
1
--- cmake/modules/csiro.cmake.orig	2015-04-12 10:08:04 UTC
2
+++ cmake/modules/csiro.cmake	2009-12-30 21:10:58.000000000 +0100
2
+++ cmake/modules/csiro.cmake
3
@@ -36,6 +36,10 @@
3
@@ -36,6 +36,10 @@ if(PL_HAVE_QHULL OR WITH_CSA)
4
       else(CMAKE_C_COMPILER MATCHES "gcc")
4
       else(CMAKE_C_COMPILER MATCHES "gcc")
5
         set(NAN_CFLAGS "${NAN_CFLAGS} -ieee")
5
         set(NAN_CFLAGS "${NAN_CFLAGS} -ieee")
6
       endif(CMAKE_C_COMPILER MATCHES "gcc")
6
       endif(CMAKE_C_COMPILER MATCHES "gcc")
(-)math/plplot/files/patch-cmake_modules_instdirs.cmake (-4 / +4 lines)
Lines 1-4 Link Here
1
--- cmake/modules/instdirs.cmake.orig	2013-11-11 19:54:54.000000000 -0500
1
--- cmake/modules/instdirs.cmake.orig	2015-04-12 10:08:04 UTC
2
+++ cmake/modules/instdirs.cmake
2
+++ cmake/modules/instdirs.cmake
3
@@ -61,13 +61,13 @@ CACHE PATH "install location for C heade
3
@@ -61,13 +61,13 @@ CACHE PATH "install location for C heade
4
 
4
 
Lines 35-45 Link Here
35
 # Ada source files (*.adb, *.ads) (following recommendations in
35
 # Ada source files (*.adb, *.ads) (following recommendations in
36
 # http://www.ada-france.org/debian/debian-ada-policy.html
36
 # http://www.ada-france.org/debian/debian-ada-policy.html
37
@@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA
37
@@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA
38
 set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada${LIB_TAG})
38
 set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada)
39
 
39
 
40
 # Drivers.
40
 # Drivers.
41
-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers${LIB_TAG})
41
-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers)
42
+set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers${LIB_TAG})
42
+set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers)
43
 
43
 
44
 # Documentation.
44
 # Documentation.
45
 set(DOC_DIR ${CMAKE_INSTALL_DATADIR}/doc/${PACKAGE})
45
 set(DOC_DIR ${CMAKE_INSTALL_DATADIR}/doc/${PACKAGE})
(-)math/plplot/files/patch-cmake_modules_linuxvga.cmake (-3 / +3 lines)
Lines 1-5 Link Here
1
--- ./cmake/modules/linuxvga.cmake.orig	2009-09-06 21:04:43.000000000 +0200
1
--- cmake/modules/linuxvga.cmake.orig	2015-04-12 10:08:04 UTC
2
+++ ./cmake/modules/linuxvga.cmake	2009-12-26 23:58:37.000000000 +0100
2
+++ cmake/modules/linuxvga.cmake
3
@@ -35,7 +35,6 @@
3
@@ -35,7 +35,6 @@
4
 # set the environment variable CMAKE_LIBRARY_PATH.
4
 # set the environment variable CMAKE_LIBRARY_PATH.
5
 # See cmake documentation for further details.
5
 # See cmake documentation for further details.
Lines 8-14 Link Here
8
   if(PLD_linuxvga)
8
   if(PLD_linuxvga)
9
     find_package(VGA)
9
     find_package(VGA)
10
     if(VGA_FOUND)
10
     if(VGA_FOUND)
11
@@ -50,6 +49,3 @@
11
@@ -50,6 +49,3 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
12
       set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE)    
12
       set(PLD_linuxvga OFF CACHE BOOL "Enable linuxvga device" FORCE)    
13
     endif(VGA_FOUND)
13
     endif(VGA_FOUND)
14
   endif(PLD_linuxvga)
14
   endif(PLD_linuxvga)
(-)math/plplot/files/patch-cmake_modules_pkg-config.cmake (-53 / +1 lines)
Lines 1-43 Link Here
1
Includes the following upstream commit to make the port work with CMake 3.1.0:
1
--- cmake/modules/pkg-config.cmake.orig	2015-04-12 10:08:04 UTC
2
3
commit 772223c638ecf5dc740c9f3dd7a6883c6d2c83d2
4
Author: Alan W. Irwin <airwin@users.sourceforge.net>
5
Date:   Sun Dec 7 09:06:08 2014 -0800
6
7
    Adjust for internal CMake-3.1 pkg-config change.
8
9
    There is a report from Greg Jung <gvjung@gmail.com> that the
10
    internal CMake command
11
12
    _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
13
14
    must be changed to
15
16
    _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
17
18
    for CMake-3.1 in order to build the cairo device properly.  Accordingly, I have made that adjustment.
19
20
    Tested by Alan W. Irwin <airwin@users> on Linux using CMake-3.0.2
21
    by building the cairo device.
22
23
    N.B. currently untested for CMake-3.1.
24
25
    ToDo:
26
27
    Extensive tests on CMake-3.1 (once that version is closer to release)
28
    still need to be done since the change in the pkg-config support by
29
    CMake may need other adjustments as well.
30
31
--- cmake/modules/pkg-config.cmake.orig	2014-02-06 00:06:07.000000000 -0500
32
+++ cmake/modules/pkg-config.cmake
2
+++ cmake/modules/pkg-config.cmake
33
@@ -1,6 +1,6 @@
34
 # cmake/modules/pkg-config.cmake
35
 #
36
-# Copyright (C) 2006  Alan W. Irwin
37
+# Copyright (C) 2006-2015 Alan W. Irwin
38
 #
39
 # This file is part of PLplot.
40
 #
41
@@ -39,7 +39,7 @@ include(FindPkgConfig)
3
@@ -39,7 +39,7 @@ include(FindPkgConfig)
42
 
4
 
43
 if(PKG_CONFIG_EXECUTABLE)
5
 if(PKG_CONFIG_EXECUTABLE)
Lines 47-63 Link Here
47
   set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
9
   set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
48
 
10
 
49
   # Will likely need WIN32 and CYGWIN stanzas as well
11
   # Will likely need WIN32 and CYGWIN stanzas as well
50
@@ -94,7 +94,12 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_DIR _link_FLAGS _cflags _v
51
     set(_xprefix ${_prefix})
52
   endif(FORCE_EXTERNAL_STATIC)
53
   
54
-  _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
55
+  if(CMAKE_VERSION VERSION_LESS "3.1")
56
+    _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
57
+  else(CMAKE_VERSION VERSION_LESS "3.1")
58
+    _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
59
+  endif(CMAKE_VERSION VERSION_LESS "3.1")
60
+    
61
   if(${_prefix}_FOUND)
62
     cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
63
     # If libraries cannot be not found, then that is equivalent to whole
(-)math/plplot/files/patch-doc__docbook__src__tcl.xml (-3 / +3 lines)
Lines 1-6 Link Here
1
--- doc/docbook/src/tcl.xml.orig
1
--- doc/docbook/src/tcl.xml.orig	2015-04-12 10:08:04 UTC
2
+++ doc/docbook/src/tcl.xml
2
+++ doc/docbook/src/tcl.xml
3
@@ -576,7 +576,7 @@
3
@@ -576,7 +576,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU
4
 	if (pm->fdata[i] > max)
4
 	if (pm->fdata[i] > max)
5
 	max = pm->fdata[i];
5
 	max = pm->fdata[i];
6
 
6
 
Lines 9-15 Link Here
9
 	return TCL_OK;
9
 	return TCL_OK;
10
 	}
10
 	}
11
 
11
 
12
@@ -589,7 +589,7 @@
12
@@ -589,7 +589,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SU
13
 	if (pm->fdata[i] &lt; min)
13
 	if (pm->fdata[i] &lt; min)
14
 	min = pm->fdata[i];
14
 	min = pm->fdata[i];
15
 
15
 
(-)math/plplot/files/patch-examples__python__CMakeLists.txt (-2 / +2 lines)
Lines 1-6 Link Here
1
--- examples/python/CMakeLists.txt.orig
1
--- examples/python/CMakeLists.txt.orig	2015-04-12 10:08:04 UTC
2
+++ examples/python/CMakeLists.txt
2
+++ examples/python/CMakeLists.txt
3
@@ -241,7 +241,7 @@
3
@@ -245,7 +245,7 @@ if(CORE_BUILD)
4
     @ONLY
4
     @ONLY
5
     )
5
     )
6
 
6
 
(-)math/plplot/files/patch-examples__tk__xtk01.c (-2 / +2 lines)
Lines 1-6 Link Here
1
--- examples/tk/xtk01.c.orig
1
--- examples/tk/xtk01.c.orig	2015-04-12 10:08:04 UTC
2
+++ examples/tk/xtk01.c
2
+++ examples/tk/xtk01.c
3
@@ -53,7 +53,7 @@
3
@@ -52,7 +52,7 @@ main( int argc, const char **argv )
4
 //
4
 //
5
 // Results:
5
 // Results:
6
 //	Returns a standard Tcl completion code, and leaves an error
6
 //	Returns a standard Tcl completion code, and leaves an error
(-)math/plplot/files/patch-examples__tk__xtk02.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- examples/tk/xtk02.c.orig	2011-11-30 23:04:42.000000000 +0100
1
--- examples/tk/xtk02.c.orig	2015-04-12 10:08:04 UTC
2
+++ examples/tk/xtk02.c	2013-10-01 23:06:58.000000000 +0200
2
+++ examples/tk/xtk02.c
3
@@ -85,7 +85,7 @@
3
@@ -83,7 +83,7 @@ main( int argc, const char **argv )
4
 //
4
 //
5
 // Results:
5
 // Results:
6
 //	Returns a standard Tcl completion code, and leaves an error
6
 //	Returns a standard Tcl completion code, and leaves an error
(-)math/plplot/files/patch-examples__tk__xtk04.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- examples/tk/xtk04.c.orig	2011-11-30 23:04:42.000000000 +0100
1
--- examples/tk/xtk04.c.orig	2015-04-12 10:08:04 UTC
2
+++ examples/tk/xtk04.c	2013-10-01 23:08:24.000000000 +0200
2
+++ examples/tk/xtk04.c
3
@@ -87,7 +87,7 @@
3
@@ -85,7 +85,7 @@ main( int argc, const char **argv )
4
 //
4
 //
5
 // Results:
5
 // Results:
6
 //	Returns a standard Tcl completion code, and leaves an error
6
 //	Returns a standard Tcl completion code, and leaves an error
(-)math/plplot/files/patch-include_plConfig.h (-12 lines)
Lines 1-12 Link Here
1
--- include/plConfig.h.in.orig	2013-12-29 21:11:07.000000000 +0100
2
+++ include/plConfig.h.in	2014-03-06 15:35:44.000000000 +0100
3
@@ -44,7 +44,8 @@
4
 #ifndef __PLCONFIG_H__
5
 #define __PLCONFIG_H__
6
 
7
-#ifdef HAVE_CONFIG_H
8
+// plplot_config.h won't be installed: don't let it be used by consumers
9
+#if defined(HAVE_CONFIG_H) && defined(_IS_BUILDING_PLPLOT_PORT_)
10
 #  include <plplot_config.h>
11
 #endif
12
 
(-)math/plplot/files/patch-include_plConfig.h.in (+12 lines)
Line 0 Link Here
1
--- include/plConfig.h.in.orig	2015-04-12 10:08:04 UTC
2
+++ include/plConfig.h.in
3
@@ -43,7 +43,8 @@
4
 #ifndef __PLCONFIG_H__
5
 #define __PLCONFIG_H__
6
 
7
-#ifdef PLPLOT_HAVE_CONFIG_H
8
+// plplot_config.h won't be installed: don't let it be used by consumers
9
+#if defined(PLPLOT_HAVE_CONFIG_H) && defined(_IS_BUILDING_PLPLOT_PORT_)
10
 #  include <plplot_config.h>
11
 #endif
12
 
(-)math/plplot/files/patch-plplot_test__CMakeLists.txt (-17 lines)
Lines 1-17 Link Here
1
--- plplot_test/CMakeLists.txt.orig	2013-07-09 21:27:35.000000000 +0200
2
+++ plplot_test/CMakeLists.txt	2013-10-01 23:12:09.000000000 +0200
3
@@ -452,14 +452,6 @@
4
     list(APPEND test_output_files_LIST ${output_list})
5
   endif(PLD_pdfqt)
6
 
7
-  if(PLD_pdf)
8
-    add_test(examples_pdf
9
-      ${SH_EXECUTABLE} -c "${TEST_ENVIRONMENT} ${TEST_SCRIPT} --front-end=c --device=pdf"
10
-      )
11
-    list_example_files(. pdf c output_list)
12
-    list(APPEND test_output_files_LIST ${output_list})
13
-  endif(PLD_pdf)
14
-
15
   if(CMP_EXECUTABLE OR DIFF_EXECUTABLE AND TAIL_EXECUTABLE)
16
     configure_file(
17
       test_diff.sh.in
(-)math/plplot/files/patch-scripts__CMakeLists.txt (-3 / +3 lines)
Lines 1-6 Link Here
1
--- scripts/CMakeLists.txt.orig	2012-01-04 16:45:07.000000000 +0100
1
--- scripts/CMakeLists.txt.orig	2015-04-12 10:08:04 UTC
2
+++ scripts/CMakeLists.txt	2013-10-01 23:16:18.000000000 +0200
2
+++ scripts/CMakeLists.txt
3
@@ -28,7 +28,7 @@
3
@@ -28,7 +28,7 @@ if(HAVE_BASH)
4
     )
4
     )
5
   endif(PLD_plmeta)
5
   endif(PLD_plmeta)
6
   if(PLD_pstex)
6
   if(PLD_pstex)
(-)math/plplot/files/patch-util__plrender.c (-20 lines)
Lines 1-20 Link Here
1
--- utils/plrender.c.orig
2
+++ utils/plrender.c
3
@@ -834,7 +834,7 @@
4
     if ( code ) { fprintf( stderr,          \
5
                       "Unable to read in %s at line %d, bytecount %d\n\
6
 Bytes requested: %d\n", __FILE__, __LINE__, \
7
-                      (int) pdfs->bp, (int) 2 * n ); return -1; }
8
+                      (int) pdfs->bp, (int) 2 * n ); return; }
9
 
10
 static void
11
 get_ncoords( PLFLT *x, PLFLT *y, PLINT n )
12
@@ -869,7 +869,7 @@
13
         free( ys );
14
     }
15
 
16
-    return 0;
17
+    return;
18
 }
19
 
20
 //--------------------------------------------------------------------------
(-)math/plplot/pkg-plist (-108 / +69 lines)
Lines 21-34 Link Here
21
include/plplot/qsastime.h
21
include/plplot/qsastime.h
22
include/plplot/qsastimedll.h
22
include/plplot/qsastimedll.h
23
%%QT4%%include/plplot/qt.h
23
%%QT4%%include/plplot/qt.h
24
%%WXGTK%%include/plplot/wxPLplotstream.h
24
%%WXGTK%%include/plplot/deprecated_wxPLplotstream.h
25
%%WXGTK%%include/plplot/wxPLplotwindow.h
25
%%WXGTK%%include/plplot/deprecated_wxPLplotwindow.h
26
%%TCLTK%%include/plplot/tclMatrix.h
26
%%TCLTK%%include/plplot/tclMatrix.h
27
%%FORTRAN%%lib/fortran/include/plplot/plplot_parameters.h
28
%%FORTRAN%%lib/fortran/modules/plplot/plf95demolib.mod
27
%%FORTRAN%%lib/fortran/modules/plplot/plf95demolib.mod
29
%%FORTRAN%%lib/fortran/modules/plplot/plplot.mod
28
%%FORTRAN%%lib/fortran/modules/plplot/plplot.mod
30
%%FORTRAN%%lib/fortran/modules/plplot/plplot_flt.mod
29
%%FORTRAN%%lib/fortran/modules/plplot/plplot_graphics.mod
30
%%FORTRAN%%lib/fortran/modules/plplot/plplot_str.mod
31
%%FORTRAN%%lib/fortran/modules/plplot/plplot_strutils.mod
32
%%FORTRAN%%lib/fortran/modules/plplot/plplot_types.mod
31
%%FORTRAN%%lib/fortran/modules/plplot/plplotp.mod
33
%%FORTRAN%%lib/fortran/modules/plplot/plplotp.mod
34
lib/cmake/plplot/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake
35
lib/cmake/plplot/export_plplot.cmake
36
lib/cmake/plplot/plplotConfig.cmake
32
lib/libcsirocsa.so
37
lib/libcsirocsa.so
33
lib/libcsirocsa.so.0
38
lib/libcsirocsa.so.0
34
lib/libcsirocsa.so.0.0.1
39
lib/libcsirocsa.so.0.0.1
Lines 35-101 Link Here
35
lib/libcsironn.so
40
lib/libcsironn.so
36
lib/libcsironn.so.0
41
lib/libcsironn.so.0
37
lib/libcsironn.so.0.0.1
42
lib/libcsironn.so.0.0.1
38
%%FORTRAN%%lib/libplf95demolibd.a
43
%%FORTRAN%%lib/libplf95demolib.a
39
lib/libplplotcxxd.so
44
lib/libplplot.so
40
lib/libplplotcxxd.so.11
45
lib/libplplot.so.13
41
lib/libplplotcxxd.so.11.0.0
46
lib/libplplot.so.13.0.1
42
lib/libplplotd.so
47
lib/libplplotcxx.so
43
lib/libplplotd.so.12
48
lib/libplplotcxx.so.12
44
lib/libplplotd.so.12.0.1
49
lib/libplplotcxx.so.12.0.0
45
%%FORTRAN%%lib/libplplotf77cd.so
50
%%FORTRAN%%lib/libplplotf95.so
46
%%FORTRAN%%lib/libplplotf77cd.so.9
51
%%FORTRAN%%lib/libplplotf95.so.12
47
%%FORTRAN%%lib/libplplotf77cd.so.9.1.1
52
%%FORTRAN%%lib/libplplotf95.so.12.0.0
48
%%FORTRAN%%lib/libplplotf77d.so
53
%%FORTRAN%%lib/libplplotf95c.so
49
%%FORTRAN%%lib/libplplotf77d.so.9
54
%%FORTRAN%%lib/libplplotf95c.so.12
50
%%FORTRAN%%lib/libplplotf77d.so.9.1.1
55
%%FORTRAN%%lib/libplplotf95c.so.12.0.0
51
%%FORTRAN%%lib/libplplotf95cd.so
56
%%QT4%%lib/libplplotqt.so
52
%%FORTRAN%%lib/libplplotf95cd.so.10
57
%%QT4%%lib/libplplotqt.so.2
53
%%FORTRAN%%lib/libplplotf95cd.so.10.0.0
58
%%QT4%%lib/libplplotqt.so.2.0.0
54
%%FORTRAN%%lib/libplplotf95d.so
59
%%TCLTK%%lib/libplplottcltk.so
55
%%FORTRAN%%lib/libplplotf95d.so.10
60
%%TCLTK%%lib/libplplottcltk.so.10
56
%%FORTRAN%%lib/libplplotf95d.so.10.0.0
61
%%TCLTK%%lib/libplplottcltk.so.10.0.0
57
%%QT4%%lib/libplplotqtd.so
62
%%WXGTK%%lib/libplplotwxwidgets.so
58
%%QT4%%lib/libplplotqtd.so.1
63
%%WXGTK%%lib/libplplotwxwidgets.so.1
59
%%QT4%%lib/libplplotqtd.so.1.0.0
64
%%WXGTK%%lib/libplplotwxwidgets.so.1.0.0
60
%%TCLTK%%lib/libplplottcltkd.so
61
%%TCLTK%%lib/libplplottcltkd.so.10
62
%%TCLTK%%lib/libplplottcltkd.so.10.0.0
63
%%WXGTK%%lib/libplplotwxwidgetsd.so
64
%%WXGTK%%lib/libplplotwxwidgetsd.so.0
65
%%WXGTK%%lib/libplplotwxwidgetsd.so.0.0.0
66
lib/libqsastime.so
65
lib/libqsastime.so
67
lib/libqsastime.so.0
66
lib/libqsastime.so.0
68
lib/libqsastime.so.0.0.1
67
lib/libqsastime.so.0.0.1
69
%%TCLTK%%lib/libtclmatrixd.so
68
%%TCLTK%%lib/libtclmatrix.so
70
%%TCLTK%%lib/libtclmatrixd.so.9
69
%%TCLTK%%lib/libtclmatrix.so.9
71
%%TCLTK%%lib/libtclmatrixd.so.9.2.0
70
%%TCLTK%%lib/libtclmatrix.so.9.2.0
72
%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so
71
%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so
73
lib/plplot/driversd/cairo.driver_info
72
lib/plplot/drivers/cairo.driver_info
74
lib/plplot/driversd/cairo.so
73
lib/plplot/drivers/cairo.so
75
%%GD%%lib/plplot/driversd/gd.driver_info
74
%%GD%%lib/plplot/drivers/gd.driver_info
76
%%GD%%lib/plplot/driversd/gd.so
75
%%GD%%lib/plplot/drivers/gd.so
77
lib/plplot/driversd/mem.driver_info
76
lib/plplot/drivers/mem.driver_info
78
lib/plplot/driversd/mem.so
77
lib/plplot/drivers/mem.so
79
lib/plplot/driversd/null.driver_info
78
lib/plplot/drivers/null.driver_info
80
lib/plplot/driversd/null.so
79
lib/plplot/drivers/null.so
81
lib/plplot/driversd/ps.driver_info
80
lib/plplot/drivers/ps.driver_info
82
lib/plplot/driversd/ps.so
81
lib/plplot/drivers/ps.so
83
lib/plplot/driversd/psttf.driver_info
82
lib/plplot/drivers/psttf.driver_info
84
lib/plplot/driversd/psttf.so
83
lib/plplot/drivers/psttf.so
85
%%QT4%%lib/plplot/driversd/qt.driver_info
84
%%QT4%%lib/plplot/drivers/qt.driver_info
86
%%QT4%%lib/plplot/driversd/qt.so
85
%%QT4%%lib/plplot/drivers/qt.so
87
lib/plplot/driversd/svg.driver_info
86
lib/plplot/drivers/svg.driver_info
88
lib/plplot/driversd/svg.so
87
lib/plplot/drivers/svg.so
89
%%TCLTK%%lib/plplot/driversd/tk.driver_info
88
%%TCLTK%%lib/plplot/drivers/tk.driver_info
90
%%TCLTK%%lib/plplot/driversd/tk.so
89
%%TCLTK%%lib/plplot/drivers/tk.so
91
%%TCLTK%%lib/plplot/driversd/tkwin.driver_info
90
%%TCLTK%%lib/plplot/drivers/tkwin.driver_info
92
%%TCLTK%%lib/plplot/driversd/tkwin.so
91
%%TCLTK%%lib/plplot/drivers/tkwin.so
93
%%WXGTK%%lib/plplot/driversd/wxwidgets.driver_info
92
%%WXGTK%%lib/plplot/drivers/wxwidgets.driver_info
94
%%WXGTK%%lib/plplot/driversd/wxwidgets.so
93
%%WXGTK%%lib/plplot/drivers/wxwidgets.so
95
lib/plplot/driversd/xfig.driver_info
94
lib/plplot/drivers/xfig.driver_info
96
lib/plplot/driversd/xfig.so
95
lib/plplot/drivers/xfig.so
97
%%X11%%lib/plplot/driversd/xwin.driver_info
96
%%X11%%lib/plplot/drivers/xwin.driver_info
98
%%X11%%lib/plplot/driversd/xwin.so
97
%%X11%%lib/plplot/drivers/xwin.so
99
%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py
98
%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py
100
%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py
99
%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py
101
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so
100
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so
Lines 102-114 Link Here
102
%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot.py
101
%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot.py
103
%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot_widgetmodule.so
102
%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplot_widgetmodule.so
104
%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py
103
%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py
105
libdata/pkgconfig/plplotd-c++.pc
104
libdata/pkgconfig/plplot-c++.pc
106
%%FORTRAN%%libdata/pkgconfig/plplotd-f77.pc
105
%%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
107
%%FORTRAN%%libdata/pkgconfig/plplotd-f95.pc
106
%%QT4%%libdata/pkgconfig/plplot-qt.pc
108
%%QT4%%libdata/pkgconfig/plplotd-qt.pc
107
%%TCLTK%%libdata/pkgconfig/plplot-tcl.pc
109
%%TCLTK%%libdata/pkgconfig/plplotd-tcl.pc
108
%%WXGTK%%libdata/pkgconfig/plplot-wxwidgets.pc
110
%%WXGTK%%libdata/pkgconfig/plplotd-wxwidgets.pc
109
libdata/pkgconfig/plplot.pc
111
libdata/pkgconfig/plplotd.pc
112
%%TCLTK%%man/man1/plserver.1.gz
110
%%TCLTK%%man/man1/plserver.1.gz
113
%%TCLTK%%man/man1/pltcl.1.gz
111
%%TCLTK%%man/man1/pltcl.1.gz
114
man/man1/pltek.1.gz
112
man/man1/pltek.1.gz
Lines 151-157 Link Here
151
%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp
149
%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp
152
%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
150
%%QT4%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
153
%%QT4%%%%DATADIR%%/examples/c++/qt_example.cpp
151
%%QT4%%%%DATADIR%%/examples/c++/qt_example.cpp
154
%%WXGTK%%%%DATADIR%%/examples/c++/wxPLplotDemo.cpp
152
%%WXGTK%%%%DATADIR%%/examples/c++/deprecated_wxPLplotDemo.cpp
155
%%DATADIR%%/examples/c++/x00.cc
153
%%DATADIR%%/examples/c++/x00.cc
156
%%DATADIR%%/examples/c++/x01.cc
154
%%DATADIR%%/examples/c++/x01.cc
157
%%DATADIR%%/examples/c++/x01cc.cc
155
%%DATADIR%%/examples/c++/x01cc.cc
Lines 192-197 Link Here
192
%%DATADIR%%/examples/c/ext-cairo-test.c
190
%%DATADIR%%/examples/c/ext-cairo-test.c
193
%%X11%%%%DATADIR%%/examples/c/extXdrawable_demo.c
191
%%X11%%%%DATADIR%%/examples/c/extXdrawable_demo.c
194
%%DATADIR%%/examples/c/plcdemos.h
192
%%DATADIR%%/examples/c/plcdemos.h
193
%%DATADIR%%/examples/c/test_plbuf.c
195
%%DATADIR%%/examples/c/test_plend.c
194
%%DATADIR%%/examples/c/test_plend.c
196
%%DATADIR%%/examples/c/tutor.c
195
%%DATADIR%%/examples/c/tutor.c
197
%%DATADIR%%/examples/c/x00c.c
196
%%DATADIR%%/examples/c/x00c.c
Lines 229-276 Link Here
229
%%DATADIR%%/examples/c/x32c.c
228
%%DATADIR%%/examples/c/x32c.c
230
%%DATADIR%%/examples/c/x33c.c
229
%%DATADIR%%/examples/c/x33c.c
231
%%DATADIR%%/examples/c/x34c.c
230
%%DATADIR%%/examples/c/x34c.c
232
%%DATADIR%%/examples/cmake/modules/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake
233
%%DATADIR%%/examples/cmake/modules/export_plplot.cmake
234
%%DATADIR%%/examples/cmake/modules/language_support.cmake
231
%%DATADIR%%/examples/cmake/modules/language_support.cmake
232
%%QT4%%%%DATADIR%%/examples/cmake/modules/ndp_UseQt4.cmake
235
%%DATADIR%%/examples/cmake/modules/pkg-config.cmake
233
%%DATADIR%%/examples/cmake/modules/pkg-config.cmake
236
%%DATADIR%%/examples/cmake/modules/plplot_configure.cmake
234
%%DATADIR%%/examples/cmake/modules/plplot_configure.cmake
237
%%DATADIR%%/examples/cmake/modules/plplot_functions.cmake
235
%%DATADIR%%/examples/cmake/modules/plplot_functions.cmake
238
%%FORTRAN%%%%DATADIR%%/examples/f77/CMakeLists.txt
239
%%FORTRAN%%%%DATADIR%%/examples/f77/Makefile
240
%%FORTRAN%%%%DATADIR%%/examples/f77/plf77demos.inc
241
%%FORTRAN%%%%DATADIR%%/examples/f77/x01f.f
242
%%FORTRAN%%%%DATADIR%%/examples/f77/x02f.f
243
%%FORTRAN%%%%DATADIR%%/examples/f77/x03f.f
244
%%FORTRAN%%%%DATADIR%%/examples/f77/x04f.f
245
%%FORTRAN%%%%DATADIR%%/examples/f77/x05f.f
246
%%FORTRAN%%%%DATADIR%%/examples/f77/x06f.f
247
%%FORTRAN%%%%DATADIR%%/examples/f77/x07f.f
248
%%FORTRAN%%%%DATADIR%%/examples/f77/x08f.f
249
%%FORTRAN%%%%DATADIR%%/examples/f77/x09f.f
250
%%FORTRAN%%%%DATADIR%%/examples/f77/x10f.f
251
%%FORTRAN%%%%DATADIR%%/examples/f77/x11f.f
252
%%FORTRAN%%%%DATADIR%%/examples/f77/x12f.f
253
%%FORTRAN%%%%DATADIR%%/examples/f77/x13f.f
254
%%FORTRAN%%%%DATADIR%%/examples/f77/x14f.f
255
%%FORTRAN%%%%DATADIR%%/examples/f77/x15f.f
256
%%FORTRAN%%%%DATADIR%%/examples/f77/x16af.f
257
%%FORTRAN%%%%DATADIR%%/examples/f77/x16f.f
258
%%FORTRAN%%%%DATADIR%%/examples/f77/x17f.f
259
%%FORTRAN%%%%DATADIR%%/examples/f77/x18f.f
260
%%FORTRAN%%%%DATADIR%%/examples/f77/x19f.f
261
%%FORTRAN%%%%DATADIR%%/examples/f77/x20f.f
262
%%FORTRAN%%%%DATADIR%%/examples/f77/x21f.f
263
%%FORTRAN%%%%DATADIR%%/examples/f77/x22f.f
264
%%FORTRAN%%%%DATADIR%%/examples/f77/x23f.f
265
%%FORTRAN%%%%DATADIR%%/examples/f77/x24f.f
266
%%FORTRAN%%%%DATADIR%%/examples/f77/x25f.f
267
%%FORTRAN%%%%DATADIR%%/examples/f77/x26f.f
268
%%FORTRAN%%%%DATADIR%%/examples/f77/x27f.f
269
%%FORTRAN%%%%DATADIR%%/examples/f77/x28f.f
270
%%FORTRAN%%%%DATADIR%%/examples/f77/x29f.f
271
%%FORTRAN%%%%DATADIR%%/examples/f77/x30f.f
272
%%FORTRAN%%%%DATADIR%%/examples/f77/x31f.f
273
%%FORTRAN%%%%DATADIR%%/examples/f77/x33f.f
274
%%FORTRAN%%%%DATADIR%%/examples/f95/CMakeLists.txt
236
%%FORTRAN%%%%DATADIR%%/examples/f95/CMakeLists.txt
275
%%FORTRAN%%%%DATADIR%%/examples/f95/Makefile
237
%%FORTRAN%%%%DATADIR%%/examples/f95/Makefile
276
%%FORTRAN%%%%DATADIR%%/examples/f95/plf95demos.inc
238
%%FORTRAN%%%%DATADIR%%/examples/f95/plf95demos.inc
Lines 534-540 Link Here
534
%%DATADIR%%/examples/test_c_interactive.sh
496
%%DATADIR%%/examples/test_c_interactive.sh
535
%%DATADIR%%/examples/test_cxx.sh
497
%%DATADIR%%/examples/test_cxx.sh
536
%%DATADIR%%/examples/test_diff.sh
498
%%DATADIR%%/examples/test_diff.sh
537
%%FORTRAN%%%%DATADIR%%/examples/test_f77.sh
538
%%FORTRAN%%%%DATADIR%%/examples/test_f95.sh
499
%%FORTRAN%%%%DATADIR%%/examples/test_f95.sh
539
%%LUA%%%%DATADIR%%/examples/test_lua.sh
500
%%LUA%%%%DATADIR%%/examples/test_lua.sh
540
%%PYTHON%%%%DATADIR%%/examples/test_python.sh
501
%%PYTHON%%%%DATADIR%%/examples/test_python.sh

Return to bug 199539