git: fa8fd4b1d384 - main - science/cdf: Update to 3.9.1.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Dec 2024 18:40:26 UTC
The branch main has been updated by stephen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fa8fd4b1d384fd7c8240863634c90d099920145b
commit fa8fd4b1d384fd7c8240863634c90d099920145b
Author: Stephen Montgomery-Smith <stephen@FreeBSD.org>
AuthorDate: 2024-12-26 18:39:50 +0000
Commit: Stephen Montgomery-Smith <stephen@FreeBSD.org>
CommitDate: 2024-12-26 18:39:50 +0000
science/cdf: Update to 3.9.1.
Change maintainer to alster@vinterdalen.se.
PR: 283453
Reported by: alster@vinterdalen.se
---
science/cdf/Makefile | 7 +++---
science/cdf/distinfo | 6 +++---
science/cdf/files/patch-Makefile | 14 ++++++------
science/cdf/files/patch-src_include_cdfdist.h | 14 ++++++------
science/cdf/files/patch-src_include_cdflib.h | 4 ++--
science/cdf/files/patch-src_tests_Makefile | 31 ---------------------------
science/cdf/pkg-plist | 5 +++--
7 files changed, 25 insertions(+), 56 deletions(-)
diff --git a/science/cdf/Makefile b/science/cdf/Makefile
index 826abf145414..803a95f11b0d 100644
--- a/science/cdf/Makefile
+++ b/science/cdf/Makefile
@@ -1,12 +1,11 @@
PORTNAME= cdf3
-PORTVERSION= 3.8.0
-PORTREVISION= 1
+DISTVERSION= 3.9.1
CATEGORIES= science
-MASTER_SITES= https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/
+MASTER_SITES= https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf39_1/
DISTNAME= cdf${VER}-dist-cdf
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
-MAINTAINER= stephen@FreeBSD.org
+MAINTAINER= alster@vinterdalen.se
COMMENT= Device independent view of the CDF data model
WWW= https://cdf.gsfc.nasa.gov/
diff --git a/science/cdf/distinfo b/science/cdf/distinfo
index 29df170e422b..194df4d48974 100644
--- a/science/cdf/distinfo
+++ b/science/cdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641605085
-SHA256 (cdf3-3.8.0/cdf38_0-dist-cdf.tar.gz) = 30a8bc22819791717c0e58ade52cfc1c41c6b5e45a0314718e322874d99fe078
-SIZE (cdf3-3.8.0/cdf38_0-dist-cdf.tar.gz) = 1251571
+TIMESTAMP = 1734726080
+SHA256 (cdf3-3.9.1/cdf39_1-dist-cdf.tar.gz) = 01d860cdfd8a466b232738facd169e87e1d70aa5dabb762e864b81f5ccf66622
+SIZE (cdf3-3.9.1/cdf39_1-dist-cdf.tar.gz) = 1515430
diff --git a/science/cdf/files/patch-Makefile b/science/cdf/files/patch-Makefile
index 6205a62a5b89..f4c7c4f93514 100644
--- a/science/cdf/files/patch-Makefile
+++ b/science/cdf/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2020-12-09 21:33:32 UTC
+--- Makefile.orig 2024-09-25 15:55:00 UTC
+++ Makefile
-@@ -47,7 +47,7 @@
+@@ -52,7 +52,7 @@
.SILENT:
@@ -9,8 +9,8 @@
NULL=true
PART=all
TARGET=
-@@ -102,6 +102,9 @@ else
- MAKE=make
+@@ -121,6 +121,9 @@ endif
+ endif
endif
endif
+ifeq ("$(OS)","freebsd")
@@ -19,13 +19,13 @@
RANLIB=ranlib
WHICHOS=$(shell uname)
-@@ -747,15 +750,15 @@ RANLIB_freebsd=yes
- FC_freebsd=f77
+@@ -874,15 +877,15 @@ CURSES_freebsd_gnu=yes
+ JNIEXT_freebsd=so
CURSES_freebsd_gnu=yes
-CC_freebsd_gnu=gcc
-LD_freebsd_gnu=gcc
--LDOPTIONS_freebsd_gnu=-shared
+-LDOPTIONS_freebsd_gnu=-shared
+CC_freebsd_gnu=${CC}
+LD_freebsd_gnu=${CC}
+LDOPTIONS_freebsd_gnu=-shared -Wl,-soname,libcdf.so.0
diff --git a/science/cdf/files/patch-src_include_cdfdist.h b/science/cdf/files/patch-src_include_cdfdist.h
index 3e3b47c5d8b1..10df9c8e9bb2 100644
--- a/science/cdf/files/patch-src_include_cdfdist.h
+++ b/science/cdf/files/patch-src_include_cdfdist.h
@@ -1,15 +1,15 @@
---- src/include/cdfdist.h.orig 2019-10-16 16:22:18 UTC
+--- src/include/cdfdist.h.orig 2024-05-06 16:47:21 UTC
+++ src/include/cdfdist.h
-@@ -135,7 +135,7 @@
+@@ -137,7 +137,7 @@
# define unix
#endif
--#if defined(__arm__)
-+#if defined(__arm__) || defined (__aarch64__)
+-#if defined(__arm__) || defined(__arm64__) || \
++#if defined(__arm__) || defined(__arm64__) || defined (__aarch64__) || \
+ (defined(__ARM_ARCH) && __ARM_ARCH > 0)
+ /* linux(gcc)-based or clang-based */
# define ARM
- # if defined(__BYTE_ORDER__)
- # if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-@@ -567,7 +567,7 @@ typedef sChar sByte;
+@@ -588,7 +588,7 @@ typedef sChar sByte;
# if defined(__DARWIN_64_BIT_INO_T)
# define STAT stat
# else
diff --git a/science/cdf/files/patch-src_include_cdflib.h b/science/cdf/files/patch-src_include_cdflib.h
index 5628e139984d..e3edfbf9e6f9 100644
--- a/science/cdf/files/patch-src_include_cdflib.h
+++ b/science/cdf/files/patch-src_include_cdflib.h
@@ -1,6 +1,6 @@
---- src/include/cdflib.h.orig 2019-10-16 16:22:18 UTC
+--- src/include/cdflib.h.orig 2023-09-20 18:55:07 UTC
+++ src/include/cdflib.h
-@@ -401,8 +401,7 @@
+@@ -407,8 +407,7 @@
#elif defined(unix) && !defined(AIX) && !defined(Mach) && !defined(hpux) || \
defined(__MINGW32__)
# if (defined(linux) && !defined(__ICC)) || defined(__CYGWIN__) || \
diff --git a/science/cdf/files/patch-src_tests_Makefile b/science/cdf/files/patch-src_tests_Makefile
deleted file mode 100644
index 8861eee8e1a4..000000000000
--- a/science/cdf/files/patch-src_tests_Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/tests/Makefile.orig 2019-10-16 16:22:18 UTC
-+++ src/tests/Makefile
-@@ -40,17 +40,17 @@
- SHELL=/bin/sh
- NULL=true
-
--FORTRAN=
--FCx=
--CCx=
--SHARED=
--FOPTIONS=
--FOPTIONSld=
--COPTIONS=
--COPTIONSld=
--SYSLIBS=
--SHAREDEXT=
--MAKE=make
-+#FORTRAN=
-+#FCx=
-+#CCx=
-+#SHARED=
-+#FOPTIONS=
-+#FOPTIONSld=
-+#COPTIONS=
-+#COPTIONSld=
-+#SYSLIBS=
-+#SHAREDEXT=
-+MAKE=gmake
-
- INCLUDEcdf=../include
-
diff --git a/science/cdf/pkg-plist b/science/cdf/pkg-plist
index 3df1997a9fac..177ca8658467 100644
--- a/science/cdf/pkg-plist
+++ b/science/cdf/pkg-plist
@@ -21,6 +21,7 @@ include/cdfconfig.h
include/cdfdist.h
include/cdflib.h
include/cdflib64.h
+include/cdftools.h
lib/cdf/help/cdf2skt.olh
lib/cdf/help/cdf2sktj.olh
lib/cdf/help/cdfbrow.ilh
@@ -44,14 +45,14 @@ lib/cdf/help/cdfmerge.olh
lib/cdf/help/cdfmergej.olh
lib/cdf/help/cdfstats.olh
lib/cdf/help/cdfstatsj.olh
-lib/cdf/help/cdfxp.ilh
lib/cdf/help/cdfvalidate.olh
lib/cdf/help/cdfvalidatej.olh
+lib/cdf/help/cdfxp.ilh
lib/cdf/help/skt2cdf.olh
lib/cdf/help/skt2cdfj.olh
+lib/libcdf.3.9.1.so
lib/libcdf.a
lib/libcdf.so
-lib/libcdf.3.8.0.so
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OperateAttributes.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OperateCDF.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OperateVariables.c