Abiword builds on Solaris with sunpro. Yay!

3 files changed, 46 insertions, 4 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index f1eafbd735a..1aaf41bfed7 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2007/09/21 13:03:39 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2007/11/29 02:49:11 rillig Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -13,6 +13,7 @@ CONFLICTS=	abiword-personal-[0-9]* abiword2-[0-9]*
 WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 USE_TOOLS+=	perl
 
+REPLACE_SH+=	${WRKDIR}/${DISTNAME}/abiword-docs/make-html.sh
 REPLACE_PERL+=	user/wp/scripts/abw2html.pl
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.abiword
@@ -47,8 +48,8 @@ post-build:
 		ABI_DOC_PROG=${WRKSRC}/src/wp/main/unix/AbiWord-2.4 \
 		./make-html.sh
 	find ${WRKDIR}/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	find ${WRKDIR}/help \( -name "*.abw.orig" -or -name "*.abw"	\
-		-or -name "*.info" -or -name "*.xhtml" \) -print | ${XARGS} ${RM} -f
+	find ${WRKDIR}/help \( -name "*.abw.orig" -o -name "*.abw"	\
+		-o -name "*.info" -o -name "*.xhtml" \) -print | ${XARGS} ${RM} -f
 
 post-install:
 	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/abiword-docs/man/abiword.1 \
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 0ac57fa7693..6f1c581333c 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2007/11/14 15:41:40 rillig Exp $
+$NetBSD: distinfo,v 1.57 2007/11/29 02:49:11 rillig Exp $
 
 SHA1 (abiword-2.4.6.tar.bz2) = 3011d221d09336f09f4bb0732add3405961a8623
 RMD160 (abiword-2.4.6.tar.bz2) = ca56800d811b3aca0af6b2fb6cd70cbea29ab792
@@ -15,3 +15,4 @@ SHA1 (patch-sc) = 13082820d8826f8418758a5f2c9f7fe78fe2f9e9
 SHA1 (patch-sd) = b371b780d35cf63b9809cad83cd5d50895a19510
 SHA1 (patch-se) = 0b1245d182cffc424b85909373107f1c29393b20
 SHA1 (patch-sf) = 8116fa7c1597a92993c373014b24350b3fa25e4f
+SHA1 (patch-sg) = 9627163b5a293d46f15537a22044e6642db93708
diff --git a/editors/abiword/patches/patch-sg b/editors/abiword/patches/patch-sg
new file mode 100644
index 00000000000..39f8f157d31
--- /dev/null
+++ b/editors/abiword/patches/patch-sg
@@ -0,0 +1,40 @@
+$NetBSD: patch-sg,v 1.1 2007/11/29 02:49:12 rillig Exp $
+
+For sunpro, "const char *" and "typedef'd const char *" are different
+types that result in different mangled names. That's really hard to find
+out:
+
+Undefined symbol:
+void UT_XML::processingInstruction(const char *, const char *);
+
+Existing symbol:
+void UT_XML::processingInstruction(const char *, const char *);
+
+Spot the difference!
+
+I couldn't find a tool that actually shows the differences between the
+two mangled symbols. "dem --verbose __1c..." would be nice. No cookie
+for Sun Microsystems.
+
+--- src/af/util/xp/ut_xml.cpp.orig	2005-09-17 18:10:32.000000000 +0200
++++ src/af/util/xp/ut_xml.cpp	2007-11-28 17:19:04.574680000 +0100
+@@ -174,9 +174,7 @@ void UT_XML::flush_all ()
+     }
+ }
+ 
+-/* Declared in ut_xml.h as: void UT_XML::startElement (const XML_Char * name, const XML_Char ** atts);
+- */
+-void UT_XML::startElement (const char * name, const char ** atts)
++void UT_XML::startElement (const XML_Char * name, const XML_Char ** atts)
+ {
+   if (m_bStopped) return;
+ 
+@@ -242,7 +240,7 @@ void UT_XML::charData (const char * buff
+   m_chardata_buffer[m_chardata_length] = 0;
+ }
+ 
+-void UT_XML::processingInstruction (const char * target, const char * data)
++void UT_XML::processingInstruction (const XML_Char * target, const XML_Char * data)
+ {
+   if (m_bStopped) return;
+   if (m_pExpertListener)