Update nut to 15.7 and fix DESCR which had gotten out of date. Also stop
patching the nut Makefile to add an install target, instead use an
explicit do-install target in the ports Makefile.
Tested on amd64.
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/biology/nutdb/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 22 May 2010 08:06:33 -0000 1.21
+++ Makefile 15 Jul 2010 18:04:16 -0000
@@ -2,8 +2,9 @@
COMMENT= record and analyze your meals for nutrient composition
-DISTNAME= nut-14.4
-PKGNAME= nutdb-14.4p0
+V= 15.7
+DISTNAME= nut-${V}
+PKGNAME= nutdb-${V}
CATEGORIES= biology
HOMEPAGE= http://nut.sourceforge.net/
@@ -21,5 +22,11 @@
ALL_TARGET= nut
USE_GMAKE= Yes
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/nut ${PREFIX}/bin/nutdb
+ ${INSTALL_MAN} ${WRKSRC}/nut.1 ${PREFIX}/man/man1/nutdb.1
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/nutdb
+ ${INSTALL_DATA} ${WRKSRC}/raw.data/* ${PREFIX}/lib/nutdb
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /usr/cvs/ports/biology/nutdb/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo 31 May 2009 16:12:19 -0000 1.16
+++ distinfo 15 Jul 2010 17:40:41 -0000
@@ -1,5 +1,5 @@
-MD5 (nut-14.4.tar.gz) = uTiau0fXzCW/WPnQ/+XG3w==
-RMD160 (nut-14.4.tar.gz) = YMLtii/HsePsio2AGKlDWo+Q8hk=
-SHA1 (nut-14.4.tar.gz) = FI4g3fxg1/yIBQQdaPLlMpfntNw=
-SHA256 (nut-14.4.tar.gz) = IFWVtEjjtwD1KefES014OGm8rDy1W0NuyzQc5u4pEPM=
-SIZE (nut-14.4.tar.gz) = 1161076
+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
Index: patches/patch-Makefile
===================================================================
RCS file: /usr/cvs/ports/biology/nutdb/patches/patch-Makefile,v
retrieving revision 1.7
diff -u -r1.7 patch-Makefile
--- patches/patch-Makefile 22 May 2010 08:06:33 -0000 1.7
+++ patches/patch-Makefile 15 Jul 2010 18:14:42 -0000
@@ -1,25 +1,18 @@
-$OpenBSD: patch-Makefile,v 1.7 2010/05/22 08:06:33 jasper Exp $
---- Makefile.orig Sat May 22 10:06:07 2010
-+++ Makefile Sat May 22 10:06:10 2010
-@@ -1,9 +1,9 @@
- objects := $(patsubst %.c,%.o,$(wildcard *.c))
+$OpenBSD$
+--- Makefile.orig Thu Jul 1 21:56:42 2010
++++ Makefile Thu Jul 15 14:14:29 2010
+@@ -1,11 +1,11 @@
+ NUTDIR := \".nutdb\"
+-FOODDIR := \"/usr/local/lib/nut\"
++FOODDIR := \"${PREFIX}/lib/nutdb\"
+ EXECUTABLE := nut
+ LIBS := -lm
--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 -O2 -s -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
++CFLAGS := -Wall -fno-inline -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
- nut: $(objects)
-- $(CC) ${CFLAGS} -o nut $(LDFLAGS) $(objects) -lm
-+ $(CC) ${CFLAGS} -o nut $(objects) -lm
+-CXXFLAGS := -Wall -O2 -s
++CXXFLAGS := -Wall
- deps:
- makedepend *.c
-@@ -11,4 +11,8 @@ deps:
- clean:
- rm -f *.o nut preprocess/*.o preprocess/dbjw
-
--# DO NOT DELETE
-+install:
-+ mkdir $(PREFIX)/lib/nutdb/
-+ ${BSD_INSTALL_PROGRAM} nut $(PREFIX)/bin/nutdb
-+ ${BSD_INSTALL_MAN} nut.1 $(PREFIX)/man/man1/nutdb.1
-+ ${BSD_INSTALL_DATA} raw.data/* $(PREFIX)/lib/nutdb/
+ SOURCE := $(wildcard *.c) $(wildcard *.cc)
+ OBJS := $(patsubst %.c,%.o,$(patsubst %.cc,%.o,$(SOURCE)))
Index: patches/patch-nut_1
===================================================================
RCS file: /usr/cvs/ports/biology/nutdb/patches/patch-nut_1,v
retrieving revision 1.9
diff -u -r1.9 patch-nut_1
--- patches/patch-nut_1 31 May 2009 16:12:19 -0000 1.9
+++ patches/patch-nut_1 15 Jul 2010 17:44:35 -0000
@@ -1,5 +1,5 @@
---- nut.1.orig Sat Apr 11 15:24:19 2009
-+++ nut.1 Sun May 31 10:11:16 2009
+--- nut.1.orig Tue Jul 6 21:54:19 2010
++++ nut.1 Thu Jul 15 13:41:01 2010
@@ -1,17 +1,17 @@
-.\" manual page [] for nut
+.\" manual page [] for nutdb
@@ -8,8 +8,8 @@
.\" LP paragraph
.\" IP indented paragraph
.\" TP hanging label
--.TH "nut" "1" "2009.04.12" "" ""
-+.TH "nutdb" "1" "2009.04.12" "" ""
+-.TH "nut" "1" "2010.05.17" "" ""
++.TH "nutdb" "1" "2010.05.17" "" ""
.SH "NAME"
-.B nut \- analyze meals with the USDA Nutrient Database
+.B nutdb \- analyze meals with the USDA Nutrient Database
@@ -22,7 +22,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 21.
+ USDA Nutrient Database for Standard Reference, Release 22.
@@ -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.
@@ -32,7 +32,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.
-@@ -144,7 +144,7 @@ desired,
+@@ -148,7 +148,7 @@ desired,
and provides an opportunity to adjust the weight of the servings to allow
for water gained or lost in preparation.
@@ -41,7 +41,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.
-@@ -168,10 +168,10 @@ the program are the USA standard 2000\-calorie Daily V
+@@ -172,10 +172,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.
Only Daily Value nutrients greater than zero are considered as
constraints when
@@ -55,7 +55,7 @@
that according
to the food database, there is no way to match the ingredients with the
constraints of the nutrition statement.
-@@ -180,11 +180,11 @@ edit the
+@@ -184,11 +184,11 @@ edit the
nutrient values.
Perhaps the food was so heavily fortified with vitamins
that the user waited until
@@ -69,7 +69,7 @@
in the same manner as a recipe.
To modify the serving size of an existing food, the food is selected
-@@ -272,7 +272,7 @@ non\-fiber carb as "." and fiber as ":".
+@@ -312,7 +312,7 @@ non\-fiber carb as "." and fiber as ":".
.B Record 'The Usual'\-\-Customary Meals:
When
@@ -78,10 +78,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
-@@ -303,7 +303,7 @@ food.db Food database
- meal.db Meal database
- theusual.db Customary Meals database
+@@ -345,7 +345,7 @@ theusual.db Customary Meals database
OPTIONS.txt Personal Options records
+ WLOG.txt Weight Log records
+ WLOG.old Last deleted Weight Log
-version NUT software version number
+version NUTDB software version number
menus.txt ASCII print file of meal database
Index: pkg/DESCR
===================================================================
RCS file: /usr/cvs/ports/biology/nutdb/pkg/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- pkg/DESCR 2 Feb 2007 14:32:52 -0000 1.3
+++ pkg/DESCR 15 Jul 2010 17:40:07 -0000
@@ -1,4 +1,4 @@
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 19, which contains 7,293 foods
-and 140 nutrients.
+Database for Standard Reference, Release 22, which contains 7,538
+foods and 143 nutrients.
Index: pkg/PLIST
===================================================================
RCS file: /usr/cvs/ports/biology/nutdb/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 24 Oct 2008 12:25:29 -0000 1.7
+++ pkg/PLIST 15 Jul 2010 17:40:07 -0000
@@ -5,5 +5,5 @@
lib/nutdb/NUT_DATA.txt
lib/nutdb/WEIGHT.lib
lib/nutdb/WEIGHT.txt
-lib/nutdb/sr21.nut
+lib/nutdb/sr22.nut
@man man/man1/nutdb.1
