- update nutdb to 16.0

This commit is contained in:
jasper 2010-12-01 08:40:16 +00:00
parent 2f0ff0590b
commit ae9611ce5b
5 changed files with 25 additions and 29 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.24 2010/10/18 16:57:47 espie Exp $
# $OpenBSD: Makefile,v 1.25 2010/12/01 08:40:16 jasper Exp $
COMMENT= record and analyze your meals for nutrient composition
V= 15.7
V= 16.0
DISTNAME= nut-${V}
PKGNAME= nutdb-${V}
CATEGORIES= biology

View File

@ -1,5 +1,5 @@
MD5 (nut-15.7.tar.gz) = jt+8n7lct18dKM1shjcY8A==
RMD160 (nut-15.7.tar.gz) = RnN+VYjU2Z1QKeWmBn28CTie5eY=
SHA1 (nut-15.7.tar.gz) = fSB0uO2JH0LD9YszctLI78bk1CM=
SHA256 (nut-15.7.tar.gz) = 51eNWFwdYrZuXM9cZIJgll85ci0VnXGuCX4g55EGTPg=
SIZE (nut-15.7.tar.gz) = 1193423
MD5 (nut-16.0.tar.gz) = dXzeFIFgW+GGSVpOfMm7Hw==
RMD160 (nut-16.0.tar.gz) = U/XBJvvWjzt20q60yE4wReBKyK8=
SHA1 (nut-16.0.tar.gz) = FodPoTsTjBI+Y4+ID3QUOitWDsg=
SHA256 (nut-16.0.tar.gz) = 1wSrd8MK1+7pp83rovaaQgJDQ8MR8ZkVCXCVOh1zcbg=
SIZE (nut-16.0.tar.gz) = 1226199

View File

@ -1,18 +1,15 @@
$OpenBSD: patch-Makefile,v 1.8 2010/08/18 03:00:40 merdely Exp $
--- Makefile.orig Thu Jul 1 21:56:42 2010
+++ Makefile Thu Jul 15 14:14:29 2010
@@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile,v 1.9 2010/12/01 08:40:16 jasper Exp $
--- Makefile.orig Wed Dec 1 09:39:15 2010
+++ Makefile Wed Dec 1 09:39:44 2010
@@ -1,9 +1,9 @@
NUTDIR := \".nutdb\"
-FOODDIR := \"/usr/local/lib/nut\"
+FOODDIR := \"${PREFIX}/lib/nutdb\"
EXECUTABLE := nut
LIBS := -lm
-CFLAGS := -Wall -O2 -s -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
-CFLAGS := -Wall -O2 -s -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR) -ansi -pedantic
+CFLAGS := -Wall -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
-CXXFLAGS := -Wall -O2 -s
+CXXFLAGS := -Wall
CXXFLAGS := $(CFLAGS)
SOURCE := $(wildcard *.c) $(wildcard *.cc)
OBJS := $(patsubst %.c,%.o,$(patsubst %.cc,%.o,$(SOURCE)))

View File

@ -1,15 +1,14 @@
--- nut.1.orig Tue Jul 6 21:54:19 2010
+++ nut.1 Thu Jul 15 13:41:01 2010
@@ -1,17 +1,17 @@
--- nut.1.orig Wed Dec 1 09:39:02 2010
+++ nut.1 Wed Dec 1 09:39:05 2010
@@ -1,4 +1,4 @@
-.\" manual page [] for nut
+.\" manual page [] for nutdb
.\" SH section heading
.\" SS subsection heading
.\" LP paragraph
.\" IP indented paragraph
@@ -6,12 +6,12 @@
.\" TP hanging label
-.TH "nut" "1" "2010.05.17" "" ""
+.TH "nutdb" "1" "2010.05.17" "" ""
.TH "nut" "1" "2010.09.30" "" ""
.SH "NAME"
-.B nut \- analyze meals with the USDA Nutrient Database
+.B nutdb \- analyze meals with the USDA Nutrient Database
@ -22,7 +21,7 @@
+.B NUTDB
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 22.
USDA Nutrient Database for Standard Reference, Release 23.
@@ -39,7 +39,7 @@ You may add your own recipes to 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.
@ -69,7 +68,7 @@
in the same manner as a recipe.
To modify the serving size of an existing food, the food is selected
@@ -312,7 +312,7 @@ non\-fiber carb as "." and fiber as ":".
@@ -302,7 +302,7 @@ non\-fiber carb as "." and fiber as ":".
.B Record 'The Usual'\-\-Customary Meals:
When
@ -78,10 +77,10 @@
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
@@ -345,7 +345,7 @@ theusual.db Customary Meals database
OPTIONS.txt Personal Options records
WLOG.txt Weight Log records
@@ -337,7 +337,7 @@ WLOG.txt Weight Log records
WLOG.old Last deleted Weight Log
WLOG.aux Copy of Weight Log with fat and lean weights calculated
fontsize Font size that proportionally controls the GUI size
-version NUT software version number
+version NUTDB software version number
menus.txt ASCII print file of meal database

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.8 2010/08/18 03:00:40 merdely Exp $
@comment $OpenBSD: PLIST,v 1.9 2010/12/01 08:40:16 jasper Exp $
@bin bin/nutdb
lib/nutdb/
lib/nutdb/FOOD_DES.txt
lib/nutdb/NUT_DATA.txt
lib/nutdb/WEIGHT.lib
lib/nutdb/WEIGHT.txt
lib/nutdb/sr22.nut
lib/nutdb/sr23.nut
@man man/man1/nutdb.1