summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--biology/nut/Makefile9
-rw-r--r--biology/nut/PLIST6
-rw-r--r--biology/nut/distinfo10
-rw-r--r--biology/nut/patches/patch-ab6
4 files changed, 15 insertions, 16 deletions
diff --git a/biology/nut/Makefile b/biology/nut/Makefile
index 4d3c37d30df..abb6f6ff54a 100644
--- a/biology/nut/Makefile
+++ b/biology/nut/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2009/08/09 23:15:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/09/19 07:52:19 obache Exp $
-DISTNAME= nut-14.4
+DISTNAME= nut-15.8
CATEGORIES= biology
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nut/}
@@ -19,12 +19,11 @@ 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
+INSTALLATION_DIRS= bin share/doc/nut share/nut
do-install:
${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
+ ${INSTALL_DATA} ${WRKSRC}/nut.html ${DESTDIR}${PREFIX}/share/doc/nut
.include "../../mk/bsd.pkg.mk"
diff --git a/biology/nut/PLIST b/biology/nut/PLIST
index efcc0ae5b86..3dd3a7fb06e 100644
--- a/biology/nut/PLIST
+++ b/biology/nut/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2009/08/09 23:15:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/09/19 07:52:19 obache Exp $
bin/nut
-man/man1/nut.1
+share/doc/nut/nut.html
share/nut/FOOD_DES.txt
share/nut/NUT_DATA.txt
share/nut/WEIGHT.lib
share/nut/WEIGHT.txt
-share/nut/sr21.nut
+share/nut/sr22.nut
diff --git a/biology/nut/distinfo b/biology/nut/distinfo
index 7f011bc17d4..61742382908 100644
--- a/biology/nut/distinfo
+++ b/biology/nut/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2009/08/09 23:15:43 wiz Exp $
+$NetBSD: distinfo,v 1.17 2010/09/19 07:52:19 obache Exp $
-SHA1 (nut-14.4.tar.gz) = 148e20ddfc60d7fc8805041d68f2e53297e7b4dc
-RMD160 (nut-14.4.tar.gz) = 60c2ed8a2fc7b1e3ec8a8d8018a9435a8f90f219
-Size (nut-14.4.tar.gz) = 1161076 bytes
-SHA1 (patch-ab) = 023e7cbe6f06507ee303b56e85f48354855661a3
+SHA1 (nut-15.8.tar.gz) = 839bc808b09dba3f98b5d4aab4d3907e5ed13e06
+RMD160 (nut-15.8.tar.gz) = f52845c8bc93a3ccce4566ae683d3b6cd38f4536
+Size (nut-15.8.tar.gz) = 1182225 bytes
+SHA1 (patch-ab) = 8f4af599da76c6b1c21564408e939159198d3df3
diff --git a/biology/nut/patches/patch-ab b/biology/nut/patches/patch-ab
index d8a85c82b3e..4cac755af23 100644
--- a/biology/nut/patches/patch-ab
+++ b/biology/nut/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2008/01/30 05:43:55 obache Exp $
+$NetBSD: patch-ab,v 1.8 2010/09/19 07:52:19 obache Exp $
---- db.c.orig 2007-12-29 07:45:33.000000000 +0000
+--- db.c.orig 2010-08-20 04:04:35.000000000 +0000
+++ db.c
@@ -28,6 +28,7 @@
#include <string.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.7 2008/01/30 05:43:55 obache Exp $
#ifndef NUTDIR
char nutdir1[]=".nutdb";
-@@ -892,9 +893,22 @@ strcpy(subuser,sub);
+@@ -982,9 +983,22 @@ strcpy(subuser,sub);
sprintf(versionfile,"%s/%s/%s","NUTDB",subuser,versionfile1);
#else
sprintf(nutdir,"%s/%s",getenv("HOME"),nutdir1);