[76896] trunk/dports/science/minc
ryandesign at macports.org
ryandesign at macports.org
Fri Mar 11 23:51:16 PST 2011
Revision: 76896
http://trac.macports.org/changeset/76896
Author: ryandesign at macports.org
Date: 2011-03-11 23:51:14 -0800 (Fri, 11 Mar 2011)
Log Message:
-----------
minc: update to 1.5.1 and fix build error with latest netcdf; see #26761 (maintainer timeout)
Modified Paths:
--------------
trunk/dports/science/minc/Portfile
Added Paths:
-----------
trunk/dports/science/minc/files/patch-MAX_NC_OPEN.diff
Removed Paths:
-------------
trunk/dports/science/minc/files/patch-time.c
Modified: trunk/dports/science/minc/Portfile
===================================================================
--- trunk/dports/science/minc/Portfile 2011-03-12 07:42:17 UTC (rev 76895)
+++ trunk/dports/science/minc/Portfile 2011-03-12 07:51:14 UTC (rev 76896)
@@ -2,18 +2,21 @@
PortSystem 1.0
name minc
-version 1.4
+version 1.5.1
categories science
platforms darwin
maintainers mac.com:mhough
description This package contains tools to manipulate MINC files.
long_description The Minc file format is a highly flexible medical image file format built on top of the NetCDF generalized data format. The format is simple, self-describing, extensible, portable and N-dimensional, with programming interfaces for both low-level data access and high-level volume manipulation. On top of the libraries is a suite of generic image-file manipulation tools. The format, libraries and tools are designed for use in a medical-imaging research environment: they are simple and powerful and make no attempt to provide a pretty interface to users.
-homepage http://www.bic.mni.mcgill.ca/software/
-master_sites ${homepage}/distribution/packages/
-checksums md5 873a6deed8109f95d29a197bad9f6070
+
+homepage http://www.bic.mni.mcgill.ca/ServicesSoftware/MINC
+master_sites http://packages.bic.mni.mcgill.ca/tgz/
+
+checksums sha1 ee2a2930754e6248f3decc12579d689ae29c8bdb \
+ rmd160 a5b1cafbeb52a6b0d5a55e6bca95953fdec7e01a
+
depends_lib port:netcdf
-platform darwin 8 {
- patchfiles patch-time.c
-}
-configure.args --with-build-path="${prefix}" --mandir=${prefix}/share/man
+patchfiles patch-MAX_NC_OPEN.diff
+
+configure.args --with-build-path=${prefix}
Added: trunk/dports/science/minc/files/patch-MAX_NC_OPEN.diff
===================================================================
--- trunk/dports/science/minc/files/patch-MAX_NC_OPEN.diff (rev 0)
+++ trunk/dports/science/minc/files/patch-MAX_NC_OPEN.diff 2011-03-12 07:51:14 UTC (rev 76896)
@@ -0,0 +1,51 @@
+--- libsrc/minc.h.orig 2004-09-28 15:23:40.000000000 -0500
++++ libsrc/minc.h 2011-03-12 01:44:21.000000000 -0600
+@@ -358,7 +358,9 @@
+
+ /* Constants for image conversion variable (icv) properties */
+ /* Maximum number of icv's allowed */
+-#define MI_MAX_NUM_ICV MAX_NC_OPEN
++/* changed to 32 as netcdf 4.x no longer defines MAX_NC_OPEN */
++/* #define MI_MAX_NUM_ICV MAX_NC_OPEN */
++#define MI_MAX_NUM_ICV 32
+ /* Default max and min for normalization */
+ #define MI_DEFAULT_MAX 1.0
+ #define MI_DEFAULT_MIN 0.0
+--- libsrc/voxel_loop.c.orig 2004-09-28 15:23:40.000000000 -0500
++++ libsrc/voxel_loop.c 2011-03-12 01:44:57.000000000 -0600
+@@ -1946,7 +1946,7 @@
+
+ /* Keep track of number of files that we can open */
+ num_free_files = loop_options->max_open_files;
+- if (num_free_files > MAX_NC_OPEN) num_free_files = MAX_NC_OPEN;
++ if (num_free_files > MI_MAX_NUM_ICV) num_free_files = MI_MAX_NUM_ICV;
+
+ /* Check to see if we can open output files (we must leave room for one
+ input file) */
+@@ -2661,7 +2661,7 @@
+ loop_options->is_signed = TRUE;
+ loop_options->valid_range[0] = 0.0;
+ loop_options->valid_range[1] = 0.0;
+- loop_options->max_open_files = MAX_NC_OPEN - 2;
++ loop_options->max_open_files = MI_MAX_NUM_ICV - 2;
+ loop_options->check_all_input_dim_info = TRUE;
+ loop_options->convert_input_to_scalar = FALSE;
+ loop_options->output_vector_size = 0;
+@@ -2776,7 +2776,7 @@
+ @NAME : set_loop_max_open_files
+ @INPUT : loop_options - user options for looping
+ max_open_files - maximum number of open files allowed (between
+- 1 and MAX_NC_OPEN)
++ 1 and MI_MAX_NUM_ICV)
+ @OUTPUT : (none)
+ @RETURNS : (nothing)
+ @DESCRIPTION: Routine to set the maximum number of open minc files.
+@@ -2789,7 +2789,7 @@
+ MNCAPI void set_loop_max_open_files(Loop_Options *loop_options,
+ int max_open_files)
+ {
+- if ((max_open_files <= 0) || (max_open_files > MAX_NC_OPEN)) {
++ if ((max_open_files <= 0) || (max_open_files > MI_MAX_NUM_ICV)) {
+ (void) fprintf(stderr,
+ "Bad number of files %d in set_loop_max_open_files\n",
+ max_open_files);
Deleted: trunk/dports/science/minc/files/patch-time.c
===================================================================
--- trunk/dports/science/minc/files/patch-time.c 2011-03-12 07:42:17 UTC (rev 76895)
+++ trunk/dports/science/minc/files/patch-time.c 2011-03-12 07:51:14 UTC (rev 76896)
@@ -1,11 +0,0 @@
---- volume_io/Prog_utils/time.c 2004-10-04 21:19:22.000000000 +0100
-+++ volume_io/Prog_utils/time.c 2005-07-03 23:33:44.000000000 +0100
-@@ -56,7 +56,7 @@
- if( !initialized )
- {
- initialized = TRUE;
-- clock_ticks_per_second = (Real) CLK_TCK;
-+ clock_ticks_per_second = (Real) sysconf ( _SC_CLK_TCK );
- }
-
- return( clock_ticks_per_second );
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110311/f2d59ebe/attachment-0001.html>
More information about the macports-changes
mailing list