Attachment #78606 for bug #113047





PORTNAME=	pnetcdf
PORTVERSION=	1.0.1
PORTREVISION=	2
CATEGORIES=	science parallel
MASTER_SITES=	http://www-unix.mcs.anl.gov/parallel-netcdf/
DISTNAME=	parallel-netcdf-${PORTVERSION}


USE_BZIP2=	YES

OPTIONS=	OPENMPI "Use openmpi instead of mpich2" off \
		FORTRAN "With Fortran Interface" off

GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
USE_GMAKE=	yes
USE_AUTOTOOLS=	autoconf:259

MAN1=		ncmpigen.1 ncmpidump.1
MAN3=		pnetcdf.3

.include <bsd.port.pre.mk>

.if defined(WITH_FORTRAN)
WANT_FORTRAN=	yes
PLIST_SUB+=	FORTRANINC=""
#BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
#FC=		gfortran42
#F77=		gfortran42
CONFIGURE_ARGS+=	--disable-f77
.else
PLIST_SUB+=	FORTRANINC="@comment "
CONFIGURE_ARGS+=	--disable-fortran --disable-f77
.endif

.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 --mandir=${PREFIX}/man --with-mpi=${PREFIX}/mpi/openmpi
CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran"
.else
BUILD_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
RUN_DEPENDS+=	${LOCALBASE}/mpich2/lib/libmpich.so:${PORTSDIR}/net/mpich2
CONFIGURE_ARGS+=	--enable-shared --mandir=${PREFIX}/man --with-mpi=${PREFIX}/mpich2
CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran"
.endif

post-install:

Lines 2-8 bin/ncvalid Link Here

(-)pkg-plist (-1 / +1 lines)
2	bin/ncmpigen	2	bin/ncmpigen
3	bin/ncmpidump	3	bin/ncmpidump
4	include/pnetcdf.h	4	include/pnetcdf.h
5	include/pnetcdf.inc	5	%%FORTRANINC%%include/pnetcdf.inc
6	lib/libpnetcdf.a	6	lib/libpnetcdf.a
7	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT	7	%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
8	%%PORTDOCS%%%%DOCSDIR%%/README	8	%%PORTDOCS%%%%DOCSDIR%%/README




--- ./aclocal.m4.orig	Thu Dec  1 08:02:22 2005
+++ ./aclocal.m4	Mon May 28 15:37:13 2007
@@ -19,7 +19,7 @@
     esac
     AC_MSG_CHECKING(m4 flags)

     esac
     AC_MSG_RESULT($M4FLAGS)
     AC_SUBST(M4FLAGS)
@@ -498,7 +498,7 @@
 			    forts="xlf f77"
 			    ;;
 			BSD/OS*|FreeBSD*)
-			    forts="f77 fort77 g77"
+			    forts="f77 fort77 g77 gfortran42"
 			    ;;
 			HP-UX*)
 			    # f77(1) doesn't have the -L option.

Removed Link Here

(-)files/patch-configure (-11 lines)
1	--- configure.orig Wed Dec 7 07:47:45 2005
2	+++ configure Mon Apr 30 11:35:44 2007
3	@@ -2769,7 +2769,7 @@
4	echo "$as_me:$LINENO: checking m4 flags" >&5
5	echo $ECHO_N "checking m4 flags... $ECHO_C" >&6
6	case "${M4FLAGS-unset}" in
7	- unset) M4FLAGS=-B10000 ;;
8	+ unset) M4FLAGS= ;;
9	esac
10	echo "$as_me:$LINENO: result: $M4FLAGS" >&5
11	echo "${ECHO_T}$M4FLAGS" >&6

Lines 1-5 Link Here

(-)files/patch-macros.make.def (-2 / +2 lines)
1	--- macros.make.def.orig Thu Feb 6 00:46:08 2003	1	--- ./macros.make.def.orig Thu Feb 6 00:46:08 2003
2	+++ macros.make.def Mon Apr 30 11:35:44 2007	2	+++ ./macros.make.def Mon May 28 15:37:13 2007
3	@@ -19,7 +19,7 @@	3	@@ -19,7 +19,7 @@
4		4
5	# Preprocessing:	5	# Preprocessing:




--- ./src/lib/ncconfig.in.orig	Wed Oct  5 23:32:41 2005
+++ ./src/lib/ncconfig.in	Mon May 28 15:45:25 2007
@@ -219,9 +219,6 @@
 /* Define to `long' if <sys/types.h> does not define. */
 #undef off_t
 
-/* Define to `int' if <sys/types.h> does not define. */
-#undef ptrdiff_t
-
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 

Return to bug 113047

Lines 7-13 Link Here

(-)Makefile (-6 / +20 lines)
7		7
8	PORTNAME= pnetcdf	8	PORTNAME= pnetcdf
9	PORTVERSION= 1.0.1	9	PORTVERSION= 1.0.1
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= science parallel	11	CATEGORIES= science parallel
12	MASTER_SITES= http://www-unix.mcs.anl.gov/parallel-netcdf/	12	MASTER_SITES= http://www-unix.mcs.anl.gov/parallel-netcdf/
13	DISTNAME= parallel-netcdf-${PORTVERSION}	13	DISTNAME= parallel-netcdf-${PORTVERSION}
Lines 19-45 CONFLICTS= hdf-4.* Link Here
19		19
20	USE_BZIP2= YES	20	USE_BZIP2= YES
21		21
22	OPTIONS= OPENMPI "Use openmpi instead of mpich2" off	22	OPTIONS= OPENMPI "Use openmpi instead of mpich2" off \
		23	FORTRAN "With Fortran Interface" off
23		24
24	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
25	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
26	USE_GMAKE= yes	27	USE_GMAKE= yes
		28	USE_AUTOTOOLS= autoconf:259
27		29
28	MAN1= ncmpigen.1 ncmpidump.1	30	MAN1= ncmpigen.1 ncmpidump.1
29	MAN3= pnetcdf.3	31	MAN3= pnetcdf.3
30		32
31	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
32		34
		35	.if defined(WITH_FORTRAN)
		36	WANT_FORTRAN= yes
		37	PLIST_SUB+= FORTRANINC=""
		38	#BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
		39	#FC= gfortran42
		40	#F77= gfortran42
		41	CONFIGURE_ARGS+= --disable-f77
		42	.else
		43	PLIST_SUB+= FORTRANINC="@comment "
		44	CONFIGURE_ARGS+= --disable-fortran --disable-f77
		45	.endif
		46
33	.if defined(WITH_OPENMPI)	47	.if defined(WITH_OPENMPI)
34	BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi	48	BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
35	RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi	49	RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
36	CONFIGURE_ARGS= --enable-shared --mandir=${PREFIX}/man --disable-f77 --with-mpi=${PREFIX}/mpi/openmpi	50	CONFIGURE_ARGS+= --enable-shared --mandir=${PREFIX}/man --with-mpi=${PREFIX}/mpi/openmpi
37	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran"	51	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran"
38	.else	52	.else
39	BUILD_DEPENDS+= ${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2	53	BUILD_DEPENDS+= ${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
40	RUN_DEPENDS+= ${LOCALBASE}/mpich2/lib/libmpich.so:${PORTSDIR}/net/mpich2	54	RUN_DEPENDS+= ${LOCALBASE}/mpich2/lib/libmpich.so:${PORTSDIR}/net/mpich2
41	CONFIGURE_ARGS= --enable-shared --mandir=${PREFIX}/man --disable-f77 --with-mpi=${PREFIX}/mpich2	55	CONFIGURE_ARGS+= --enable-shared --mandir=${PREFIX}/man --with-mpi=${PREFIX}/mpich2
42	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran"	56	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC -Df2cFortran"
43	.endif	57	.endif
44		58
45	post-install:	59	post-install:

Lines 1-5 Link Here

(-)files/patch-aclocal.m4 (-2 / +11 lines)
1	--- aclocal.m4.orig Thu Dec 1 08:02:22 2005	1	--- ./aclocal.m4.orig Thu Dec 1 08:02:22 2005
2	+++ aclocal.m4 Mon Apr 30 11:35:44 2007	2	+++ ./aclocal.m4 Mon May 28 15:37:13 2007
3	@@ -19,7 +19,7 @@	3	@@ -19,7 +19,7 @@
4	esac	4	esac
5	AC_MSG_CHECKING(m4 flags)	5	AC_MSG_CHECKING(m4 flags)
Lines 9-11 Link Here
9	esac	9	esac
10	AC_MSG_RESULT($M4FLAGS)	10	AC_MSG_RESULT($M4FLAGS)
11	AC_SUBST(M4FLAGS)	11	AC_SUBST(M4FLAGS)
		12	@@ -498,7 +498,7 @@
		13	forts="xlf f77"
		14	;;
		15	BSD/OS\|FreeBSD)
		16	- forts="f77 fort77 g77"
		17	+ forts="f77 fort77 g77 gfortran42"
		18	;;
		19	HP-UX*)
		20	# f77(1) doesn't have the -L option.

Added Link Here

(-)files/patch-src__lib__ncconfig.in (+12 lines)
1	--- ./src/lib/ncconfig.in.orig Wed Oct 5 23:32:41 2005
2	+++ ./src/lib/ncconfig.in Mon May 28 15:45:25 2007
3	@@ -219,9 +219,6 @@
4	/* Define to `long' if <sys/types.h> does not define. */
5	#undef off_t
6
7	-/* Define to `int' if <sys/types.h> does not define. */
8	-#undef ptrdiff_t
9	-
10	/* Define to `unsigned' if <sys/types.h> does not define. */
11	#undef size_t
12