5 files changed, 5 insertions, 108 deletions

diff --git a/science/cdf/Makefile b/science/cdf/Makefile
index 629b8f023dc9..c4611b701aaf 100644
--- a/science/cdf/Makefile
+++ b/science/cdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cdf3
 PORTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	ftp://nssdcftp.gsfc.nasa.gov/standards/cdf/dist/cdf${VER}/unix/	\
 		http://windsor.gsfc.nasa.gov/standards/cdf/dist/cdf${VER}/unix/
@@ -16,7 +16,7 @@ DISTNAME=	cdf${VER}-dist-cdf
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Device independent view of the CDF data model
 
-MAKE_FLAGS=	INSTALLDIR=${PREFIX} OS=${OPSYS:L} ENV=ports	\
+MAKE_FLAGS=	INSTALLDIR=${PREFIX} OS=${OPSYS:L} ENV=gnu	\
 		FORTRAN=yes F77=${F77}
 INSTALLS_SHLIB=	yes
 
@@ -34,7 +34,6 @@ PORTDOCS=	CDF_copyright.txt CHANGES.txt Release.notes Welcome.txt
 pre-configure:
 .for def in ${DEFS}
 	${REINPLACE_CMD} -e 's|<path>|${PREFIX}|'		\
-		-e 's|/home/cdf/cdf30-dist|${PREFIX}|'		\
 		 ${WRKSRC}/src/definitions/definitions.${def}
 .endfor
 
diff --git a/science/cdf/distinfo b/science/cdf/distinfo
index d91eab37f533..cfe1021918ca 100644
--- a/science/cdf/distinfo
+++ b/science/cdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (cdf31-dist-cdf.tar.gz) = 35e94458c07884c2bcfdfe7f0efb3b37
-SHA256 (cdf31-dist-cdf.tar.gz) = aea95b355ca150fa8515c73899fdedddf52abdcea85acaf8e39b8e9f76dca51b
-SIZE (cdf31-dist-cdf.tar.gz) = 915812
+MD5 (cdf31-dist-cdf.tar.gz) = e7d6c2a4203278c8885bbfe99fdac5b3
+SHA256 (cdf31-dist-cdf.tar.gz) = 863d899395be73d73de8678492229542bc078c1ba372909d7c927d064d16c152
+SIZE (cdf31-dist-cdf.tar.gz) = 927221
diff --git a/science/cdf/files/patch-Makefile b/science/cdf/files/patch-Makefile
deleted file mode 100644
index 96172ffca73a..000000000000
--- a/science/cdf/files/patch-Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
---- Makefile.orig	Thu Jan 26 21:56:59 2006
-+++ Makefile	Sat Jan 28 20:38:26 2006
-@@ -297,6 +297,32 @@
- SYSLIBSshr_linux_gnu32=-lm -lc
- 
- #------------------------------------------------------------------------------
-+# Macros for FreeBSD.
-+#------------------------------------------------------------------------------
-+
-+SHARED_freebsd=yes
-+FOPTIONS_freebsd=-w
-+FOPTIONSld_freebsd=${FFLAGS}
-+SHAREDEXT_freebsd=so
-+LDOPTIONSlibcdf_freebsd=-shared
-+AROPTIONS_freebsd=rc
-+RANLIB_freebsd=yes
-+FC_freebsd=${F77}
-+EXEEXT_freebsd=
-+
-+CURSES_freebsd_ports=yes
-+CC_freebsd_ports=${CC}
-+LD_freebsd_ports=ld
-+PIC_freebsd_ports=-fPIC
-+COPTIONS_freebsd_ports=${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DMALLOC_CHECK_=0
-+COPTIONSld_freebsd_ports=
-+FOPTIONS_freebsd_ports=${FFLAGS}
-+FOPTIONSld_freebsd_ports=
-+CURSESLIB_freebsd_ports=-lncurses
-+SYSLIBSexe_freebsd_ports=-lm -lc
-+SYSLIBSshr_freebsd_ports=-lm -lc
-+
-+#------------------------------------------------------------------------------
- # Macros for Cygwin.
- #------------------------------------------------------------------------------
- 
-@@ -411,6 +437,7 @@
- all.cygwin.gnu: all.build
- all.mingw.gnu: all.build
- all.mach.macosx: all.build
-+all.freebsd.ports: all.build
- 
- all.build:
- 	@cd $(LIBsrcDIR); $(MAKE) \
-@@ -1424,7 +1451,7 @@
- show.qnx.gnu: show.notsupported
- show.linux.gnu: show.supported
- show.linux.gnu32: show.supported
--show.breebsd.gnu: show.supported
-+show.freebsd.ports: show.supported
- show.cygwin.gnu: show.supported
- show.mingw.gnu: show.supported
- show.posix.vax: show.supported
diff --git a/science/cdf/files/patch-src_include_cdfdist.h b/science/cdf/files/patch-src_include_cdfdist.h
deleted file mode 100644
index acf89f3c8525..000000000000
--- a/science/cdf/files/patch-src_include_cdfdist.h
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/include/cdfdist.h.orig	Mon Jan 30 20:05:49 2006
-+++ src/include/cdfdist.h	Tue Jan 31 22:26:02 2006
-@@ -101,7 +101,7 @@
- #  define unix
- #endif
- 
--#if defined(linux) || defined(__CYGWIN__) || defined(__MINGW32__)
-+#if defined(linux) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__FreeBSD__)
- #  if defined(PPC)
- #    define POWERPC
- #  else
-@@ -143,7 +143,7 @@
- #        define alphavmsI
- #      endif
- #    else           /* "vms" not defined if "-W ansi89" used. */
--#      if !defined(linux)
-+#      if !defined(linux) && !defined(__FreeBSD__)
- #        define posixSHELL
- #        define posixSHELLalpha
- #        if __D_FLOAT
-@@ -456,7 +456,8 @@
- #      endif
- #    endif
- #    if defined(macosX) || defined(__osf__) || defined(__CYGWIN__) || \
--        defined(vms) || defined(sgi) || defined(__MINGW32__)
-+        defined(vms) || defined(sgi) || defined(__MINGW32__) || \
-+        defined(__FreeBSD__)
- #      define FOPEN64 fopen
- #    else
- #      define FOPEN64 fopen64
-@@ -513,7 +514,7 @@
- *****************************************************************************/
- 
- #if defined(sun) || defined(MIPSEB) || defined(IBMRS) || defined(HP) || \
--    defined(NeXT) || defined(mac) || defined(POWERPC)
-+    defined(NeXT) || defined(mac) || defined(POWERPC) || defined(__sparc64__)
- #  define FP1cpu
- #endif
- 
diff --git a/science/cdf/files/patch-src_include_cdflib.h b/science/cdf/files/patch-src_include_cdflib.h
deleted file mode 100644
index 9f0fdb2d0d75..000000000000
--- a/science/cdf/files/patch-src_include_cdflib.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/include/cdflib.h.orig	Mon Jul 11 23:51:18 2005
-+++ ./src/include/cdflib.h	Fri Jan 27 21:51:27 2006
-@@ -351,7 +351,7 @@
- #if defined(unix) && !defined(AIX) && !defined(Mach) && !defined(hpux) || \
-     defined(__MINGW32__)
- #  if defined(linux) || defined(__CYGWIN__) || defined(macosX) || \
--      defined(sun) || defined(__MINGW32__)
-+      defined(sun) || defined(__MINGW32__) || defined(__FreeBSD__)
- #    define Fif_ENTRYPOINT(ep__,ep_,ep,EP) ep__
- #  else
- #    define Fif_ENTRYPOINT(ep__,ep_,ep,EP) ep_