pkg/34466: [update] biology/nut

["Martin Wilke" <miwi%FreeBSD.org@localhost>]

>Number:         34466
>Category:       pkg
>Synopsis:       [update] biology/nut
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 04 12:00:00 +0000 2006
>Originator:     Martin Wilke
>Release:        NetBSD 4.0_BETA i386
>Organization:
>Environment:


System: NetBSD 4.0_BETA (GENERIC) #0: Thu Aug 31 02:51:57 UTC 2006
        
builds%b4.netbsd.org@localhost:/home/builds/ab/netbsd-4/i386/200608300000Z-obj/home/builds/ab/netbsd-4/src/sys/arch/i386/compile/GENERIC



>Description:


- Update to 12.0
- Changelog not found (sorry i have search of author website and freshmeat)
- Could remove from todo


>How-To-Repeat:





>Fix:


--- nut.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/pkgsrc/biology/nut/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile    5 Feb 2006 23:08:20 -0000       1.21
+++ Makefile    4 Sep 2006 11:24:54 -0000
@@ -1,10 +1,8 @@
 # $NetBSD: Makefile,v 1.21 2006/02/05 23:08:20 joerg Exp $
 
-DISTNAME=      nut-10.18
-PKGREVISION=   1
+DISTNAME=      nut-12.0
 CATEGORIES=    biology
 MASTER_SITES=  http://www.lafn.org/~av832/
-EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    root%garbled.net@localhost
 HOMEPAGE=      http://www.lafn.org/~av832/
Index: PLIST
===================================================================
RCS file: /home/pcvs/pkgsrc/biology/nut/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST       15 Aug 2004 12:06:34 -0000      1.4
+++ PLIST       4 Sep 2006 11:35:48 -0000
@@ -5,5 +5,5 @@
 share/nut/NUT_DATA.txt
 share/nut/WEIGHT.lib
 share/nut/WEIGHT.txt
-share/nut/sr17.nut
+share/nut/sr19.nut
 @dirrm share/nut
Index: distinfo
===================================================================
RCS file: /home/pcvs/pkgsrc/biology/nut/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo    19 Apr 2005 10:45:19 -0000      1.14
+++ distinfo    4 Sep 2006 11:30:28 -0000
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.14 2005/04/19 10:45:19 wiz 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-12.0.tar.gz) = eb778d5cfbeb9ece333a188eef0e3427bcd4a1c8
+RMD160 (nut-12.0.tar.gz) = d3d6ec5ca24a5401148b032aab5f978a246d56c4
+Size (nut-12.0.tar.gz) = 1171792 bytes
+SHA1 (patch-ab) = 8b82af29ca2b7757c745196e25843b7538c6673d
+SHA1 (patch-ac) = f84e230a25c6f7cfac14d6b2e8e5d6182091af97
Index: patches/patch-ab
===================================================================
RCS file: /home/pcvs/pkgsrc/biology/nut/patches/patch-ab,v
retrieving revision 1.6
diff -u -r1.6 patch-ab
--- patches/patch-ab    19 Apr 2005 10:45:19 -0000      1.6
+++ patches/patch-ab    4 Sep 2006 11:30:23 -0000
@@ -1,7 +1,5 @@
-$NetBSD: patch-ab,v 1.6 2005/04/19 10:45:19 wiz Exp $
-
---- db.c.orig  2005-04-16 18:08:41.000000000 +0200
-+++ db.c
+--- db.c.orig  2006-08-31 20:17:08.000000000 +0200
++++ db.c       2006-09-04 13:27:25.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <string.h>
  #include <sys/stat.h>
@@ -10,7 +8,7 @@
   
  #ifndef NUTDIR
  char nutdir1[]=".nutdb";
-@@ -881,9 +882,22 @@ strcpy(subuser,sub);
+@@ -887,9 +888,22 @@
   sprintf(versionfile,"%s/%s/%s","NUTDB",subuser,versionfile1);
  #else
  sprintf(nutdir,"%s/%s",getenv("HOME"),nutdir1);
Index: patches/patch-ac
===================================================================
RCS file: /home/pcvs/pkgsrc/biology/nut/patches/patch-ac,v
retrieving revision 1.3
diff -u -r1.3 patch-ac
--- patches/patch-ac    19 Apr 2005 10:45:19 -0000      1.3
+++ patches/patch-ac    4 Sep 2006 11:27:45 -0000
@@ -1,12 +1,10 @@
-$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
+--- Makefile.orig      2006-09-01 01:45:53.000000000 +0200
++++ Makefile   2006-09-04 13:26:21.000000000 +0200
 @@ -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
+-CFLAGS= -Os -s -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"/usr/local/lib/nut\" 
-ansi -pedantic
++CFLAGS= -Os -s -Wall -DNUTDIR=\".nutdb\" -DFOODDIR=\"${PREFIX}/lib/nut\" 
-ansi -pedantic
  
  nut:  $(objects)
        gcc ${CFLAGS} -lm -o nut $(objects)
--- nut.diff ends here ---