5 files changed, 17 insertions, 63 deletions

diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index 0b4465af8dad..e93513e47bbb 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netcdf
-PORTVERSION=	3.6.1
+PORTVERSION=	3.6.2
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.unidata.ucar.edu/pub/netcdf/%SUBDIR%/ \
 		http://sunpoet.net/distfiles/
@@ -15,31 +15,23 @@ MASTER_SITE_SUBDIR=	. old
 MAINTAINER=	sunpoet@sunpoet.net
 COMMENT=	Library for machine-independent, array-oriented data access
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
 CONFLICTS=	hdf-4.*
 
-CONFIGURE_ENV=	CPPFLAGS="-fPIC -DPIC -Df2cFortran"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--enable-shared --mandir=${PREFIX}/man --disable-f77
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran"
+
+USE_BZIP2=	YES
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 MAN1=	ncdump.1 ncgen.1
-MAN3=	netcdf.3 netcdf.3f
-
-post-build:
-	@(cd ${WRKSRC}/libsrc && \
-		${SETENV} ${MAKE_ENV} ${MAKE} linux_shared_library)
-	@(cd ${WRKSRC}/cxx && \
-		${SETENV} ${MAKE_ENV} ${MAKE} linux_shared_library)
+MAN3=	netcdf.3
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/ncdump
-	@${STRIP_CMD} ${PREFIX}/bin/ncgen
-	${INSTALL_DATA} ${WRKSRC}/libsrc/libnetcdf.so ${PREFIX}/lib/libnetcdf.so.1
-	${LN} -sf libnetcdf.so.1 ${PREFIX}/lib/libnetcdf.so
-	${INSTALL_DATA} ${WRKSRC}/cxx/libnetcdf_c++.so ${PREFIX}/lib/libnetcdf_c++.so.1
-	${LN} -sf libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so
+	@${STRIP_CMD} ${PREFIX}/bin/ncdump ${PREFIX}/bin/ncgen
+	${LN} -fs libnetcdf.so.4 ${PREFIX}/lib/libnetcdf.so
+	${LN} -fs libnetcdf_c++.so.4 ${PREFIX}/lib/libnetcdf_c++.so
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in COPYRIGHT README RELEASE_NOTES
diff --git a/science/netcdf/distinfo b/science/netcdf/distinfo
index fa988c3f6686..63fec67ffd48 100644
--- a/science/netcdf/distinfo
+++ b/science/netcdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (netcdf-3.6.1.tar.gz) = 07a9db424337c5e4833fb84136e09a1e
-SHA256 (netcdf-3.6.1.tar.gz) = 15c42a2c698c4e42ee17720701168711d86e97e97311223015d07853fb09249f
-SIZE (netcdf-3.6.1.tar.gz) = 883888
+MD5 (netcdf-3.6.2.tar.bz2) = 1eca0ea1e81e14ebc5bb93e5dd25c364
+SHA256 (netcdf-3.6.2.tar.bz2) = 0468f1d9ab0fbad6edb957d8fb597010cb5c546c6de6752c9a63b0e0f194e564
+SIZE (netcdf-3.6.2.tar.bz2) = 4580511
diff --git a/science/netcdf/files/patch-Makefile b/science/netcdf/files/patch-Makefile
deleted file mode 100644
index 00d94fb843f1..000000000000
--- a/science/netcdf/files/patch-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	Mon Feb 27 00:43:59 2006
-+++ Makefile	Sat Dec 23 05:33:43 2006
-@@ -117,6 +117,8 @@
- ncgen/distclean	\
- cxx/clean	\
- cxx/distclean	\
-+fortran/install	\
-+fortran/uninstall	\
- :
- 	@subdir=`echo $@ | sed 's,/.*,,'`; \
- 	target=`echo $@ | sed 's,.*/,,'`; \
-@@ -124,8 +126,6 @@
- 
- fortran/all	\
- fortran/test	\
--fortran/install	\
--fortran/uninstall	\
- nf_test/all	\
- nf_test/test	\
- :
diff --git a/science/netcdf/files/patch-rules.make b/science/netcdf/files/patch-rules.make
deleted file mode 100644
index 4c9e564dc054..000000000000
--- a/science/netcdf/files/patch-rules.make
+++ /dev/null
@@ -1,19 +0,0 @@
---- rules.make.orig	Sat Dec 18 05:34:48 2004
-+++ rules.make	Thu Jan  6 15:12:59 2005
-@@ -145,14 +145,8 @@
- 	$(INSTALL) $(MANUAL) $@
- $(MANDIR)/man3/$(MANUAL):	$(MANDIR)/man3 $(MANUAL)
- 	$(INSTALL) $(MANUAL) $@
--$(MANDIR)/man3f/$(MANUAL):	$(MANDIR)/man3 $(MANDIR)/man3/$(MANUAL) \
--				$(MANDIR)/man3f
--	rm -f $@
--	ln -s $(MANDIR)/man3/$(MANUAL) $@
--$(MANDIR)/man3f90/$(MANUAL):	$(MANDIR)/man3 $(MANDIR)/man3/$(MANUAL) \
--				$(MANDIR)/man3f90
--	rm -f $@
--	ln -s $(MANDIR)/man3/$(MANUAL) $@
-+$(MANDIR)/man3f/$(MANUAL):	$(MANDIR)/man3 $(MANDIR)/man3/$(MANUAL)
-+$(MANDIR)/man3f90/$(MANUAL):	$(MANDIR)/man3 $(MANDIR)/man3/$(MANUAL)
- 
- ################################################################################
- # Cleanup:
diff --git a/science/netcdf/pkg-plist b/science/netcdf/pkg-plist
index fcbebdf8999f..ccb8850193b8 100644
--- a/science/netcdf/pkg-plist
+++ b/science/netcdf/pkg-plist
@@ -3,14 +3,15 @@ bin/ncgen
 include/ncvalues.h
 include/netcdf.h
 include/netcdf.hh
-include/netcdf.inc
 include/netcdfcpp.h
 lib/libnetcdf.a
+lib/libnetcdf.la
 lib/libnetcdf.so
-lib/libnetcdf.so.1
+lib/libnetcdf.so.4
 lib/libnetcdf_c++.a
+lib/libnetcdf_c++.la
 lib/libnetcdf_c++.so
-lib/libnetcdf_c++.so.1
+lib/libnetcdf_c++.so.4
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES