Index: head/science/pnetcdf/Makefile =================================================================== --- head/science/pnetcdf/Makefile (revision 429818) +++ head/science/pnetcdf/Makefile (revision 429819) @@ -1,46 +1,45 @@ # Created by: Chao Shin # $FreeBSD$ PORTNAME= pnetcdf PORTVERSION= 1.8.0 CATEGORIES= science parallel MASTER_SITES= http://cucis.ece.northwestern.edu/projects/PnetCDF/Release/ \ LOCAL/sunpoet DISTNAME= parallel-netcdf-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library providing high-performance I/O OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= MPI OPTIONS_SINGLE_MPI= OPENMPI MPICH2 OPTIONS_DEFAULT=OPENMPI CONFLICTS_INSTALL= hdf-4.* CFLAGS+= -fPIC CONFIGURE_ARGS= ac_cv_fc_compiler_nag=no GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes USE_PERL5= build USES= fortran gmake pathfix perl5 tar:bzip2 PORTDOCS= COPYRIGHT INSTALL README MPICH2_CONFIGURE_ON= --with-mpi=${LOCALBASE} MPICH2_LIB_DEPENDS= libmpich.so:net/mpich2 OPENMPI_CONFIGURE_ON= --with-mpi=${LOCALBASE}/mpi/openmpi OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi 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}/Makefile.in post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/n* ${STAGEDIR}${PREFIX}/bin/pnetcdf_version post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Index: head/science/pnetcdf/files/patch-rules.make =================================================================== --- head/science/pnetcdf/files/patch-rules.make (revision 429818) +++ head/science/pnetcdf/files/patch-rules.make (nonexistent) @@ -1,32 +0,0 @@ ---- rules.make.orig 2013-10-26 16:53:18 UTC -+++ rules.make -@@ -125,21 +125,21 @@ - # $(INSTALL)ation: - - $(INCDIR)/$(HEADER): $(INCDIR) $(HEADER) -- $(INSTALL) $(srcdir)/$(HEADER) $@ -+ $(INSTALL) $(srcdir)/$(HEADER) $(DESTDIR)$@ - $(INCDIR)/$(HEADER1): $(INCDIR) $(HEADER1) -- $(INSTALL) $(srcdir)/$(HEADER1) $@ -+ $(INSTALL) $(srcdir)/$(HEADER1) $(DESTDIR)$@ - $(INCDIR)/$(HEADER2): $(INCDIR) $(HEADER2) -- $(INSTALL) $(srcdir)/$(HEADER2) $@ -+ $(INSTALL) $(srcdir)/$(HEADER2) $(DESTDIR)$@ - $(INCDIR)/$(HEADER3): $(INCDIR) $(HEADER3) -- $(INSTALL) $(srcdir)/$(HEADER3) $@ -+ $(INSTALL) $(srcdir)/$(HEADER3) $(DESTDIR)$@ - - $(LIBDIR)/$(LIBRARY): $(LIBDIR) $(LIBRARY) -- $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -m 644 $(LIBRARY) $@ -+ $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$@ - - $(BINDIR)/$(PROGRAM): $(BINDIR) $(PROGRAM) -- $(INSTALL) -d -m 755 $(BINDIR) -- $(INSTALL) -m 755 $(PROGRAM) $@ -+ $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 755 $(PROGRAM) $(DESTDIR)$@ - - #$(BINDIR) \ - #$(INCDIR) \ Property changes on: head/science/pnetcdf/files/patch-rules.make ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/science/pnetcdf/files/patch-macros.make.in =================================================================== --- head/science/pnetcdf/files/patch-macros.make.in (nonexistent) +++ head/science/pnetcdf/files/patch-macros.make.in (revision 429819) @@ -0,0 +1,31 @@ +Add DESTDIR support with modified MANDIR (prefix/share/man -> prefix/man) + +Obtained from: http://trac.mcs.anl.gov/projects/parallel-netcdf/changeset/2745 + +--- macros.make.in.orig 2016-11-24 02:55:40 UTC ++++ macros.make.in +@@ -20,13 +20,20 @@ LN_S = @LN_S@ + # Installation Directories: + # SRCDIR = @SRCDIR@ + prefix = @prefix@ +-INCDIR = $(prefix)/include +-LIBDIR = $(prefix)/lib +-BINDIR = $(prefix)/bin +-MANDIR = $(prefix)/man + BUILDDIR = @BUILDDIR@ + LIBRARY = @BUILDDIR@/src/lib/libpnetcdf.a + ++ifdef DESTDIR ++INCDIR = $(DESTDIR)/$(prefix)/include ++LIBDIR = $(DESTDIR)/$(prefix)/lib ++BINDIR = $(DESTDIR)/$(prefix)/bin ++MANDIR = $(DESTDIR)/$(prefix)/man ++else ++INCDIR = $(prefix)/include ++LIBDIR = $(prefix)/lib ++BINDIR = $(prefix)/bin ++MANDIR = $(prefix)/share/man ++endif + + # Useful tools + M4 = @M4@ Property changes on: head/science/pnetcdf/files/patch-macros.make.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/pnetcdf/pkg-descr =================================================================== --- head/science/pnetcdf/pkg-descr (revision 429818) +++ head/science/pnetcdf/pkg-descr (revision 429819) @@ -1,8 +1,8 @@ Parallel-NetCDF is a library providing high-performance I/O while still maintaining file-format compatibility with Unidata's NetCDF. NetCDF gives scientific programmers a space-efficient and portable means for storing data. However, it does so in a serial manner, making it difficult to achieve high I/O performance. By making some small changes to the API specified by NetCDF, we can use MPI-IO and its collective operations. -WWW: http://trac.mcs.anl.gov/projects/parallel-netcdf +WWW: https://trac.mcs.anl.gov/projects/parallel-netcdf