Date: Sun, 16 Feb 2014 19:24:06 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344625 - in head/math/plplot: . files Message-ID: <201402161924.s1GJO6Bq000508@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Feb 16 19:24:06 2014 New Revision: 344625 URL: http://svnweb.freebsd.org/changeset/ports/344625 QAT: https://qat.redports.org/buildarchive/r344625/ Log: math/plplot: Upgrade from dev ver 5.9.10 to latest stable ver 5.10.0 Deleted: head/math/plplot/files/patch-drivers__ntk.c head/math/plplot/files/patch-util__pltcl.c Modified: head/math/plplot/Makefile head/math/plplot/distinfo head/math/plplot/files/patch-bindings__tk__tkMain.c head/math/plplot/files/patch-cmake_modules_instdirs.cmake head/math/plplot/files/patch-cmake_modules_pkg-config.cmake head/math/plplot/pkg-plist Modified: head/math/plplot/Makefile ============================================================================== --- head/math/plplot/Makefile Sun Feb 16 19:12:22 2014 (r344624) +++ head/math/plplot/Makefile Sun Feb 16 19:24:06 2014 (r344625) @@ -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 Modified: head/math/plplot/distinfo ============================================================================== --- head/math/plplot/distinfo Sun Feb 16 19:12:22 2014 (r344624) +++ head/math/plplot/distinfo Sun Feb 16 19:24:06 2014 (r344625) @@ -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 Modified: head/math/plplot/files/patch-bindings__tk__tkMain.c ============================================================================== --- head/math/plplot/files/patch-bindings__tk__tkMain.c Sun Feb 16 19:12:22 2014 (r344624) +++ head/math/plplot/files/patch-bindings__tk__tkMain.c Sun Feb 16 19:24:06 2014 (r344625) @@ -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 Modified: head/math/plplot/files/patch-cmake_modules_instdirs.cmake ============================================================================== --- head/math/plplot/files/patch-cmake_modules_instdirs.cmake Sun Feb 16 19:12:22 2014 (r344624) +++ head/math/plplot/files/patch-cmake_modules_instdirs.cmake Sun Feb 16 19:24:06 2014 (r344625) @@ -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. Modified: head/math/plplot/files/patch-cmake_modules_pkg-config.cmake ============================================================================== --- head/math/plplot/files/patch-cmake_modules_pkg-config.cmake Sun Feb 16 19:12:22 2014 (r344624) +++ head/math/plplot/files/patch-cmake_modules_pkg-config.cmake Sun Feb 16 19:24:06 2014 (r344625) @@ -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 Modified: head/math/plplot/pkg-plist ============================================================================== --- head/math/plplot/pkg-plist Sun Feb 16 19:12:22 2014 (r344624) +++ head/math/plplot/pkg-plist Sun Feb 16 19:24:06 2014 (r344625) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402161924.s1GJO6Bq000508>