- unbreak the build following NULL changes

- remove libutf8 dependency, base locale support seems enough
- remove ONLY_FOR_ARCHS, it may possibly be useful on USB drives too

not really tested but the port doesn't build as-is and has
been on ports@ for most of a week without feedback, so in it goes.

misc/hfsplus/Makefile

@@ -1,14 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2011/02/06 16:03:55 fgsch Exp $
+# $OpenBSD: Makefile,v 1.20 2011/04/22 11:37:46 sthen Exp $
 
 COMMENT=	hfsplus filesystem access tool
 
-# this only makes sense on macintosh (powerpc) systems.
-ONLY_FOR_ARCHS= powerpc
-
 VERSION=	1.0.4
 DISTNAME=	hfsplus_${VERSION}
 PKGNAME=	hfsplus-${VERSION}
-REVISION =	3
+REVISION=	4
 WRKDIST=	${WRKDIR}/hfsplus-${VERSION}
 CATEGORIES=	misc 
 EXTRACT_SUFX=	.src.tar.bz2
@@ -19,13 +16,12 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	c utf8
+WANTLIB=	c
 
 AUTOCONF_VERSION=	2.59
 BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS}
 # needs the AM_PROG_LIBTOOL macro                                             
 BUILD_DEPENDS += devel/libtool                              
-LIB_DEPENDS=	misc/libutf8 
 
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
@@ -34,8 +30,7 @@ MASTER_SITES=	http://penguinppc.org/historical/hfsplus/
 
 # actually uses automake/autoheader, but that is done in pre-configure now
 CONFIGURE_STYLE=automake
-CONFIGURE_ENV=	LIBS="-lutf8" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}
 SHARED_LIBS=	hfsp	0.0

misc/hfsplus/patches/patch-libhfsp_src_swab_h

@@ -1,8 +1,7 @@
-$OpenBSD: patch-libhfsp_src_swab_h,v 1.4 2011/02/06 16:03:55 fgsch Exp $
+$OpenBSD: patch-libhfsp_src_swab_h,v 1.5 2011/04/22 11:37:46 sthen Exp $
 --- libhfsp/src/swab.h.orig	Tue Mar  5 19:50:29 2002
-+++ libhfsp/src/swab.h	Sat Jan 29 08:42:04 2011
-@@ -24,8 +24,13 @@
-  * $Id: patch-libhfsp_src_swab_h,v 1.4 2011/02/06 16:03:55 fgsch Exp $
++++ libhfsp/src/swab.h	Sun Apr 17 09:50:06 2011
+@@ -25,7 +25,12 @@
   */
  
 +#if defined(__OpenBSD__)

misc/hfsplus/patches/patch-libhfsp_src_unicode_c

@@ -1,24 +1,22 @@
-$OpenBSD: patch-libhfsp_src_unicode_c,v 1.1.1.1 2002/03/30 20:46:26 drahn Exp $
---- libhfsp/src/unicode.c.orig	Tue Oct 10 06:14:05 2000
-+++ libhfsp/src/unicode.c	Mon Mar 25 13:41:47 2002
-@@ -13,6 +13,12 @@
+$OpenBSD: patch-libhfsp_src_unicode_c,v 1.2 2011/04/22 11:37:46 sthen Exp $
+--- libhfsp/src/unicode.c.orig	Tue Mar  5 19:50:29 2002
++++ libhfsp/src/unicode.c	Sun Apr 17 09:57:44 2011
+@@ -13,11 +13,17 @@
  #  include "config.h"
  # endif
   
+-#include <stdlib.h>
 +#if defined(__OpenBSD__)
 +#include <sys/types.h>
 +#include <sys/endian.h>
 +#include <stddef.h>
-+#include <libutf8.h>
++#include <stdlib.h>
 +#else
- #include <stdlib.h>
  #include <endian.h>
  #include <byteswap.h>
-@@ -21,6 +27,7 @@
+ #include <linux/string.h>
++#endif
+ 
  #define __USE_GNU
      /* need wcsrtomb */
  #include <wchar.h>
-+#endif
- 
- #include "libhfsp.h"
- 

misc/hfsplus/patches/patch-src_glob_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_glob_c,v 1.1 2011/04/22 11:37:46 sthen Exp $
+--- src/glob.c.orig	Sun Apr 17 09:59:32 2011
++++ src/glob.c	Sun Apr 17 09:59:38 2011
+@@ -48,7 +48,7 @@ int strmatch(const char *str, const char *pat)
+ 
+ 	switch (*pat)
+ 	{
+-	    case NULL:	// pattern at end
++	    case 0:	// pattern at end
+ 		return (!*str); // String at end ?
+ 
+ 	    case '*':  // match all