gentoo resync : 03.03.2021

4 files changed, 3 insertions, 237 deletions

diff --git a/sci-libs/cdf/Manifest b/sci-libs/cdf/Manifest
index f77eadce2b75..3b1d0e20ce38 100644
--- a/sci-libs/cdf/Manifest
+++ b/sci-libs/cdf/Manifest
@@ -1,15 +1,6 @@
 AUX 50cdf 124 BLAKE2B 93acfc3dd493c8518497ed7dafa35cc61f66501bd9d7c4db1f4072cdda9742f2927b5f388dde26d33e76d4d33405a8a92fbf133a1ed729ce8cba21458f552123 SHA512 4fe515d03379f2b6e1723c771f73e65be9f67365a46e75dbeb3358bbdc6f3446b91efd989363bf229b7ae93a446ddedeefd883a0d59d28c1480a10a8994eeadc
 AUX cdf-3.2-soname.patch 738 BLAKE2B 4c6a94feeefa623e88622b6dfd76581ef6d0c0d91c376e597bfa1e0130a734ea6dd40ad5235272788d7338220710d26e634639383d8cf5cdbd1901778484a580 SHA512 f3bb09e43b3b36ed346dc7690cc0c75a28e8dcfb2c1ebbf8a0577abdc2d15bbcbce7b0da9c5de23ef65e669bd118692db498aef230e9395dd4b67dba48258a8d
-AUX cdf-3.4-Makefile.patch 3838 BLAKE2B fdfe3253212c96b1848989a07fdcd3bc830f614414b1f47d9ccc11964b8fa2c4f9cc435f29b418bfd6f461aef0db5b8c004f9cecc83357a10e34cf81ea924452 SHA512 f8eb1b78b5a8e466dff38fa8108ac7316bd171e50e7e9125a99b10482994f02b86656d2d3e34a29c1a384beab6c0fd97ddf6e4697c18657d189620a9efcd1e47
 AUX cdf-3.5.0.2-Makefile.patch 3973 BLAKE2B 2106f52abb639b4f31f08372de81db5cb96dbdccd0a55821605e659b7f85fad554cd8d4212fa4b9e6fd6225e5f3fd6c98e76d7aa7c2fe05dd96ea49d3c8444fe SHA512 9842d43d8e2910f8d7cc00c27711f84cde622ab69084ce1c798625475034b73db857410d6fc1311933512bb3a235cfe2fb0808d2eebfc6165e3962e04aaed4e1
-DIST cdf34_1-dist-cdf.tar.gz 1045465 BLAKE2B f6889584e6c1d26c66d0c17d1e44d63ae2b966ec97e6c1d40fe3ef819225f96c9bad1d000529a9f91f88f6dbcbbf6043bf432203f0d60d48c57941224ca25ec0 SHA512 d68e39b521402256205196f09ec9742b7fdcd1d59fb3251b5eb50812fee52f9ae193c39d342b3dcc467d03911972e4e19f1cf157ac102eae6cc77cb6abacac44
-DIST cdf34_1-dist-java.tar.gz 713180 BLAKE2B c5c8aabb7c3a9a7f3fee3cb9205b4c66d147c5862d0b1f415d8de56f44a06b6b1e00a89bb143ca8868fe65a58423792ae89fdf0a40635bfa49c0b9a05233b573 SHA512 1b95110e6ff455cb379370a74b4160098b5dbd3bef8a3854634caad40d93fde9bc804e4f10187cfeb232f9b9a28a69ce6de6caba969c64dc21b89b339e01e112
-DIST cdf34crm.pdf 1693915 BLAKE2B 77869347ff02105a104d3762118103e9bc5edaf931f1228e3a79f70c8f30b0eaefc091c7c61d0868fa735e987941f8d11200ef9717a77e4649b846ba8de02192 SHA512 cbc8a4b6237632147de24c0eecaaff0f7fa6551eec08f68ebc72c79aff71a99608c309874bd07e9dca6203868171159556a29a7669ecb7e45e60a5cef8d81cb4
-DIST cdf34frm.pdf 1968381 BLAKE2B 163f091927702e3ce72c8ca8d24c19a80e995daec21ef8a7a4906570939234f0576de3269a7b02c8023a3a165016084ad2e3d69684eef1b55e98a0e56d0cbde0 SHA512 c5402db80c05192430e1ca7142d356a8224c52f128fe8c1be937767623c12a7ed55d7afaa0955a00e9ebcace87ba5fed977fc8020a71cdac40fb44326c5f8f65
-DIST cdf34ifd.pdf 415359 BLAKE2B dd928ca68fcfa0239af12e08196293406cda14f87fd1647e48900b9a61cdc13855ac554340c7d3cf3a50fdb7ff03e5957fb9fc966256b7ed27007b97a859cc6f SHA512 1ab42f8677fbbb7cb477c6cbbfe632a8569c6a78fee07dd32c42f549b7d451faaf0ca61ba03f2ea5ba4de2a3a71cc40e4de6ca3dcf86b7caef7594cefc9f2246
-DIST cdf34jrm.pdf 3505200 BLAKE2B 9ae6029f702cc06f4b1fae2d288378a5e7cdee47ef6c1c4d0d24071bead3d94a9d964d39e759eaaeeeb09fe010aede00feb5d9339b6a554f64de92a1df98db35 SHA512 1609f609f7f455bb4749f5f948183f066bc7b6a1367082fccfed669a9768d8c6d8e46f39680e0e99b4accd030c262af92deff9f832e2789ea191874c107df94c
-DIST cdf34prm.pdf 1062987 BLAKE2B 5dc0d5e70d6ae802cf80fab6082d8f77ae1c957c236d133930ccb0c08179889c3011cc6cafe7253df795eb66f08e6be65631bbc10fc4385a9097e7b0d8e9e9ea SHA512 f4e95ce93c896147e4c3074caa8a4d564aadebc8e741c6e593a9377fc0fb0e6f3225c2cd9962900a144418a5b445f462fe12d1178857c3f229f2650da4030587
-DIST cdf34ug.pdf 1307731 BLAKE2B 365711a1d8384dea8017826e753460a5d93295e893540ebf5e300ced8b253316f721edb10effae24a24c857a301edb080da2977d5482f5f6ae540b39fc89a14d SHA512 78c4891690494131f1a8793e1e0dbb9aa0d021b88d04489385156dcc25a218555acad3ec727265aa2b749e24c9a66601ad0698ad201bc6f16b74c9266aae4a0f
 DIST cdf350crm.pdf 2139671 BLAKE2B fbfcc12d919ca07beb1df621f967bbe69b33d0c403613e1b12c01354e53e86f93920104d24dab4f3d1260d72f5e6de663ae3a87ef310dfabf46af2c216424f07 SHA512 382c3cfd73b7c75a017f0c563c61473fccc11ca344f33f4f5a543f4c339a52879400532dbff9956ae8c2b7706f63223132666c3154ad7ada281cd4418e48b4dd
 DIST cdf350frm.pdf 2194293 BLAKE2B 40b269a7987a1522ec7f92eae8efba1117993e459df574afe89d5325d21c3e685a5ed09216bfa56e22f40e831c99bf6d69faa14b9d3a1014d1cbceba43dc3bc9 SHA512 1c1db067f42b56ddb01399821103ced7207da1dc191f62f7acf6776a05c15a992f7be060790233e1b94444724aedb6f83ba687f60b7a20b4988f9d591b40d481
 DIST cdf350jrm.pdf 4009791 BLAKE2B 5b0ea4fcfe2237b4105707d2a3a9945e13333c4ee073d7d9a5a2b839a250308697aa9291aa1e224b886f821235b4d6c4f5f5304a1ad61d45436e1dc4f2b0425a SHA512 cf42de6d94168337936403fc2e504b03fdd676ae8daf8020186d3261bc7331822d47b7c509c804ca5fd637af3696308d09c5db102aaa546138d0630c3df999c3
@@ -18,6 +9,5 @@ DIST cdf350ug.pdf 1396156 BLAKE2B 39f3e3b0441ef103c9131b3c5523c5a387eb785d545c68
 DIST cdf35_0-dist-cdf.tar.gz 1137065 BLAKE2B df3235338e63686dd0446663b8738618c45c4e86c858b4f41d3326ebf14d391ecce43309cf5d6a3db4a9f9e53820bf8a73acb77549a0432594859b24acb7eb84 SHA512 f26bd1e298494563cb30c52751bd175124814dca2fe2c05ae056d6c2ad905fb5ddc7da35888c6a07d69914f52481cb4e9fcab9684c9a8a0ca4b80ca449ad3406
 DIST cdf35_0-dist-java.tar.gz 724055 BLAKE2B 563542821106b040bb0eaefa303cbda46ace5a127cda1936c55e5eaf3b395eb67073a622e84d1bfc33cb65faa4b51710008cfbae86fd680e5cca2c80dbc5162b SHA512 2e69447e9c36ced39a6bfcd1f2a5dfa7c36c04e9a5acac12952c1b415c5191471efbf2cc432b5b31eb37c8ee31bda3e27bce0fa266c5549fb1b0ab86c4dd6c4f
 DIST cdf35ifd.pdf 560458 BLAKE2B c44722d30c4217b492fe140833ae9c58721040b629cf414fe8d9d7d44433b3f62241d621d4b6d634f54e4f0ecb4c026b66a1e752a1d868b0861eed54d4a95bee SHA512 018a524f7fc8dc5b8b3512ed8bdea42bae141eb65d24b4fbbdac6ecebaeac5c458caf3a476fc4b7c0313b17441cbe7dce32d1002f9344d056cd46853ee3cd438
-EBUILD cdf-3.4.1.ebuild 3160 BLAKE2B 0be079f14b31d8cbd32fcf2f470716deb8a116d6a4705f4fee268edfce9ce9d1678726b33fdf1ccdc16daac4f3f05d8bfa466ab3e5a1e105bcc29e52df982cf1 SHA512 f05585881ae9906dac47d63e06647bfb11e087d05e5a4d5f437bbfec0b99647a22f2a64bc2fbb1c9c5e62656ce64a23244b1db59bc1a6f060e20e827e60a2dc1
-EBUILD cdf-3.5.0.2.ebuild 3177 BLAKE2B 3a643b73c40ea6ccfdd1545bcfbc80e8ed1857fee18118e4764fcfb6be67502d3cb09fa810d93f7d66af28277a9b46111528747c612b97b2d49003837629a1ae SHA512 57269d226912eb305dc88908de46da821a2393cf803b60674be4995037d579863a0e12d6f408dfc15fc70c3ecc951664bc13d6e6bd27a0c547c79e0ab82f8396
+EBUILD cdf-3.5.0.2.ebuild 3171 BLAKE2B aa123eaf3bb93f76d8654427eabf289cade23af0a34392d1657856247cb3936758a9ca42fd689241e612a369d335d42dc095de9311258e4b357b2501bcb62f76 SHA512 45fb170eb5a323f35c8c83029af361b231f06a959e0b0f48de6b74a783ee5dafcee2d8156bc8b6c818c0fc55ee29fa320d877e715f2b7c3c634cd5771ee95388
 MISC metadata.xml 1025 BLAKE2B b93e6e8c52f2ac85ac66c6aa1a9a4075c11d6d6ae4c28e540a33b2964f911e5c118510f0b57d25ead76aa3bf07be70b309af1079425bf786c18f70e00930c143 SHA512 26992a8b0ce0aff229d7dc4e87440dc15e0a0143ef88ba6d910a8e4f6372803ae8e3bd007a53b554509220bdb41fe8a804f9b606a4dca47f03d88d39f2164549
diff --git a/sci-libs/cdf/cdf-3.4.1.ebuild b/sci-libs/cdf/cdf-3.4.1.ebuild
deleted file mode 100644
index fcc6e3d4c3d6..000000000000
--- a/sci-libs/cdf/cdf-3.4.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-pkg-opt-2 multilib toolchain-funcs versionator
-
-MY_DP="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
-MY_P="${MY_DP}_$(get_version_component_range 3)"
-
-DESCRIPTION="Common Data Format I/O library for multi-dimensional data sets"
-HOMEPAGE="https://cdf.gsfc.nasa.gov"
-SRC_BASE="ftp://cdaweb.gsfc.nasa.gov/pub/${PN}/dist/${MY_P}/unix"
-
-SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
-	java? ( ${SRC_BASE}/${MY_P}-dist-java.tar.gz )
-	doc? (
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}crm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}frm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ifd.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}prm.pdf
-		${SRC_BASE}/${MY_DP}_documentation/${MY_DP}ug.pdf
-		java? ( ${SRC_BASE}/${MY_DP}_documentation/${MY_DP}jrm.pdf )
-	)"
-
-LICENSE="CDF"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples java ncurses static-libs"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.5:= )
-	ncurses? ( sys-libs/ncurses:0= )
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}-dist"
-
-src_prepare() {
-	# respect cflags, remove useless scripts
-	epatch \
-		"${FILESDIR}"/${PN}-3.4-Makefile.patch \
-		"${FILESDIR}"/${PN}-3.2-soname.patch
-	# use proper lib dir
-	sed -i \
-		-e "s:\$(INSTALLDIR)/lib:\$(INSTALLDIR)/$(get_libdir):g" \
-		Makefile || die "sed failed"
-}
-
-src_compile() {
-	PV_SO=${PV:0:1}
-	emake \
-		OS=linux \
-		CC=$(tc-getCC) \
-		ENV=gnu \
-		SHARED=yes \
-		SHAREDEXT_linux=so.${PV_SO} \
-		CURSESLIB_linux_gnu="$(usex ncurses "$($(tc-getPKG_CONFIG) --libs ncurses)" "")" \
-		CURSES=$(usex ncurses) \
-		${myconf} \
-		all
-
-	if use java; then
-		export CDF_BASE="${S}"
-		export CDF_LIB="${S}/src/lib"
-		cd cdfjava/jni
-		$(tc-getCC) \
-			${CFLAGS} -fPIC \
-			-I${CDF_BASE}/src/include \
-			-I$(java-config -O)/include \
-			-I$(java-config -O)/include/linux \
-			-c cdfNativeLibrary.c \
-			-o cdfNativeLibrary.o \
-			|| die "compiling java lib failed"
-		$(tc-getCC) \
-			${LDFLAGS} \
-			-shared cdfNativeLibrary.o \
-			-Wl,-soname=libcdfNativeLibrary.so.${PV_SO} \
-			-L${CDF_LIB} -lcdf -lm \
-			-o libcdfNativeLibrary.so.${PV_SO} \
-			|| die "linking java lib failed"
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	dodir /usr/bin /usr/$(get_libdir)
-	# -j1 (fragile non-autotooled make)
-	emake -j1 \
-		INSTALLDIR="${ED}/usr" \
-		SHAREDEXT=so.${PV_SO} \
-		install
-	dosym libcdf.so.${PV_SO} /usr/$(get_libdir)/libcdf.so
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcdf.a
-	dodoc Release.notes CHANGES.txt Welcome.txt
-	doenvd "${FILESDIR}"/50cdf
-
-	if use doc; then
-		dodoc "${DISTDIR}"/${MY_DP}{crm,frm,ifd,prm,ug}.pdf
-		use java && dodoc "${DISTDIR}"/${MY_DP}jrm.pdf
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*
-	fi
-
-	if use java; then
-		cd cdfjava || die
-		dolib.so jni/libcdfNativeLibrary.so.${PV_SO}
-		dosym libcdfNativeLibrary.so.${PV_SO} \
-			/usr/$(get_libdir)/libcdfNativeLibrary.so
-		java-pkg_dojar */*.jar
-		if use examples; then
-			insinto /usr/share/doc/${PF}/examples/java
-			doins examples/*
-		fi
-	fi
-}
diff --git a/sci-libs/cdf/cdf-3.5.0.2.ebuild b/sci-libs/cdf/cdf-3.5.0.2.ebuild
index 2a56dc164bf6..0742117a90c6 100644
--- a/sci-libs/cdf/cdf-3.5.0.2.ebuild
+++ b/sci-libs/cdf/cdf-3.5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ SRC_URI="${SRC_BASE}/${MY_P}-dist-${PN}.tar.gz
 
 LICENSE="CDF"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples java ncurses static-libs"
 
 RDEPEND="
diff --git a/sci-libs/cdf/files/cdf-3.4-Makefile.patch b/sci-libs/cdf/files/cdf-3.4-Makefile.patch
deleted file mode 100644
index 4a6c0a0ef266..000000000000
--- a/sci-libs/cdf/files/cdf-3.4-Makefile.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Nur cdf34_1-dist.orig/Makefile cdf34_1-dist/Makefile
---- cdf34_1-dist.orig/Makefile	2012-06-19 06:05:21.000000000 -0700
-+++ cdf34_1-dist/Makefile	2012-08-03 10:11:38.672992055 -0700
-@@ -715,17 +715,17 @@
- "PIC=$(PIC_$(OS)_$(ENV))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "LDx=$(LD_$(OS)_$(ENV))" \
--"COPTIONS=$(UCOPTIONS) $(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSshr_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
--"LDOPTIONS=$(LDOPTIONS_$(OS)_$(ENV))" \
-+"LDOPTIONS=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))" \
- "AROPTIONS=$(AROPTIONS_$(OS))" \
- "RANLIB=$(RANLIB_$(OS))" \
- all
- 	@cd $(TOOLSsrcDIR); $(MAKE) \
- "CURSES=$(AND.$(CURSES).$(CURSES_$(OS)_$(ENV)))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))" \
-@@ -735,9 +735,9 @@
- "FCx=$(FC_$(OS))" \
- "CCx=$(CC_$(OS)_$(ENV))" \
- "SHARED=$(AND.$(SHARED).$(SHARED_$(OS)))" \
--"FOPTIONS=$(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
-+"FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS)) $(FOPTIONS_$(OS)_$(ENV))" \
- "FOPTIONSld=$(FOPTIONSld_$(OS)) $(FOPTIONSld_$(OS)_$(ENV))" \
--"COPTIONS=$(COPTIONS_$(OS)_$(ENV))" \
-+"COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))" \
- "COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))" \
- "SYSLIBS=$(SYSLIBSexe_$(OS)_$(ENV))" \
- "SHAREDEXT=$(SHAREDEXT_$(OS))" \
-@@ -773,12 +773,17 @@
- install.all: install.definitions install.include install.lib \
- 	     install.tools install.help_ notify.user copy.leapseconds
- 
--install.definitions: create.bin copy.definitions change.definitions
-+install.definitions: create.bin
- install.include: create.include copy.include
- install.tools: create.bin copy.tools
- install.help_: create.help copy.help
- 
- install.lib: create.lib copy.lib.a
-+	@if [ -f $(LIBsrcDIR)/libcdf.$(SHAREDEXT) ] ; then \
-+	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
-+	 else \
-+	   $(NULL) ; \
-+	 fi
- 	@if [ -f $(LIBsrcDIR)/libcdf.so ] ; then \
- 	   $(MAKE) "INSTALLDIR=$(INSTALLDIR)" install.lib.so ; \
- 	 else \
-@@ -884,8 +889,8 @@
- 	      cp $(INCsrcDIR)/cdfconfig.h $(INSTALLDIR)/include
- 
- copy.lib.so:
--	@echo cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
--	      cp $(LIBsrcDIR)/libcdf.so $(INSTALLDIR)/lib
-+	@echo cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
-+	      cp $(LIBsrcDIR)/libcdf.$(SHAREDEXT) $(INSTALLDIR)/lib
- 
- copy.lib.sl:
- 	@echo cp $(LIBsrcDIR)/libcdf.sl $(INSTALLDIR)/lib
-@@ -1964,15 +1969,15 @@
- show.supported:
- 	@echo SHARED is $(SUPPORTED.$(SHARED_$(OS)))
- 	@echo CURSES is $(SUPPORTED.$(CURSES_$(OS)_$(ENV)))
--	@echo FOPTIONS=$(FOPTIONS_$(OS))
-+	@echo FOPTIONS=$(FFLAGS) $(FOPTIONS_$(OS))
- 	@echo FOPTIONSld=$(FOPTIONSld_$(OS))
- 	@echo SHAREDEXT=$(SHAREDEXT_$(OS))
--	@echo LDOPTIONSlibcdf=$(LDOPTIONS_$(OS)_$(ENV))
-+	@echo LDOPTIONSlibcdf=$(LDFLAGS) $(LDOPTIONS_$(OS)_$(ENV))
- 	@echo RANLIB=$(RANLIB_$(OS))
- 	@echo FCx=$(FC_$(OS))
- 	@echo CCx=$(CC_$(OS)_$(ENV))
- 	@echo PIC=$(PIC_$(OS)_$(ENV))
--	@echo COPTIONS=$(COPTIONS_$(OS)_$(ENV))
-+	@echo COPTIONS=$(CFLAGS) $(COPTIONS_$(OS)_$(ENV))
- 	@echo COPTIONSld=$(COPTIONSld_$(OS)_$(ENV))
- 	@echo CURSESLIB=$(CURSESLIB_$(OS)_$(ENV))
- 	@echo SYSLIBSexe=$(SYSLIBSexe_$(OS)_$(ENV))
-diff -Nur cdf34_1-dist.orig/src/tools/Makefile cdf34_1-dist/src/tools/Makefile
---- cdf34_1-dist.orig/src/tools/Makefile	2012-06-15 09:22:16.000000000 -0700
-+++ cdf34_1-dist/src/tools/Makefile	2012-08-03 10:11:38.685992724 -0700
-@@ -35,10 +35,10 @@
- INCLUDEcdf= ../include
- 
- CC=$(CCx)
--CFLAGS=$(COPTIONS) -I$(INCLUDEcdf)
--CFLAGSld=$(COPTIONSld)
-+CFLAGS:=$(CFLAGS) $(COPTIONS) -I$(INCLUDEcdf)
-+CFLAGSld=$(LDFLAGS) $(COPTIONSld)
- 
--LIBCDFa=../lib/libcdf.a 
-+LIBCDFa=../lib/libcdf.so.3
- LIBs1=$(LIBCDFa) $(SYSLIBS)
- LIBs2=$(LIBCDFa) $(CURSESLIB) $(SYSLIBS)
-