- update nutdb to 13.5

maintainer time-out.
This commit is contained in:
jasper 2008-04-11 09:15:49 +00:00
parent 949f36cd49
commit ffb906e4e2
4 changed files with 25 additions and 34 deletions

View File

@ -1,22 +1,22 @@
# $OpenBSD: Makefile,v 1.14 2008/02/10 18:23:24 jasper Exp $ # $OpenBSD: Makefile,v 1.15 2008/04/11 09:15:49 jasper Exp $
COMMENT= record and analyze your meals for nutrient composition COMMENT= record and analyze your meals for nutrient composition
DISTNAME= nut-12.5 DISTNAME= nut-13.5
PKGNAME= nutdb-12.5 PKGNAME= nutdb-13.5
CATEGORIES= biology CATEGORIES= biology
HOMEPAGE= http://www.lafn.org/~av832/ HOMEPAGE= http://www.lafn.org/~av832/
MAINTAINER= Jon Trembley <jon@brain-box.net> MAINTAINER= Jon Trembley <jon@brain-box.net>
# GPL # GPLv2
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m WANTLIB= c m
MASTER_SITES= ${HOMEPAGE} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nut/}
NO_REGRESS= Yes NO_REGRESS= Yes

View File

@ -1,5 +1,5 @@
MD5 (nut-12.5.tar.gz) = u3Em4LcNBJS4libRMVd5/Q== MD5 (nut-13.5.tar.gz) = Gc+1t/VwLN59BhyPCmKgvQ==
RMD160 (nut-12.5.tar.gz) = YoS6/CYRyOedhpXBSigMdBtA9i0= RMD160 (nut-13.5.tar.gz) = 6sGtOMGsat4rLcqoQpD5G2KBNHM=
SHA1 (nut-12.5.tar.gz) = 6wuEcOmki81xLeDX7vSl1B9EDss= SHA1 (nut-13.5.tar.gz) = rBCqRkUPCwv13n24PLijjJiDMAA=
SHA256 (nut-12.5.tar.gz) = gR+q/1kAwtCQOUc0tgmy5BFSsdHkgRTb47WhbSsTzUY= SHA256 (nut-13.5.tar.gz) = BbiZSLsWGXGLN9gRLqB9YRhecFl3ADhdDsbWe22mpv4=
SIZE (nut-12.5.tar.gz) = 1129289 SIZE (nut-13.5.tar.gz) = 1182466

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-nut_1,v 1.4 2007/06/11 21:02:40 jasper Exp $ $OpenBSD: patch-nut_1,v 1.5 2008/04/11 09:15:49 jasper Exp $
--- nut.1.orig Thu Jun 7 00:21:06 2007 --- nut.1.orig Tue Apr 8 15:32:55 2008
+++ nut.1 Thu Jun 7 00:22:56 2007 +++ nut.1 Tue Apr 8 15:34:13 2008
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
-.\" manual page [] for nut -.\" manual page [] for nut
+.\" manual page [] for nutdb +.\" manual page [] for nutdb
@ -9,8 +9,8 @@ $OpenBSD: patch-nut_1,v 1.4 2007/06/11 21:02:40 jasper Exp $
.\" LP paragraph .\" LP paragraph
.\" IP indented paragraph .\" IP indented paragraph
.\" TP hanging label .\" TP hanging label
-.TH "nut" "1" "2007.04.12" "" "" -.TH "nut" "1" "2008.04.04" "" ""
+.TH "nutdb" "1" "2007.04.12" "" "" +.TH "nutdb" "1" "2008.04.04" "" ""
.SH "NAME" .SH "NAME"
-.B nut \- analyze meals with the USDA Nutrient Database -.B nut \- analyze meals with the USDA Nutrient Database
+.B nutdb \- analyze meals with the USDA Nutrient Database +.B nutdb \- analyze meals with the USDA Nutrient Database
@ -23,8 +23,8 @@ $OpenBSD: patch-nut_1,v 1.4 2007/06/11 21:02:40 jasper Exp $
+.B NUTDB +.B NUTDB
allows you to record what you eat and analyze your meals for nutrient allows you to record what you eat and analyze your meals for nutrient
composition. The database included is the composition. The database included is the
USDA Nutrient Database for Standard Reference, Release 19, which contains USDA Nutrient Database for Standard Reference, Release 20.
@@ -40,7 +40,7 @@ You may add your own recipes to the database, @@ -39,7 +39,7 @@ You may add your own recipes to the database,
by creating them from the foods in the database. by creating them from the foods in the database.
You can also add foods from the information on commercial food labels. The program is completely menu\-driven and there are no commands to learn. You can also add foods from the information on commercial food labels. The program is completely menu\-driven and there are no commands to learn.
@ -33,25 +33,16 @@ $OpenBSD: patch-nut_1,v 1.4 2007/06/11 21:02:40 jasper Exp $
can be called with an optional argument to specify a database subdirectory. can be called with an optional argument to specify a database subdirectory.
For example, if a user tracks meals for other family members, each person For example, if a user tracks meals for other family members, each person
can have his own database, and each database is entirely separate. can have his own database, and each database is entirely separate.
@@ -84,7 +84,7 @@ By pressing "m" the macronutrient ratios are reset to @@ -139,7 +139,7 @@ desired,
values in the analysis, including calories, protein, carbohydrates,
and fats.
(There is also an "n" option, not shown in the prompt, which works just
-like "m" but sets the groups of fatty acids to NUT reference values, and sets the micronutrients by percentage rather than absolute values.)
+like "m" but sets the groups of fatty acids to NUTDB reference values, and sets the micronutrients by percentage rather than absolute values.)
By pressing "e" all values are reset to the absolute values in the
analysis.
By pressing "o" all DV defaults are restored.
@@ -146,7 +146,7 @@ desired,
and provides an opportunity to adjust the weight of the servings to allow and provides an opportunity to adjust the weight of the servings to allow
for water gained or lost in preparation. for water gained or lost in preparation.
-NUT allows you to add a labeled food -NUT allows you to add a labeled food
+NUTDB allows you to add a labeled food +NUTDB allows you to add a labeled food
with an ordered list of ingredients and a nutrition statement, with an ordered list of ingredients and a nutrition statement.
The new food will have additional nutrients that The new food will have additional nutrients that
were not on the nutrition statement, but that the database says are in the food. were not on the nutrition statement, but that the database says are in the food.
@@ -165,10 +165,10 @@ the program are the USA standard 2000\-calorie Daily V @@ -163,10 +163,10 @@ the program are the USA standard 2000\-calorie Daily V
customized options\-\-but users can always set the label's nutrient information in grams. customized options\-\-but users can always set the label's nutrient information in grams.
Only Daily Value nutrients greater than zero are considered as Only Daily Value nutrients greater than zero are considered as
constraints when constraints when
@ -65,7 +56,7 @@ $OpenBSD: patch-nut_1,v 1.4 2007/06/11 21:02:40 jasper Exp $
that according that according
to the food database, there is no way to match the ingredients with the to the food database, there is no way to match the ingredients with the
constraints of the nutrition statement. constraints of the nutrition statement.
@@ -177,11 +177,11 @@ edit the @@ -175,11 +175,11 @@ edit the
nutrient values. nutrient values.
Perhaps the food was so heavily fortified with vitamins Perhaps the food was so heavily fortified with vitamins
that the user waited until that the user waited until
@ -79,7 +70,7 @@ $OpenBSD: patch-nut_1,v 1.4 2007/06/11 21:02:40 jasper Exp $
in the same manner as a recipe. in the same manner as a recipe.
To modify the serving size of an existing food, the food is selected To modify the serving size of an existing food, the food is selected
@@ -256,7 +256,7 @@ non\-fiber carb as "." and fiber as ":". @@ -265,7 +265,7 @@ non\-fiber carb as "." and fiber as ":".
.B Record 'The Usual'\-\-Customary Meals: .B Record 'The Usual'\-\-Customary Meals:
When When
@ -88,7 +79,7 @@ $OpenBSD: patch-nut_1,v 1.4 2007/06/11 21:02:40 jasper Exp $
asks what you are having, you can answer "the usual." Specifically, asks what you are having, you can answer "the usual." Specifically,
this function allows you to record a customary meal, this function allows you to record a customary meal,
and give it a name. Later, when and give it a name. Later, when
@@ -287,7 +287,7 @@ food.db Food database @@ -296,7 +296,7 @@ food.db Food database
meal.db Meal database meal.db Meal database
theusual.db Customary Meals database theusual.db Customary Meals database
OPTIONS.txt Personal Options records OPTIONS.txt Personal Options records

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.4 2006/11/30 17:38:27 jasper Exp $ @comment $OpenBSD: PLIST,v 1.5 2008/04/11 09:15:49 jasper Exp $
bin/nutdb bin/nutdb
lib/nutdb/ lib/nutdb/
lib/nutdb/FOOD_DES.txt lib/nutdb/FOOD_DES.txt
lib/nutdb/NUT_DATA.txt lib/nutdb/NUT_DATA.txt
lib/nutdb/WEIGHT.lib lib/nutdb/WEIGHT.lib
lib/nutdb/WEIGHT.txt lib/nutdb/WEIGHT.txt
lib/nutdb/sr19.nut lib/nutdb/sr20.nut
@man man/man1/nutdb.1 @man man/man1/nutdb.1