mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

math/plplot: Upgrade from dev ver 5.9.10 to latest stable ver 5.10.0

Browse Source
This commit is contained in:
John Marino 2014-02-16 19:24:06 +00:00
parent 7ba6236cfd
commit c62a1a534e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=344625
8 changed files with 27 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
math/plplot/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= plplot
PORTVERSION= 5.9.10
PORTVERSION= 5.10.0
CATEGORIES= math science
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source

4
math/plplot/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (plplot-5.9.10.tar.gz) = 6be3e20d6992cb2afd132a00cbc812aa5db170abe5855c44eb01481ac4b0b723
SIZE (plplot-5.9.10.tar.gz) = 15215720
SHA256 (plplot-5.10.0.tar.gz) = d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5
SIZE (plplot-5.10.0.tar.gz) = 14766687

19
math/plplot/files/patch-bindings__tk__tkMain.c
View File

@ -1,20 +1,13 @@
--- bindings/tk/tkMain.c.orig 2013-01-30 00:36:01.000000000 +0100
+++ bindings/tk/tkMain.c 2013-10-01 22:51:31.000000000 +0200
@@ -85,17 +85,6 @@
--- bindings/tk/tkMain.c.orig 2013-12-18 20:25:14.000000000 -0500
+++ bindings/tk/tkMain.c
@@ -92,10 +92,6 @@ EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl
int allowOverwrite ) );
#endif
// From tclIntDecls.h
-#ifndef Tcl_Import_TCL_DECLARED
-EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
- Tcl_Namespace * nsPtr, char * pattern,
- 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
// to include tkInt.h or tkConfig.h here, because people might copy this

18
math/plplot/files/patch-cmake_modules_instdirs.cmake
View File

@ -1,6 +1,6 @@
--- ./cmake/modules/instdirs.cmake.orig 2009-09-06 21:04:43.000000000 +0200
+++ ./cmake/modules/instdirs.cmake 2009-12-26 22:13:15.000000000 +0100
@@ -61,13 +61,13 @@
--- cmake/modules/instdirs.cmake.orig 2013-11-11 19:54:54.000000000 -0500
+++ cmake/modules/instdirs.cmake
@@ -61,13 +61,13 @@ CACHE PATH "install location for C heade
set(
CMAKE_INSTALL_INFODIR
@ -16,29 +16,29 @@
CACHE PATH "install location for man documentation"
)
@@ -75,7 +75,7 @@
@@ -75,7 +75,7 @@ CACHE PATH "install location for man doc
# cached values above.
# Data.
-set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION})
-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 @@
@@ -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}${VERSION}/tcl)
-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 @@
@@ -101,7 +101,7 @@ set(ADA_INCLUDE_DIR ${CMAKE_INSTALL_DATA
set(ADA_LIB_DIR ${CMAKE_INSTALL_LIBDIR}/ada/adalib/plplotada${LIB_TAG})
# Drivers.
-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${VERSION}/drivers${LIB_TAG})
-set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}${PLPLOT_VERSION}/drivers${LIB_TAG})
+set(DRV_DIR ${CMAKE_INSTALL_LIBDIR}/${PACKAGE}/drivers${LIB_TAG})
# Documentation.

16
math/plplot/files/patch-cmake_modules_pkg-config.cmake
View File

@ -1,11 +1,11 @@
--- cmake/modules/pkg-config.cmake.orig 2012-01-05 14:59:36.000000000 +0100
+++ cmake/modules/pkg-config.cmake 2013-10-01 23:01:57.000000000 +0200
@@ -39,7 +39,7 @@
--- cmake/modules/pkg-config.cmake.orig 2014-02-06 00:06:07.000000000 -0500
+++ cmake/modules/pkg-config.cmake
@@ -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(PKG_CONFIG_ENV PKG_CONFIG_PATH=${PKG_CONFIG_DIR})
else(PKG_CONFIG_EXECUTABLE)
message(STATUS "Looking for pkg-config - not 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

74
math/plplot/files/patch-drivers__ntk.c
View File

@ -1,74 +0,0 @@
--- drivers/ntk.c.orig
+++ drivers/ntk.c
@@ -115,7 +115,7 @@
//
sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient
if ( Tcl_Eval( interp, scmd ) != TCL_OK )
- fprintf( stderr, "%s\n", interp->result );
+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
}
}
@@ -264,7 +264,7 @@
sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp );
if ( Tcl_Eval( interp, cmd ) != TCL_OK )
{
- fprintf( stderr, "%s\n", interp->result );
+ fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
plexit( "No such tk server." );
}
}
@@ -301,7 +301,7 @@
// Set up device parameters
Tcl_Eval( interp, "tk scaling" ); // pixels per mm
- ppm = (PLFLT) atof( interp->result ) / ( 25.4 / 72. );
+ ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. );
plP_setpxl( ppm, ppm );
plP_setphy( xmin, xmax * scale, ymin, ymax * scale );
}
@@ -371,11 +371,11 @@
{
tk_cmd( "update" );
tk_cmd( "info exists keypress" );
- sscanf( interp->result, "%d", &st );
+ sscanf( Tcl_GetStringResult(interp), "%d", &st );
}
tk_cmd( "set keypress" );
- sscanf( interp->result, "%d", &key );
+ sscanf( Tcl_GetStringResult(interp), "%d", &key );
//fprintf(stderr,"\n%d\n", key);fflush(stderr);
tk_cmd( "unset keypress" );
st = 0;
@@ -433,7 +433,7 @@
{
tk_cmd( "update" );
tk_cmd( "winfo exists $plf.f2.c$ccanv" );
- sscanf( interp->result, "%d", &st );
+ sscanf( Tcl_GetStringResult(interp), "%d", &st );
}
st = 0;
// this give a "Segmentation fault", even after checking for the canvas!
@@ -450,16 +450,16 @@
{
tk_cmd( "update" );
tk_cmd( "info exists xloc" );
- sscanf( interp->result, "%d", &st );
+ sscanf( Tcl_GetStringResult(interp), "%d", &st );
}
tk_cmd( "set xloc" );
- sscanf( interp->result, "%d", &gin.pX );
+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX );
tk_cmd( "set yloc" );
- sscanf( interp->result, "%d", &gin.pY );
+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY );
tk_cmd( "set bloc" );
- sscanf( interp->result, "%d", &gin.button );
+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.button );
tk_cmd( "set sloc" );
- sscanf( interp->result, "%d", &gin.state );
+ sscanf( Tcl_GetStringResult(interp), "%d", &gin.state );
gin.dX = (PLFLT) gin.pX / xmax;
gin.dY = 1. - (PLFLT) gin.pY / ymax;

11
math/plplot/files/patch-util__pltcl.c
View File

@ -1,11 +0,0 @@
--- utils/pltcl.c.orig
+++ utils/pltcl.c
@@ -119,7 +119,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.

2
math/plplot/pkg-plist
View File

@ -41,7 +41,7 @@ lib/libplplotcxxd.so.11
lib/libplplotcxxd.so.11.0.0
lib/libplplotd.so
lib/libplplotd.so.12
lib/libplplotd.so.12.0.0
lib/libplplotd.so.12.0.1
%%FORTRAN%%lib/libplplotf77cd.so
%%FORTRAN%%lib/libplplotf77cd.so.9
%%FORTRAN%%lib/libplplotf77cd.so.9.1.1