From owner-svn-ports-head@FreeBSD.ORG Wed Jan 29 21:45:01 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 56E1D64E; Wed, 29 Jan 2014 21:45:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4242F18E9; Wed, 29 Jan 2014 21:45:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0TLj1BV063116; Wed, 29 Jan 2014 21:45:01 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0TLixKo063070; Wed, 29 Jan 2014 21:44:59 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201401292144.s0TLixKo063070@svn.freebsd.org> From: Thierry Thomas Date: Wed, 29 Jan 2014 21:44:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341786 - in head/science/nifticlib: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2014 21:45:01 -0000 Author: thierry Date: Wed Jan 29 21:44:59 2014 New Revision: 341786 URL: http://svnweb.freebsd.org/changeset/ports/341786 QAT: https://qat.redports.org/buildarchive/r341786/ Log: Update to v2.0.0 and patch for clang. PR: ports/183454 Submitted by: Jason Bacon (maintainer) Added: head/science/nifticlib/files/patch-examples-Makefile (contents, props changed) head/science/nifticlib/files/patch-utils-Makefile (contents, props changed) Modified: head/science/nifticlib/Makefile head/science/nifticlib/distinfo head/science/nifticlib/files/patch-Makefile head/science/nifticlib/pkg-descr head/science/nifticlib/pkg-plist Modified: head/science/nifticlib/Makefile ============================================================================== --- head/science/nifticlib/Makefile Wed Jan 29 21:31:02 2014 (r341785) +++ head/science/nifticlib/Makefile Wed Jan 29 21:44:59 2014 (r341786) @@ -1,28 +1,27 @@ -# Created by: Jason Bacon +# Created by: Jason W. Bacon # $FreeBSD$ PORTNAME= nifticlib -PORTVERSION= 1.1.0 +PORTVERSION= 2.0.0 CATEGORIES= science graphics -MASTER_SITES= SF/niftilib/${PORTNAME}/${PORTNAME}-${PORTVERSION} +MASTER_SITES= SF/niftilib/nifticlib/nifticlib_2_0_0 MAINTAINER= jwbacon@tds.net COMMENT= Neuroimaging Informatics Technology Initiative data format -USES= gmake +# LICENSE= public domain -MAN1= nifticlib.1 +USES= gmake +MAKE_JOBS_UNSAFE=yes -NO_STAGE= yes -post-patch: - @${REINPLACE_CMD} -e 's/include depend.mk/-&/' \ - ${WRKSRC}/fsliolib/Makefile ${WRKSRC}/nifticdf/Makefile \ - ${WRKSRC}/niftilib/Makefile ${WRKSRC}/znzlib/Makefile +# AFNI currently has nifti embedded in the distfile and installs the +# nifti bins by itself. +CONFLICTS= afni-[0-9]* dbh-[0-9]* 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 ${MANPREFIX}/man/man1 + ${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}${PREFIX}/man/man1 .include Modified: head/science/nifticlib/distinfo ============================================================================== --- head/science/nifticlib/distinfo Wed Jan 29 21:31:02 2014 (r341785) +++ head/science/nifticlib/distinfo Wed Jan 29 21:44:59 2014 (r341786) @@ -1,2 +1,2 @@ -SHA256 (nifticlib-1.1.0.tar.gz) = 8997ade09c3b86806cccaf4e030f278dc91706ffafdda6043dca1c2f126cd018 -SIZE (nifticlib-1.1.0.tar.gz) = 251180 +SHA256 (nifticlib-2.0.0.tar.gz) = a3e988e6a32ec57833056f6b09f940c69e79829028da121ff2c5c6f7f94a7f88 +SIZE (nifticlib-2.0.0.tar.gz) = 258491 Modified: head/science/nifticlib/files/patch-Makefile ============================================================================== --- head/science/nifticlib/files/patch-Makefile Wed Jan 29 21:31:02 2014 (r341785) +++ head/science/nifticlib/files/patch-Makefile Wed Jan 29 21:44:59 2014 (r341786) @@ -1,106 +1,49 @@ ---- 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 +--- Makefile.orig 2010-07-20 12:18:58.000000000 -0500 ++++ Makefile 2013-10-29 15:55:12.000000000 -0500 +@@ -17,21 +17,21 @@ + + + ## 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 ++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 @@ + + + ## 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 - tar: - (cd .. ; ln -s $(THIS_DIR) ${TARFILE_NAME} ; \ + ############################################################## + # platform specific redefines (to use, set ARCH appropriately) Added: head/science/nifticlib/files/patch-examples-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/nifticlib/files/patch-examples-Makefile Wed Jan 29 21:44:59 2014 (r341786) @@ -0,0 +1,8 @@ +--- examples/Makefile.orig 2013-10-29 15:56:43.000000000 -0500 ++++ examples/Makefile 2013-10-29 15:56:48.000000000 -0500 +@@ -1,4 +1,4 @@ +-CC = gcc ++CC ?= gcc + CFLAGS = -ansi -pedantic + + FSLIO_INCS = -I../include Added: head/science/nifticlib/files/patch-utils-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/nifticlib/files/patch-utils-Makefile Wed Jan 29 21:44:59 2014 (r341786) @@ -0,0 +1,10 @@ +--- utils/Makefile.orig 2007-05-17 15:18:44.000000000 -0500 ++++ utils/Makefile 2013-10-29 15:55:12.000000000 -0500 +@@ -1,5 +1,5 @@ +-CC = gcc +-CFLAGS = -ansi -pedantic ++CC ?= gcc ++CFLAGS ?= -ansi -pedantic + + FSLIO_INCS = -I../include + NIFTI_INCS = -I../include Modified: head/science/nifticlib/pkg-descr ============================================================================== --- head/science/nifticlib/pkg-descr Wed Jan 29 21:31:02 2014 (r341785) +++ head/science/nifticlib/pkg-descr Wed Jan 29 21:44:59 2014 (r341786) @@ -1,4 +1,4 @@ -NIfTI-1 is a new Analyze-style data format, proposed by the NIfTI DFWG +NIfTI-1 is an Analyze-style data format, proposed by the NIfTI DFWG as a short-term measure to facilitate inter-operation of functional MRI data analysis software packages. Modified: head/science/nifticlib/pkg-plist ============================================================================== --- head/science/nifticlib/pkg-plist Wed Jan 29 21:31:02 2014 (r341785) +++ head/science/nifticlib/pkg-plist Wed Jan 29 21:44:59 2014 (r341786) @@ -1,13 +1,15 @@ +@comment Generated by sysutils/genplist bin/nifti1_test bin/nifti_stats bin/nifti_tool include/dbh.h include/fslio.h include/nifti1.h -include/nifticdf.h include/nifti1_io.h +include/nifticdf.h include/znzlib.h lib/libfslio.a lib/libnifticdf.a lib/libniftiio.a lib/libznz.a +man/man1/nifticlib.1.gz