Date: Sun, 28 Jul 2013 08:32:19 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323814 - in head/science/nifticlib: . files Message-ID: <201307280832.r6S8WJTB071362@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sun Jul 28 08:32:18 2013 New Revision: 323814 URL: http://svnweb.freebsd.org/changeset/ports/323814 Log: - Try to unbreak parallel builds (-jX) - Trim Makefile header, convert USE_GMAKE - Install manpage relative to MANPREFIX - Replace tab with space after WWW line Reported by: pointyhat-west Added: head/science/nifticlib/files/patch-Makefile (contents, props changed) Modified: head/science/nifticlib/Makefile head/science/nifticlib/pkg-descr Modified: head/science/nifticlib/Makefile ============================================================================== --- head/science/nifticlib/Makefile Sun Jul 28 07:56:47 2013 (r323813) +++ head/science/nifticlib/Makefile Sun Jul 28 08:32:18 2013 (r323814) @@ -1,9 +1,5 @@ -# New ports collection makefile for: nifticlib -# Date created: 2007-04-27 -# Whom: Jason W. Bacon -# +# Created by: Jason Bacon <bacon@smithers.neuro.mcw.edu> # $FreeBSD$ -# PORTNAME= nifticlib PORTVERSION= 1.1.0 @@ -13,14 +9,19 @@ MASTER_SITES= SF/niftilib/${PORTNAME}/${ MAINTAINER= jwbacon@tds.net COMMENT= Neuroimaging Informatics Technology Initiative data format -USE_GMAKE= yes +USES= gmake MAN1= nifticlib.1 +post-patch: + @${REINPLACE_CMD} -e 's/include depend.mk/-&/' \ + ${WRKSRC}/fsliolib/Makefile ${WRKSRC}/nifticdf/Makefile \ + ${WRKSRC}/niftilib/Makefile ${WRKSRC}/znzlib/Makefile + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include - ${INSTALL_MAN} ${FILESDIR}/nifticlib.1 ${PREFIX}/man/man1 + ${INSTALL_MAN} ${FILESDIR}/nifticlib.1 ${MANPREFIX}/man/man1 .include <bsd.port.mk> Added: head/science/nifticlib/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/nifticlib/files/patch-Makefile Sun Jul 28 08:32:18 2013 (r323814) @@ -0,0 +1,106 @@ +--- Makefile.orig 2013-07-28 02:33:14.000000000 +0800 ++++ Makefile 2013-07-28 02:38:08.000000000 +0800 +@@ -115,34 +115,33 @@ + + + znz: +- echo "arch is $(ARCH)" +- (cd $(ZNZ); $(MAKE) depend; $(MAKE) lib;) ++ $(MAKE) -C $(ZNZ) depend lib + @echo " ----------- $(ZNZ) build completed." + @echo "" + + nifti: znz +- (cd $(NIFTI); $(MAKE) depend; $(MAKE) lib;) ++ $(MAKE) -C $(NIFTI) depend lib + @echo " ----------- $(NIFTI) build completed." + @echo "" + + nifticdf:nifti +- (cd $(NIFTICDF); $(MAKE) depend; $(MAKE) lib;) ++ $(MAKE) -C $(NIFTICDF) depend lib + @echo " ----------- $(NIFTICDF) build completed." + @echo "" + + fslio: nifti +- (cd $(FSLIO); $(MAKE) depend; $(MAKE) lib;) ++ $(MAKE) -C $(FSLIO) depend lib + @echo " ---------- $(FSLIO) build completed." + @echo "" + + example:nifti +- (cd $(EXAMPLES); $(MAKE) all;) ++ $(MAKE) -C $(EXAMPLES) all + @echo Example programs built. + @echo "" + + + utils: nifti nifticdf +- (cd $(UTILS); $(MAKE) all;) ++ $(MAKE) -C $(UTILS) all + @echo Utility programs built. + @echo "" + +@@ -152,7 +151,7 @@ + @echo "" + + regress_data: +- (cd $(TESTING); $(MAKE) regress_data 'RM=$(RM)' 'TAR=$(TAR)'; ) ++ $(MAKE) -C $(TESTING) regress_data 'RM=$(RM)' 'TAR=$(TAR)' + @echo "" + @echo Regression testing data installed. + @echo See Testing/README_regress for details. +@@ -167,25 +166,25 @@ + $(INSTALL_LIB_DIR): + mkdir -p $@ + +-znz_install: $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR) ++znz_install: znz $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR) + ($(CP) $(ZNZ)/*.a $(INSTALL_LIB_DIR); $(CP) $(ZNZ)/*.h $(INSTALL_INC_DIR);) + $(RANLIB) $(INSTALL_LIB_DIR)/*.a + @echo " $(ZNZ) installed." + @echo "" + +-nifti_install: $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR) ++nifti_install: nifti $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR) + ($(CP) $(NIFTI)/*.a $(INSTALL_LIB_DIR); $(CP) $(NIFTI)/*.h $(INSTALL_INC_DIR);) + $(RANLIB) $(INSTALL_LIB_DIR)/*.a + @echo " $(NIFTI) installed." + @echo "" + +-nifticdf_install: $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR) ++nifticdf_install: nifticdf $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR) + ($(CP) $(NIFTICDF)/*.a $(INSTALL_LIB_DIR); $(CP) $(NIFTICDF)/*.h $(INSTALL_INC_DIR);) + $(RANLIB) $(INSTALL_LIB_DIR)/*.a + @echo " $(NIFTI) installed." + @echo "" + +-fslio_install: $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR) ++fslio_install: fslio $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR) + ($(CP) $(FSLIO)/*.a $(INSTALL_LIB_DIR); $(CP) $(FSLIO)/*.h $(INSTALL_INC_DIR);) + $(RANLIB) $(INSTALL_LIB_DIR)/*.a + @echo " $(FSLIO) installed." +@@ -212,19 +211,19 @@ + (cd $(FSLIO); $(RM) -f *.o *.a core; $(RM) -f depend.mk;) + + examples_clean: +- (cd $(EXAMPLES); $(MAKE) clean;) ++ $(MAKE) -C $(EXAMPLES) clean + + utils_clean: +- (cd $(UTILS); $(MAKE) clean;) ++ $(MAKE) -C $(UTILS) clean + + doc_clean: + ($(RM) -fr docs/html;) + + regress_clean: +- (cd $(TESTING); $(MAKE) regress_clean; ) ++ $(MAKE) -C $(TESTING) regress_clean + + regress_clean_all: +- (cd $(TESTING); $(MAKE) regress_clean_all; ) ++ $(MAKE) -C $(TESTING) regress_clean_all + + tar: + (cd .. ; ln -s $(THIS_DIR) ${TARFILE_NAME} ; \ Modified: head/science/nifticlib/pkg-descr ============================================================================== --- head/science/nifticlib/pkg-descr Sun Jul 28 07:56:47 2013 (r323813) +++ head/science/nifticlib/pkg-descr Sun Jul 28 08:32:18 2013 (r323814) @@ -2,4 +2,4 @@ NIfTI-1 is a new Analyze-style data form as a short-term measure to facilitate inter-operation of functional MRI data analysis software packages. -WWW: http://nifti.nimh.nih.gov/ +WWW: http://nifti.nimh.nih.gov/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307280832.r6S8WJTB071362>