diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index db04c9ddcbf9..207725ea7181 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -1,106 +1,106 @@ # Created by: Thomas Gellekum 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} MAINTAINER= stephen@FreeBSD.org COMMENT= IBM's Open Visualization Data Explorer LICENSE= IBM-OVDX-v1 LICENSE_NAME= IBM PUBLIC LICENSE - Open Visualization Data Explorer VERSION 1.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libtiff.so:graphics/tiff \ libcdf.so:science/cdf MAKE_JOBS_UNSAFE= yes USES= bison compiler:c++17-lang gl gmake libtool magick:6 motif xorg USE_XORG= x11 xt xinerama xext xpm xmu sm ice USE_GL= gl glu GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared USE_LDCONFIG= yes CONFIGURE_ENV= ARCH=freebsd CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib NO_MTREE= yes PLIST_SUB= ARCH=freebsd PKGMESSAGE= ${WRKDIR}/pkg-message .if defined(WITH_HDF) && !defined(WITHOUT_NETCDF) IGNORE= HDF and NETCDF are conflicting .endif .if defined(WITH_HDF) LIB_DEPENDS+= libmfhdf.so:science/hdf .else CONFIGURE_ARGS+= --without-hdf .endif .if !defined(WITHOUT_NETCDF) LIB_DEPENDS+= libnetcdf.so:science/netcdf .else CONFIGURE_ARGS+= --without-netcdf .endif .if defined(WITH_JAVA) ONLY_FOR_ARCHS= i386 USE_JAVA= yes BUILD_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer RUN_DEPENDS+= ${JAVALIBDIR}/npcosmop211.jar:graphics/cosmoplayer CONFIGURE_ARGS+= --with-cosmojar-path=${JAVALIBDIR}/npcosmop211.jar \ --with-java40jar-path=${JAVALIBDIR}/java40.jar \ --with-jni-path=${JAVA_HOME}/include:${JAVA_HOME}/include/freebsd PLIST_SUB+= JAVA="" DIR2PRUNE= dx/java/user dx/java/server/nets .else CONFIGURE_ARGS+= --without-javadx PLIST_SUB+= JAVA="@comment " .endif PLIST_SUB+= UNAMEP=${ARCH} .include post-patch: @${RM} ${WRKSRC}/include/stamp-h.in .for dir in doc help html man @${FIND} ${WRKSRC}/${dir} -type f | ${XARGS} \ ${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g" .endfor @${REINPLACE_CMD} -e "s;/usr/X11R6;${LOCALBASE};g" \ ${WRKSRC}/configure @${REINPLACE_CMD} -e "s|startserver.bat||" \ ${WRKSRC}/src/uipp/java/server/Makefile.in @${REINPLACE_CMD} -e 's|$$(ARCH)|@ARCH@|' \ ${WRKSRC}/src/misc/Makefile.* @${REINPLACE_CMD} -e 's/void exit (int);/[[noreturn]] void exit (int);/' \ ${WRKSRC}/configure for f in `find ${WRKSRC} -name "*.bm"`; do \ if [ $${f%/*} != "${WRKSRC}/src/uipp/widgets" ]; then \ ${REINPLACE_CMD} -E 's/0x(..)/static_cast(0x\1)/g' $$f; \ ${REINPLACE_CMD} -E 's/static unsigned char/static char/g' $$f; \ fi; \ done post-install: @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE} .if defined(WITH_JAVA) ${CHMOD} 0775 ${STAGEDIR}${PREFIX}/dx/java/server/nets ${TOUCH} ${DIR2PRUNE:S|^|${STAGEDIR}${PREFIX}/|:S|$|/.keepme|} @${ECHO} "---------------------------------------------------------" \ >> ${PKGMESSAGE} @${ECHO} "Before starting ${PREFIX}/dx/java/server/bin/startserver" \ >> ${PKGMESSAGE} @${ECHO} "you must install the port graphics/opendx-samples." \ >> ${PKGMESSAGE} .endif @${ECHO} "---------------------------------------------------------" \ >> ${PKGMESSAGE} .include diff --git a/science/cdf/Makefile b/science/cdf/Makefile index b28618d5e5a1..1798ffba19fe 100644 --- a/science/cdf/Makefile +++ b/science/cdf/Makefile @@ -1,58 +1,56 @@ # 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} MAINTAINER= stephen@FreeBSD.org COMMENT= Device independent view of the CDF data model LICENSE= NASA-G LICENSE_NAME= NASA/Goddard Space Flight Center LICENSE_FILE= ${WRKSRC}/CDF_copyright.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= fails to compile: error: use of undeclared identifier FP1ZEROsingle; did you mean FP1zeroSingle? 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} MAKE_JOBS_UNSAFE= yes TEST_TARGET= test # XXX: test segfaults FFLAGS+= -std=legacy WRKSRC= ${WRKDIR}/cdf${VER}-dist SUB_FILES= pkg-message VER= ${PORTVERSION:S/.//:S/./_/} DEFS= B C K 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}|' \ ${WRKSRC}/src/definitions/definitions.${def} .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,12 +1,12 @@ ---- 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__) || \ - defined(sun) || defined(__MINGW32__) || defined(__FreeBSD__) || \ - defined(__PPC__) + defined(sun) || defined(__MINGW32__) # define Fif_ENTRYPOINT(ep__,ep_,ep,EP) ep__ # else # define Fif_ENTRYPOINT(ep__,ep_,ep,EP) ep_ 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,29 +1,31 @@ ---- 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 -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 fd98519af8a8..3df1997a9fac 100644 --- a/science/cdf/pkg-plist +++ b/science/cdf/pkg-plist @@ -1,67 +1,73 @@ bin/cdfcompare bin/cdfconvert bin/cdfdir bin/cdfdump bin/cdfedit bin/cdfexport bin/cdfinquire bin/cdfirsdump +bin/cdfleapsecondsinfo bin/cdfmerge bin/cdfstats bin/cdfvalidate bin/definitions.B bin/definitions.C bin/definitions.K bin/skeletoncdf bin/skeletontable include/cdf.h include/cdf.inc include/cdfconfig.h include/cdfdist.h include/cdflib.h include/cdflib64.h lib/cdf/help/cdf2skt.olh lib/cdf/help/cdf2sktj.olh lib/cdf/help/cdfbrow.ilh lib/cdf/help/cdfcmp.olh lib/cdf/help/cdfcmpj.olh lib/cdf/help/cdfcvt.olh lib/cdf/help/cdfcvtj.olh lib/cdf/help/cdfdirj.olh lib/cdf/help/cdfdump.olh lib/cdf/help/cdfdumpj.olh lib/cdf/help/cdfedit.ilh lib/cdf/help/cdfedit.olh lib/cdf/help/cdfeditj.olh 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 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 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.cdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.cdf %%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