From f123e951b52e4dc33495e63ce3b520a8b3dea54b Mon Sep 17 00:00:00 2001 From: bernd Date: Tue, 1 Nov 2005 17:18:15 +0000 Subject: [PATCH] - Fix some file modes here as well. - update-patches while I'm here - bump PKGNAME ok niallo@ --- biology/nutdb/Makefile | 4 ++-- biology/nutdb/patches/patch-Makefile | 10 +++++----- biology/nutdb/patches/patch-nut.1 | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/biology/nutdb/Makefile b/biology/nutdb/Makefile index ae3edb1e2a8..8beba7cbd08 100644 --- a/biology/nutdb/Makefile +++ b/biology/nutdb/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2005/02/07 17:34:23 naddy Exp $ +# $OpenBSD: Makefile,v 1.7 2005/11/01 17:18:15 bernd Exp $ COMMENT= "record what you eat and analyze your meals for nutrient composition" -PKGNAME= nutdb-10.15 +PKGNAME= nutdb-10.15p0 DISTNAME= nut-10.15 CATEGORIES= biology HOMEPAGE= http://www.lafn.org/~av832/ diff --git a/biology/nutdb/patches/patch-Makefile b/biology/nutdb/patches/patch-Makefile index cc426ff8dec..4122d76195d 100644 --- a/biology/nutdb/patches/patch-Makefile +++ b/biology/nutdb/patches/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Oct 19 11:28:46 2004 -+++ Makefile Tue Oct 19 11:32:01 2004 +--- Makefile.orig Sat Dec 11 01:08:13 2004 ++++ Makefile Tue Nov 1 17:39:44 2005 @@ -1,15 +1,18 @@ objects := $(patsubst %.c,%.o,$(wildcard *.c)) @@ -21,6 +21,6 @@ -# DO NOT DELETE +install: + mkdir $(PREFIX)/lib/nutdb/ -+ install -m 755 nut $(PREFIX)/bin/nutdb -+ install -m 644 nut.1 $(PREFIX)/man/man1/nutdb.1 -+ mv raw.data/* $(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/ diff --git a/biology/nutdb/patches/patch-nut.1 b/biology/nutdb/patches/patch-nut.1 index e2e4735e8a4..3ebdb15277b 100644 --- a/biology/nutdb/patches/patch-nut.1 +++ b/biology/nutdb/patches/patch-nut.1 @@ -1,5 +1,5 @@ ---- nut.1.orig Wed Jan 26 17:12:39 2005 -+++ nut.1 Sun Feb 6 11:16:39 2005 +--- nut.1.orig Thu Jan 27 00:12:39 2005 ++++ nut.1 Tue Nov 1 17:38:01 2005 @@ -1,16 +1,16 @@ -.\" manual page [] for nut +.\" manual page [] for nutdb @@ -21,7 +21,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 17, which contains -@@ -39,7 +39,7 @@ +@@ -39,7 +39,7 @@ You may add your own recipes to the data 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. @@ -30,7 +30,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. -@@ -122,7 +122,7 @@ +@@ -122,7 +122,7 @@ desired, and provides an opportunity to adjust the weight of the servings to allow for water gained or lost in preparation. @@ -39,7 +39,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. -@@ -141,18 +141,18 @@ +@@ -141,18 +141,18 @@ the program are the USA standard 2000-ca 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 @@ -61,7 +61,7 @@ in the same manner as a recipe. To modify the serving size of an existing food, the food is selected -@@ -226,7 +226,7 @@ +@@ -226,7 +226,7 @@ non-fiber carb as "." and fiber as ":". .B Record 'The Usual'--Customary Meals: When @@ -70,7 +70,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 -@@ -257,7 +257,7 @@ +@@ -257,7 +257,7 @@ food.db Food database meal.db Meal database theusual.db Customary Meals database OPTIONS.txt Personal Options records