Routine upgrade, add conflicts. Fix: Diff attached. Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->zeising I'll take it.
Hi! http://people.freebsd.org/~kwm/patch-conversion__minctoecat__machine_indep.c is a patch to fix build of minc with clang, is it ok to include it? I also changed the WWW line in pkg-descr and pkg-message to point to http://www.bic.mni.mcgill.ca/ServicesSoftware/MINC since the previous link was dead. Attached patch with your update and these changes are attached, so you can check it and let me know if you approve. -- Niclas Zeising
Yes, it's fine. Thanks, -J On 07/20/12 10:37, Niclas Zeising wrote: > Hi! > http://people.freebsd.org/~kwm/patch-conversion__minctoecat__machine_indep.c > is a patch to fix build of minc with clang, is it ok to include it? > I also changed the WWW line in pkg-descr and pkg-message to point to > http://www.bic.mni.mcgill.ca/ServicesSoftware/MINC since the previous > link was dead. Attached patch with your update and these changes are > attached, so you can check it and let me know if you approve. -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Jason W. Bacon jwbacon@tds.net http://personalpages.tds.net/~jwbacon ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Author: zeising Date: Fri Jul 20 16:32:07 2012 New Revision: 301233 URL: http://svn.freebsd.org/changeset/ports/301233 Log: Update to version 1.5.1 [1] Fix build with clang [2] Change WWW in pkg-descr and pkg-message to point to current web side [3] PR: ports/169924 [1] Submitted by: Jason Bacon <jwbacon@tds.net> (maintainer) [1], kwm [2], [3] Approved by: maintainer, kwm (mentor) Added: head/science/minc/files/ head/science/minc/files/patch-conversion__minctoecat__machine_indep.c (contents, props changed) Modified: head/science/minc/Makefile head/science/minc/distinfo head/science/minc/pkg-descr head/science/minc/pkg-message Modified: head/science/minc/Makefile ============================================================================== --- head/science/minc/Makefile Fri Jul 20 15:21:06 2012 (r301232) +++ head/science/minc/Makefile Fri Jul 20 16:32:07 2012 (r301233) @@ -16,11 +16,9 @@ # Of course, the netcdf port must be installed first. PORTNAME= minc -PORTVERSION= 1.4 -PORTREVISION= 2 +PORTVERSION= 1.5.1 CATEGORIES= science biology -MASTER_SITES= http://www.bic.mni.mcgill.ca/software/distribution/packages/ \ - http://www.neuro.mcw.edu/~bacon/Ports/distfiles/ +MASTER_SITES= http://www.nitrc.org/frs/downloadlink.php/400/ MAINTAINER= jwbacon@tds.net COMMENT= Medical Imaging NetCDF @@ -34,7 +32,9 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-static=yes --enable-shared=yes -CONFLICTS= minc-2* +CONFLICTS= minc-2* zh-tk-[0-9]* + +WRKSRC= ${WRKDIR}/${PORTNAME}-1.5 MAN1= dcm2mnc.1 \ ecattominc.1 \ @@ -49,6 +49,7 @@ MAN1= dcm2mnc.1 \ mincexpand.1 \ mincextract.1 \ mincheader.1 \ + minchistory.1 \ mincinfo.1 \ minclookup.1 \ mincmakescalar.1 \ @@ -73,6 +74,8 @@ MAN1= dcm2mnc.1 \ MAN3= ParseArgv.3 +FETCH_ARGS+= -F + post-install: @${CAT} ${PKGMESSAGE} Modified: head/science/minc/distinfo ============================================================================== --- head/science/minc/distinfo Fri Jul 20 15:21:06 2012 (r301232) +++ head/science/minc/distinfo Fri Jul 20 16:32:07 2012 (r301233) @@ -1,2 +1,2 @@ -SHA256 (minc-1.4.tar.gz) = a07c9523f232c823f38275bc8bb23011e70a29a0a45071dad0dec81317a75c4f -SIZE (minc-1.4.tar.gz) = 1213768 +SHA256 (minc-1.5.1.tar.gz) = 3ca7045c6eaa32daea184af3f78e30969bb0a0dddce2a1b292ba1624d23a61c9 +SIZE (minc-1.5.1.tar.gz) = 1356462 Added: head/science/minc/files/patch-conversion__minctoecat__machine_indep.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/minc/files/patch-conversion__minctoecat__machine_indep.c Fri Jul 20 16:32:07 2012 (r301233) @@ -0,0 +1,11 @@ +--- conversion/minctoecat/machine_indep.c.orig 2012-07-20 17:16:13.000000000 +0200 ++++ conversion/minctoecat/machine_indep.c 2012-07-20 17:17:48.000000000 +0200 +@@ -84,7 +84,7 @@ + bufr[1] = ret >>16; + } + #else /* BIG ENDIAN : sun hp sgi*/ +-ftovaxf(orig,number) ++void ftovaxf(orig,number) + unsigned short number[2]; + float orig; + { Modified: head/science/minc/pkg-descr ============================================================================== --- head/science/minc/pkg-descr Fri Jul 20 15:21:06 2012 (r301232) +++ head/science/minc/pkg-descr Fri Jul 20 16:32:07 2012 (r301233) @@ -4,7 +4,7 @@ Neelin at the McConnell Brain Imaging Ce Institute. Many others have contributed to the design and implementation MINC over the years. -WWW: http://www.bic.mni.mcgill.ca/software/minc/ +WWW: http://www.bic.mni.mcgill.ca/ServicesSoftware/MINC Port maintainer: Jason W. Bacon jwbacon@tds.net Modified: head/science/minc/pkg-message ============================================================================== --- head/science/minc/pkg-message Fri Jul 20 15:21:06 2012 (r301232) +++ head/science/minc/pkg-message Fri Jul 20 16:32:07 2012 (r301233) @@ -4,5 +4,5 @@ port maintainer: jwbacon@tds.net For MINC usage, please visit the MINC WEB site at -http://www.bic.mni.mcgill.ca/software/minc/ +http://www.bic.mni.mcgill.ca/ServicesSoftware/MINC ============================================================================= _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!