pkg/37920: [fix] editors/abiword doesn't build on FreeBSD

[asau%inbox.ru@localhost]

>Number:         37920
>Category:       pkg
>Synopsis:       [fix] editors/abiword doesn't build on FreeBSD
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 30 09:30:00 +0000 2008
>Originator:     Aleksej Saushev
>Release:        
>Organization:
>Environment:
FreeBSD 6.2-STABLE-200706 i386
>Description:
editors/abiword doesn't build.
>How-To-Repeat:
cd editors/abiword; bmake

>Fix:
Bring following patches from FreeBSD ports (modified):


First hunk taken from FreeBSD's patch-src_af_util_xp_ut_iconv.cpp

--- src/af/util/xp/ut_iconv.cpp.orig    Thu Jan 24 09:18:16 2008
+++ src/af/util/xp/ut_iconv.cpp Thu Jan 24 09:20:24 2008
@@ -67,7 +67,7 @@
 #if defined (WIN32) || defined(__QNXNTO__) || defined(__CYGWIN__) ||  \
 (defined (__MACH__) && defined (__APPLE__)) || \
 (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \
-defined (__AIX__) || defined(__OpenBSD__) || \
+defined (__AIX__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
 (defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && 
(__GLIBC_MINOR__ <= 1)) || \
 defined(__NetBSD__) || (defined(_LIBICONV_VERSION) && _LIBICONV_VERSION >= 
0x0109 && !defined(__DragonFly__))
 
@@ -340,7 +340,7 @@
 #ifdef UT_ICONV_USING_GLIB
   return g_iconv((GIConv)cd, (char **)inbuf, inbytesleft, outbuf, 
outbytesleft);
 #else
-  return iconv( (iconv_t)cd, (ICONV_CONST char **)inbuf, inbytesleft, outbuf, 
outbytesleft );
+  return iconv( (iconv_t)cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft 
);
 #endif
 }
 
FreeBSD's patch-src_af_util_xp_ut_string_class.cpp

--- src/af/util/xp/ut_string_class.cpp.orig     Mon Jan 17 14:38:20 2005
+++ src/af/util/xp/ut_string_class.cpp  Mon Jan 17 14:38:43 2005
@@ -352,9 +352,6 @@
 #  else /* va_list is a pointer */
 #  define VA_COPY(ap1, ap2)      ((ap1) = (ap2))
 #  endif /* va_list is a pointer */
-#  if defined (__GNUC__)
-#  define VA_COPY(ap1,ap2)     __va_copy((ap1),(ap2))
-#  endif
 #endif /* !VA_COPY */
 
 UT_String& UT_String_vprintf (UT_String & inStr, const char *format,