Wed Jan 30 05:43:56 2008 UTC ()
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.


(obache)
diff -r1.1 -r1.2 pkgsrc/biology/nut/DESCR
diff -r1.24 -r1.25 pkgsrc/biology/nut/Makefile
diff -r1.4 -r1.5 pkgsrc/biology/nut/PLIST
diff -r1.14 -r1.15 pkgsrc/biology/nut/distinfo
diff -r1.6 -r1.7 pkgsrc/biology/nut/patches/patch-ab
diff -r1.3 -r0 pkgsrc/biology/nut/patches/patch-ac
cvs diff -r1.1 -r1.2 pkgsrc/biology/nut/DESCR (expand / switch to unified diff)

--- pkgsrc/biology/nut/DESCR 2001/10/31 21:28:07 1.1
+++ pkgsrc/biology/nut/DESCR 2008/01/30 05:43:55 1.2
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1Nut allows you to record what you eat and analyze your meals for nutrient 1Nut allows you to record what you eat and analyze your meals for nutrient
2composition. The database included is the USDA Nutrient Database for 2composition. The database included is the USDA Nutrient Database for
3Standard Reference, Release 12, which contains 5,976 foods. 3Standard Reference, Release 20.
cvs diff -r1.24 -r1.25 pkgsrc/biology/nut/Makefile (expand / switch to unified diff)

--- pkgsrc/biology/nut/Makefile 2008/01/19 09:16:19 1.24
+++ pkgsrc/biology/nut/Makefile 2008/01/30 05:43:55 1.25
@@ -1,24 +1,29 @@ @@ -1,24 +1,29 @@
1# $NetBSD: Makefile,v 1.24 2008/01/19 09:16:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.25 2008/01/30 05:43:55 obache Exp $
2 2
3DISTNAME= nut-10.18 3DISTNAME= nut-13.2
4PKGREVISION= 1 
5CATEGORIES= biology 4CATEGORIES= biology
6MASTER_SITES= # ${MASTER_SITE_SOURCEFORGE:=nut/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nut/}
7EXTRACT_SUFX= .tar.bz2 
8 6
9MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://nut.sourceforge.net/ 8HOMEPAGE= http://nut.sourceforge.net/
11COMMENT= Record what you eat and analyze your meals 9COMMENT= Record what you eat and analyze your meals
12 10
 11PKG_DESTDIR_SUPPORT= user-destdir
 12
13BUILD_TARGET= nut 13BUILD_TARGET= nut
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
15 15
 16SUBST_CLASSES+= path
 17SUBST_STAGE.path= pre-build
 18SUBST_FILES.path= Makefile
 19SUBST_SED.path= -e 's|/usr/local/lib|${PREFIX}/share|g'
 20
16INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
17 22
18do-install: 23do-install:
19 ${INSTALL_PROGRAM} ${WRKSRC}/nut ${PREFIX}/bin 24 ${INSTALL_PROGRAM} ${WRKSRC}/nut ${DESTDIR}${PREFIX}/bin
20 ${INSTALL_DATA_DIR} ${PREFIX}/share/nut 25 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/nut
21 ${INSTALL_DATA} ${WRKSRC}/raw.data/* ${PREFIX}/share/nut 26 ${INSTALL_DATA} ${WRKSRC}/raw.data/* ${DESTDIR}${PREFIX}/share/nut
22 ${INSTALL_MAN} ${WRKSRC}/nut.1 ${PREFIX}/${PKGMANDIR}/man1 27 ${INSTALL_MAN} ${WRKSRC}/nut.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
23 28
24.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/biology/nut/PLIST (expand / switch to unified diff)

--- pkgsrc/biology/nut/PLIST 2004/08/15 12:06:34 1.4
+++ pkgsrc/biology/nut/PLIST 2008/01/30 05:43:55 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1@comment $NetBSD: PLIST,v 1.4 2004/08/15 12:06:34 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.5 2008/01/30 05:43:55 obache Exp $
2bin/nut 2bin/nut
3man/man1/nut.1 3man/man1/nut.1
4share/nut/FOOD_DES.txt 4share/nut/FOOD_DES.txt
5share/nut/NUT_DATA.txt 5share/nut/NUT_DATA.txt
6share/nut/WEIGHT.lib 6share/nut/WEIGHT.lib
7share/nut/WEIGHT.txt 7share/nut/WEIGHT.txt
8share/nut/sr17.nut 8share/nut/sr20.nut
9@dirrm share/nut 9@dirrm share/nut
cvs diff -r1.14 -r1.15 pkgsrc/biology/nut/distinfo (expand / switch to unified diff)

--- pkgsrc/biology/nut/distinfo 2005/04/19 10:45:19 1.14
+++ pkgsrc/biology/nut/distinfo 2008/01/30 05:43:55 1.15
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.14 2005/04/19 10:45:19 wiz Exp $ 1$NetBSD: distinfo,v 1.15 2008/01/30 05:43:55 obache Exp $
2 2
3SHA1 (nut-10.18.tar.bz2) = b136a1842858016430bc59831ea02869ce221479 3SHA1 (nut-13.2.tar.gz) = cdefbe18338ae7e0c62d8d91bf2296bdb9235876
4RMD160 (nut-10.18.tar.bz2) = dce992a2b635f63f7f971d505ea4bff6a8d9b46d 4RMD160 (nut-13.2.tar.gz) = a6aab1fd776c7763f0529b71fdcd7f1d736f5ab1
5Size (nut-10.18.tar.bz2) = 815615 bytes 5Size (nut-13.2.tar.gz) = 1183222 bytes
6SHA1 (patch-ab) = 53e11acf560f0ecc457c249d6c2e564ae38af9bb 6SHA1 (patch-ab) = 023e7cbe6f06507ee303b56e85f48354855661a3
7SHA1 (patch-ac) = 01862c0437c26787667b78124858b90b75b98e94 
cvs diff -r1.6 -r1.7 pkgsrc/biology/nut/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/biology/nut/patches/patch-ab 2005/04/19 10:45:19 1.6
+++ pkgsrc/biology/nut/patches/patch-ab 2008/01/30 05:43:55 1.7
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-ab,v 1.6 2005/04/19 10:45:19 wiz Exp $ 1$NetBSD: patch-ab,v 1.7 2008/01/30 05:43:55 obache Exp $
2 2
3--- db.c.orig 2005-04-16 18:08:41.000000000 +0200 3--- db.c.orig 2007-12-29 07:45:33.000000000 +0000
4+++ db.c 4+++ db.c
5@@ -28,6 +28,7 @@ 5@@ -28,6 +28,7 @@
6 #include <string.h> 6 #include <string.h>
7 #include <sys/stat.h> 7 #include <sys/stat.h>
8 #include <ctype.h> 8 #include <ctype.h>
9+#include <errno.h> 9+#include <errno.h>
10  10
11 #ifndef NUTDIR 11 #ifndef NUTDIR
12 char nutdir1[]=".nutdb"; 12 char nutdir1[]=".nutdb";
13@@ -881,9 +882,22 @@ strcpy(subuser,sub); 13@@ -892,9 +893,22 @@ strcpy(subuser,sub);
14 sprintf(versionfile,"%s/%s/%s","NUTDB",subuser,versionfile1); 14 sprintf(versionfile,"%s/%s/%s","NUTDB",subuser,versionfile1);
15 #else 15 #else
16 sprintf(nutdir,"%s/%s",getenv("HOME"),nutdir1); 16 sprintf(nutdir,"%s/%s",getenv("HOME"),nutdir1);
17-mkdir (nutdir, 0700 ); 17-mkdir (nutdir, 0700 );
18+if (mkdir(nutdir, S_IRWXU|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) != 0) { 18+if (mkdir(nutdir, S_IRWXU|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) != 0) {
19+ if (errno != EEXIST) { 19+ if (errno != EEXIST) {
20+ printf("Cannot create %s: %s\n", nutdir, 20+ printf("Cannot create %s: %s\n", nutdir,
21+ strerror(errno)); 21+ strerror(errno));
22+ exit(1); 22+ exit(1);
23+ } 23+ }
24+} 24+}
25 sprintf(nutdirsubuser,"%s/%s/%s",getenv("HOME"),nutdir1,subuser); 25 sprintf(nutdirsubuser,"%s/%s/%s",getenv("HOME"),nutdir1,subuser);
26 mkdir (nutdirsubuser, 0700 ); 26 mkdir (nutdirsubuser, 0700 );
File Deleted: pkgsrc/biology/nut/patches/Attic/patch-ac