From d17032a9352c3c4a4b4894ab9d185a79b54f9451 Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Tue, 28 Dec 2004 01:56:41 +0000
Subject: Patch added for gcc 3.3.x issue: xap_UnixEncodingManager.cpp:551:
 error: invalid conversion from `const char*'    to `char*'

Include ../../devel/popt/buildlink3.mk (and not using abiword's popt).

Add support for building on Darwin/Mac OS X. (Note: using X11 instead of Cocoa.)

Bump PKGREVISION.
---
 editors/abiword/Makefile         | 10 +++++++++-
 editors/abiword/distinfo         |  3 ++-
 editors/abiword/patches/patch-ae | 28 ++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 editors/abiword/patches/patch-ae

(limited to 'editors')

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 3a2d808b6dc..9cb49a70980 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2004/11/22 13:31:46 adam Exp $
+# $NetBSD: Makefile,v 1.83 2004/12/28 01:56:41 reed Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	abiword-${ABIWORD_DIST_VERSION}
+PKGREVISION=	1
 COMMENT=	Open Source cross-platform word processor
 
 # GTK1 version and previous name of the GTK2 version
@@ -22,6 +23,12 @@ PKG_SUPPORTED_OPTIONS=	gucharmap
 CONFIGURE_ARGS+=	--enable-gucharmap
 .endif
 CONFIGURE_ARGS+=	--with-sys-wv
+.if ${OPSYS} == "Darwin"
+# hardcode relative install path in libwv (MacOS X only)
+CONFIGURE_ARGS+=	--without-epath
+# Use X11 instead of Cocoa API
+CONFIGURE_ARGS+=	--disable-Cocoa
+.endif
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
 post-install:
@@ -38,6 +45,7 @@ SUBST_MESSAGE.docs=	"Fixing docs Makefile."
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../converters/wv/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
 
 .if !empty(PKG_OPTIONS:Mgucharmap)
 .include "../../fonts/gucharmap/buildlink3.mk"
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index cbef9ca51ba..df040bc96c0 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2004/11/22 13:31:46 adam Exp $
+$NetBSD: distinfo,v 1.31 2004/12/28 01:56:41 reed Exp $
 
 SHA1 (abiword-2.0.14.tar.bz2) = 1ecbf566da6fda5af401e8025ffe2a6c3092f9d9
 Size (abiword-2.0.14.tar.bz2) = 22587062 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = a35ff56401929065244d2018003537d7fb1f6ea8
 SHA1 (patch-ab) = 27c48de3374288c7f6d6749ff18ebeedf91cb3ab
 SHA1 (patch-ac) = a8ba221c53832a3cab97f23b0cb07f94cd351f56
 SHA1 (patch-ad) = 15b34ebdfde5bf94360ad11ad3693843bd509030
+SHA1 (patch-ae) = aededf86e6a48e7901680ecb05aee3fa9fa9a48a
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
new file mode 100644
index 00000000000..8b9d22ae87b
--- /dev/null
+++ b/editors/abiword/patches/patch-ae
@@ -0,0 +1,28 @@
+$NetBSD: patch-ae,v 1.14 2004/12/28 01:56:41 reed Exp $
+
+--- src/af/xap/unix/xap_UnixEncodingManager.cpp.orig	Fri Dec 17 16:05:43 2004
++++ src/af/xap/unix/xap_UnixEncodingManager.cpp	Fri Dec 17 16:23:13 2004
+@@ -548,7 +548,7 @@
+ 					MYLANG += LanguageISOName;
+ 					MYLANG += "_";
+ 					MYLANG += LanguageISOTerritory;
+-					putenv(MYLANG.utf8_str());
++					putenv(const_cast<char*>MYLANG.utf8_str());
+ #else
+ 					UT_UTF8String MYLANG (LanguageISOName);
+ 					MYLANG += "_";
+@@ -571,7 +571,7 @@
+ #if defined(SETENV_MISSING)
+ 					MYLANG = "LANG=";
+ 					MYLANG += OLDLANG;
+-					putenv(MYLANG.utf8_str());
++					putenv(const_cast<char*>MYLANG.utf8_str());
+ #else
+ 					setenv("LANG", OLDLANG.utf8_str(), 1);
+ #endif			
+@@ -584,4 +584,4 @@
+ 		}
+ 	}
+ 	describe();
+-}
++};
-- 
cgit v1.2.3