Hello,
attached is an update for math/plplot to 5.15.0. C and C++ tested on powerpc
and amd64, fortran untested. Requires the update to cmake 3.14.5 previously
posted by rsadowski@.
-m
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 Makefile
--- Makefile 12 Jul 2019 20:47:45 -0000 1.65
+++ Makefile 29 Jul 2019 09:59:31 -0000
@@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.65 2019/07/12 20:47:45 sthen Exp $
-BROKEN-powerpc = Error: Kind -2 not supported for type INTEGER at (1)
-
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 \
@@ -18,9 +16,6 @@ SHARED_LIBS = csirocsa 4.0 \
PKGNAME-main = ${DISTNAME}
PKGNAME-c++ = plplot-c++-${VERSION}
PKGNAME-fortran = plplot-fortran-${VERSION}
-REVISION-c++ = 2
-REVISION-fortran = 2
-REVISION-main = 3
CATEGORIES = math graphics
@@ -31,7 +26,7 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=plplot/}
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
MODULES = fortran
MODFORTRAN_COMPILER = gfortran
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/plplot/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 4 Nov 2017 10:28:21 -0000 1.6
+++ distinfo 29 Jul 2019 09:59:31 -0000
@@ -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
Index: patches/patch-cmake_modules_csiro_cmake
===================================================================
RCS file: patches/patch-cmake_modules_csiro_cmake
diff -N patches/patch-cmake_modules_csiro_cmake
--- patches/patch-cmake_modules_csiro_cmake 4 Nov 2017 10:28:21 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-cmake_modules_csiro_cmake,v 1.2 2017/11/04 10:28:21 steven 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)
- 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")
- if(NOT DEFINED NaNAwareCCompiler)
Index: patches/patch-plplot_test_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/math/plplot/patches/patch-plplot_test_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-plplot_test_CMakeLists_txt
--- patches/patch-plplot_test_CMakeLists_txt 4 Nov 2017 10:28:21 -0000
1.1
+++ patches/patch-plplot_test_CMakeLists_txt 29 Jul 2019 09:59:31 -0000
@@ -3,45 +3,57 @@ $OpenBSD: patch-plplot_test_CMakeLists_t
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)
+
+ # 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)
- 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 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})
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/math/plplot/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 4 Nov 2017 10:28:21 -0000 1.5
+++ pkg/PLIST-main 29 Jul 2019 09:59:31 -0000
@@ -2,8 +2,12 @@
@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
@@ -17,11 +21,39 @@ include/plplot/plstrm.h
include/plplot/plxwd.h
include/plplot/qsastime.h
include/plplot/qsastimedll.h
-lib/cmake/
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 +267,6 @@ share/doc/plplot/README.drivers
share/doc/plplot/README.nn
share/doc/plplot/README.pkg-config
share/doc/plplot/README.release
-share/doc/plplot/README.testing
share/doc/plplot/README.wxwidgets
share/doc/plplot/html/
share/doc/plplot/html/API-C.html
@@ -320,12 +351,10 @@ share/doc/plplot/html/part_introduction.
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 +362,7 @@ share/doc/plplot/html/plP_checkdriverini
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 +377,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 +431,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 +458,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 +473,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 +555,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,13 +635,14 @@ share/examples/plplot/cmake/modules/plpl
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
share/examples/plplot/test_diff.sh
share/examples/plplot/test_fortran.sh
share/plplot/
-share/plplot/cglobe.map
share/plplot/cmap0_alternate.pal
share/plplot/cmap0_black_on_white.pal
share/plplot/cmap0_default.pal
@@ -630,8 +654,5 @@ share/plplot/cmap1_gray.pal
share/plplot/cmap1_highfreq.pal
share/plplot/cmap1_lowfreq.pal
share/plplot/cmap1_radar.pal
-share/plplot/globe.map
share/plplot/plstnd5.fnt
share/plplot/plxtnd5.fnt
-share/plplot/usa.map
-share/plplot/usaglobe.map
