From nobody Sat Jan 08 02:53:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 81A4B193A568; Sat, 8 Jan 2022 02:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JW4QR1dr0z4jyH; Sat, 8 Jan 2022 02:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18A9E17026; Sat, 8 Jan 2022 02:53:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2082r37l000670; Sat, 8 Jan 2022 02:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2082r3hW000669; Sat, 8 Jan 2022 02:53:03 GMT (envelope-from git) Date: Sat, 8 Jan 2022 02:53:03 GMT Message-Id: <202201080253.2082r3hW000669@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 7b0210d18c1e - main - category/port: science/cdf List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b0210d18c1e01935e60be8e3987c969f54283a0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641610383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nAF6qVK//DOYT2DEH7hFd4cohzVgsL6vgGe5QX9Qjj0=; b=iFg4uN4EqAU8Qvh22qgeP4RXnWb9Ex3W2SOfyUfwrySSXAsGUMBIPAwutuFctjNrkBmLQ6 Lbq0u4ywHkv5LKxy7hduyjmOXEy6Tfbt5lhknq/RhOuTnsUGpF+dbGPGsjp+SjWPS/aDWB 7ogJ03BQG3w7xx7x64eD2Nt4ZCz295ChaVlY0IylVHJaiw2orBKHn0MTXdpG37/kFNtg+L 4FqMwSZ6C6JtpK1M1qdK6Yyn4bCJAOLM7gjF2ZX2iMbQEcbW0YNzI0SDz9vw83tUoN7CLL 5krGRQLM6zf//QXXGSd9yKw9oXO5jhB+YbCOoAduShZrT9akwTR1VmH13ReRhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641610383; a=rsa-sha256; cv=none; b=cmA3I9K2cZK0X6Ps9P4vyYD7izgwUYfaNM8FGuNXjgTdgTEuYd2Fv1fTRAEGgulxanGfu/ usTUn2hZcR3p7EkKfI09BmB2egsNA9EV7EOd7gbGnjnxMLfV1rauMYi9GBHcK24pIkjQZn R1Ss4EvC7aQWfwRsmeADWAuTHEkoO3P2xpKXpMBpYrFuC3T6wcxpAHNLsZ8XQ7LjPP0TjH 3rojAna7r+QS9YG9M1pRqzFYjR8VqEomuS/60YcNYSLA0kKxvtOLGEolSd7prn7jsbLIyM PReVXsIpLvbri7v0PyU1umhxmDHH+A3T2UF92jejDD4RdSbhU4PIhTIA87jp2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b0210d18c1e01935e60be8e3987c969f54283a0 commit 7b0210d18c1e01935e60be8e3987c969f54283a0 Author: Stephen Montgomery-Smith AuthorDate: 2022-01-08 02:51:53 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2022-01-08 02:51:53 +0000 category/port: science/cdf - Bump portrevision of dependent port graphics/opendx. --- graphics/opendx/Makefile | 2 +- science/cdf/Makefile | 14 +++++------ science/cdf/distinfo | 5 ++-- science/cdf/files/patch-Makefile | 36 +++++++++++++++++++++------ science/cdf/files/patch-src_include_cdfdist.h | 11 ++++++++ science/cdf/files/patch-src_include_cdflib.h | 4 +-- science/cdf/files/patch-src_tests_Makefile | 6 +++-- science/cdf/pkg-plist | 10 ++++++-- 8 files changed, 63 insertions(+), 25 deletions(-) diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index db04c9ddcbf9..207725ea7181 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -2,7 +2,7 @@ PORTNAME= opendx PORTVERSION= 4.4.4 -PORTREVISION= 33 +PORTREVISION= 34 CATEGORIES= graphics math java MASTER_SITES= http://www.sfr-fresh.com/unix/misc/ DISTNAME= dx-${PORTVERSION} diff --git a/science/cdf/Makefile b/science/cdf/Makefile index b28618d5e5a1..1798ffba19fe 100644 --- a/science/cdf/Makefile +++ b/science/cdf/Makefile @@ -1,11 +1,9 @@ # Created by: Thierry Thomas PORTNAME= cdf3 -PORTVERSION= 3.3.0 -PORTREVISION= 13 +PORTVERSION= 3.8.0 CATEGORIES= science -MASTER_SITES= LOCAL/thierry/${PORTNAME} \ - ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf${VER}/unix/ +MASTER_SITES= https://spdf.gsfc.nasa.gov/pub/software/cdf/dist/cdf38_0/ DISTNAME= cdf${VER}-dist-cdf DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} @@ -21,7 +19,7 @@ BROKEN_aarch64= fails to compile: error: use of undeclared identifier FP1ZEROsi BROKEN_armv6= fails to compile: error: use of undeclared identifier FP1ZEROsingle; did you mean FP1zeroSingle? BROKEN_armv7= fails to compile: error: use of undeclared identifier FP1ZEROsingle; did you mean FP1zeroSingle? -USES= fortran ncurses +USES= fortran ncurses gmake USE_LDCONFIG= yes MAKE_FLAGS= INSTALLDIR=${STAGEDIR}${PREFIX} OS=freebsd ENV=gnu \ FORTRAN=yes FC_freebsd=${F77} @@ -39,6 +37,8 @@ PORTDOCS= CDF_copyright.txt CHANGES.txt Release.notes Welcome.txt OPTIONS_DEFINE= DOCS EXAMPLES +MAKE_ARGS+= OS=freebsd ENV=gnu all + post-patch: .for def in ${DEFS} @${REINPLACE_CMD} -e 's||${PREFIX}|' \ @@ -46,13 +46,11 @@ post-patch: .endfor post-install: - ${MV} ${STAGEDIR}${PREFIX}/lib/libcdf.so \ - ${STAGEDIR}${PREFIX}/lib/libcdf.so.0 - ${LN} -sf libcdf.so.0 ${STAGEDIR}${PREFIX}/lib/libcdf.so ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR} ${SED} -i '' 's,${STAGEDIR},,g' ${STAGEDIR}${PREFIX}/bin/definitions.? + ${RM} -f ${STAGEDIR}${PREFIX}/CDFLeapSeconds.txt .include diff --git a/science/cdf/distinfo b/science/cdf/distinfo index 976cb58de1dd..29df170e422b 100644 --- a/science/cdf/distinfo +++ b/science/cdf/distinfo @@ -1,2 +1,3 @@ -SHA256 (cdf3-3.3.0/cdf33_0-dist-cdf.tar.gz) = 2cb49e9c0d282cdd3737c55df3df0f4b62bb701a07ecfa11c5372a0416bfa81f -SIZE (cdf3-3.3.0/cdf33_0-dist-cdf.tar.gz) = 985719 +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 diff --git a/science/cdf/files/patch-Makefile b/science/cdf/files/patch-Makefile index bbdabded187a..6205a62a5b89 100644 --- a/science/cdf/files/patch-Makefile +++ b/science/cdf/files/patch-Makefile @@ -1,24 +1,44 @@ ---- Makefile.orig 2009-05-13 14:17:26 UTC +--- Makefile.orig 2020-12-09 21:33:32 UTC +++ Makefile -@@ -601,14 +601,14 @@ RANLIB_freebsd=yes +@@ -47,7 +47,7 @@ + + .SILENT: + +-SHELL=/bin/bash ++SHELL=${LOCALBASE}/bin/bash + NULL=true + PART=all + TARGET= +@@ -102,6 +102,9 @@ else + MAKE=make + endif + endif ++ifeq ("$(OS)","freebsd") ++ MAKE=gmake ++endif + RANLIB=ranlib + + WHICHOS=$(shell uname) +@@ -747,15 +750,15 @@ RANLIB_freebsd=yes FC_freebsd=f77 CURSES_freebsd_gnu=yes -CC_freebsd_gnu=gcc -LD_freebsd_gnu=gcc -LDOPTIONS_freebsd_gnu=-shared -+CC_freebsd_gnu=$(CC) -+LD_freebsd_gnu=$(CC) ++CC_freebsd_gnu=${CC} ++LD_freebsd_gnu=${CC} +LDOPTIONS_freebsd_gnu=-shared -Wl,-soname,libcdf.so.0 PIC_freebsd_gnu=-fPIC -COPTIONS_freebsd_gnu=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DMALLOC_CHECK_=0 ++COPTIONS_freebsd_gnu=${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DMALLOC_CHECK_=0 + COPTIONSZlib_freebsd_gnu=-DHAVE_STDARG_H -DHAVE_UNISTD_H -COPTIONSld_freebsd_gnu= -FOPTIONS_freebsd_gnu= -FOPTIONSld_freebsd_gnu= -+COPTIONS_freebsd_gnu=$(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DMALLOC_CHECK_=0 -+COPTIONSld_freebsd_gnu=$(LDFLAGS) -+FOPTIONS_freebsd_gnu=$(FFLAGS) -+FOPTIONSld_freebsd_gnu=$(LDFLAGS) ++COPTIONSld_freebsd_gnu=${LDFLAGS} ++FOPTIONS_freebsd_gnu=${FFLAGS} ++FOPTIONSld_freebsd_gnu=${LDFLAGS} CURSESLIB_freebsd_gnu=-lncurses SYSLIBSexe_freebsd_gnu=-lm -lc SYSLIBSshr_freebsd_gnu=-lm -lc diff --git a/science/cdf/files/patch-src_include_cdfdist.h b/science/cdf/files/patch-src_include_cdfdist.h new file mode 100644 index 000000000000..6e3d27a36448 --- /dev/null +++ b/science/cdf/files/patch-src_include_cdfdist.h @@ -0,0 +1,11 @@ +--- src/include/cdfdist.h.orig 2022-01-08 02:20:38 UTC ++++ src/include/cdfdist.h +@@ -567,7 +567,7 @@ typedef sChar sByte; + # if defined(__DARWIN_64_BIT_INO_T) + # define STAT stat + # else +-# define STAT stat64 ++# define STAT stat + # endif + # endif + # endif diff --git a/science/cdf/files/patch-src_include_cdflib.h b/science/cdf/files/patch-src_include_cdflib.h index cf0878f2eab6..5628e139984d 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 2009-05-12 12:37:37 UTC +--- src/include/cdflib.h.orig 2019-10-16 16:22:18 UTC +++ src/include/cdflib.h -@@ -375,8 +375,7 @@ +@@ -401,8 +401,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 index a24ac2704728..8861eee8e1a4 100644 --- a/science/cdf/files/patch-src_tests_Makefile +++ b/science/cdf/files/patch-src_tests_Makefile @@ -1,6 +1,6 @@ ---- src/tests/Makefile.orig 2009-05-12 18:09:12 UTC +--- src/tests/Makefile.orig 2019-10-16 16:22:18 UTC +++ src/tests/Makefile -@@ -33,16 +33,16 @@ +@@ -40,17 +40,17 @@ SHELL=/bin/sh NULL=true @@ -14,6 +14,7 @@ -COPTIONSld= -SYSLIBS= -SHAREDEXT= +-MAKE=make +#FORTRAN= +#FCx= +#CCx= @@ -24,6 +25,7 @@ +#COPTIONSld= +#SYSLIBS= +#SHAREDEXT= ++MAKE=gmake INCLUDEcdf=../include diff --git a/science/cdf/pkg-plist b/science/cdf/pkg-plist index fd98519af8a8..3df1997a9fac 100644 --- a/science/cdf/pkg-plist +++ b/science/cdf/pkg-plist @@ -6,6 +6,7 @@ bin/cdfedit bin/cdfexport bin/cdfinquire bin/cdfirsdump +bin/cdfleapsecondsinfo bin/cdfmerge bin/cdfstats bin/cdfvalidate @@ -37,10 +38,12 @@ lib/cdf/help/cdfinq.olh lib/cdf/help/cdfinqj.olh lib/cdf/help/cdfirsdump.olh lib/cdf/help/cdfirsdumpj.olh +lib/cdf/help/cdfleaptableinfo.olh +lib/cdf/help/cdfleaptableinfoj.olh lib/cdf/help/cdfmerge.olh lib/cdf/help/cdfmergej.olh -lib/cdf/help/cdfstatj.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 @@ -48,12 +51,13 @@ lib/cdf/help/skt2cdf.olh lib/cdf/help/skt2cdfj.olh lib/libcdf.a lib/libcdf.so -lib/libcdf.so.0 +lib/libcdf.3.8.0.so %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OperateAttributes.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OperateCDF.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OperateVariables.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacsst2.cdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cacsst2.skt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cdf.inc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/d103a2x.cdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.dat %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.c @@ -62,6 +66,8 @@ lib/libcdf.so.0 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.f %%PORTEXAMPLES%%%%EXAMPLESDIR%%/geocpi0.cdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/geocpi0.skt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geocpi1.cdf +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geocpi2.cdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ij01r39.cdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/read_example1.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zfia10x.cdf