[140025] trunk/dports/science/plplot
takeshi at macports.org
takeshi at macports.org
Mon Sep 7 01:34:07 PDT 2015
Revision: 140025
https://trac.macports.org/changeset/140025
Author: takeshi at macports.org
Date: 2015-09-07 01:34:07 -0700 (Mon, 07 Sep 2015)
Log Message:
-----------
plplot: update to 5.11.0, closing #47958
Modified Paths:
--------------
trunk/dports/science/plplot/Portfile
trunk/dports/science/plplot/files/patch-cmake-modules-pkg-config.cmake.diff
Removed Paths:
-------------
trunk/dports/science/plplot/files/patch-CMakeLists.txt.diff
trunk/dports/science/plplot/files/patch-plConfig.h.in.diff
Modified: trunk/dports/science/plplot/Portfile
===================================================================
--- trunk/dports/science/plplot/Portfile 2015-09-07 08:21:34 UTC (rev 140024)
+++ trunk/dports/science/plplot/Portfile 2015-09-07 08:34:07 UTC (rev 140025)
@@ -6,16 +6,15 @@
PortGroup wxWidgets 1.0
name plplot
-version 5.10.0
-revision 3
+version 5.11.1
platforms darwin
maintainers takeshi openmaintainer
categories science
license LGPL
description Scientific plotting package, double precision version
master_sites sourceforge
-checksums rmd160 16e353cf410232da700d5f2edd1533006f2dc4c4 \
- sha256 d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5
+checksums rmd160 13d7b1ca7c532691e12f59c86e9a7a689e9e9c2f \
+ sha256 289dff828c440121e57b70538b3f0fb4056dc47159bc1819ea444321f2ff1c4c
homepage http://plplot.sourceforge.net/
set description_base "PLplot is a cross-platform software package for \
creating scientific plots. To help accomplish that task it is organized as a \
@@ -34,13 +33,13 @@
port:fontconfig \
port:freefont-ttf \
port:freetype \
+ port:libtool \
port:libLASi \
port:swig-tcl \
port:tcl
-patchfiles patch-CMakeLists.txt.diff \
- patch-plConfig.h.in.diff \
- patch-cmake-modules-pkg-config.cmake.diff
+patchfiles patch-cmake-modules-pkg-config.cmake.diff
+
post-patch {
reinplace "s|-ObjC|-ObjC -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
reinplace "s|-framework AquaTerm|-F${frameworks_dir} -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
@@ -76,11 +75,14 @@
-DCMAKE_LIBRARY_PATH=${prefix}/lib \
-DTCL_INCLUDE_PATH=${prefix}/include \
-DTCL_LIBRARY=${prefix}/lib/libtcl.dylib \
- -DFREETYPE_INCLUDE_DIR=${prefix}/include/freetype2 \
- -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
+ -DFREETYPE_INCLUDE_DIR_ft2build=${prefix}/include/freetype2 \
+ -DFREETYPE_LIBRARIES=${prefix}/lib/libfreetype.dylib \
-DPL_FREETYPE_FONT_PATH=${prefix}/share/fonts/freefont-ttf \
+ -DLTDL_INCLUDE_DIR=${prefix}/include \
+ -DLTDL_LIBRARY_DIR=${prefix}/lib \
-DWITH_FREETYPE=ON \
-DQHULL_INCLUDE_DIR=${prefix}/include \
+ -DQHULL_LIBRARIES=${prefix}/lib/libqhull.dylib \
-DPLD_aqt=OFF \
-DPLD_extcairo=ON \
-DPLD_memcairo=ON \
@@ -127,8 +129,7 @@
-DENABLE_wxwidgets=OFF \
-DBUILD_TEST=OFF \
-DHAVE_AGG=OFF \
- -DSWIG_DIR=${prefix}/bin \
- -DPLPLOT_HAVE_CONFIG_H=ON
+ -DSWIG_DIR=${prefix}/bin
configure.post_args ../${distname}
pre-configure {
Deleted: trunk/dports/science/plplot/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/plplot/files/patch-CMakeLists.txt.diff 2015-09-07 08:21:34 UTC (rev 140024)
+++ trunk/dports/science/plplot/files/patch-CMakeLists.txt.diff 2015-09-07 08:34:07 UTC (rev 140025)
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig 2013-12-30 05:11:07.000000000 +0900
-+++ CMakeLists.txt 2014-06-11 08:53:10.000000000 +0900
-@@ -125,7 +125,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h
- )
- # Allow access to the generated plplot_config.h for this build.
--add_definitions("-DHAVE_CONFIG_H")
-+add_definitions("-DPLPLOT_HAVE_CONFIG_H")
- # Install top-level files
-
- # Enable testing framework for examples
Modified: trunk/dports/science/plplot/files/patch-cmake-modules-pkg-config.cmake.diff
===================================================================
--- trunk/dports/science/plplot/files/patch-cmake-modules-pkg-config.cmake.diff 2015-09-07 08:21:34 UTC (rev 140024)
+++ trunk/dports/science/plplot/files/patch-cmake-modules-pkg-config.cmake.diff 2015-09-07 08:34:07 UTC (rev 140025)
@@ -1,16 +1,11 @@
---- cmake/modules/pkg-config.cmake.orig 2014-02-06 14:06:07.000000000 +0900
-+++ cmake/modules/pkg-config.cmake 2015-03-01 22:14:10.000000000 +0900
-@@ -94,7 +94,12 @@
- set(_xprefix ${_prefix})
- endif(FORCE_EXTERNAL_STATIC)
-
-- _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+ if(CMAKE_VERSION VERSION_LESS "3.1")
-+ _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+ else(CMAKE_VERSION VERSION_LESS "3.1")
-+ _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-+ endif(CMAKE_VERSION VERSION_LESS "3.1")
-+
- if(${_prefix}_FOUND)
- cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
- # If libraries cannot be not found, then that is equivalent to whole
+--- cmake/modules/pkg-config.cmake.orig 2015-08-13 02:35:27.000000000 +0900
++++ cmake/modules/pkg-config.cmake 2015-09-07 16:02:00.000000000 +0900
+@@ -228,7 +228,7 @@
+ "/System/Library/Frameworks/([^ ]*)\\.framework"
+ "-framework \\1"
+ link_flags
+- ${link_flags}
++ "${link_flags}"
+ )
+ #message("(frameworks) link_flags = ${link_flags}")
+ endif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
Deleted: trunk/dports/science/plplot/files/patch-plConfig.h.in.diff
===================================================================
--- trunk/dports/science/plplot/files/patch-plConfig.h.in.diff 2015-09-07 08:21:34 UTC (rev 140024)
+++ trunk/dports/science/plplot/files/patch-plConfig.h.in.diff 2015-09-07 08:34:07 UTC (rev 140025)
@@ -1,11 +0,0 @@
---- include/plConfig.h.in.orig 2013-12-30 05:11:07.000000000 +0900
-+++ include/plConfig.h.in 2014-06-09 21:59:26.000000000 +0900
-@@ -44,7 +44,7 @@
- #ifndef __PLCONFIG_H__
- #define __PLCONFIG_H__
-
--#ifdef HAVE_CONFIG_H
-+#ifdef PLPLOT_HAVE_CONFIG_H
- # include <plplot_config.h>
- #endif
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150907/d2947cac/attachment.html>
More information about the macports-changes
mailing list