[pkgsrc/trunk]: pkgsrc/biology/nut Update to 10.18. Should fix PR 27404.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7924396ab955
branches:  trunk
changeset: 492761:7924396ab955
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Apr 19 10:45:19 2005 +0000

description:
Update to 10.18. Should fix PR 27404.

10.18:
This release contains a fix for the floating point
exception on NetBSD-2.0/alpha.
10.17:
This release corrects the formatting of the man page and
restores the correct alpha-linolenic acid reference
value, which was too low in the last release.
10.16:
This release fixes a segfault that occurs when analyzing
added and subtracted foods that total zero calories.
10.15:
This release completes the changing of all calculations
to substitute user averages for program constants in the
values of calories per gram of carb, fat, and protein,
and of the percentage of total fat that is fatty acids.
This means that personal options in terms of percentages
and ratios will be more precise.

diffstat:

 biology/nut/Makefile         |   4 ++--
 biology/nut/distinfo         |  12 ++++++------
 biology/nut/patches/patch-ab |   8 ++++----
 biology/nut/patches/patch-ac |   8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diffs (73 lines):

diff -r e70b02502880 -r 7924396ab955 biology/nut/Makefile
--- a/biology/nut/Makefile      Tue Apr 19 09:58:52 2005 +0000
+++ b/biology/nut/Makefile      Tue Apr 19 10:45:19 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/04/19 10:45:19 wiz Exp $
 
-DISTNAME=      nut-10.14
+DISTNAME=      nut-10.18
 CATEGORIES=    biology
 MASTER_SITES=  http://www.lafn.org/~av832/
 EXTRACT_SUFX=  .tar.bz2
diff -r e70b02502880 -r 7924396ab955 biology/nut/distinfo
--- a/biology/nut/distinfo      Tue Apr 19 09:58:52 2005 +0000
+++ b/biology/nut/distinfo      Tue Apr 19 10:45:19 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2005/02/22 21:28:55 agc Exp $
+$NetBSD: distinfo,v 1.14 2005/04/19 10:45:19 wiz Exp $
 
-SHA1 (nut-10.14.tar.bz2) = 1682ae780e91192df77a8dc25e7260210807320d
-RMD160 (nut-10.14.tar.bz2) = 323f652f312a839c8404ee901abc13df8b599a44
-Size (nut-10.14.tar.bz2) = 814888 bytes
-SHA1 (patch-ab) = 1ce697145adea9501e3818798c10a42486d7c5d2
-SHA1 (patch-ac) = 525d65d517f637ed908d1df95672d34713dcf2bd
+SHA1 (nut-10.18.tar.bz2) = b136a1842858016430bc59831ea02869ce221479
+RMD160 (nut-10.18.tar.bz2) = dce992a2b635f63f7f971d505ea4bff6a8d9b46d
+Size (nut-10.18.tar.bz2) = 815615 bytes
+SHA1 (patch-ab) = 53e11acf560f0ecc457c249d6c2e564ae38af9bb
+SHA1 (patch-ac) = 01862c0437c26787667b78124858b90b75b98e94
diff -r e70b02502880 -r 7924396ab955 biology/nut/patches/patch-ab
--- a/biology/nut/patches/patch-ab      Tue Apr 19 09:58:52 2005 +0000
+++ b/biology/nut/patches/patch-ab      Tue Apr 19 10:45:19 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2004/08/15 12:06:34 wiz Exp $
+$NetBSD: patch-ab,v 1.6 2005/04/19 10:45:19 wiz Exp $
 
---- db.c.orig  2004-08-07 05:03:16.000000000 +0200
+--- db.c.orig  2005-04-16 18:08:41.000000000 +0200
 +++ db.c
-@@ -29,6 +29,7 @@
+@@ -28,6 +28,7 @@
  #include <string.h>
  #include <sys/stat.h>
  #include <ctype.h>
@@ -10,7 +10,7 @@
   
  #ifndef NUTDIR
  char nutdir1[]=".nutdb";
-@@ -739,9 +740,22 @@ strcpy(subuser,sub);
+@@ -881,9 +882,22 @@ strcpy(subuser,sub);
   sprintf(versionfile,"%s/%s/%s","NUTDB",subuser,versionfile1);
  #else
  sprintf(nutdir,"%s/%s",getenv("HOME"),nutdir1);
diff -r e70b02502880 -r 7924396ab955 biology/nut/patches/patch-ac
--- a/biology/nut/patches/patch-ac      Tue Apr 19 09:58:52 2005 +0000
+++ b/biology/nut/patches/patch-ac      Tue Apr 19 10:45:19 2005 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2003/07/12 12:23:13 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2005/04/19 10:45:19 wiz Exp $
 
---- Makefile.orig      Mon May 12 22:15:17 2003
+--- Makefile.orig      2005-04-17 23:44:02.000000000 +0200
 +++ Makefile
 @@ -1,6 +1,6 @@
  objects := $(patsubst %.c,%.o,$(wildcard *.c))
  
--CFLAGS= -O3 -Wall -pedantic -ansi -DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/local/lib/nut\"
-+CFLAGS= -O3 -Wall -pedantic -ansi -DNUTDIR=\".nutdb\" -DFOODDIR=\"${PREFIX}/share/nut\"
+-CFLAGS= -O3 -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/local/lib/nut\" -ansi -pedantic -fno-strict-aliasing
++CFLAGS= -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"${PREFIX}/share/nut\" -ansi -pedantic -fno-strict-aliasing
  
  nut:  $(objects)
        gcc ${CFLAGS} -lm -o nut $(objects)