Update to 9.11:

New in 9.11:
Because the program uses the approximation of 4 calories per gram
for carbohydrate and protein to analyze meals according to the
"Daily Value" -- although real food has various values for calories
per gram -- the program now refigures fat percentage values at each
analysis so that when calories, carbs, and protein are each at
exactly 100%, fat will be also.
New in 9.10:
This release fixes a buffer overflow in the food selection function
which caused the program to not find certain foods even though they
existed in the database.
New in 9.9:
A bug has been fixed in which during food selection, the program
lost the value of the food name key. Also, some of the program's
reference values for the essential fatty acids have been modified.
New in 9.8:
The program now defaults to either grams or ounces, depending on
the weight unit the user enters to specify servings. A bug in
handling customary meal names that are too long has been fixed.
New in 9.7:
The program computes essential fatty acid reference values based
on the user's diet. Prior releases aimed toward a particular balance
of Omega-6 and Omega-3. This release allows the user to specify
the balance between Omega-6 and Omega-3 without having to determine
the amount of the individual fatty acids.
New in 9.6:
The program is now capable of understanding food names in simple
English, such as "fried chicken" and "mashed potatoes." This is
accomplished by including the list of abbreviations the USDA uses
and by successively searching for each tokenized term, whatever
the order in the USDA name.

3 files changed, 16 insertions, 10 deletions

diff --git a/biology/nut/Makefile b/biology/nut/Makefile
index 93acf019812..64a7151cce2 100644
--- a/biology/nut/Makefile
+++ b/biology/nut/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2004/01/22 07:20:07 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/10 18:37:48 wiz Exp $
 
-DISTNAME=	nut-9.5
+DISTNAME=	nut-9.11
 CATEGORIES=	biology
 MASTER_SITES=	http://www.lafn.org/~av832/
 
diff --git a/biology/nut/distinfo b/biology/nut/distinfo
index 48f82d2dda4..15194c974b9 100644
--- a/biology/nut/distinfo
+++ b/biology/nut/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/12/25 14:46:17 wiz Exp $
+$NetBSD: distinfo,v 1.8 2004/03/10 18:37:48 wiz Exp $
 
-SHA1 (nut-9.5.tar.gz) = f08bd6a1aa44076734d483652383a123f8a00e8c
-Size (nut-9.5.tar.gz) = 900995 bytes
-SHA1 (patch-ab) = db5aa9edf54a610c890f97b172fd82fd843cfdf7
+SHA1 (nut-9.11.tar.gz) = 3279b552b1284febf2c724ce62d589caaeaae6dd
+Size (nut-9.11.tar.gz) = 903657 bytes
+SHA1 (patch-ab) = 1046ccc0a5a9759453e502717fe1ab6daba06459
 SHA1 (patch-ac) = 525d65d517f637ed908d1df95672d34713dcf2bd
diff --git a/biology/nut/patches/patch-ab b/biology/nut/patches/patch-ab
index eece45db143..fa4cf477d1f 100644
--- a/biology/nut/patches/patch-ab
+++ b/biology/nut/patches/patch-ab
@@ -1,16 +1,22 @@
-$NetBSD: patch-ab,v 1.3 2003/08/11 07:26:01 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2004/03/10 18:37:48 wiz Exp $
 
---- db.c.orig	Sun Aug 10 22:12:44 2003
+--- db.c.orig	2004-02-15 22:36:00.000000000 +0100
 +++ db.c
-@@ -23,6 +23,7 @@
+@@ -23,11 +23,12 @@
  #include "meal.h"
  #include "options.h"
  #include "util.h"
+-#ifndef DOS
++#ifdef DOS
+ #include <tgmath.h>
+ #else
+ #include <math.h>
+ #endif
 +#include <errno.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -683,7 +684,13 @@ void make_filenames(void)
+@@ -691,7 +692,13 @@ void make_filenames(void)
   sprintf(versionfile,"%s/%s","NUTDB",versionfile1);
  #else
  sprintf(nutdir,"%s/%s",getenv("HOME"),nutdir1);