Hi, This is a diff for the latest version of nutdb 14.3.
Tested on amd64. -- Benoit Lecocq
Index: Makefile =================================================================== RCS file: /cvs/ports/biology/nutdb/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 24 Oct 2008 12:25:29 -0000 1.17 +++ Makefile 9 Mar 2009 16:44:15 -0000 @@ -2,8 +2,8 @@ COMMENT= record and analyze your meals for nutrient composition -DISTNAME= nut-14.0 -PKGNAME= nutdb-14.0 +DISTNAME= nut-14.3 +PKGNAME= nutdb-14.3 CATEGORIES= biology HOMEPAGE= http://nut.sourceforge.net/ Index: distinfo =================================================================== RCS file: /cvs/ports/biology/nutdb/distinfo,v retrieving revision 1.14 diff -u -r1.14 distinfo --- distinfo 24 Oct 2008 12:25:29 -0000 1.14 +++ distinfo 9 Mar 2009 16:44:15 -0000 @@ -1,5 +1,5 @@ -MD5 (nut-14.0.tar.gz) = H3QWQSGfSgvJLdDAHdNPew== -RMD160 (nut-14.0.tar.gz) = X8FLOCacD2e4h87zcNL95jf8WlA= -SHA1 (nut-14.0.tar.gz) = r+zdLdKwIO3eC0aJUU4041NgP38= -SHA256 (nut-14.0.tar.gz) = LzHYrzRzS4r0yA3Azkk3E5kJsZRReyqCoc8MQMLcGmk= -SIZE (nut-14.0.tar.gz) = 1160656 +MD5 (nut-14.3.tar.gz) = gNQ6f5mIKmyJgw9Y72W9BQ== +RMD160 (nut-14.3.tar.gz) = TbLrgf1m8ANGZksilg7xMZfoGcY= +SHA1 (nut-14.3.tar.gz) = Jrmi5HCNAmVNd/lB6ZPpO196ASQ= +SHA256 (nut-14.3.tar.gz) = fEid6+FANVYIjpXVGaMsGvUcEKNAmT3JXV5FxJXq+JU= +SIZE (nut-14.3.tar.gz) = 1160625 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/biology/nutdb/patches/patch-Makefile,v retrieving revision 1.4 diff -u -r1.4 patch-Makefile --- patches/patch-Makefile 10 Feb 2008 18:23:24 -0000 1.4 +++ patches/patch-Makefile 9 Mar 2009 16:44:15 -0000 @@ -1,25 +1,14 @@ -$OpenBSD: patch-Makefile,v 1.4 2008/02/10 18:23:24 jasper Exp $ ---- Makefile.orig Mon Jan 29 06:06:37 2007 -+++ Makefile Wed Jan 30 07:14:50 2008 -@@ -1,14 +1,24 @@ +--- Makefile.orig Mon Dec 29 17:34:19 2008 ++++ Makefile Mon Mar 9 17:31:10 2009 +@@ -1,6 +1,6 @@ objects := $(patsubst %.c,%.o,$(wildcard *.c)) -CFLAGS= -Os -s -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/local/lib/nut\" -ansi -pedantic +CFLAGS+= -Wall -pedantic -ansi -DNUTDIR=\".nutdb\" -DFOODDIR=\"$(PREFIX)/lib/nutdb\" nut: $(objects) -- gcc ${CFLAGS} -lm -o nut $(objects) -+ ${CC} ${CFLAGS} -lm -o nut $(objects) - -+anameal.o: anameal.c -+ ${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $< -o $@ -+ -+food.o: food.c -+ ${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $< -o $@ -+ - deps: - makedepend *.c - + $(CC) ${CFLAGS} -o nut $(LDFLAGS) $(objects) -lm +@@ -11,4 +11,8 @@ clean: rm -f *.o nut preprocess/*.o preprocess/dbjw Index: patches/patch-nut_1 =================================================================== RCS file: /cvs/ports/biology/nutdb/patches/patch-nut_1,v retrieving revision 1.7 diff -u -r1.7 patch-nut_1 --- patches/patch-nut_1 24 Oct 2008 12:25:29 -0000 1.7 +++ patches/patch-nut_1 9 Mar 2009 16:44:15 -0000 @@ -1,16 +1,11 @@ -$OpenBSD: patch-nut_1,v 1.7 2008/10/24 12:25:29 jasper Exp $ ---- nut.1.orig Mon Oct 20 10:31:47 2008 -+++ nut.1 Mon Oct 20 10:55:14 2008 -@@ -1,17 +1,17 @@ --.\" manual page [] for nut -+.\" manual page [] for nutdb - .\" SH section heading - .\" SS subsection heading +--- nut.1.orig Mon Mar 9 14:32:46 2009 ++++ nut.1 Mon Mar 9 14:34:46 2009 +@@ -4,14 +4,14 @@ .\" LP paragraph .\" IP indented paragraph .\" TP hanging label --.TH "nut" "1" "2008.09.17" "" "" -+.TH "nutdb" "1" "2008.09.17" "" "" +-.TH "nut" "1" "2009.02.07" "" "" ++.TH "nutdb" "1" "2009.02.07" "" "" .SH "NAME" -.B nut \- analyze meals with the USDA Nutrient Database +.B nutdb \- analyze meals with the USDA Nutrient Database @@ -24,7 +19,7 @@ allows you to record what you eat and analyze your meals for nutrient composition. The database included is the USDA Nutrient Database for Standard Reference, Release 21. -@@ -39,7 +39,7 @@ You may add your own recipes to the database, +@@ -39,7 +39,7 @@ 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. @@ -33,7 +28,7 @@ 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 can have his own database, and each database is entirely separate. -@@ -139,7 +139,7 @@ desired, +@@ -139,7 +139,7 @@ and provides an opportunity to adjust the weight of the servings to allow for water gained or lost in preparation. @@ -42,7 +37,7 @@ with an ordered list of ingredients and a nutrition statement. The new food will have additional nutrients that were not on the nutrition statement, but that the database says are in the food. -@@ -163,10 +163,10 @@ the program are the USA standard 2000\-calorie Daily V +@@ -163,10 +163,10 @@ customized options\-\-but users can always set the label's nutrient information in grams. Only Daily Value nutrients greater than zero are considered as constraints when @@ -56,7 +51,7 @@ 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 +@@ -175,11 +175,11 @@ nutrient values. Perhaps the food was so heavily fortified with vitamins that the user waited until @@ -70,7 +65,7 @@ in the same manner as a recipe. To modify the serving size of an existing food, the food is selected -@@ -265,7 +265,7 @@ non\-fiber carb as "." and fiber as ":". +@@ -267,7 +267,7 @@ .B Record 'The Usual'\-\-Customary Meals: When @@ -79,7 +74,7 @@ asks what you are having, you can answer "the usual." Specifically, this function allows you to record a customary meal, and give it a name. Later, when -@@ -296,7 +296,7 @@ food.db Food database +@@ -298,7 +298,7 @@ meal.db Meal database theusual.db Customary Meals database OPTIONS.txt Personal Options records
