Attachment #202916 for bug #236577

View | Details | Raw Unified | Return to bug 236577
Collapse All | Expand All

Lines 2-9 Link Here

(-)math/plplot/Makefile (-3 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= plplot	4	PORTNAME= plplot
5	PORTVERSION= 5.12.0	5	DISTVERSION= 5.14.0
6	PORTREVISION= 6
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 25-30 Link Here
25	localbase perl5 pathfix pkgconfig	24	localbase perl5 pathfix pkgconfig
26	USE_GNOME= cairo pango	25	USE_GNOME= cairo pango
27	USE_PERL5= build	26	USE_PERL5= build
		27
28	CMAKE_ARGS= -DENABLE_java:BOOL=OFF \	28	CMAKE_ARGS= -DENABLE_java:BOOL=OFF \
29	-DENABLE_octave:BOOL=OFF \	29	-DENABLE_octave:BOOL=OFF \
30	-DENABLE_pdl:BOOL=OFF \	30	-DENABLE_pdl:BOOL=OFF \
Lines 38-47 Link Here
38	CFLAGS+= -D_IS_BUILDING_PLPLOT_PORT_	38	CFLAGS+= -D_IS_BUILDING_PLPLOT_PORT_
39	USE_LDCONFIG= yes	39	USE_LDCONFIG= yes
40	CMAKE_OFF= DEFAULT_NO_QT_DEVICES	40	CMAKE_OFF= DEFAULT_NO_QT_DEVICES
		41	LDFLAGS= -pthread
		42	DATADIR= ${PREFIX}/share/${PORTNAME}${PORTVERSION}
41		43
42	FREEFONT_DIR= ${LOCALBASE}/share/fonts/freefont-ttf	44	FREEFONT_DIR= ${LOCALBASE}/share/fonts/freefont-ttf
43		45
44	OPTIONS_DEFINE= DOCS FORTRAN GD LUA PYTHON TCLTK THREADS WXGTK X11	46	OPTIONS_DEFINE= DOCS FORTRAN GD LUA PYTHON QT5 TCLTK THREADS WXGTK X11
45	OPTIONS_RADIO= QHULL	47	OPTIONS_RADIO= QHULL
46	OPTIONS_RADIO_QHULL= QHULL2015 QHULL2003	48	OPTIONS_RADIO_QHULL= QHULL2015 QHULL2003
47	OPTIONS_DEFAULT= QHULL2015 THREADS X11	49	OPTIONS_DEFAULT= QHULL2015 THREADS X11
Lines 97-102 Link Here
97		99
98	THREADS_CMAKE_BOOL= THREADS_HAVE_PTHREAD_ARG	100	THREADS_CMAKE_BOOL= THREADS_HAVE_PTHREAD_ARG
99		101
		102	QT5_USES= qt:5
		103	QT5_USE= QT=core,gui,printsupport,svg,xml,widgets,buildtools_build,qmake_build
		104	QT5_CMAKE_BOOL= ENABLE_qt
100		105
101	WXGTK_LIB_DEPENDS= libagg.so:graphics/agg	106	WXGTK_LIB_DEPENDS= libagg.so:graphics/agg
102	WXGTK_USE= WX=3.0+	107	WXGTK_USE= WX=3.0+

Lines 1-3 Link Here

(-)math/plplot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1486185399	1	TIMESTAMP = 1552753531
2	SHA256 (plplot-5.12.0.tar.gz) = 8dc5da5ef80e4e19993d4c3ef2a84a24cc0e44a5dade83201fca7160a6d352ce	2	SHA256 (plplot-5.14.0.tar.gz) = 331009037c9cad9fcefacd7dbe9c7cfae25e766f5590f9efd739a294c649df97
3	SIZE (plplot-5.12.0.tar.gz) = 16253895	3	SIZE (plplot-5.14.0.tar.gz) = 15413089




--- bindings/tk/tkMain.c.orig	2015-04-12 10:08:04 UTC
+++ bindings/tk/tkMain.c
@@ -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




--- 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 @@ 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")




--- 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)




--- 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)
 
 # Drivers.
-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})




The *internal* _pkg_check_modules_internal macro of cmake gained another 
parameter in cmake-3.13.

https://gitlab.kitware.com/cmake/cmake/commit/7aa26cf0e9319be3f7785763eb3699823453eb60

--- cmake/modules/pkg-config.cmake.orig	2018-11-25 12:01:15 UTC
+++ cmake/modules/pkg-config.cmake
@@ -122,8 +122,10 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_
     _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
   elseif(CMAKE_VERSION VERSION_LESS "3.6")
     _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-  else(CMAKE_VERSION VERSION_LESS "3.1")
+  elseif(CMAKE_VERSION VERSION_LESS "3.13")
     _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}")
+  else(CMAKE_VERSION VERSION_LESS "3.1")
+    _pkg_check_modules_internal(0 0 0 0 0 0 ${_prefix} "${_package}")
   endif(CMAKE_VERSION VERSION_LESS "3.1")
 
   if(${_prefix}_FOUND)

Lines 2-9 Link Here

(-)math/plplot/pkg-plist (-38 / +48 lines)
2	%%TCLTK%%bin/pltcl	2	%%TCLTK%%bin/pltcl
3	bin/pltek	3	bin/pltek
4	%%WXGTK%%bin/wxPLViewer	4	%%WXGTK%%bin/wxPLViewer
		5	include/plplot/csa.h
		6	include/plplot/csadll.h
5	include/plplot/disptab.h	7	include/plplot/disptab.h
6	include/plplot/drivers.h	8	include/plplot/drivers.h
		9	include/plplot/nn.h
		10	include/plplot/nndll.h
7	include/plplot/pdf.h	11	include/plplot/pdf.h
8	include/plplot/plConfig.h	12	include/plplot/plConfig.h
9	include/plplot/plDevs.h	13	include/plplot/plDevs.h
Lines 19-24 Link Here
19	include/plplot/plxwd.h	23	include/plplot/plxwd.h
20	include/plplot/qsastime.h	24	include/plplot/qsastime.h
21	include/plplot/qsastimedll.h	25	include/plplot/qsastimedll.h
		26	%%QT5%%include/plplot/qt.h
22	%%TCLTK%%include/plplot/tclMatrix.h	27	%%TCLTK%%include/plplot/tclMatrix.h
23	%%WXGTK%%include/plplot/wxPLplot_nanosec.h	28	%%WXGTK%%include/plplot/wxPLplot_nanosec.h
24	%%WXGTK%%include/plplot/wxPLplotstream.h	29	%%WXGTK%%include/plplot/wxPLplotstream.h
Lines 42-55 Link Here
42	lib/libcsironn.so.0.0.2	47	lib/libcsironn.so.0.0.2
43	%%FORTRAN%%lib/libplf95demolib.a	48	%%FORTRAN%%lib/libplf95demolib.a
44	lib/libplplot.so	49	lib/libplplot.so
45	lib/libplplot.so.14	50	lib/libplplot.so.16
46	lib/libplplot.so.14.0.0	51	lib/libplplot.so.16.0.0
47	lib/libplplotcxx.so	52	lib/libplplotcxx.so
48	lib/libplplotcxx.so.13	53	lib/libplplotcxx.so.14
49	lib/libplplotcxx.so.13.0.0	54	lib/libplplotcxx.so.14.0.0
50	%%FORTRAN%%lib/libplplotf95.so	55	%%FORTRAN%%lib/libplplotf95.so
51	%%FORTRAN%%lib/libplplotf95.so.13	56	%%FORTRAN%%lib/libplplotf95.so.13
52	%%FORTRAN%%lib/libplplotf95.so.13.0.0	57	%%FORTRAN%%lib/libplplotf95.so.13.0.0
		58	%%QT5%%lib/libplplotqt.so
		59	%%QT5%%lib/libplplotqt.so.2
		60	%%QT5%%lib/libplplotqt.so.2.0.2
53	%%TCLTK%%lib/libplplottcltk.so	61	%%TCLTK%%lib/libplplottcltk.so
54	%%TCLTK%%lib/libplplottcltk.so.13	62	%%TCLTK%%lib/libplplottcltk.so.13
55	%%TCLTK%%lib/libplplottcltk.so.13.0.0	63	%%TCLTK%%lib/libplplottcltk.so.13.0.0
Lines 65-103 Link Here
65	%%TCLTK%%lib/libtclmatrix.so	73	%%TCLTK%%lib/libtclmatrix.so
66	%%TCLTK%%lib/libtclmatrix.so.10	74	%%TCLTK%%lib/libtclmatrix.so.10
67	%%TCLTK%%lib/libtclmatrix.so.10.3.0	75	%%TCLTK%%lib/libtclmatrix.so.10.3.0
		76	lib/plplot5.14.0/drivers/cairo.driver_info
		77	lib/plplot5.14.0/drivers/cairo.so
		78	lib/plplot5.14.0/drivers/mem.driver_info
		79	lib/plplot5.14.0/drivers/mem.so
		80	lib/plplot5.14.0/drivers/null.driver_info
		81	lib/plplot5.14.0/drivers/null.so
		82	lib/plplot5.14.0/drivers/ps.driver_info
		83	lib/plplot5.14.0/drivers/ps.so
		84	lib/plplot5.14.0/drivers/psttf.driver_info
		85	lib/plplot5.14.0/drivers/psttf.so
		86	lib/plplot5.14.0/drivers/svg.driver_info
		87	lib/plplot5.14.0/drivers/svg.so
		88	lib/plplot5.14.0/drivers/xfig.driver_info
		89	lib/plplot5.14.0/drivers/xfig.so
		90	%%X11%%lib/plplot5.14.0/drivers/xwin.driver_info
		91	%%X11%%lib/plplot5.14.0/drivers/xwin.so
68	libdata/pkgconfig/plplot-c++.pc	92	libdata/pkgconfig/plplot-c++.pc
69	%%FORTRAN%%libdata/pkgconfig/plplot-f95.pc	93	%%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
		94	%%QT5%%libdata/pkgconfig/plplot-qt.pc
70	%%TCLTK%%libdata/pkgconfig/plplot-tcl.pc	95	%%TCLTK%%libdata/pkgconfig/plplot-tcl.pc
71	%%TCLTK%%libdata/pkgconfig/plplot-tcl_Main.pc	96	%%TCLTK%%libdata/pkgconfig/plplot-tcl_Main.pc
72	%%WXGTK%%libdata/pkgconfig/plplot-wxwidgets.pc	97	%%WXGTK%%libdata/pkgconfig/plplot-wxwidgets.pc
73	libdata/pkgconfig/plplot.pc	98	libdata/pkgconfig/plplot.pc
74	%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so	99	%%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.so
75	lib/plplot/drivers/cairo.driver_info	100	%%GD%%lib/plplot5.14.0/drivers/gd.driver_info
76	lib/plplot/drivers/cairo.so	101	%%GD%%lib/plplot5.14.0/drivers/gd.so
77	%%GD%%lib/plplot/drivers/gd.driver_info	102	%%TCLTK%%lib/plplot5.14.0/drivers/ntk.driver_info
78	%%GD%%lib/plplot/drivers/gd.so	103	%%TCLTK%%lib/plplot5.14.0/drivers/ntk.so
79	lib/plplot/drivers/mem.driver_info	104	%%QT5%%lib/plplot5.14.0/drivers/qt.driver_info
80	lib/plplot/drivers/mem.so	105	%%QT5%%lib/plplot5.14.0/drivers/qt.so
81	%%TCLTK%%lib/plplot/drivers/ntk.driver_info	106	%%TCLTK%%lib/plplot5.14.0/drivers/tk.driver_info
82	%%TCLTK%%lib/plplot/drivers/ntk.so	107	%%TCLTK%%lib/plplot5.14.0/drivers/tk.so
83	lib/plplot/drivers/null.driver_info	108	%%TCLTK%%lib/plplot5.14.0/drivers/tkwin.driver_info
84	lib/plplot/drivers/null.so	109	%%TCLTK%%lib/plplot5.14.0/drivers/tkwin.so
85	lib/plplot/drivers/ps.driver_info	110	%%WXGTK%%lib/plplot5.14.0/drivers/wxwidgets.driver_info
86	lib/plplot/drivers/ps.so	111	%%WXGTK%%lib/plplot5.14.0/drivers/wxwidgets.so
87	lib/plplot/drivers/psttf.driver_info
88	lib/plplot/drivers/psttf.so
89	lib/plplot/drivers/svg.driver_info
90	lib/plplot/drivers/svg.so
91	%%TCLTK%%lib/plplot/drivers/tk.driver_info
92	%%TCLTK%%lib/plplot/drivers/tk.so
93	%%TCLTK%%lib/plplot/drivers/tkwin.driver_info
94	%%TCLTK%%lib/plplot/drivers/tkwin.so
95	%%WXGTK%%lib/plplot/drivers/wxwidgets.driver_info
96	%%WXGTK%%lib/plplot/drivers/wxwidgets.so
97	lib/plplot/drivers/xfig.driver_info
98	lib/plplot/drivers/xfig.so
99	%%X11%%lib/plplot/drivers/xwin.driver_info
100	%%X11%%lib/plplot/drivers/xwin.so
101	%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py	112	%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py
102	%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py	113	%%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py
103	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so	114	%%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so
Lines 106-112 Link Here
106	%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py	117	%%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py
107	%%TCLTK%%man/man1/plserver.1.gz	118	%%TCLTK%%man/man1/plserver.1.gz
108	%%TCLTK%%man/man1/pltcl.1.gz	119	%%TCLTK%%man/man1/pltcl.1.gz
109	man/man1/pltek.1.gz
110	%%PORTDOCS%%%%DOCSDIR%%/ABOUT	120	%%PORTDOCS%%%%DOCSDIR%%/ABOUT
111	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	121	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
112	%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB	122	%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
Lines 116-131 Link Here
116	%%PORTDOCS%%%%DOCSDIR%%/NEWS	126	%%PORTDOCS%%%%DOCSDIR%%/NEWS
117	%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS	127	%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
118	%%PORTDOCS%%%%DOCSDIR%%/README	128	%%PORTDOCS%%%%DOCSDIR%%/README
119	%%PORTDOCS%%%%DOCSDIR%%/README.1st.csa
120	%%PORTDOCS%%%%DOCSDIR%%/README.1st.nn
121	%%PORTDOCS%%%%DOCSDIR%%/README.csa	129	%%PORTDOCS%%%%DOCSDIR%%/README.csa
		130	%%PORTDOCS%%%%DOCSDIR%%/README.cumulated_%%CMAKE_BUILD_TYPE%%
122	%%PORTDOCS%%%%DOCSDIR%%/README.drivers	131	%%PORTDOCS%%%%DOCSDIR%%/README.drivers
123	%%PORTDOCS%%%%DOCSDIR%%/README.nn	132	%%PORTDOCS%%%%DOCSDIR%%/README.nn
124	%%PORTDOCS%%%%DOCSDIR%%/README.pkg-config	133	%%PORTDOCS%%%%DOCSDIR%%/README.pkg-config
125	%%PORTDOCS%%%%DOCSDIR%%/README.release	134	%%PORTDOCS%%%%DOCSDIR%%/README.release
126	%%PORTDOCS%%%%DOCSDIR%%/README.testing
127	%%PORTDOCS%%%%DOCSDIR%%/README.wxwidgets	135	%%PORTDOCS%%%%DOCSDIR%%/README.wxwidgets
128	%%DATADIR%%/cglobe.map	136	share/man/man1/pltek.1
129	%%DATADIR%%/cmap0_alternate.pal	137	%%DATADIR%%/cmap0_alternate.pal
130	%%DATADIR%%/cmap0_black_on_white.pal	138	%%DATADIR%%/cmap0_black_on_white.pal
131	%%DATADIR%%/cmap0_default.pal	139	%%DATADIR%%/cmap0_default.pal
Lines 141-147 Link Here
141	%%DATADIR%%/examples/Makefile	149	%%DATADIR%%/examples/Makefile
142	%%DATADIR%%/examples/c++/CMakeLists.txt	150	%%DATADIR%%/examples/c++/CMakeLists.txt
143	%%DATADIR%%/examples/c++/Makefile	151	%%DATADIR%%/examples/c++/Makefile
		152	%%QT5%%%%DATADIR%%/examples/c++/README.qt_example
144	%%DATADIR%%/examples/c++/plc++demos.h	153	%%DATADIR%%/examples/c++/plc++demos.h
		154	%%QT5%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp
		155	%%QT5%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
		156	%%QT5%%%%DATADIR%%/examples/c++/qt_example.cpp
145	%%WXGTK%%%%DATADIR%%/examples/c++/wxPLplotDemo.cpp	157	%%WXGTK%%%%DATADIR%%/examples/c++/wxPLplotDemo.cpp
146	%%DATADIR%%/examples/c++/x00.cc	158	%%DATADIR%%/examples/c++/x00.cc
147	%%DATADIR%%/examples/c++/x01.cc	159	%%DATADIR%%/examples/c++/x01.cc
Lines 222-227 Link Here
222	%%DATADIR%%/examples/c/x33c.c	234	%%DATADIR%%/examples/c/x33c.c
223	%%DATADIR%%/examples/c/x34c.c	235	%%DATADIR%%/examples/c/x34c.c
224	%%DATADIR%%/examples/cmake/modules/language_support.cmake	236	%%DATADIR%%/examples/cmake/modules/language_support.cmake
		237	%%QT5%%%%DATADIR%%/examples/cmake/modules/ndp_UseQt4.cmake
225	%%DATADIR%%/examples/cmake/modules/pkg-config.cmake	238	%%DATADIR%%/examples/cmake/modules/pkg-config.cmake
226	%%DATADIR%%/examples/cmake/modules/plplot_configure.cmake	239	%%DATADIR%%/examples/cmake/modules/plplot_configure.cmake
227	%%DATADIR%%/examples/cmake/modules/plplot_functions.cmake	240	%%DATADIR%%/examples/cmake/modules/plplot_functions.cmake
Lines 538-544 Link Here
538	%%TCLTK%%%%DATADIR%%/examples/tk/xtk01.c	551	%%TCLTK%%%%DATADIR%%/examples/tk/xtk01.c
539	%%TCLTK%%%%DATADIR%%/examples/tk/xtk02.c	552	%%TCLTK%%%%DATADIR%%/examples/tk/xtk02.c
540	%%TCLTK%%%%DATADIR%%/examples/tk/xtk04.c	553	%%TCLTK%%%%DATADIR%%/examples/tk/xtk04.c
541	%%DATADIR%%/globe.map
542	%%TCLTK%%%%DATADIR%%/pkgIndex.tcl	554	%%TCLTK%%%%DATADIR%%/pkgIndex.tcl
543	%%DATADIR%%/plstnd5.fnt	555	%%DATADIR%%/plstnd5.fnt
544	%%DATADIR%%/plxtnd5.fnt	556	%%DATADIR%%/plxtnd5.fnt
Lines 565-569 Link Here
565	%%TCLTK%%%%DATADIR%%/tcl/pltools.tcl	577	%%TCLTK%%%%DATADIR%%/tcl/pltools.tcl
566	%%TCLTK%%%%DATADIR%%/tcl/plwidget.tcl	578	%%TCLTK%%%%DATADIR%%/tcl/plwidget.tcl
567	%%TCLTK%%%%DATADIR%%/tcl/tclIndex	579	%%TCLTK%%%%DATADIR%%/tcl/tclIndex
568	%%DATADIR%%/usa.map
569	%%DATADIR%%/usaglobe.map

Return to bug 236577

Lines 1-13 Link Here

(-)math/plplot/files/patch-bindings__tk__tkMain.c (-13 lines)
1	--- bindings/tk/tkMain.c.orig 2015-04-12 10:08:04 UTC
2	+++ bindings/tk/tkMain.c
3	@@ -90,10 +90,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl
4	int allowOverwrite ) );
5	#endif
6
7	-#ifndef Tcl_GetGlobalNamespace_TCL_DECLARE
8	-EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( (
9	- Tcl_Interp * interp ) );
10	-#endif
11
12	//
13	// Declarations for various library procedures and variables (don't want

Lines 1-15 Link Here

(-)math/plplot/files/patch-cmake_modules_FindVGA.cmake (-15 lines)
1	--- cmake/modules/FindVGA.cmake.orig 2015-04-12 10:08:04 UTC
2	+++ cmake/modules/FindVGA.cmake
3	@@ -6,7 +6,6 @@
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.
6
7	-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	find_path(VGA_INCLUDE_DIR vga.h /usr/local/include /usr/include)
9
10	if(VGA_INCLUDE_DIR)
11	@@ -33,4 +32,3 @@ else(VGA_FOUND)
12	message(FATAL_ERROR "FindVGA: Could not find vga.h and/or the vga library")
13	endif(VGA_FIND_REQUIRED)
14	endif(VGA_FOUND)
15	-endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")

Lines 1-13 Link Here

(-)math/plplot/files/patch-cmake_modules_csiro.cmake (-13 lines)
1	--- cmake/modules/csiro.cmake.orig 2015-04-12 10:08:04 UTC
2	+++ cmake/modules/csiro.cmake
3	@@ -36,6 +36,10 @@ if(PL_HAVE_QHULL OR WITH_CSA)
4	else(CMAKE_C_COMPILER MATCHES "gcc")
5	set(NAN_CFLAGS "${NAN_CFLAGS} -ieee")
6	endif(CMAKE_C_COMPILER MATCHES "gcc")
7	+ else(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
8	+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
9	+ set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp")
10	+ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
11	endif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
12	endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86")
13	if(NOT DEFINED NaNAwareCCompiler)

Lines 1-45 Link Here

(-)math/plplot/files/patch-cmake_modules_instdirs.cmake (-45 lines)
1	--- cmake/modules/instdirs.cmake.orig 2015-04-12 10:08:04 UTC
2	+++ cmake/modules/instdirs.cmake
3	@@ -61,13 +61,13 @@ CACHE PATH "install location for C heade
4
5	set(
6	CMAKE_INSTALL_INFODIR
7	-${CMAKE_INSTALL_DATADIR}/info
8	+${CMAKE_INSTALL_PREFIX}/info
9	CACHE PATH "install location for info documentation"
10	)
11
12	set(
13	CMAKE_INSTALL_MANDIR
14	-${CMAKE_INSTALL_DATADIR}/man
15	+${CMAKE_INSTALL_PREFIX}/man
16	CACHE PATH "install location for man documentation"
17	)
18
19	@@ -75,7 +75,7 @@ CACHE PATH "install location for man doc
20	# cached values above.
21
22	# Data.
23	-set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION})
24	+set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE})
25
26	# Libraries.
27	set(LIB_DIR ${CMAKE_INSTALL_LIBDIR})
28	@@ -90,7 +90,7 @@ set(BIN_DIR ${CMAKE_INSTALL_BINDIR})
29	set(SHLIB_DIR ${CMAKE_INSTALL_LIBDIR})
30
31	# Tcl files.
32	-set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${PLPLOT_VERSION}/tcl)
33	+set(TCL_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}/tcl)
34
35	# Ada source files (.adb, .ads) (following recommendations in
36	# http://www.ada-france.org/debian/debian-ada-policy.html
37	@@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA
38	set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada)
39
40	# Drivers.
41	-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers)
42	+set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers)
43
44	# Documentation.
45	set(DOC_DIR ${CMAKE_INSTALL_DATADIR}/doc/${PACKAGE})

Lines 1-19 Link Here

(-)math/plplot/files/patch-cmake_modules_pkg-config.cmake (-19 lines)
1	The internal _pkg_check_modules_internal macro of cmake gained another
2	parameter in cmake-3.13.
3
4	https://gitlab.kitware.com/cmake/cmake/commit/7aa26cf0e9319be3f7785763eb3699823453eb60
5
6	--- cmake/modules/pkg-config.cmake.orig 2018-11-25 12:01:15 UTC
7	+++ cmake/modules/pkg-config.cmake
8	@@ -122,8 +122,10 @@ macro(pkg_check_pkgconfig _package _include_DIR _link_
9	_pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
10	elseif(CMAKE_VERSION VERSION_LESS "3.6")
11	_pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
12	- else(CMAKE_VERSION VERSION_LESS "3.1")
13	+ elseif(CMAKE_VERSION VERSION_LESS "3.13")
14	_pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}")
15	+ else(CMAKE_VERSION VERSION_LESS "3.1")
16	+ _pkg_check_modules_internal(0 0 0 0 0 0 ${_prefix} "${_package}")
17	endif(CMAKE_VERSION VERSION_LESS "3.1")
18
19	if(${_prefix}_FOUND)