Attachment 202916 Details for Bug 236577 – patch

[patch] patch

plplot.patch (text/plain), 15.18 KB, created by Yuri Victorovich on 2019-03-16 17:03:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2019-03-16 17:03:31 UTC

Size: 15.18 KB

patch

obsolete

>Index: math/plplot/Makefile
>===================================================================
>--- math/plplot/Makefile	(revision 495909)
>+++ math/plplot/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	plplot
>-PORTVERSION=	5.12.0
>-PORTREVISION=	6
>+DISTVERSION=	5.14.0
> CATEGORIES=	math science
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
> 
>@@ -25,6 +24,7 @@
> 		localbase perl5 pathfix pkgconfig
> USE_GNOME=	cairo pango
> USE_PERL5=	build
>+
> CMAKE_ARGS=	-DENABLE_java:BOOL=OFF \
> 		-DENABLE_octave:BOOL=OFF \
> 		-DENABLE_pdl:BOOL=OFF \
>@@ -38,10 +38,12 @@
> CFLAGS+=	-D_IS_BUILDING_PLPLOT_PORT_
> USE_LDCONFIG=	yes
> CMAKE_OFF=		DEFAULT_NO_QT_DEVICES
>+LDFLAGS=	-pthread
>+DATADIR=	${PREFIX}/share/${PORTNAME}${PORTVERSION}
> 
> FREEFONT_DIR=	${LOCALBASE}/share/fonts/freefont-ttf
> 
>-OPTIONS_DEFINE=		DOCS FORTRAN GD LUA PYTHON TCLTK THREADS WXGTK X11
>+OPTIONS_DEFINE=		DOCS FORTRAN GD LUA PYTHON QT5 TCLTK THREADS WXGTK X11
> OPTIONS_RADIO=		QHULL
> OPTIONS_RADIO_QHULL=	QHULL2015 QHULL2003
> OPTIONS_DEFAULT=	QHULL2015 THREADS X11
>@@ -97,6 +99,9 @@
> 
> THREADS_CMAKE_BOOL=	THREADS_HAVE_PTHREAD_ARG
> 
>+QT5_USES=		qt:5
>+QT5_USE=		QT=core,gui,printsupport,svg,xml,widgets,buildtools_build,qmake_build
>+QT5_CMAKE_BOOL=		ENABLE_qt
> 
> WXGTK_LIB_DEPENDS=	libagg.so:graphics/agg
> WXGTK_USE=		WX=3.0+
>Index: math/plplot/distinfo
>===================================================================
>--- math/plplot/distinfo	(revision 495909)
>+++ math/plplot/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1486185399
>-SHA256 (plplot-5.12.0.tar.gz) = 8dc5da5ef80e4e19993d4c3ef2a84a24cc0e44a5dade83201fca7160a6d352ce
>-SIZE (plplot-5.12.0.tar.gz) = 16253895
>+TIMESTAMP = 1552753531
>+SHA256 (plplot-5.14.0.tar.gz) = 331009037c9cad9fcefacd7dbe9c7cfae25e766f5590f9efd739a294c649df97
>+SIZE (plplot-5.14.0.tar.gz) = 15413089
>Index: math/plplot/files/patch-bindings__tk__tkMain.c
>===================================================================
>--- math/plplot/files/patch-bindings__tk__tkMain.c	(revision 495909)
>+++ math/plplot/files/patch-bindings__tk__tkMain.c	(nonexistent)
>@@ -1,13 +0,0 @@
>---- 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
>
>Property changes on: math/plplot/files/patch-bindings__tk__tkMain.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: math/plplot/files/patch-cmake_modules_FindVGA.cmake
>===================================================================
>--- math/plplot/files/patch-cmake_modules_FindVGA.cmake	(revision 495909)
>+++ math/plplot/files/patch-cmake_modules_FindVGA.cmake	(nonexistent)
>@@ -1,15 +0,0 @@
>---- 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")
>
>Property changes on: math/plplot/files/patch-cmake_modules_FindVGA.cmake
>___________________________________________________________________
>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: math/plplot/files/patch-cmake_modules_csiro.cmake
>===================================================================
>--- math/plplot/files/patch-cmake_modules_csiro.cmake	(revision 495909)
>+++ math/plplot/files/patch-cmake_modules_csiro.cmake	(nonexistent)
>@@ -1,13 +0,0 @@
>---- 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)
>
>Property changes on: math/plplot/files/patch-cmake_modules_csiro.cmake
>___________________________________________________________________
>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: math/plplot/files/patch-cmake_modules_instdirs.cmake
>===================================================================
>--- math/plplot/files/patch-cmake_modules_instdirs.cmake	(revision 495909)
>+++ math/plplot/files/patch-cmake_modules_instdirs.cmake	(nonexistent)
>@@ -1,45 +0,0 @@
>---- 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})
>
>Property changes on: math/plplot/files/patch-cmake_modules_instdirs.cmake
>___________________________________________________________________
>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: math/plplot/files/patch-cmake_modules_pkg-config.cmake
>===================================================================
>--- math/plplot/files/patch-cmake_modules_pkg-config.cmake	(revision 495909)
>+++ math/plplot/files/patch-cmake_modules_pkg-config.cmake	(nonexistent)
>@@ -1,19 +0,0 @@
>-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)
>
>Property changes on: math/plplot/files/patch-cmake_modules_pkg-config.cmake
>___________________________________________________________________
>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: math/plplot/pkg-plist
>===================================================================
>--- math/plplot/pkg-plist	(revision 495909)
>+++ math/plplot/pkg-plist	(working copy)
>@@ -2,8 +2,12 @@
> %%TCLTK%%bin/pltcl
> bin/pltek
> %%WXGTK%%bin/wxPLViewer
>+include/plplot/csa.h
>+include/plplot/csadll.h
> include/plplot/disptab.h
> include/plplot/drivers.h
>+include/plplot/nn.h
>+include/plplot/nndll.h
> include/plplot/pdf.h
> include/plplot/plConfig.h
> include/plplot/plDevs.h
>@@ -19,6 +23,7 @@
> include/plplot/plxwd.h
> include/plplot/qsastime.h
> include/plplot/qsastimedll.h
>+%%QT5%%include/plplot/qt.h
> %%TCLTK%%include/plplot/tclMatrix.h
> %%WXGTK%%include/plplot/wxPLplot_nanosec.h
> %%WXGTK%%include/plplot/wxPLplotstream.h
>@@ -42,14 +47,17 @@
> lib/libcsironn.so.0.0.2
> %%FORTRAN%%lib/libplf95demolib.a
> lib/libplplot.so
>-lib/libplplot.so.14
>-lib/libplplot.so.14.0.0
>+lib/libplplot.so.16
>+lib/libplplot.so.16.0.0
> lib/libplplotcxx.so
>-lib/libplplotcxx.so.13
>-lib/libplplotcxx.so.13.0.0
>+lib/libplplotcxx.so.14
>+lib/libplplotcxx.so.14.0.0
> %%FORTRAN%%lib/libplplotf95.so
> %%FORTRAN%%lib/libplplotf95.so.13
> %%FORTRAN%%lib/libplplotf95.so.13.0.0
>+%%QT5%%lib/libplplotqt.so
>+%%QT5%%lib/libplplotqt.so.2
>+%%QT5%%lib/libplplotqt.so.2.0.2
> %%TCLTK%%lib/libplplottcltk.so
> %%TCLTK%%lib/libplplottcltk.so.13
> %%TCLTK%%lib/libplplottcltk.so.13.0.0
>@@ -65,39 +73,42 @@
> %%TCLTK%%lib/libtclmatrix.so
> %%TCLTK%%lib/libtclmatrix.so.10
> %%TCLTK%%lib/libtclmatrix.so.10.3.0
>+lib/plplot5.14.0/drivers/cairo.driver_info
>+lib/plplot5.14.0/drivers/cairo.so
>+lib/plplot5.14.0/drivers/mem.driver_info
>+lib/plplot5.14.0/drivers/mem.so
>+lib/plplot5.14.0/drivers/null.driver_info
>+lib/plplot5.14.0/drivers/null.so
>+lib/plplot5.14.0/drivers/ps.driver_info
>+lib/plplot5.14.0/drivers/ps.so
>+lib/plplot5.14.0/drivers/psttf.driver_info
>+lib/plplot5.14.0/drivers/psttf.so
>+lib/plplot5.14.0/drivers/svg.driver_info
>+lib/plplot5.14.0/drivers/svg.so
>+lib/plplot5.14.0/drivers/xfig.driver_info
>+lib/plplot5.14.0/drivers/xfig.so
>+%%X11%%lib/plplot5.14.0/drivers/xwin.driver_info
>+%%X11%%lib/plplot5.14.0/drivers/xwin.so
> libdata/pkgconfig/plplot-c++.pc
> %%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
>+%%QT5%%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
> %%LUA%%%%LUA_MODLIBDIR%%/plplot/plplotluac.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
>-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
>+%%GD%%lib/plplot5.14.0/drivers/gd.driver_info
>+%%GD%%lib/plplot5.14.0/drivers/gd.so
>+%%TCLTK%%lib/plplot5.14.0/drivers/ntk.driver_info
>+%%TCLTK%%lib/plplot5.14.0/drivers/ntk.so
>+%%QT5%%lib/plplot5.14.0/drivers/qt.driver_info
>+%%QT5%%lib/plplot5.14.0/drivers/qt.so
>+%%TCLTK%%lib/plplot5.14.0/drivers/tk.driver_info
>+%%TCLTK%%lib/plplot5.14.0/drivers/tk.so
>+%%TCLTK%%lib/plplot5.14.0/drivers/tkwin.driver_info
>+%%TCLTK%%lib/plplot5.14.0/drivers/tkwin.so
>+%%WXGTK%%lib/plplot5.14.0/drivers/wxwidgets.driver_info
>+%%WXGTK%%lib/plplot5.14.0/drivers/wxwidgets.so
> %%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/Plframe.py
> %%TCLTK%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/TclSup.py
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/_plplotcmodule.so
>@@ -106,7 +117,6 @@
> %%PYTHON%%%%PYTHON_SITELIBDIR%%/plplotc.py
> %%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
>@@ -116,16 +126,14 @@
> %%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.cumulated_%%CMAKE_BUILD_TYPE%%
> %%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
>+share/man/man1/pltek.1
> %%DATADIR%%/cmap0_alternate.pal
> %%DATADIR%%/cmap0_black_on_white.pal
> %%DATADIR%%/cmap0_default.pal
>@@ -141,7 +149,11 @@
> %%DATADIR%%/examples/Makefile
> %%DATADIR%%/examples/c++/CMakeLists.txt
> %%DATADIR%%/examples/c++/Makefile
>+%%QT5%%%%DATADIR%%/examples/c++/README.qt_example
> %%DATADIR%%/examples/c++/plc++demos.h
>+%%QT5%%%%DATADIR%%/examples/c++/qt_PlotWindow.cpp
>+%%QT5%%%%DATADIR%%/examples/c++/qt_PlotWindow.h
>+%%QT5%%%%DATADIR%%/examples/c++/qt_example.cpp
> %%WXGTK%%%%DATADIR%%/examples/c++/wxPLplotDemo.cpp
> %%DATADIR%%/examples/c++/x00.cc
> %%DATADIR%%/examples/c++/x01.cc
>@@ -222,6 +234,7 @@
> %%DATADIR%%/examples/c/x33c.c
> %%DATADIR%%/examples/c/x34c.c
> %%DATADIR%%/examples/cmake/modules/language_support.cmake
>+%%QT5%%%%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
>@@ -538,7 +551,6 @@
> %%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
>@@ -565,5 +577,3 @@
> %%TCLTK%%%%DATADIR%%/tcl/pltools.tcl
> %%TCLTK%%%%DATADIR%%/tcl/plwidget.tcl
> %%TCLTK%%%%DATADIR%%/tcl/tclIndex
>-%%DATADIR%%/usa.map
>-%%DATADIR%%/usaglobe.map

Actions: View | Diff

Attachments on bug 236577: 202916