cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update nutdb to 12.0

Browse Source 
(no response from maintainer)
This commit is contained in:
jasper 2006-11-30 17:38:27 +00:00
parent 0983a6434c
commit 5a7554c2b7
5 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
biology/nutdb/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2005/11/01 17:18:15 bernd Exp $ # $OpenBSD: Makefile,v 1.8 2006/11/30 17:38:27 jasper Exp $
COMMENT= "record what you eat and analyze your meals for nutrient composition" COMMENT= "record what you eat and analyze your meals for nutrient composition"
PKGNAME= nutdb-10.15p0 DISTNAME= nut-12.0
DISTNAME= nut-10.15
CATEGORIES= biology CATEGORIES= biology
HOMEPAGE= http://www.lafn.org/~av832/ HOMEPAGE= http://www.lafn.org/~av832/

8
biology/nutdb/distinfo
View File

@ -1,4 +1,4 @@
MD5 (nut-10.15.tar.gz) = a635e2ce84352751f0518487ffd41937 MD5 (nut-12.0.tar.gz) = 77a97786d82ffae7078f148fd6636893
RMD160 (nut-10.15.tar.gz) = adc179320a50f0184ee87042cfc9b206a904eab9 RMD160 (nut-12.0.tar.gz) = d3d6ec5ca24a5401148b032aab5f978a246d56c4
SHA1 (nut-10.15.tar.gz) = b9ee94b0fd164ba29a5a759b8b32a85eb05174bb SHA1 (nut-12.0.tar.gz) = eb778d5cfbeb9ece333a188eef0e3427bcd4a1c8
SIZE (nut-10.15.tar.gz) = 1021559 SIZE (nut-12.0.tar.gz) = 1171792

15
biology/nutdb/patches/patch-Makefile
View File

@ -1,20 +1,19 @@
--- Makefile.orig Sat Dec 11 01:08:13 2004 $OpenBSD: patch-Makefile,v 1.3 2006/11/30 17:38:27 jasper Exp $
+++ Makefile Tue Nov 1 17:39:44 2005 --- Makefile.orig Fri Sep 1 01:45:53 2006
@@ -1,15 +1,18 @@ +++ Makefile Sun Nov 26 19:54:27 2006
@@ -1,9 +1,9 @@
objects := $(patsubst %.c,%.o,$(wildcard *.c)) objects := $(patsubst %.c,%.o,$(wildcard *.c))
-CFLAGS= -O3 -Wall -pedantic -ansi -DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/local/lib/nut\" -CFLAGS= -Os -s -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/local/lib/nut\" -ansi -pedantic
+CFLAGS+= -Wall -pedantic -ansi -DNUTDIR=\".nutdb\" -DFOODDIR=\"$(PREFIX)/lib/nutdb\" +CFLAGS+= -Wall -pedantic -ansi -DNUTDIR=\".nutdb\" -DFOODDIR=\"$(PREFIX)/lib/nutdb\"
nut: $(objects) nut: $(objects)
- gcc ${CFLAGS} -lm -o nut $(objects) - gcc ${CFLAGS} -lm -o nut $(objects)
- strip nut
-
+ ${CC} ${CFLAGS} -lm -o nut $(objects) + ${CC} ${CFLAGS} -lm -o nut $(objects)
+ # strip nut
deps: deps:
makedepend *.c makedepend *.c
@@ -11,4 +11,8 @@ deps:
clean: clean:
rm -f *.o nut preprocess/*.o preprocess/dbjw rm -f *.o nut preprocess/*.o preprocess/dbjw

53
biology/nutdb/patches/patch-nut.1
View File

@ -1,6 +1,7 @@
--- nut.1.orig Thu Jan 27 00:12:39 2005 $OpenBSD: patch-nut.1,v 1.7 2006/11/30 17:38:27 jasper Exp $
+++ nut.1 Tue Nov 1 17:38:01 2005 --- nut.1.orig Fri Sep 1 02:26:31 2006
@@ -1,16 +1,16 @@ +++ nut.1 Sun Nov 26 19:54:27 2006
@@ -1,17 +1,17 @@
-.\" manual page [] for nut -.\" manual page [] for nut
+.\" manual page [] for nutdb +.\" manual page [] for nutdb
.\" SH section heading .\" SH section heading
@ -8,29 +9,31 @@
.\" LP paragraph .\" LP paragraph
.\" IP indented paragraph .\" IP indented paragraph
.\" TP hanging label .\" TP hanging label
-.TH NUT 1 "NUT - 2005.01.26" -.TH "nut" "1" "2006.08.31" "" ""
+.TH NUTDB 1 "NUTDB - 2005.01.26" +.TH "nutdb" "1" "2006.08.31" "" ""
.SH NAME .SH "NAME"
.SH SYNOPSIS -.B nut \- analyze meals with the USDA Nutrient Database
+.B nutdb \- analyze meals with the USDA Nutrient Database
.SH "SYNOPSIS"
-.B nut [dbname] -.B nut [dbname]
+.B nutdb [dbname] +.B nutdb [dbname]
.SH DESCRIPTION .SH "DESCRIPTION"
.LP .LP
-.B NUT -.B NUT
+.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 17, which contains USDA Nutrient Database for Standard Reference, Release 19, which contains
@@ -39,7 +39,7 @@ You may add your own recipes to the data @@ -40,7 +40,7 @@ You may add your own recipes to the data
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.
-.B NUT -.B NUT
+.B NUTDB +.B NUTDB
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.
@@ -122,7 +122,7 @@ desired, @@ -144,7 +144,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.
@ -39,15 +42,21 @@
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.
@@ -141,18 +141,18 @@ the program are the USA standard 2000-ca @@ -163,10 +163,10 @@ the program are the USA standard 2000\-c
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
-NUT constructs an approximate recipe in order to fill -NUT constructs an approximate recipe in order to fill
+NUTDB constructs an approximate recipe in order to fill +NUTDB constructs an approximate recipe in order to fill
in nutrient values that were not expressed on the food label. in nutrient values that were not expressed on the food label.
After the recipe is displayed there is an additional opportunity to -Occasionally the "recipe" that NUT estimates for a packaged food will only
edit the -show a "trace" of every ingredient, and this is NUT's way of saying
+Occasionally the "recipe" that NUTDB estimates for a packaged food will only
+show a "trace" of every ingredient, and this is NUTDB's way of saying
that according
to the food database, there is no way to match the ingredients with the
constraints of the nutrition statement.
@@ -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
@ -61,21 +70,21 @@
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
@@ -226,7 +226,7 @@ non-fiber carb as "." and fiber as ":". @@ -253,7 +253,7 @@ non\-fiber carb as "." and fiber as ":"
.B Record 'The Usual'--Customary Meals: .B Record 'The Usual'\-\-Customary Meals:
When When
-.B NUT -.B NUT
+.B NUTDB +.B NUTDB
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
@@ -257,7 +257,7 @@ food.db Food database @@ -284,7 +284,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
-version NUT software version number -version NUT software version number
+version NUTDB software version number +version NUTDB software version number
menus.txt ASCII print file of meal database menus.txt ASCII print file of meal database
.fi .fi
.SH AUTHOR .SH "AUTHOR"

4
biology/nutdb/pkg/PLIST
View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.3 2004/12/25 19:35:35 sturm Exp $ @comment $OpenBSD: PLIST,v 1.4 2006/11/30 17:38:27 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/sr17.nut lib/nutdb/sr19.nut
@man man/man1/nutdb.1 @man man/man1/nutdb.1