Apply tshiozak@'s fix for NetBSD >= 2.0, more information:

"Questions about iconv.h" on tech-userlevel@ mailing list.

Bump PKGREVISION.

4 files changed, 34 insertions, 14 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 509682f8228..4cadcf241c2 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.80 2004/10/21 06:30:39 xtraeme Exp $
+# $NetBSD: Makefile,v 1.81 2004/10/29 07:42:38 xtraeme Exp $
 #
 .include "Makefile.common"
 
-PKGNAME=		abiword-${ABIWORD_DIST_VERSION}
-
-COMMENT=		Open Source cross-platform word processor
+PKGNAME=	abiword-${ABIWORD_DIST_VERSION}
+PKGREVISION=	1
+COMMENT=	Open Source cross-platform word processor
 
 # GTK1 version and previous name of the GTK2 version
-CONFLICTS=		abiword-personal-[0-9]* abiword2-[0-9]*
+CONFLICTS=	abiword-personal-[0-9]* abiword2-[0-9]*
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/abi
+WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 
-REPLACE_PERL=		user/wp/scripts/abw2html.pl
+REPLACE_PERL=	user/wp/scripts/abw2html.pl
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.abiword
 PKG_SUPPORTED_OPTIONS=	gucharmap
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 5e49405558a..55deaad61c6 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/10/27 02:50:19 reed Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/10/29 07:42:38 xtraeme Exp $
 #
 
 ABIWORD_DIST_VERSION=	2.0.11
@@ -23,11 +23,6 @@ USE_GNU_TOOLS+=		make
 USE_PERL5=		run
 USE_X11=		yes
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "Linux" # iconv is not needed for Linux; it is included in glibc
-USE_BUILTIN.iconv=      no # Make sure we get libiconv dependency.
-.endif
-
 CONFIGURE_ARGS+=        --enable-threads
 CONFIGURE_ARGS+=        --with-libxml2
 CONFIGURE_ARGS+=        --with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg}
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 01fd24f38aa..f3562492961 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.28 2004/10/21 06:30:39 xtraeme Exp $
+$NetBSD: distinfo,v 1.29 2004/10/29 07:42:38 xtraeme Exp $
 
 SHA1 (abiword-2.0.11.tar.bz2) = 356828fbcec5ffade735f5bf68b8d9a7f6e9ef09
 Size (abiword-2.0.11.tar.bz2) = 22200079 bytes
 SHA1 (patch-aa) = 730e205f54516535394659c74e052bbe706e1bc2
 SHA1 (patch-ab) = 27c48de3374288c7f6d6749ff18ebeedf91cb3ab
 SHA1 (patch-ac) = 883e0cae06ca96b92d81a0183f15a5af8fc77be2
+SHA1 (patch-ad) = 15b34ebdfde5bf94360ad11ad3693843bd509030
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
new file mode 100644
index 00000000000..12c1fcfba22
--- /dev/null
+++ b/editors/abiword/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.13 2004/10/29 07:42:38 xtraeme Exp $
+
+--- src/af/util/xp/ut_iconv.h.orig	2004-10-29 09:29:57.000000000 +0200
++++ src/af/util/xp/ut_iconv.h	2004-10-29 09:30:03.000000000 +0200
+@@ -22,6 +22,8 @@
+ #ifndef UT_ICONV_H
+ #define UT_ICONV_H
+ 
++#include <sys/param.h>
++
+ #ifdef __cplusplus
+ /* make freebsd happy */
+ extern "C" {
+@@ -41,6 +43,10 @@
+ 
+ typedef iconv_t UT_iconv_t;
+ 
++#if defined(__NetBSD__) && __NetBSD_Version__ >= 200000000
++struct __tag_iconv_t { };  /* XXX: for catch/throw (ISO C++ 15.1)*/
++#endif
++
+ #define UT_ICONV_INVALID ((iconv_t)(-1))
+ 
+ #ifdef __cplusplus