Index: branches/2016Q4/science/nifticlib/Makefile
===================================================================
--- branches/2016Q4/science/nifticlib/Makefile	(revision 430677)
+++ branches/2016Q4/science/nifticlib/Makefile	(revision 430678)
@@ -1,28 +1,29 @@
 # Created by: Jason W. Bacon <bacon4000@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	nifticlib
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	science graphics
 MASTER_SITES=	SF/niftilib/nifticlib/nifticlib_2_0_0
 
 MAINTAINER=	bacon4000@gmail.com
 COMMENT=	Neuroimaging Informatics Technology Initiative data format
 
-# LICENSE=	public domain
+LICENSE=	PD
 
 USES=		gmake
 
 # AFNI currently has nifti embedded in the distfile and installs the
 # nifti bins by itself.
 CONFLICTS=	afni-[0-9]* dbh-[0-9]*
 
-MAKE_JOBS_UNSAFE=	yes
+CFLAGS+=	-fPIC
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/lib/*.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_MAN} ${FILESDIR}/nifticlib.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: branches/2016Q4/science/nifticlib/files/patch-Makefile
===================================================================
--- branches/2016Q4/science/nifticlib/files/patch-Makefile	(revision 430677)
+++ branches/2016Q4/science/nifticlib/files/patch-Makefile	(revision 430678)
@@ -1,152 +1,152 @@
---- Makefile.orig	2010-07-20 19:18:58.000000000 +0200
-+++ Makefile	2014-02-20 23:32:52.000000000 +0100
-@@ -17,21 +17,21 @@
+--- Makefile.orig	2010-07-20 17:18:58 UTC
++++ Makefile
+@@ -17,21 +17,21 @@ TARFILE_NAME	=	nifticlib-2.0.0
  
  
  ## Compiler  defines
 -cc		=	gcc
 -CC		=	gcc
 -AR		=	ar
 -RANLIB  = ranlib
 -DEPENDFLAGS	=	-MM
 -GNU_ANSI_FLAGS	= 	-Wall -ansi -pedantic
 -ANSI_FLAGS	= 	${GNU_ANSI_FLAGS}
 -CFLAGS		=	$(ANSI_FLAGS)
 +cc		?=	gcc
 +CC		?=	gcc
 +AR		?=	ar
 +RANLIB  	?=	ranlib
 +DEPENDFLAGS	?=	-MM
-+GNU_ANSI_FLAGS	?= 	-Wall -ansi -pedantic
++GNU_ANSI_FLAGS	?= 	-ansi -pedantic
 +ANSI_FLAGS	+= 	${GNU_ANSI_FLAGS}
 +CFLAGS		+=	$(ANSI_FLAGS)
  
  ## Command defines
  ## gmake does not work on MacOSX or some versions of linux MAKE  = gmake 
 -RM		=	rm
 -MV		=	mv
 -CP		=	cp
 -TAR		=	tar
 +RM		?=	rm
 +MV		?=	mv
 +CP		?=	cp
 +TAR		?=	tar
  
  
  ## Installation
-@@ -41,9 +41,9 @@
+@@ -41,9 +41,9 @@ INSTALL_INC_DIR	=	include
  
  
  ## Zlib defines
 -ZLIB_INC	=	-I/usr/include
 -ZLIB_PATH	=	-L/usr/lib
 -ZLIB_LIBS 	= 	$(ZLIB_PATH) -lm -lz 
 +ZLIB_INC	?=	-I/usr/include
 +ZLIB_PATH	?=	-L/usr/lib
 +ZLIB_LIBS 	?= 	$(ZLIB_PATH) -lm -lz 
  
  ##############################################################
  # platform specific redefines (to use, set ARCH appropriately)
-@@ -116,33 +116,33 @@
+@@ -116,33 +116,33 @@ clean_all: clean regress_clean_all insta
  
  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 @@
+@@ -152,7 +152,7 @@ doc:
  	@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 @@
+@@ -167,25 +167,25 @@ $(INSTALL_INC_DIR):
  $(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 @@
+@@ -212,19 +212,19 @@ fslio_clean:
  	(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} ; \
Index: branches/2016Q4/science/nifticlib/files/patch-examples-Makefile
===================================================================
--- branches/2016Q4/science/nifticlib/files/patch-examples-Makefile	(revision 430677)
+++ branches/2016Q4/science/nifticlib/files/patch-examples-Makefile	(revision 430678)
@@ -1,8 +1,8 @@
---- examples/Makefile.orig	2013-10-29 15:56:43.000000000 -0500
-+++ examples/Makefile	2013-10-29 15:56:48.000000000 -0500
+--- examples/Makefile.orig	2009-04-14 14:47:16 UTC
++++ examples/Makefile
 @@ -1,4 +1,4 @@
 -CC	=	gcc
 +CC	?=	gcc
  CFLAGS	=	-ansi -pedantic
  
  FSLIO_INCS	=	-I../include
Index: branches/2016Q4/science/nifticlib/files/patch-utils-Makefile
===================================================================
--- branches/2016Q4/science/nifticlib/files/patch-utils-Makefile	(revision 430677)
+++ branches/2016Q4/science/nifticlib/files/patch-utils-Makefile	(revision 430678)
@@ -1,10 +1,10 @@
---- utils/Makefile.orig	2007-05-17 15:18:44.000000000 -0500
-+++ utils/Makefile	2013-10-29 15:55:12.000000000 -0500
+--- utils/Makefile.orig	2007-05-17 20:18:44 UTC
++++ utils/Makefile
 @@ -1,5 +1,5 @@
 -CC	=	gcc
 -CFLAGS	=	-ansi -pedantic
 +CC	?=	gcc
 +CFLAGS	?=	-ansi -pedantic
  
  FSLIO_INCS	=	-I../include
  NIFTI_INCS	=	-I../include
Index: branches/2016Q4
===================================================================
--- branches/2016Q4	(revision 430677)
+++ branches/2016Q4	(revision 430678)

Property changes on: branches/2016Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r429778