cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to nutdb-20.1

Browse Source
This commit is contained in:
jasper 2015-05-09 08:31:34 +00:00
parent f8d2ef0551
commit a825ad7359
6 changed files with 21 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
biology/nutdb/Makefile
View File

@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.31 2013/03/19 13:07:13 nigel Exp $
# $OpenBSD: Makefile,v 1.32 2015/05/09 08:31:34 jasper Exp $
COMMENT= record and analyze your meals for nutrient composition
V= 16.12
V= 20.1
DISTNAME= nut-${V}
PKGNAME= nutdb-${V}
REVISION= 2
CATEGORIES= biology
HOMEPAGE= http://nut.sourceforge.net/
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += X11 Xau Xdmcp Xext Xft Xinerama c fltk fontconfig m pthread stdc++
WANTLIB += X11 Xau Xdmcp Xext Xft Xpm Xinerama c fltk fontconfig m pthread stdc++
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nut/}
@ -21,11 +20,15 @@ NO_TEST= Yes
LIB_DEPENDS= x11/fltk
MAKE_FLAGS+= CC="${CC}" \
OPT="" \
prefix=${PREFIX} \
libdir=${PREFIX}/lib/nutdb
USE_GMAKE= Yes
pre-configure:
perl -pi -e 's,\b(?:nut)\b,nutdb,g;s,\b(?:NUT)\b,NUTDB,g' ${WRKSRC}/nut.1
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nut ${PREFIX}/bin/nutdb
${INSTALL_PROGRAM} ${WRKSRC}/fltk/Nut ${PREFIX}/bin/Nutdb

4
biology/nutdb/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nut-16.12.tar.gz) = z2GF3Ksq7as7e4R9ickz5bGCRm1QcozOmoJGGS9xpVY=
SIZE (nut-16.12.tar.gz) = 1262771
SHA256 (nut-20.1.tar.gz) = P4xkhmnU6a86doT/+3S677BPKb/lqEess6qd81QMTHw=
SIZE (nut-20.1.tar.gz) = 1441077

20
biology/nutdb/patches/patch-Makefile
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile,v 1.12 2011/08/24 19:29:24 naddy Exp $
--- Makefile.orig Sun May 22 01:13:30 2011
+++ Makefile Wed Aug 24 21:24:50 2011
@@ -24,7 +24,7 @@ else
CC = gcc
$OpenBSD: patch-Makefile,v 1.13 2015/05/09 08:31:34 jasper Exp $
--- Makefile.orig Sat May 9 10:10:14 2015
+++ Makefile Sat May 9 10:10:51 2015
@@ -28,7 +28,7 @@ endif
ifeq ($(OS),HP-UX)
CFLAGS := $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
else
-CFLAGS := $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+CFLAGS += $(OPT) -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
endif
-CFLAGS := -O -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+CFLAGS += -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
ifeq ($(CC),gcc)
CFLAGS += -Wall -fno-inline -ansi
endif
CXXFLAGS := $(CFLAGS) `fltk-config --cxxflags`

12
biology/nutdb/patches/patch-fltk_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-fltk_Makefile,v 1.1 2011/11/28 10:18:53 sthen Exp $
--- fltk/Makefile.orig Mon Nov 28 10:11:29 2011
+++ fltk/Makefile Mon Nov 28 10:11:38 2011
@@ -16,7 +16,7 @@ CC = gcc
CXX = g++
endif
-CFLAGS := -I.. `fltk-config --optim --cflags` -O -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
+CFLAGS := -I.. `fltk-config --cflags` -O -DNUTDIR=$(NUTDIR) -DFOODDIR=$(FOODDIR)
ifeq ($(CXX),g++)
CFLAGS += -Wall -fno-inline -ansi

88
biology/nutdb/patches/patch-nut_1
View File

@ -1,88 +0,0 @@
--- nut.1.orig Sun May 22 05:24:54 2011
+++ nut.1 Wed Aug 24 21:23:07 2011
@@ -1,4 +1,4 @@
-.\" manual page [] for nut
+.\" manual page [] for nutdb
.\" SH section heading
.\" SS subsection heading
.\" LP paragraph
@@ -6,12 +6,12 @@
.\" TP hanging label
.TH "nut" "1" "2011.05.22" "" ""
.SH "NAME"
-.B nut \- analyze meals with the USDA Nutrient Database
+.B nutdb \- analyze meals with the USDA Nutrient Database
.SH "SYNOPSIS"
-.B nut [dbname]
+.B nutdb [dbname]
.SH "DESCRIPTION"
.LP
-.B NUT
+.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 23.
@@ -45,7 +45,7 @@ functions are made synchronous and explicit.
Both the console program and the GUI operate identically on the underlying
database.
-.B NUT
+.B NUTDB
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.
@@ -157,7 +157,7 @@ desired,
and provides an opportunity to adjust the weight of the servings to allow
for water gained or lost in preparation.
-NUT allows you to add a labeled food
+NUTDB allows you to add a labeled food
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.
@@ -181,10 +181,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
-NUT constructs an approximate recipe in order to fill
+NUTDB constructs an approximate recipe in order to fill
in nutrient values that were not expressed on the food label.
-Occasionally the "recipe" that NUT estimates for a packaged food will only
-show a "trace" of every ingredient, and this is NUT's way of saying
+Occasionally the "recipe" that NUTDB estimates for a packaged food will only
+show a "trace" of every ingredient, and this is NUTDB's way of saying
that according
to the food database, there is no way to match the ingredients with the
constraints of the nutrition statement.
@@ -193,11 +193,11 @@ edit the
nutrient values.
Perhaps the food was so heavily fortified with vitamins
that the user waited until
-after NUT constructed a recipe to specify the
+after NUTDB constructed a recipe to specify the
additional vitamin amounts.
Whatever the rationale for additional editing, the user has total control
over the nutritional information no matter what
-NUT's approximate recipe suggested. The new food record is saved in the database
+NUTDB's approximate recipe suggested. The new food record is saved in the database
in the same manner as a recipe.
This feature is only in the console program.
@@ -328,7 +328,7 @@ non\-fiber carb as "." and fiber as ":".
.B Record 'The Usual'\-\-Customary Meals:
When
-.B NUT
+.B NUTDB
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
@@ -363,7 +363,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
.fi
.SH "AUTHOR"

7
biology/nutdb/pkg/PLIST
View File

@ -1,10 +1,7 @@
@comment $OpenBSD: PLIST,v 1.10 2011/11/28 10:18:53 sthen Exp $
@comment $OpenBSD: PLIST,v 1.11 2015/05/09 08:31:34 jasper Exp $
@bin bin/Nutdb
@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/sr23.nut
lib/nutdb/sr27.nut
@man man/man1/nutdb.1