- update nutdb to 14.3
from benoit lecocq, with some tweaks
This commit is contained in:
parent
2353c353c4
commit
5a08fd2f41
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2008/10/24 12:25:29 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2009/04/02 13:24:30 jasper Exp $
|
||||
|
||||
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/
|
||||
|
||||
|
@ -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
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Makefile,v 1.5 2009/03/24 14:51:04 naddy Exp $
|
||||
--- Makefile.orig Mon Aug 25 22:11:23 2008
|
||||
+++ Makefile Tue Mar 24 15:50:10 2009
|
||||
$OpenBSD: patch-Makefile,v 1.6 2009/04/02 13:24:30 jasper Exp $
|
||||
--- Makefile.orig Mon Dec 29 17:34:19 2008
|
||||
+++ Makefile Thu Apr 2 15:23:45 2009
|
||||
@@ -1,14 +1,24 @@
|
||||
objects := $(patsubst %.c,%.o,$(wildcard *.c))
|
||||
|
||||
@ -8,8 +8,8 @@ $OpenBSD: patch-Makefile,v 1.5 2009/03/24 14:51:04 naddy Exp $
|
||||
+CFLAGS+= -Wall -pedantic -ansi -DNUTDIR=\".nutdb\" -DFOODDIR=\"$(PREFIX)/lib/nutdb\"
|
||||
|
||||
nut: $(objects)
|
||||
- gcc ${CFLAGS} -lm -o nut $(objects)
|
||||
+ ${CC} ${CFLAGS} -o nut $(objects) -lm
|
||||
- $(CC) ${CFLAGS} -o nut $(LDFLAGS) $(objects) -lm
|
||||
+ $(CC) ${CFLAGS} -o nut $(objects) -lm
|
||||
|
||||
+anameal.o: anameal.c
|
||||
+ ${CC} ${CFLAGS} $(EXTRA_CFLAGS) -c $< -o $@
|
||||
|
@ -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 Sun Feb 8 00:52:28 2009
|
||||
+++ nut.1 Thu Apr 2 15:23:37 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
|
||||
@ -70,7 +65,7 @@ $OpenBSD: patch-nut_1,v 1.7 2008/10/24 12:25:29 jasper Exp $
|
||||
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 @@ non\-fiber carb as "." and fiber as ":".
|
||||
|
||||
.B Record 'The Usual'\-\-Customary Meals:
|
||||
When
|
||||
@ -79,7 +74,7 @@ $OpenBSD: patch-nut_1,v 1.7 2008/10/24 12:25:29 jasper Exp $
|
||||
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 @@ food.db Food database
|
||||
meal.db Meal database
|
||||
theusual.db Customary Meals database
|
||||
OPTIONS.txt Personal Options records
|
||||
|
Loading…
Reference in New Issue
Block a user