Attachment 174159 Details for Bug 209982 – Unified diff

[patch] Unified diff

nifticlib-diff.txt (text/plain), 3.65 KB, created by Jason W. Bacon on 2016-08-28 16:19:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason W. Bacon

Created: 2016-08-28 16:19:15 UTC

Size: 3.65 KB

patch

obsolete

>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/science/nifticlib/Makefile /usr/wip/science/nifticlib/Makefile
>--- /usr/ports/science/nifticlib/Makefile	2015-12-11 02:48:56.000000000 -0600
>+++ /usr/wip/science/nifticlib/Makefile	2016-08-28 11:08:51.818875627 -0500
>@@ -9,7 +9,7 @@
> MAINTAINER=	bacon4000@gmail.com
> COMMENT=	Neuroimaging Informatics Technology Initiative data format
> 
>-# LICENSE=	public domain
>+LICENSE=	PD
> 
> USES=		gmake
> 
>@@ -17,7 +17,7 @@
> # 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
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/science/nifticlib/files/patch-Makefile /usr/wip/science/nifticlib/files/patch-Makefile
>--- /usr/ports/science/nifticlib/files/patch-Makefile	2014-02-20 16:40:14.000000000 -0600
>+++ /usr/wip/science/nifticlib/files/patch-Makefile	2016-08-28 10:59:57.929916787 -0500
>@@ -1,6 +1,6 @@
>---- 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
>@@ -17,7 +17,7 @@
> +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)
>  
>@@ -34,7 +34,7 @@
>  
>  
>  ## Installation
>-@@ -41,9 +41,9 @@
>+@@ -41,9 +41,9 @@ INSTALL_INC_DIR	=	include
>  
>  
>  ## Zlib defines
>@@ -47,7 +47,7 @@
>  
>  ##############################################################
>  # 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)"
>@@ -87,7 +87,7 @@
>  	@echo Utility programs built.
>  	@echo ""
>  
>-@@ -152,7 +152,7 @@
>+@@ -152,7 +152,7 @@ doc:
>  	@echo ""
>  
>  regress_data:
>@@ -96,7 +96,7 @@
>  	@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 $@
>  
>@@ -126,7 +126,7 @@
>  	($(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:
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/science/nifticlib/files/patch-examples-Makefile /usr/wip/science/nifticlib/files/patch-examples-Makefile
>--- /usr/ports/science/nifticlib/files/patch-examples-Makefile	2014-01-29 15:44:59.000000000 -0600
>+++ /usr/wip/science/nifticlib/files/patch-examples-Makefile	2016-08-28 10:59:57.930916533 -0500
>@@ -1,5 +1,5 @@
>---- 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
>diff -ruN --exclude=CVS --exclude=.svn /usr/ports/science/nifticlib/files/patch-utils-Makefile /usr/wip/science/nifticlib/files/patch-utils-Makefile
>--- /usr/ports/science/nifticlib/files/patch-utils-Makefile	2014-01-29 15:44:59.000000000 -0600
>+++ /usr/wip/science/nifticlib/files/patch-utils-Makefile	2016-08-28 10:59:57.931916487 -0500
>@@ -1,5 +1,5 @@
>---- 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

Flags:

jwb: maintainer-approval+

Actions: View | Diff

Attachments on bug 209982: 174159 | 178348