Restore r323814 to remove MAKE_JOBS_UNSAFE.

Reported by:	danfe
Approved by:	maintainer time-out

2 files changed, 105 insertions, 3 deletions

diff --git a/science/nifticlib/Makefile b/science/nifticlib/Makefile
index bbc3af24b6f7..7e07164e28f0 100644
--- a/science/nifticlib/Makefile
+++ b/science/nifticlib/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Neuroimaging Informatics Technology Initiative data format
 # LICENSE=	public domain
 
 USES=		gmake
-MAKE_JOBS_UNSAFE=yes
 
 # AFNI currently has nifti embedded in the distfile and installs the
 # nifti bins by itself.
diff --git a/science/nifticlib/files/patch-Makefile b/science/nifticlib/files/patch-Makefile
index ef3b199c6937..3416db34fd54 100644
--- a/science/nifticlib/files/patch-Makefile
+++ b/science/nifticlib/files/patch-Makefile
@@ -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} ; \