diff options
Diffstat (limited to 'biology')
| -rw-r--r-- | biology/nut/Makefile | 5 | ||||
| -rw-r--r-- | biology/nut/PLIST | 5 | ||||
| -rw-r--r-- | biology/nut/distinfo | 8 | ||||
| -rw-r--r-- | biology/nut/patches/patch-ab | 47 |
4 files changed, 35 insertions, 30 deletions
diff --git a/biology/nut/Makefile b/biology/nut/Makefile index 16d5475108b..0fd8cb2f335 100644 --- a/biology/nut/Makefile +++ b/biology/nut/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2004/08/14 15:51:37 snj Exp $ +# $NetBSD: Makefile,v 1.12 2004/08/15 12:06:34 wiz Exp $ -DISTNAME= nut-9.11 +DISTNAME= nut-10.1 CATEGORIES= biology MASTER_SITES= http://www.lafn.org/~av832/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= root@garbled.net HOMEPAGE= http://www.lafn.org/~av832/ diff --git a/biology/nut/PLIST b/biology/nut/PLIST index caecdf13ef8..78f579b52ce 100644 --- a/biology/nut/PLIST +++ b/biology/nut/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.3 2003/08/11 07:26:00 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/08/15 12:06:34 wiz 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/sr16.nut +share/nut/sr17.nut @dirrm share/nut diff --git a/biology/nut/distinfo b/biology/nut/distinfo index 15194c974b9..014ca62d3a8 100644 --- a/biology/nut/distinfo +++ b/biology/nut/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2004/03/10 18:37:48 wiz Exp $ +$NetBSD: distinfo,v 1.9 2004/08/15 12:06:34 wiz Exp $ -SHA1 (nut-9.11.tar.gz) = 3279b552b1284febf2c724ce62d589caaeaae6dd -Size (nut-9.11.tar.gz) = 903657 bytes -SHA1 (patch-ab) = 1046ccc0a5a9759453e502717fe1ab6daba06459 +SHA1 (nut-10.1.tar.bz2) = e7cee292aad8d97fcc008a3ece10790a64bb0398 +Size (nut-10.1.tar.bz2) = 813239 bytes +SHA1 (patch-ab) = 1ce697145adea9501e3818798c10a42486d7c5d2 SHA1 (patch-ac) = 525d65d517f637ed908d1df95672d34713dcf2bd diff --git a/biology/nut/patches/patch-ab b/biology/nut/patches/patch-ab index fa4cf477d1f..9f74297b125 100644 --- a/biology/nut/patches/patch-ab +++ b/biology/nut/patches/patch-ab @@ -1,32 +1,35 @@ -$NetBSD: patch-ab,v 1.4 2004/03/10 18:37:48 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2004/08/15 12:06:34 wiz Exp $ ---- db.c.orig 2004-02-15 22:36:00.000000000 +0100 +--- db.c.orig 2004-08-07 05:03:16.000000000 +0200 +++ db.c -@@ -23,11 +23,12 @@ - #include "meal.h" - #include "options.h" - #include "util.h" --#ifndef DOS -+#ifdef DOS - #include <tgmath.h> - #else - #include <math.h> - #endif -+#include <errno.h> - #include <stdio.h> - #include <stdlib.h> +@@ -29,6 +29,7 @@ #include <string.h> -@@ -691,7 +692,13 @@ void make_filenames(void) - sprintf(versionfile,"%s/%s","NUTDB",versionfile1); + #include <sys/stat.h> + #include <ctype.h> ++#include <errno.h> + + #ifndef NUTDIR + char nutdir1[]=".nutdb"; +@@ -739,9 +740,22 @@ strcpy(subuser,sub); + sprintf(versionfile,"%s/%s/%s","NUTDB",subuser,versionfile1); #else sprintf(nutdir,"%s/%s",getenv("HOME"),nutdir1); -mkdir (nutdir, 0700 ); +if (mkdir(nutdir, S_IRWXU|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) != 0) { -+ if (errno != EEXIST) { -+ printf("Cannot create %s/%s: %s\n", getenv("HOME"), nutdir1, -+ strerror(errno)); -+ exit(1); -+ } ++ if (errno != EEXIST) { ++ printf("Cannot create %s: %s\n", nutdir, ++ strerror(errno)); ++ exit(1); ++ } ++} + sprintf(nutdirsubuser,"%s/%s/%s",getenv("HOME"),nutdir1,subuser); + mkdir (nutdirsubuser, 0700 ); ++if (mkdir(nutdirsubuser, S_IRWXU|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) != 0) { ++ if (errno != EEXIST) { ++ printf("Cannot create %s: %s\n", nutdirsubuser, ++ strerror(errno)); ++ exit(1); ++ } +} sprintf(USDAjoined,"%s/%s",FOODDIR,USDAjoined1); sprintf(globalFOOD,"%s/%s",FOODDIR,globalFOOD1); |