Thu Sep 18 12:17:59 2008 UTC ()
Avoid dependency on GNU iconv by using standard names for encodings (instead
of GNUisms).  NetBSD 4.0 supports the alternative names though, so this patch
could be removed later.  Bump PKGREVISION.


(ghen)
diff -r1.4 -r1.5 pkgsrc/audio/easyh10/Makefile
diff -r1.2 -r1.3 pkgsrc/audio/easyh10/distinfo
diff -r0 -r1.1 pkgsrc/audio/easyh10/patches/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/audio/easyh10/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/easyh10/Makefile 2008/01/04 18:08:34 1.4
+++ pkgsrc/audio/easyh10/Makefile 2008/09/18 12:17:59 1.5
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.4 2008/01/04 18:08:34 joerg Exp $ 1# $NetBSD: Makefile,v 1.5 2008/09/18 12:17:59 ghen Exp $
2 2
3DISTNAME= easyh10-1.5 3DISTNAME= easyh10-1.5
 4PKGREVISION= 1
4CATEGORIES= audio 5CATEGORIES= audio
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=easyh10/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=easyh10/}
6 7
7MAINTAINER= ghen@NetBSD.org 8MAINTAINER= ghen@NetBSD.org
8HOMEPAGE= http://easyh10.sourceforge.net/ 9HOMEPAGE= http://easyh10.sourceforge.net/
9COMMENT= Database tool for the iRiver H10 digital audio player 10COMMENT= Database tool for the iRiver H10 digital audio player
10 11
11PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
12 13
13USE_TOOLS+= gmake 14USE_TOOLS+= gmake
14USE_GNU_ICONV= yes 
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18CONFIGURE_ARGS+= --with-id3tag-library=${BUILDLINK_PREFIX.libid3tag}/lib 18CONFIGURE_ARGS+= --with-id3tag-library=${BUILDLINK_PREFIX.libid3tag}/lib
19CONFIGURE_ARGS+= --with-iconv-library=${BUILDLINK_PREFIX.iconv}/lib 19CONFIGURE_ARGS+= --with-iconv-library=${BUILDLINK_PREFIX.iconv}/lib
20 20
21.include "../../audio/libid3tag/buildlink3.mk" 21.include "../../audio/libid3tag/buildlink3.mk"
22.include "../../converters/libiconv/buildlink3.mk" 22.include "../../converters/libiconv/buildlink3.mk"
23.include "../../devel/zlib/buildlink3.mk" 23.include "../../devel/zlib/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/audio/easyh10/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/easyh10/distinfo 2006/11/29 16:59:57 1.2
+++ pkgsrc/audio/easyh10/distinfo 2008/09/18 12:17:59 1.3
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.2 2006/11/29 16:59:57 ghen Exp $ 1$NetBSD: distinfo,v 1.3 2008/09/18 12:17:59 ghen Exp $
2 2
3SHA1 (easyh10-1.5.tar.gz) = 2d6dd78f23829b6e2d21e3362a8eafd651597f19 3SHA1 (easyh10-1.5.tar.gz) = 2d6dd78f23829b6e2d21e3362a8eafd651597f19
4RMD160 (easyh10-1.5.tar.gz) = 87893bbcf595f928ba94fcde3b2b2c16b2e09c76 4RMD160 (easyh10-1.5.tar.gz) = 87893bbcf595f928ba94fcde3b2b2c16b2e09c76
5Size (easyh10-1.5.tar.gz) = 406548 bytes 5Size (easyh10-1.5.tar.gz) = 406548 bytes
 6SHA1 (patch-aa) = 774606669a087113c6084f964170f2948448fb60
File Added: pkgsrc/audio/easyh10/patches/patch-aa
$NetBSD: patch-aa,v 1.1 2008/09/18 12:17:59 ghen Exp $

Use standard names for encodings to avoid dependency on GNU iconv on NetBSD 3.

--- libucs2/ucs2char_iconv.c.orig	2006-07-27 03:42:35.000000000 +0200
+++ libucs2/ucs2char_iconv.c
@@ -69,8 +69,8 @@ static int is_bigendian(void)
 
 static const char *get_ucs2encoding(void)
 {
-	static const char *unicode_big = "UNICODEBIG";
-	static const char *unicode_little = "UNICODELITTLE";
+	static const char *unicode_big = "UCS-2BE";
+	static const char *unicode_little = "UCS-2LE";
 	return is_bigendian() ? unicode_big : unicode_little;
 }