4 files changed, 78 insertions, 23 deletions

diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index b5ce13588f60..c09439252284 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -11,32 +11,28 @@
 # Of course, the netcdf port must be installed first.
 
 PORTNAME=	minc
-PORTVERSION=	2.2.00
-PORTREVISION=	1
+PORTVERSION=	2.0.18
+PORTEPOCH=	1
 CATEGORIES=	science biology
-MASTER_SITES=	http://packages.bic.mni.mcgill.ca/tgz/
+MASTER_SITES=	http://packages.bic.mni.mcgill.ca/tgz/ \
+		http://www.nitrc.org/frs/download.php/801/
 PKGNAMESUFFIX=	2
 
-MAINTAINER=	jwbacon@tds.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Medical Imaging NetCDF
 
-BROKEN=		Does not build with new hdf5 version
-
 LICENSE=	BSD
 
-LIB_DEPENDS=	netcdf.4:${PORTSDIR}/science/netcdf \
-		hdf5:${PORTSDIR}/science/hdf5
+LIB_DEPENDS=	libnetcdf.so.4:${PORTSDIR}/science/netcdf \
+		libhdf5.so.0:${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}
-CMAKE_ARGS=	-DMINC2_BUILD_SHARED_LIBS:BOOL=YES
+CONFIGURE_ARGS=	--enable-shared=yes --enable-static=yes
 
 CONFLICTS=	minc-1* zh-tk-[0-9]*
-
-NO_STAGE=	yes
-post-install:
-	${CAT} ${PKGMESSAGE}
+LATEST_LINK=	minc2
 
 .include <bsd.port.mk>
diff --git a/science/minc2/distinfo b/science/minc2/distinfo
index 2702ffab4ed8..c471ce509e14 100644
--- a/science/minc2/distinfo
+++ b/science/minc2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minc-2.2.00.tar.gz) = e689d3612db6241125e3155d5a5c109d4da6f4bd774cc00a7e6729f2a790a174
-SIZE (minc-2.2.00.tar.gz) = 1665189
+SHA256 (minc-2.0.18.tar.gz) = 674cc89c43edfdb1957251c0124ea83252740c667cf3c4d9fc6183dcdb10f3e5
+SIZE (minc-2.0.18.tar.gz) = 1628038
diff --git a/science/minc2/files/patch-conversion_minctoecat_machine_indep.c b/science/minc2/files/patch-conversion_minctoecat_machine_indep.c
new file mode 100644
index 000000000000..556375778be4
--- /dev/null
+++ b/science/minc2/files/patch-conversion_minctoecat_machine_indep.c
@@ -0,0 +1,20 @@
+--- conversion/minctoecat/machine_indep.c.orig	2007-03-29 07:08:46.000000000 +0200
++++ conversion/minctoecat/machine_indep.c	2014-01-28 22:55:57.000000000 +0100
+@@ -61,7 +61,7 @@
+ }
+ 
+ #if defined(__alpha) || defined(_WIN32) /* LITTLE_ENDIAN : alpha, intel */
+-ftovaxf(f, bufr)
++void ftovaxf(f, bufr)
+ float f;
+ unsigned short *bufr;
+ {
+@@ -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 328f4d68ca48..d09ce2761d8d 100644
--- a/science/minc2/pkg-plist
+++ b/science/minc2/pkg-plist
@@ -3,7 +3,6 @@ bin/ecattominc
 bin/invert_raw_image
 bin/minc_modify_header
 bin/mincaverage
-bin/mincblob
 bin/minccalc
 bin/mincconcat
 bin/mincconvert
@@ -21,11 +20,9 @@ bin/minclookup
 bin/mincmakescalar
 bin/mincmakevector
 bin/mincmath
-bin/mincmorph
 bin/mincpik
 bin/mincresample
 bin/mincreshape
-bin/mincsample
 bin/mincstats
 bin/minctoecat
 bin/minctoraw
@@ -36,9 +33,11 @@ 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
@@ -65,12 +64,52 @@ include/volume_io/vol_io_prototypes.h
 include/volume_io/volume.h
 include/volume_io/volume_cache.h
 include/voxel_loop.h
-lib/MINC2Config.cmake
-lib/UseMINC2.cmake
+lib/libminc2.a
+lib/libminc2.la
 lib/libminc2.so
 lib/libminc2.so.2
-lib/libminc2.so.2.2.00
+lib/libvolume_io2.a
+lib/libvolume_io2.la
 lib/libvolume_io2.so
 lib/libvolume_io2.so.2
-lib/libvolume_io2.so.2.2.00
+man/man1/dcm2mnc.1.gz
+man/man1/ecattominc.1.gz
+man/man1/invert_raw_image.1.gz
+man/man1/minc_modify_header.1.gz
+man/man1/mincaverage.1.gz
+man/man1/minccalc.1.gz
+man/man1/mincconcat.1.gz
+man/man1/mincconvert.1.gz
+man/man1/minccopy.1.gz
+man/man1/mincdiff.1.gz
+man/man1/mincedit.1.gz
+man/man1/mincexpand.1.gz
+man/man1/mincextract.1.gz
+man/man1/mincgen.1.gz
+man/man1/mincheader.1.gz
+man/man1/minchistory.1.gz
+man/man1/mincinfo.1.gz
+man/man1/minclookup.1.gz
+man/man1/mincmakescalar.1.gz
+man/man1/mincmakevector.1.gz
+man/man1/mincmath.1.gz
+man/man1/mincpik.1.gz
+man/man1/mincresample.1.gz
+man/man1/mincreshape.1.gz
+man/man1/mincstats.1.gz
+man/man1/minctoecat.1.gz
+man/man1/minctoraw.1.gz
+man/man1/mincview.1.gz
+man/man1/mincwindow.1.gz
+man/man1/mnc2nii.1.gz
+man/man1/nii2mnc.1.gz
+man/man1/rawtominc.1.gz
+man/man1/transformtags.1.gz
+man/man1/upet2mnc.1.gz
+man/man1/vff2mnc.1.gz
+man/man1/voxeltoworld.1.gz
+man/man1/xfmconcat.1.gz
+man/man1/xfmflip.1.gz
+man/man1/xfminvert.1.gz
+man/man3/ParseArgv.3.gz
 @dirrm include/volume_io