From owner-svn-ports-head@freebsd.org Wed May 25 14:57:27 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EEECB4A2E7; Wed, 25 May 2016 14:57:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 302F81FD9; Wed, 25 May 2016 14:57:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4PEvQSG061984; Wed, 25 May 2016 14:57:26 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4PEvQC4061980; Wed, 25 May 2016 14:57:26 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201605251457.u4PEvQC4061980@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 25 May 2016 14:57:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415837 - in head/science/minc2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2016 14:57:27 -0000 Author: amdmi3 Date: Wed May 25 14:57:25 2016 New Revision: 415837 URL: https://svnweb.freebsd.org/changeset/ports/415837 Log: - Fix build - Add LICENSE_FILE Added: head/science/minc2/files/patch-progs_mincdump_mincdump.c (contents, props changed) head/science/minc2/files/patch-progs_mincdump_mincdump.h (contents, props changed) head/science/minc2/files/patch-progs_mincdump_vardata.c (contents, props changed) Modified: head/science/minc2/Makefile Modified: head/science/minc2/Makefile ============================================================================== --- head/science/minc2/Makefile Wed May 25 14:43:29 2016 (r415836) +++ head/science/minc2/Makefile Wed May 25 14:57:25 2016 (r415837) @@ -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 Added: head/science/minc2/files/patch-progs_mincdump_mincdump.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/minc2/files/patch-progs_mincdump_mincdump.c Wed May 25 14:57:25 2016 (r415837) @@ -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)" }, Added: head/science/minc2/files/patch-progs_mincdump_mincdump.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/minc2/files/patch-progs_mincdump_mincdump.h Wed May 25 14:57:25 2016 (r415837) @@ -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]; Added: head/science/minc2/files/patch-progs_mincdump_vardata.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/minc2/files/patch-progs_mincdump_vardata.c Wed May 25 14:57:25 2016 (r415837) @@ -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);