[pkgsrc/trunk]: pkgsrc/biology/nut Update nut to 13.2. Should close PR 34466.

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/af58e2f630b8
branches:  trunk
changeset: 538140:af58e2f630b8
user:      obache <obache%pkgsrc.org@localhost>
date:      Wed Jan 30 05:43:55 2008 +0000

description:
Update nut to 13.2.  Should close PR 34466.

Pkgsrc changes:
    Add DESTDIR support.

Recent changes (cannot available changes from 10.18 to 12.6 anymore).
13.2:
This release makes minor changes to the analysis reset and food suggestion
functions.
13.1:
This release changes some fatty acid defaults to allow more saturated fat when
eating low-carb, and to raise the maximum amount of long-chain Omega-3.
13.0:
This release introduces the new USDA Nutrient Database SR20 and allows current
NUT installations to have their existing meal records reinterpreted with the new
database.
12.7:
This release uses a new food name abbreviation algorithm so that food names are
more informative and less cryptic.

diffstat:

 biology/nut/DESCR            |   2 +-
 biology/nut/Makefile         |  23 ++++++++++++++---------
 biology/nut/PLIST            |   4 ++--
 biology/nut/distinfo         |  11 +++++------
 biology/nut/patches/patch-ab |   6 +++---
 biology/nut/patches/patch-ac |  12 ------------
 6 files changed, 25 insertions(+), 33 deletions(-)

diffs (118 lines):

diff -r 022df4c479ac -r af58e2f630b8 biology/nut/DESCR
--- a/biology/nut/DESCR Wed Jan 30 05:06:11 2008 +0000
+++ b/biology/nut/DESCR Wed Jan 30 05:43:55 2008 +0000
@@ -1,3 +1,3 @@
 Nut 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 12, which contains 5,976 foods.
+Standard Reference, Release 20.
diff -r 022df4c479ac -r af58e2f630b8 biology/nut/Makefile
--- a/biology/nut/Makefile      Wed Jan 30 05:06:11 2008 +0000
+++ b/biology/nut/Makefile      Wed Jan 30 05:43:55 2008 +0000
@@ -1,24 +1,29 @@
-# $NetBSD: Makefile,v 1.24 2008/01/19 09:16:19 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2008/01/30 05:43:55 obache Exp $
 
-DISTNAME=      nut-10.18
-PKGREVISION=   1
+DISTNAME=      nut-13.2
 CATEGORIES=    biology
-MASTER_SITES=  # ${MASTER_SITE_SOURCEFORGE:=nut/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nut/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://nut.sourceforge.net/
 COMMENT=       Record what you eat and analyze your meals
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 BUILD_TARGET=  nut
 USE_TOOLS+=    gmake
 
+SUBST_CLASSES+=                path
+SUBST_STAGE.path=      pre-build
+SUBST_FILES.path=      Makefile
+SUBST_SED.path=                -e 's|/usr/local/lib|${PREFIX}/share|g'
+
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/nut ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/nut
-       ${INSTALL_DATA} ${WRKSRC}/raw.data/* ${PREFIX}/share/nut
-       ${INSTALL_MAN} ${WRKSRC}/nut.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_PROGRAM} ${WRKSRC}/nut ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/nut
+       ${INSTALL_DATA} ${WRKSRC}/raw.data/* ${DESTDIR}${PREFIX}/share/nut
+       ${INSTALL_MAN} ${WRKSRC}/nut.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff -r 022df4c479ac -r af58e2f630b8 biology/nut/PLIST
--- a/biology/nut/PLIST Wed Jan 30 05:06:11 2008 +0000
+++ b/biology/nut/PLIST Wed Jan 30 05:43:55 2008 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2004/08/15 12:06:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/01/30 05:43:55 obache Exp $
 bin/nut
 man/man1/nut.1
 share/nut/FOOD_DES.txt
 share/nut/NUT_DATA.txt
 share/nut/WEIGHT.lib
 share/nut/WEIGHT.txt
-share/nut/sr17.nut
+share/nut/sr20.nut
 @dirrm share/nut
diff -r 022df4c479ac -r af58e2f630b8 biology/nut/distinfo
--- a/biology/nut/distinfo      Wed Jan 30 05:06:11 2008 +0000
+++ b/biology/nut/distinfo      Wed Jan 30 05:43:55 2008 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2005/04/19 10:45:19 wiz Exp $
+$NetBSD: distinfo,v 1.15 2008/01/30 05:43:55 obache Exp $
 
-SHA1 (nut-10.18.tar.bz2) = b136a1842858016430bc59831ea02869ce221479
-RMD160 (nut-10.18.tar.bz2) = dce992a2b635f63f7f971d505ea4bff6a8d9b46d
-Size (nut-10.18.tar.bz2) = 815615 bytes
-SHA1 (patch-ab) = 53e11acf560f0ecc457c249d6c2e564ae38af9bb
-SHA1 (patch-ac) = 01862c0437c26787667b78124858b90b75b98e94
+SHA1 (nut-13.2.tar.gz) = cdefbe18338ae7e0c62d8d91bf2296bdb9235876
+RMD160 (nut-13.2.tar.gz) = a6aab1fd776c7763f0529b71fdcd7f1d736f5ab1
+Size (nut-13.2.tar.gz) = 1183222 bytes
+SHA1 (patch-ab) = 023e7cbe6f06507ee303b56e85f48354855661a3
diff -r 022df4c479ac -r af58e2f630b8 biology/nut/patches/patch-ab
--- a/biology/nut/patches/patch-ab      Wed Jan 30 05:06:11 2008 +0000
+++ b/biology/nut/patches/patch-ab      Wed Jan 30 05:43:55 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2005/04/19 10:45:19 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2008/01/30 05:43:55 obache Exp $
 
---- db.c.orig  2005-04-16 18:08:41.000000000 +0200
+--- db.c.orig  2007-12-29 07:45:33.000000000 +0000
 +++ db.c
 @@ -28,6 +28,7 @@
  #include <string.h>
@@ -10,7 +10,7 @@
   
  #ifndef NUTDIR
  char nutdir1[]=".nutdb";
-@@ -881,9 +882,22 @@ strcpy(subuser,sub);
+@@ -892,9 +893,22 @@ strcpy(subuser,sub);
   sprintf(versionfile,"%s/%s/%s","NUTDB",subuser,versionfile1);
  #else
  sprintf(nutdir,"%s/%s",getenv("HOME"),nutdir1);
diff -r 022df4c479ac -r af58e2f630b8 biology/nut/patches/patch-ac
--- a/biology/nut/patches/patch-ac      Wed Jan 30 05:06:11 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/04/19 10:45:19 wiz Exp $
-
---- Makefile.orig      2005-04-17 23:44:02.000000000 +0200
-+++ Makefile
-@@ -1,6 +1,6 @@
- objects := $(patsubst %.c,%.o,$(wildcard *.c))
- 
--CFLAGS= -O3 -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/local/lib/nut\" -ansi -pedantic -fno-strict-aliasing
-+CFLAGS= -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"${PREFIX}/share/nut\" -ansi -pedantic -fno-strict-aliasing
- 
- nut:  $(objects)
-       gcc ${CFLAGS} -lm -o nut $(objects)