- Fix build

- Add LICENSE_FILE

4 files changed, 74 insertions, 0 deletions

diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index 9fc783fa001b..e4e100508983 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -13,6 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Medical Imaging NetCDF
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libnetcdf.so:science/netcdf
diff --git a/science/minc2/files/patch-progs_mincdump_mincdump.c b/science/minc2/files/patch-progs_mincdump_mincdump.c
new file mode 100644
index 000000000000..dd09a0708d57
--- /dev/null
+++ b/science/minc2/files/patch-progs_mincdump_mincdump.c
@@ -0,0 +1,51 @@
+--- progs/mincdump/mincdump.c.orig	2012-09-24 17:35:36 UTC
++++ progs/mincdump/mincdump.c
+@@ -553,7 +553,7 @@ do_ncdump(char *path, struct fspec* spec
+ static void
+ set_brief(struct fspec * fspecp, char *key, char *optarg)
+ {
+-    fspecp->brief_data_cmnts = true;
++    fspecp->brief_data_cmnts = my_true;
+     switch (tolower(optarg[0])) {
+     case 'c':
+         fspecp->data_lang = LANG_C;
+@@ -569,7 +569,7 @@ set_brief(struct fspec * fspecp, char *k
+ static void
+ set_full(struct fspec * fspecp, char *key, char *optarg)
+ {
+-    fspecp->full_data_cmnts = true;
++    fspecp->full_data_cmnts = my_true;
+     switch (tolower(optarg[0])) {
+     case 'c':
+         fspecp->data_lang = LANG_C;
+@@ -688,10 +688,10 @@ main(int argc, char *argv[])
+     static struct fspec fspec =	/* defaults, overridden on command line */
+       {
+ 	  0,			/* construct netcdf name from file name */
+-	  false,		/* print header info only, no data? */
+-	  false,		/* just print coord vars? */
+-	  false,		/* brief  comments in data section? */
+-	  false,		/* full annotations in data section?  */
++	  my_false,		/* print header info only, no data? */
++	  my_false,		/* just print coord vars? */
++	  my_false,		/* brief  comments in data section? */
++	  my_false,		/* full annotations in data section?  */
+ 	  LANG_C,		/* language conventions for indices */
+ 	  0,			/* if -v specified, number of variables */
+ 	  0			/* if -v specified, list of variable names */
+@@ -701,13 +701,13 @@ main(int argc, char *argv[])
+     static ArgvInfo argTable[] = {
+         {"-b", ARGV_FUNC, (char *) set_brief, (char *) &fspec,
+          "Brief annotations for C or Fortran indices in data" },
+-        {"-c", ARGV_CONSTANT, (char *) true, (char *) &fspec.coord_vals,
++        {"-c", ARGV_CONSTANT, (char *) my_true, (char *) &fspec.coord_vals,
+          "Coordinate variable data and header information" },
+         {"-d", ARGV_FUNC, (char *) set_sigdigs, (char *) NULL,
+          "Obsolete option for setting significant digits" },
+         {"-f", ARGV_FUNC, (char *) set_full, (char *) &fspec,
+          "Full annotations for C or Fortran indices in data" },
+-        {"-h", ARGV_CONSTANT, (char *) true, (char *) &fspec.header_only, 
++        {"-h", ARGV_CONSTANT, (char *) my_true, (char *) &fspec.header_only, 
+          "Header information only, no data" }, 
+         {"-l", ARGV_INT, (char *) 1, (char *) &max_len, 
+          "Line length maximum in data section (default 80)" },
diff --git a/science/minc2/files/patch-progs_mincdump_mincdump.h b/science/minc2/files/patch-progs_mincdump_mincdump.h
new file mode 100644
index 000000000000..ee9704df9d93
--- /dev/null
+++ b/science/minc2/files/patch-progs_mincdump_mincdump.h
@@ -0,0 +1,11 @@
+--- progs/mincdump/mincdump.h.orig	2012-09-24 17:35:36 UTC
++++ progs/mincdump/mincdump.h
+@@ -15,7 +15,7 @@
+ #define  Printf  (void) printf
+ 
+ typedef int boolean;
+-enum {false=0, true=1};
++enum {my_false=0, my_true=1};
+ 
+ struct ncdim {			/* dimension */
+     char name[NC_MAX_NAME];
diff --git a/science/minc2/files/patch-progs_mincdump_vardata.c b/science/minc2/files/patch-progs_mincdump_vardata.c
new file mode 100644
index 000000000000..b22617aa7391
--- /dev/null
+++ b/science/minc2/files/patch-progs_mincdump_vardata.c
@@ -0,0 +1,11 @@
+--- progs/mincdump/vardata.c.orig	2012-09-24 17:35:36 UTC
++++ progs/mincdump/vardata.c
+@@ -775,7 +775,7 @@ vardata(
+ 
+ 	if (vrank > 0) {
+ 	    corsav = cor[vrank-1];
+-	    if (fsp->brief_data_cmnts != false
++	    if (fsp->brief_data_cmnts != my_false
+ 		&& vrank > 1
+ 		&& left > 0) {	/* print brief comment with indices range */
+ 		Printf("// %s(",vp->name);