Update plplot to 5.15.0

This version unbreak the build with upcoming cmake 3.15.2.
This commit is contained in:
rsadowski 2019-08-21 05:47:45 +00:00
parent bf12019dd1
commit 5142e79327
9 changed files with 120 additions and 84 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.66 2019/08/03 19:36:04 sthen Exp $
# $OpenBSD: Makefile,v 1.67 2019/08/21 05:47:45 rsadowski Exp $
BROKEN-powerpc = Error: Kind -2 not supported for type INTEGER at (1)
@ -6,19 +6,18 @@ COMMENT-main = advanced 2D and 3D scientific plotting library
COMMENT-c++ = C++ interface to plplot
COMMENT-fortran = Fortran 77 interface to plplot
VERSION = 5.13.0
VERSION = 5.15.0
DISTNAME = plplot-${VERSION}
SHARED_LIBS = csirocsa 4.0 \
csironn 0.0 \
plplot 15.0 \
plplotcxx 13.0 \
plplotfortran 0.0 \
plplot 16.0 \
plplotcxx 14.0 \
plplotfortran 1.0 \
qsastime 0.0
PKGNAME-main = ${DISTNAME}
PKGNAME-c++ = plplot-c++-${VERSION}
PKGNAME-fortran = plplot-fortran-${VERSION}
REVISION = 4
CATEGORIES = math graphics
@ -30,8 +29,8 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=plplot/}
COMPILER = base-clang ports-gcc base-gcc
MODULES = fortran
MODFORTRAN_COMPILER = gfortran
MODULES = fortran
MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS = print/ghostscript/gnu-fonts \
${MODFORTRAN_BUILD_DEPENDS}
@ -51,7 +50,6 @@ CONFIGURE_ARGS = -D ENABLE_ada=OFF \
-D ENABLE_lua=OFF \
-D ENABLE_ocaml=OFF \
-D ENABLE_octave=OFF \
-D ENABLE_pdl=OFF \
-D ENABLE_python=OFF \
-D ENABLE_qt=OFF \
-D ENABLE_pyqt4=OFF \

View File

@ -1,2 +1,2 @@
SHA256 (plplot-5.13.0.tar.gz) = 7Da77osD2dHJj4/Yj33DQVVg5Vm1PrGqmRwtz2GyXSs=
SIZE (plplot-5.13.0.tar.gz) = 16269842
SHA256 (plplot-5.15.0.tar.gz) = uS3k2PYmqbIMhPyU9Papl27dduM/serkT2gEvcxijHs=
SIZE (plplot-5.15.0.tar.gz) = 15380293

View File

@ -1,19 +1,19 @@
$OpenBSD: patch-cmake_modules_csiro_cmake,v 1.2 2017/11/04 10:28:21 steven Exp $
$OpenBSD: patch-cmake_modules_csiro_cmake,v 1.3 2019/08/21 05:47:45 rsadowski Exp $
Index: cmake/modules/csiro.cmake
--- cmake/modules/csiro.cmake.orig
+++ cmake/modules/csiro.cmake
@@ -31,11 +31,11 @@ if(PL_HAVE_QHULL OR WITH_CSA)
@@ -30,11 +30,11 @@ if(PL_HAVE_QHULL OR WITH_CSA)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER MATCHES "gcc")
set(NAN_CFLAGS "${NAN_CFLAGS} -mieee-fp")
else(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86")
if(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
- if(CMAKE_C_COMPILER MATCHES "gcc")
+ if(CMAKE_COMPILER_IS_GNUCC)
set(NAN_CFLAGS "${NAN_CFLAGS} -mieee")
- else(CMAKE_C_COMPILER MATCHES "gcc")
+ else(CMAKE_COMPILER_IS_GNUCC)
set(NAN_CFLAGS "${NAN_CFLAGS} -ieee")
- endif(CMAKE_C_COMPILER MATCHES "gcc")
+ endif(CMAKE_COMPILER_IS_GNUCC)
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "alpha.*")
- if(CMAKE_C_COMPILER MATCHES "gcc")
+ if(CMAKE_COMPILER_IS_GNUCC)
set(NAN_CFLAGS "${NAN_CFLAGS} -mieee")
- else(CMAKE_C_COMPILER MATCHES "gcc")
+ else(CMAKE_COMPILER_IS_GNUCC)
set(NAN_CFLAGS "${NAN_CFLAGS} -ieee")
- endif(CMAKE_C_COMPILER MATCHES "gcc")
+ endif(CMAKE_COMPILER_IS_GNUCC)
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i[0-9]86" AND NOT CMAKE_C_COMPILER MATCHES "gcc")
if(NOT DEFINED NaNAwareCCompiler)
message(STATUS "Check for NaN awareness in C compiler")

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-examples_CMakeLists_txt,v 1.2 2017/11/04 10:28:21 steven Exp $
$OpenBSD: patch-examples_CMakeLists_txt,v 1.3 2019/08/21 05:47:45 rsadowski Exp $
Index: examples/CMakeLists.txt
--- examples/CMakeLists.txt.orig
+++ examples/CMakeLists.txt
@@ -213,7 +213,7 @@ if(CORE_BUILD)
@@ -225,7 +225,7 @@ if(CORE_BUILD)
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Makefile.examples
@ -11,7 +11,7 @@ Index: examples/CMakeLists.txt
RENAME Makefile
)
@@ -291,7 +291,7 @@ if(CORE_BUILD)
@@ -393,7 +393,7 @@ if(CORE_BUILD)
FILES
${CMAKE_CURRENT_SOURCE_DIR}/Chloe.pgm
${CMAKE_CURRENT_SOURCE_DIR}/README.Chloe
@ -20,7 +20,7 @@ Index: examples/CMakeLists.txt
)
endif(CORE_BUILD)
@@ -314,7 +314,7 @@ if(CORE_BUILD)
@@ -409,7 +409,7 @@ if(CORE_BUILD)
# Start configuration/installation of CMake-based build system for
# installed examples.
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
@ -29,7 +29,7 @@ Index: examples/CMakeLists.txt
)
# language_info_LIST contains information about the languages used in
@@ -351,33 +351,33 @@ if(CORE_BUILD)
@@ -445,33 +445,33 @@ if(CORE_BUILD)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/plplot_configure.cmake_installed_examples
@ -68,7 +68,7 @@ Index: examples/CMakeLists.txt
)
endif(ANY_QT_DEVICE)
@@ -424,7 +424,7 @@ if(CORE_BUILD)
@@ -518,7 +518,7 @@ if(CORE_BUILD)
string(REGEX REPLACE "^.*:(.*)$" "\\1" LANG_SUPPORT_FILE ${LANG_SUPPORT_info})
install(FILES
${CMAKE_SOURCE_DIR}/cmake/modules/${LANG_SUPPORT_DIR}/${LANG_SUPPORT_FILE}

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-examples_c++_CMakeLists_txt,v 1.2 2017/11/04 10:28:21 steven Exp $
$OpenBSD: patch-examples_c++_CMakeLists_txt,v 1.3 2019/08/21 05:47:45 rsadowski Exp $
Index: examples/c++/CMakeLists.txt
--- examples/c++/CMakeLists.txt.orig
+++ examples/c++/CMakeLists.txt
@@ -76,12 +76,12 @@ if(CORE_BUILD)
@@ -74,12 +74,12 @@ if(CORE_BUILD)
set(qt_INSTALLED_FILES qt_PlotWindow.cpp qt_PlotWindow.h qt_example.cpp README.qt_example)
endif(PLD_extqt)
@ -17,7 +17,7 @@ Index: examples/c++/CMakeLists.txt
)
endif(CORE_BUILD)
@@ -271,7 +271,7 @@ if(CORE_BUILD)
@@ -270,7 +270,7 @@ if(CORE_BUILD)
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Makefile.examples

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-examples_c_CMakeLists_txt,v 1.2 2017/11/04 10:28:21 steven Exp $
$OpenBSD: patch-examples_c_CMakeLists_txt,v 1.3 2019/08/21 05:47:46 rsadowski Exp $
Index: examples/c/CMakeLists.txt
--- examples/c/CMakeLists.txt.orig
+++ examples/c/CMakeLists.txt
@@ -86,11 +86,11 @@ if(CORE_BUILD)
@@ -84,11 +84,11 @@ if(CORE_BUILD)
endif(PLD_xcairo OR PLD_extcairo)
install(FILES ${c_SRCS} ${extXdrawable_SRC} ${extcairo_SRC} ${cairo_DOCS}
@ -16,7 +16,7 @@ Index: examples/c/CMakeLists.txt
)
set(CC "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${CMAKE_C_FLAGS}")
@@ -210,7 +210,7 @@ if(CORE_BUILD)
@@ -209,7 +209,7 @@ if(CORE_BUILD)
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Makefile.examples

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-examples_fortran_CMakeLists_txt,v 1.1 2017/11/04 10:28:21 steven Exp $
$OpenBSD: patch-examples_fortran_CMakeLists_txt,v 1.2 2019/08/21 05:47:46 rsadowski Exp $
Index: examples/fortran/CMakeLists.txt
--- examples/fortran/CMakeLists.txt.orig
+++ examples/fortran/CMakeLists.txt
@@ -117,7 +117,7 @@ if(CORE_BUILD)
)
@@ -123,7 +123,7 @@ if(CORE_BUILD)
PROPERTIES GENERATED ON)
install(FILES ${fortran_SRCS} README_precision
- DESTINATION ${DATA_DIR}/examples/fortran
@ -12,7 +12,7 @@ Index: examples/fortran/CMakeLists.txt
)
set(FC "${CMAKE_Fortran_COMPILER} ${CMAKE_Fortran_COMPILER_ARG1} ${CMAKE_Fortran_FLAGS}")
@@ -127,16 +127,16 @@ if(CORE_BUILD)
@@ -133,16 +133,16 @@ if(CORE_BUILD)
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Makefile.examples

View File

@ -1,47 +1,59 @@
$OpenBSD: patch-plplot_test_CMakeLists_txt,v 1.1 2017/11/04 10:28:21 steven Exp $
$OpenBSD: patch-plplot_test_CMakeLists_txt,v 1.2 2019/08/21 05:47:46 rsadowski Exp $
Index: plplot_test/CMakeLists.txt
--- plplot_test/CMakeLists.txt.orig
+++ plplot_test/CMakeLists.txt
@@ -492,14 +492,14 @@ if(SH_EXECUTABLE)
foreach(SCRIPT ${SCRIPTS})
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT}
- DESTINATION ${DATA_DIR}/examples
+ DESTINATION ${EXAMPLE_DIR}
PERMISSIONS ${PERM_SCRIPTS}
)
endforeach(SCRIPT ${SCRIPTS})
@@ -77,7 +77,7 @@ if(SH_EXECUTABLE)
endif(ENABLE_tcl)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh_install
- DESTINATION ${DATA_DIR}/examples
+ DESTINATION ${EXAMPLE_DIR}
PERMISSIONS ${PERM_SCRIPTS}
RENAME plplot-test.sh
)
@@ -507,21 +507,21 @@ if(SH_EXECUTABLE)
if(ENABLE_tcl)
# Part 2. Install this CMakeLists.txt file.
- install(FILES CMakeLists.txt DESTINATION ${DATA_DIR}/examples/plplot_test)
+ install(FILES CMakeLists.txt DESTINATION ${EXAMPLE_DIR}/plplot_test)
# Part 3. Configure AND install PLplot test files.
set(PERM_SCRIPTS
@@ -99,7 +99,7 @@ if(SH_EXECUTABLE)
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh_install
FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot-test.sh_install
- DESTINATION ${DATA_DIR}/examples
+ DESTINATION ${EXAMPLE_DIR}
PERMISSIONS ${PERM_SCRIPTS}
RENAME test_tcl.sh
RENAME plplot-test.sh
)
@@ -114,7 +114,7 @@ if(SH_EXECUTABLE)
)
endif(ENABLE_tcl)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh_install
- DESTINATION ${DATA_DIR}/examples
+ DESTINATION ${EXAMPLE_DIR}
PERMISSIONS ${PERM_SCRIPTS}
RENAME plplot-test-interactive.sh
)
if(PLD_plmeta)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/test_plrender.sh_install
FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot-test-interactive.sh_install
- DESTINATION ${DATA_DIR}/examples
+ DESTINATION ${EXAMPLE_DIR}
PERMISSIONS ${PERM_SCRIPTS}
RENAME test_plrender.sh
RENAME plplot-test-interactive.sh
)
@@ -244,7 +244,7 @@ if(SH_EXECUTABLE)
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/test_tcl.sh_install
- DESTINATION ${DATA_DIR}/examples
+ DESTINATION ${EXAMPLE_DIR}
PERMISSIONS ${PERM_SCRIPTS}
RENAME test_tcl.sh
)
@@ -309,7 +309,7 @@ if(SH_EXECUTABLE)
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/test_plrender.sh_install
- DESTINATION ${DATA_DIR}/examples
+ DESTINATION ${EXAMPLE_DIR}
PERMISSIONS ${PERM_SCRIPTS}
RENAME test_plrender.sh
)
@@ -328,7 +328,7 @@ if(SH_EXECUTABLE)
foreach(SCRIPT ${SCRIPTS})
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT}
- DESTINATION ${DATA_DIR}/examples
+ DESTINATION ${EXAMPLE_DIR}
PERMISSIONS ${PERM_SCRIPTS}
)
endforeach(SCRIPT ${SCRIPTS})

View File

@ -1,9 +1,13 @@
@comment $OpenBSD: PLIST-main,v 1.6 2019/08/03 19:36:04 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.7 2019/08/21 05:47:46 rsadowski Exp $
@pkgpath math/plplot
@bin bin/pltek
include/plplot/
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
@ -18,9 +22,38 @@ include/plplot/plxwd.h
include/plplot/qsastime.h
include/plplot/qsastimedll.h
lib/cmake/plplot/
lib/cmake/plplot/export_cairo${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_cairo.cmake
lib/cmake/plplot/export_csirocsa${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_csirocsa.cmake
lib/cmake/plplot/export_csironn${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_csironn.cmake
lib/cmake/plplot/export_mem${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_mem.cmake
lib/cmake/plplot/export_null${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_null.cmake
lib/cmake/plplot/export_plfortrandemolib${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_plfortrandemolib.cmake
lib/cmake/plplot/export_plplot${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_plplot.cmake
lib/cmake/plplot/export_plplotcxx${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_plplotcxx.cmake
lib/cmake/plplot/export_plplotfortran${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_plplotfortran.cmake
lib/cmake/plplot/export_pltek${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_pltek.cmake
lib/cmake/plplot/export_ps${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_ps.cmake
lib/cmake/plplot/export_qsastime${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_qsastime.cmake
lib/cmake/plplot/export_svg${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_svg.cmake
lib/cmake/plplot/export_xfig${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_xfig.cmake
lib/cmake/plplot/export_xwin${MODCMAKE_BUILD_SUFFIX}
lib/cmake/plplot/export_xwin.cmake
lib/cmake/plplot/plplotConfig.cmake
lib/cmake/plplot/plplot_exports.cmake
@lib lib/libcsirocsa.so.${LIBcsirocsa_VERSION}
@lib lib/libcsironn.so.${LIBcsironn_VERSION}
@lib lib/libplplot.so.${LIBplplot_VERSION}
@ -235,7 +268,6 @@ share/doc/plplot/README.nn
share/doc/plplot/README.pkg-config
share/doc/plplot/README.release
share/doc/plplot/README.shapefiles
share/doc/plplot/README.testing
share/doc/plplot/README.wxwidgets
share/doc/plplot/html/
share/doc/plplot/html/API-C.html
@ -320,12 +352,10 @@ share/doc/plplot/html/part_introduction.html
share/doc/plplot/html/part_programming.html
share/doc/plplot/html/part_reference.html
share/doc/plplot/html/pdf-driver.html
share/doc/plplot/html/perl.html
share/doc/plplot/html/plAlloc2dGrid.html
share/doc/plplot/html/plClearOpts.html
share/doc/plplot/html/plFree2dGrid.html
share/doc/plplot/html/plGetCursor.html
share/doc/plplot/html/plHLS_RGB.html
share/doc/plplot/html/plMergeOpts.html
share/doc/plplot/html/plMinMax2dGrid.html
share/doc/plplot/html/plOptUsage.html
@ -333,6 +363,7 @@ share/doc/plplot/html/plP_checkdriverinit.html
share/doc/plplot/html/plP_getinitdriverlist.html
share/doc/plplot/html/plResetOpts.html
share/doc/plplot/html/plSetUsage.html
share/doc/plplot/html/plStatic2dGrid.html
share/doc/plplot/html/plTranslateCursor.html
share/doc/plplot/html/pl_setcontlabelformat.html
share/doc/plplot/html/pl_setcontlabelparam.html
@ -347,8 +378,6 @@ share/doc/plplot/html/plbox3.html
share/doc/plplot/html/plbtime.html
share/doc/plplot/html/plcalc_world.html
share/doc/plplot/html/plclear.html
share/doc/plplot/html/plclr.html
share/doc/plplot/html/plcol.html
share/doc/plplot/html/plcol0.html
share/doc/plplot/html/plcol1.html
share/doc/plplot/html/plcolorbar.html
@ -403,7 +432,6 @@ share/doc/plplot/html/plgxax.html
share/doc/plplot/html/plgyax.html
share/doc/plplot/html/plgzax.html
share/doc/plplot/html/plhist.html
share/doc/plplot/html/plhls.html
share/doc/plplot/html/plhlsrgb.html
share/doc/plplot/html/plimage.html
share/doc/plplot/html/plimagefr.html
@ -431,7 +459,6 @@ share/doc/plplot/html/plot3d.html
share/doc/plplot/html/plot3dc.html
share/doc/plplot/html/plot3dcl.html
share/doc/plplot/html/plot3dfortran.html
share/doc/plplot/html/plpage.html
share/doc/plplot/html/plparseopts.html
share/doc/plplot/html/plparseoptsfortran.html
share/doc/plplot/html/plpat.html
@ -447,8 +474,6 @@ share/doc/plplot/html/plptex.html
share/doc/plplot/html/plptex3.html
share/doc/plplot/html/plrandd.html
share/doc/plplot/html/plreplot.html
share/doc/plplot/html/plrgb.html
share/doc/plplot/html/plrgb1.html
share/doc/plplot/html/plrgbhls.html
share/doc/plplot/html/plsabort.html
share/doc/plplot/html/plschr.html
@ -531,7 +556,6 @@ share/doc/plplot/html/plvpas.html
share/doc/plplot/html/plvpor.html
share/doc/plplot/html/plvsta.html
share/doc/plplot/html/plw3d.html
share/doc/plplot/html/plwid.html
share/doc/plplot/html/plwidth.html
share/doc/plplot/html/plwind.html
share/doc/plplot/html/plxormod.html
@ -612,6 +636,8 @@ share/examples/plplot/cmake/modules/plplot_configure.cmake
share/examples/plplot/cmake/modules/plplot_functions.cmake
share/examples/plplot/plplot-test-interactive.sh
share/examples/plplot/plplot-test.sh
share/examples/plplot/plplot_test/
share/examples/plplot/plplot_test/CMakeLists.txt
share/examples/plplot/test_c.sh
share/examples/plplot/test_c_interactive.sh
share/examples/plplot/test_cxx.sh