Fix errno. Installed files changed -> bump revision.

4 files changed, 22 insertions, 16 deletions

diff --git a/devel/libhfs/Makefile b/devel/libhfs/Makefile
index bc7dc312316..92334b111d5 100644
--- a/devel/libhfs/Makefile
+++ b/devel/libhfs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:46 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/15 22:14:15 joerg Exp $
 #
 
 DISTNAME=	hfsutils-3.2.6
 PKGNAME=	libhfs-3.2.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel sysutils
 MASTER_SITES=	ftp://ftp.mars.org/pub/hfs/
 
diff --git a/devel/libhfs/distinfo b/devel/libhfs/distinfo
index e770e6f831a..ca2ab25c0b8 100644
--- a/devel/libhfs/distinfo
+++ b/devel/libhfs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:18 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/15 22:14:15 joerg Exp $
 
 SHA1 (hfsutils-3.2.6.tar.gz) = 6d71dfb2c93c0d8082972d39f3f75ae53a438d5d
 RMD160 (hfsutils-3.2.6.tar.gz) = a8b8c0c6556f3be2b701baab80b933dc6691a6ea
 Size (hfsutils-3.2.6.tar.gz) = 207697 bytes
 SHA1 (patch-aa) = e6c3465d0d2ae0c7679be7cee08d220594832879
 SHA1 (patch-ab) = 2a849153a5d9eb6b11c33ef0c7266cccd9c072a6
-SHA1 (patch-ac) = ea8ae702d37536033e11eb404c6a1ecf25c255da
-SHA1 (patch-ad) = 23bb872978c37db5b9d1209b6b315f19de30c6fb
+SHA1 (patch-ac) = 2b979c9b93e4b2d3d5987e03fdb961f573835ad7
+SHA1 (patch-ad) = d382b1c840c6ffc7ae428227c4554ae7c2b8f1b3
diff --git a/devel/libhfs/patches/patch-ac b/devel/libhfs/patches/patch-ac
index 71c17680aa8..10267ea261f 100644
--- a/devel/libhfs/patches/patch-ac
+++ b/devel/libhfs/patches/patch-ac
@@ -1,15 +1,18 @@
-$NetBSD: patch-ac,v 1.3 1999/12/02 19:05:06 fredb Exp $
+$NetBSD: patch-ac,v 1.4 2005/12/15 22:14:15 joerg Exp $
 
---- libhfs/libhfs.h.orig	Mon Nov 15 19:52:30 1999
-+++ libhfs/libhfs.h	Mon Nov 15 19:52:30 1999
-@@ -19,8 +19,8 @@
+--- libhfs/libhfs.h.orig	2005-12-15 22:07:50.000000000 +0000
++++ libhfs/libhfs.h
+@@ -19,10 +19,9 @@
   * Id: libhfs.h,v 1.7 1998/11/02 22:09:02 rob Exp 
   */
  
 -# include "hfs.h"
 -# include "apple.h"
+-
+-extern int errno;
 +# include <hfs.h>
 +# include <apple.h>
++#include <errno.h>
  
- extern int errno;
- 
+ # define ERROR(code, str)  \
+     do { hfs_error = (str), errno = (code); goto fail; } while (0)
diff --git a/devel/libhfs/patches/patch-ad b/devel/libhfs/patches/patch-ad
index 70363af6861..55c24d292d7 100644
--- a/devel/libhfs/patches/patch-ad
+++ b/devel/libhfs/patches/patch-ad
@@ -1,13 +1,16 @@
-$NetBSD: patch-ad,v 1.3 1999/12/02 19:05:06 fredb Exp $
+$NetBSD: patch-ad,v 1.4 2005/12/15 22:14:15 joerg Exp $
 
---- librsrc/librsrc.h.orig	Mon Nov 15 19:52:30 1999
-+++ librsrc/librsrc.h	Mon Nov 15 19:52:30 1999
-@@ -19,7 +19,7 @@
+--- librsrc/librsrc.h.orig	2005-12-15 22:09:15.000000000 +0000
++++ librsrc/librsrc.h
+@@ -19,9 +19,9 @@
   * Id: librsrc.h,v 1.5 1998/04/11 08:27:19 rob Exp 
   */
  
 -# include "rsrc.h"
 +# include <rsrc.h>
++#include <errno.h>
  
- extern int errno;
+-extern int errno;
  
+ # define ERROR(code, str)  \
+     do { rsrc_error = (str), errno = (code); goto fail; } while (0)