Date: Tue, 6 Dec 2016 14:51:24 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427958 - in head/science/pnetcdf: . files Message-ID: <201612061451.uB6EpOib020042@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Tue Dec 6 14:51:24 2016 New Revision: 427958 URL: https://svnweb.freebsd.org/changeset/ports/427958 Log: - Update to 1.7.0 - Use CONFLICTS_INSTALL instead of CONFLICTS - Convert to options target helper - Pet portlint: fix diff header of patch files - Sort PLIST Changes: http://trac.mcs.anl.gov/projects/parallel-netcdf/wiki/ReleaseNotes-1.7.0 Added: head/science/pnetcdf/files/patch-configure (contents, props changed) Modified: head/science/pnetcdf/Makefile head/science/pnetcdf/distinfo head/science/pnetcdf/files/patch-rules.make head/science/pnetcdf/pkg-plist Modified: head/science/pnetcdf/Makefile ============================================================================== --- head/science/pnetcdf/Makefile Tue Dec 6 14:50:34 2016 (r427957) +++ head/science/pnetcdf/Makefile Tue Dec 6 14:51:24 2016 (r427958) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pnetcdf -PORTVERSION= 1.6.1 -PORTREVISION= 2 +PORTVERSION= 1.7.0 CATEGORIES= science parallel MASTER_SITES= http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/ \ LOCAL/sunpoet @@ -17,13 +16,14 @@ OPTIONS_SINGLE= MPI OPTIONS_SINGLE_MPI= OPENMPI MPICH2 OPTIONS_DEFAULT=OPENMPI -CONFLICTS= hdf-4.* +CONFLICTS_INSTALL= hdf-4.* CFLAGS+= -fPIC -DPIC +CONFIGURE_ARGS= ac_cv_fc_compiler_nag=no GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes USE_PERL5= build -USES= fortran gmake perl5 tar:bzip2 +USES= fortran gmake pathfix perl5 tar:bzip2 PORTDOCS= COPYRIGHT INSTALL README @@ -34,10 +34,13 @@ OPENMPI_LIB_DEPENDS= libmpi.so:net/openm post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e '/$$(INSTALL.*$$(...DIR)/ s|$$(...DIR)|$$(DESTDIR)&|' + @${REINPLACE_CMD} -e '/$$(INSTALL.*$$(PREFIX)/ s|$$(PREFIX)|$$(DESTDIR)&|' ${WRKSRC}/src/lib/Makefile.in post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include <bsd.port.mk> Modified: head/science/pnetcdf/distinfo ============================================================================== --- head/science/pnetcdf/distinfo Tue Dec 6 14:50:34 2016 (r427957) +++ head/science/pnetcdf/distinfo Tue Dec 6 14:51:24 2016 (r427958) @@ -1,2 +1,3 @@ -SHA256 (parallel-netcdf-1.6.1.tar.bz2) = 4d0a4eac0cd25147af97c0018a9b2310a9fbab18b7708a7766438d2c4a29c045 -SIZE (parallel-netcdf-1.6.1.tar.bz2) = 1787990 +TIMESTAMP = 1481035855 +SHA256 (parallel-netcdf-1.7.0.tar.bz2) = cc0c77a0beabbcdb26bd147a3cd1a5d6186cb4ba71b5b9bf9efcf1e5b45b5a0c +SIZE (parallel-netcdf-1.7.0.tar.bz2) = 874368 Added: head/science/pnetcdf/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/pnetcdf/files/patch-configure Tue Dec 6 14:51:24 2016 (r427958) @@ -0,0 +1,21 @@ +--- configure.orig 2016-03-03 20:07:36 UTC ++++ configure +@@ -3056,12 +3056,12 @@ fi + + + +-if test "x$MPICC" = x && test "x$CC" != x ; then MPICC=$CC ; fi +-if test "x$MPICXX" = x && test "x$CXX" != x ; then MPICXX=$CXX ; fi +-if test "x$MPIF77" = x && test "x$F77" != x ; then MPIF77=$F77 ; fi +-if test "x$MPIF77" = x && test "x$FC" != x ; then MPIF77=$FC ; fi +-if test "x$MPIF90" = x && test "x$F90" != x ; then MPIF90=$F90 ; fi +-if test "x$MPIF90" = x && test "x$FC" != x ; then MPIF90=$FC ; fi ++#if test "x$MPICC" = x && test "x$CC" != x ; then MPICC=$CC ; fi ++#if test "x$MPICXX" = x && test "x$CXX" != x ; then MPICXX=$CXX ; fi ++#if test "x$MPIF77" = x && test "x$F77" != x ; then MPIF77=$F77 ; fi ++#if test "x$MPIF77" = x && test "x$FC" != x ; then MPIF77=$FC ; fi ++#if test "x$MPIF90" = x && test "x$F90" != x ; then MPIF90=$F90 ; fi ++#if test "x$MPIF90" = x && test "x$FC" != x ; then MPIF90=$FC ; fi + + CANDIDATE_MPICC="${MPICC} mpicc" + CANDIDATE_MPICXX="${MPICXX} mpicxx mpic++ mpiCC" Modified: head/science/pnetcdf/files/patch-rules.make ============================================================================== --- head/science/pnetcdf/files/patch-rules.make Tue Dec 6 14:50:34 2016 (r427957) +++ head/science/pnetcdf/files/patch-rules.make Tue Dec 6 14:51:24 2016 (r427958) @@ -1,5 +1,5 @@ ---- rules.make.orig 2013-10-27 00:53:18.000000000 +0800 -+++ rules.make 2014-03-09 22:42:45.290481492 +0800 +--- rules.make.orig 2013-10-26 16:53:18 UTC ++++ rules.make @@ -125,21 +125,21 @@ # $(INSTALL)ation: Modified: head/science/pnetcdf/pkg-plist ============================================================================== --- head/science/pnetcdf/pkg-plist Tue Dec 6 14:50:34 2016 (r427957) +++ head/science/pnetcdf/pkg-plist Tue Dec 6 14:51:24 2016 (r427958) @@ -2,17 +2,20 @@ bin/ncmpidiff bin/ncmpidump bin/ncmpigen bin/ncmpivalid +bin/ncoffsets bin/pnetcdf_version include/pnetcdf include/pnetcdf.h include/pnetcdf.inc include/pnetcdf.mod lib/libpnetcdf.a +libdata/pkgconfig/pnetcdf.pc man/man1/ncmpidiff.1.gz man/man1/ncmpidump.1.gz man/man1/ncmpigen.1.gz man/man1/ncmpivalid.1.gz +man/man1/ncoffsets.1.gz +man/man1/pnetcdf_version.1.gz man/man3/pnetcdf.3.gz man/man3/pnetcdf_f77.3.gz man/man3/pnetcdf_f90.3.gz -man/man1/pnetcdf_version.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612061451.uB6EpOib020042>