6 files changed, 23 insertions, 67 deletions

diff --git a/science/pnetcdf/Makefile b/science/pnetcdf/Makefile
index 2b967729c414..86f373d9b9f0 100644
--- a/science/pnetcdf/Makefile
+++ b/science/pnetcdf/Makefile
@@ -6,52 +6,51 @@
 #
 
 PORTNAME=	pnetcdf
-PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTVERSION=	1.0.3
 CATEGORIES=	science parallel
-MASTER_SITES=	http://www-unix.mcs.anl.gov/parallel-netcdf/
+MASTER_SITES=	http://ftp.mcs.anl.gov/parallel-netcdf/
 DISTNAME=	parallel-netcdf-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library providing high-performance I/O
 
-CONFLICTS=	hdf-4.*
-
-USE_BZIP2=	YES
-
 OPTIONS=	OPENMPI "Use openmpi instead of mpich2" off
 
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-USE_GMAKE=	yes
+CONFLICTS=	hdf-4.*
+
+USE_BZIP2=	yes
 USE_FORTRAN=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	M4FLAGS=""
 
-MAN1=		ncmpigen.1 ncmpidump.1
+MAN1=		ncmpidump.1 ncmpigen.1
 MAN3=		pnetcdf.3
+PORTDOCS=	COPYRIGHT INSTALL README
+PLIST_FILES=	bin/ncmpidump bin/ncmpigen bin/ncvalid \
+		include/pnetcdf.h include/pnetcdf.inc lib/libpnetcdf.a
 
-.include <bsd.port.pre.mk>
+CFLAGS+=	-fPIC -DPIC
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not configure
-.endif
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_OPENMPI)
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
-CONFIGURE_ARGS=	--enable-shared --disable-f77 --with-mpi=${PREFIX}/mpi/openmpi
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran"
+CONFIGURE_ARGS+=--with-mpi=${LOCALBASE}/mpi/openmpi
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
 RUN_DEPENDS+=	${LOCALBASE}/mpich2/lib/libmpich.so:${PORTSDIR}/net/mpich2
-CONFIGURE_ARGS=	--enable-shared --disable-f77 --with-mpi=${PREFIX}/mpich2
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran"
+CONFIGURE_ARGS+=--with-mpi=${LOCALBASE}/mpich2
 .endif
 
 post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/ncmpidump ${PREFIX}/bin/ncmpigen ${PREFIX}/bin/ncvalid
+.for file in ncmpidump ncmpigen ncvalid
+	@${STRIP_CMD} ${PREFIX}/bin/${file}
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in COPYRIGHT INSTALL README
+.for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/science/pnetcdf/distinfo b/science/pnetcdf/distinfo
index ace6d8c5be16..d0a7db54ad41 100644
--- a/science/pnetcdf/distinfo
+++ b/science/pnetcdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (parallel-netcdf-1.0.1.tar.bz2) = e906d2ee7dddaf85b06b51fc5946eb9e
-SHA256 (parallel-netcdf-1.0.1.tar.bz2) = 3327d653fa65eed404dfdf0681b055d359fd48c4e33abe8f47bec335f4a3b480
-SIZE (parallel-netcdf-1.0.1.tar.bz2) = 3434372
+MD5 (parallel-netcdf-1.0.3.tar.bz2) = 2b7f43ff29a66b5eb58eb90fdf83d0dd
+SHA256 (parallel-netcdf-1.0.3.tar.bz2) = 25804a81a91a7026068c0db2a7d8390b8b8a479bd2aa0e797c417b7be78f8d6c
+SIZE (parallel-netcdf-1.0.3.tar.bz2) = 3504561
diff --git a/science/pnetcdf/files/patch-aclocal.m4 b/science/pnetcdf/files/patch-aclocal.m4
deleted file mode 100644
index fbdf4d1aa5a1..000000000000
--- a/science/pnetcdf/files/patch-aclocal.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig	Thu Dec  1 08:02:22 2005
-+++ aclocal.m4	Mon Apr 30 11:35:44 2007
-@@ -19,7 +19,7 @@
-     esac
-     AC_MSG_CHECKING(m4 flags)
-     case "${M4FLAGS-unset}" in
--	unset) M4FLAGS=-B10000 ;;
-+	unset) M4FLAGS= ;;
-     esac
-     AC_MSG_RESULT($M4FLAGS)
-     AC_SUBST(M4FLAGS)
diff --git a/science/pnetcdf/files/patch-configure b/science/pnetcdf/files/patch-configure
deleted file mode 100644
index 0b851157a30e..000000000000
--- a/science/pnetcdf/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Dec  7 07:47:45 2005
-+++ configure	Mon Apr 30 11:35:44 2007
-@@ -2769,7 +2769,7 @@
-     echo "$as_me:$LINENO: checking m4 flags" >&5
- echo $ECHO_N "checking m4 flags... $ECHO_C" >&6
-     case "${M4FLAGS-unset}" in
--	unset) M4FLAGS=-B10000 ;;
-+	unset) M4FLAGS= ;;
-     esac
-     echo "$as_me:$LINENO: result: $M4FLAGS" >&5
- echo "${ECHO_T}$M4FLAGS" >&6
diff --git a/science/pnetcdf/files/patch-macros.make.def b/science/pnetcdf/files/patch-macros.make.def
deleted file mode 100644
index b700e544a9a3..000000000000
--- a/science/pnetcdf/files/patch-macros.make.def
+++ /dev/null
@@ -1,11 +0,0 @@
---- macros.make.def.orig	Thu Feb  6 00:46:08 2003
-+++ macros.make.def	Mon Apr 30 11:35:44 2007
-@@ -19,7 +19,7 @@
- 
- # Preprocessing:
- M4		= m4
--M4FLAGS		= -B10000
-+M4FLAGS		= 
- CPP		= c89 -E
- CPPFLAGS	= $(INCLUDES) $(DEFINES) @CPPFLAGS@
- FPP		= 
diff --git a/science/pnetcdf/pkg-plist b/science/pnetcdf/pkg-plist
deleted file mode 100644
index 2e616da0bbe0..000000000000
--- a/science/pnetcdf/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/ncvalid
-bin/ncmpigen
-bin/ncmpidump
-include/pnetcdf.h
-include/pnetcdf.inc
-lib/libpnetcdf.a
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%@dirrm %%DOCSDIR%%