Upgrade to 2.2.00.

PR:		ports/180411
Approved by:	jwbacon (at) tds.net (maintainer)

4 files changed, 19 insertions, 71 deletions

diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index a89eb8fa42e9..17e6261a59ae 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -1,10 +1,5 @@
-############################################################################
-# New ports collection Makefile for:   minc 1.x (Medical Imaging NetCDF)
-# Date created:        21 Dec 2005
-# Whom:                jbacon
-#
+# Created by: jbacon
 # $FreeBSD$
-#
 
 ############################################################################
 # http://www.bic.mni.mcgill.ca/software/minc/
@@ -16,67 +11,30 @@
 # Of course, the netcdf port must be installed first.
 
 PORTNAME=	minc
-PORTVERSION=	2.0.18
+PORTVERSION=	2.2.00
 CATEGORIES=	science biology
-MASTER_SITES=	http://www.nitrc.org/frs/download.php/801/
+MASTER_SITES=	http://packages.bic.mni.mcgill.ca/tgz/
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Medical Imaging NetCDF
 
+LICENSE=	AS-IS
+LICENSE_NAME=	AS-IS
+LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_PERMS=	dist-mirror pkg-mirror
+
 LIB_DEPENDS=	netcdf.4:${PORTSDIR}/science/netcdf \
 		hdf5:${PORTSDIR}/science/hdf5
 
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
+USES=		cmake:outsource bison:build
 CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include -DH5_USE_16_API
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ARGS=	--enable-shared=yes --enable-static=yes
+CMAKE_ARGS=	-DMINC2_BUILD_SHARED_LIBS:BOOL=YES
 
 CONFLICTS=	minc-1* zh-tk-[0-9]*
 LATEST_LINK=	minc2
 
-MAN1=	dcm2mnc.1 \
-	ecattominc.1 \
-	invert_raw_image.1 \
-	minc_modify_header.1 \
-	mincaverage.1 \
-	minccalc.1 \
-	mincconcat.1 \
-	mincconvert.1 \
-	minccopy.1 \
-	mincdiff.1 \
-	mincedit.1 \
-	mincexpand.1 \
-	mincextract.1 \
-	mincgen.1 \
-	mincheader.1 \
-	minchistory.1 \
-	mincinfo.1 \
-	minclookup.1 \
-	mincmakescalar.1 \
-	mincmakevector.1 \
-	mincmath.1 \
-	mincpik.1 \
-	mincresample.1 \
-	mincreshape.1 \
-	mincstats.1 \
-	minctoecat.1 \
-	minctoraw.1 \
-	mincview.1 \
-	mincwindow.1 \
-	mnc2nii.1 \
-	nii2mnc.1 \
-	rawtominc.1 \
-	transformtags.1 \
-	upet2mnc.1 \
-	vff2mnc.1 \
-	voxeltoworld.1 \
-	xfmconcat.1 \
-	xfmflip.1 \
-	xfminvert.1
-
-MAN3=	ParseArgv.3
-
 post-install:
 	${CAT} ${PKGMESSAGE}
 
diff --git a/science/minc2/distinfo b/science/minc2/distinfo
index c471ce509e14..2702ffab4ed8 100644
--- a/science/minc2/distinfo
+++ b/science/minc2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minc-2.0.18.tar.gz) = 674cc89c43edfdb1957251c0124ea83252740c667cf3c4d9fc6183dcdb10f3e5
-SIZE (minc-2.0.18.tar.gz) = 1628038
+SHA256 (minc-2.2.00.tar.gz) = e689d3612db6241125e3155d5a5c109d4da6f4bd774cc00a7e6729f2a790a174
+SIZE (minc-2.2.00.tar.gz) = 1665189
diff --git a/science/minc2/files/patch-conversion__minctoecat__machine_indep.c b/science/minc2/files/patch-conversion__minctoecat__machine_indep.c
deleted file mode 100644
index b1e87762e631..000000000000
--- a/science/minc2/files/patch-conversion__minctoecat__machine_indep.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
- {
diff --git a/science/minc2/pkg-plist b/science/minc2/pkg-plist
index 0af479a6913b..328f4d68ca48 100644
--- a/science/minc2/pkg-plist
+++ b/science/minc2/pkg-plist
@@ -3,6 +3,7 @@ bin/ecattominc
 bin/invert_raw_image
 bin/minc_modify_header
 bin/mincaverage
+bin/mincblob
 bin/minccalc
 bin/mincconcat
 bin/mincconvert
@@ -20,9 +21,11 @@ bin/minclookup
 bin/mincmakescalar
 bin/mincmakevector
 bin/mincmath
+bin/mincmorph
 bin/mincpik
 bin/mincresample
 bin/mincreshape
+bin/mincsample
 bin/mincstats
 bin/minctoecat
 bin/minctoraw
@@ -33,11 +36,9 @@ bin/nii2mnc
 bin/rawtominc
 bin/transformtags
 bin/upet2mnc
-bin/vff2mnc
 bin/voxeltoworld
 bin/worldtovoxel
 bin/xfmconcat
-bin/xfmflip
 bin/xfminvert
 include/ParseArgv.h
 include/minc.h
@@ -64,12 +65,12 @@ include/volume_io/vol_io_prototypes.h
 include/volume_io/volume.h
 include/volume_io/volume_cache.h
 include/voxel_loop.h
-lib/libminc2.a
-lib/libminc2.la
+lib/MINC2Config.cmake
+lib/UseMINC2.cmake
 lib/libminc2.so
 lib/libminc2.so.2
-lib/libvolume_io2.a
-lib/libvolume_io2.la
+lib/libminc2.so.2.2.00
 lib/libvolume_io2.so
 lib/libvolume_io2.so.2
+lib/libvolume_io2.so.2.2.00
 @dirrm include/volume_io