Date: Wed, 28 Dec 2016 19:41:51 +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: r429819 - in head/science/pnetcdf: . files Message-ID: <201612281941.uBSJfpWQ068827@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Wed Dec 28 19:41:50 2016 New Revision: 429819 URL: https://svnweb.freebsd.org/changeset/ports/429819 Log: - Update DESTDIR support: use usptream patch with modified MANDIR (prefix/share/man -> prefix/man) - Update WWW: use https:// Obtained from: http://trac.mcs.anl.gov/projects/parallel-netcdf/changeset/2745 Added: head/science/pnetcdf/files/patch-macros.make.in (contents, props changed) Deleted: head/science/pnetcdf/files/patch-rules.make Modified: head/science/pnetcdf/Makefile head/science/pnetcdf/pkg-descr Modified: head/science/pnetcdf/Makefile ============================================================================== --- head/science/pnetcdf/Makefile Wed Dec 28 19:41:46 2016 (r429818) +++ head/science/pnetcdf/Makefile Wed Dec 28 19:41:50 2016 (r429819) @@ -33,7 +33,6 @@ OPENMPI_CONFIGURE_ON= --with-mpi=${LOCAL 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: Added: head/science/pnetcdf/files/patch-macros.make.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/pnetcdf/files/patch-macros.make.in Wed Dec 28 19:41:50 2016 (r429819) @@ -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@ Modified: head/science/pnetcdf/pkg-descr ============================================================================== --- head/science/pnetcdf/pkg-descr Wed Dec 28 19:41:46 2016 (r429818) +++ head/science/pnetcdf/pkg-descr Wed Dec 28 19:41:50 2016 (r429819) @@ -5,4 +5,4 @@ However, it does so in a serial manner, 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612281941.uBSJfpWQ068827>