Date: Thu, 20 Feb 2014 22:40:15 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345274 - in head/science/nifticlib: . files Message-ID: <201402202240.s1KMeFtx091918@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Thu Feb 20 22:40:14 2014 New Revision: 345274 URL: http://svnweb.freebsd.org/changeset/ports/345274 QAT: https://qat.redports.org/buildarchive/r345274/ Log: Restore r323814 to remove MAKE_JOBS_UNSAFE. Reported by: danfe Approved by: maintainer time-out Modified: head/science/nifticlib/Makefile head/science/nifticlib/files/patch-Makefile Modified: head/science/nifticlib/Makefile ============================================================================== --- head/science/nifticlib/Makefile Thu Feb 20 22:25:44 2014 (r345273) +++ head/science/nifticlib/Makefile Thu Feb 20 22:40:14 2014 (r345274) @@ -12,7 +12,6 @@ COMMENT= Neuroimaging Informatics Techno # LICENSE= public domain USES= gmake -MAKE_JOBS_UNSAFE=yes # AFNI currently has nifti embedded in the distfile and installs the # nifti bins by itself. Modified: head/science/nifticlib/files/patch-Makefile ============================================================================== --- head/science/nifticlib/files/patch-Makefile Thu Feb 20 22:25:44 2014 (r345273) +++ head/science/nifticlib/files/patch-Makefile Thu Feb 20 22:40:14 2014 (r345274) @@ -1,5 +1,5 @@ ---- Makefile.orig 2010-07-20 12:18:58.000000000 -0500 -+++ Makefile 2013-10-29 15:55:12.000000000 -0500 +--- Makefile.orig 2010-07-20 19:18:58.000000000 +0200 ++++ Makefile 2014-02-20 23:32:52.000000000 +0100 @@ -17,21 +17,21 @@ @@ -47,3 +47,106 @@ ############################################################## # platform specific redefines (to use, set ARCH appropriately) +@@ -116,33 +116,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 +152,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 +167,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 +212,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} ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402202240.s1KMeFtx091918>