From 4549697fc0a929bac59e056d6285275eb1c0450f Mon Sep 17 00:00:00 2001 From: pvalchev Date: Sat, 7 Jan 2006 02:17:47 +0000 Subject: [PATCH] use va_copy() on all architectures (fixes many) --- editors/abiword/Makefile | 4 ++-- .../patch-abi_src_af_util_xp_ut_string_class_cpp | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 editors/abiword/patches/patch-abi_src_af_util_xp_ut_string_class_cpp diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 03ae5b81f80..710e6cdda17 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.49 2005/11/15 09:21:51 wilfried Exp $ +# $OpenBSD: Makefile,v 1.50 2006/01/07 02:17:47 pvalchev Exp $ COMMENT= "free cross-platform WYSIWYG word processor" VERSION= 2.4.1 MAJORVER= ${VERSION:C/..$//} DISTNAME= abiword-${VERSION} -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 CATEGORIES= editors HOMEPAGE= http://www.abisource.com/ diff --git a/editors/abiword/patches/patch-abi_src_af_util_xp_ut_string_class_cpp b/editors/abiword/patches/patch-abi_src_af_util_xp_ut_string_class_cpp new file mode 100644 index 00000000000..063a3375fcf --- /dev/null +++ b/editors/abiword/patches/patch-abi_src_af_util_xp_ut_string_class_cpp @@ -0,0 +1,14 @@ +$OpenBSD: patch-abi_src_af_util_xp_ut_string_class_cpp,v 1.4 2006/01/07 02:17:47 pvalchev Exp $ +--- abi/src/af/util/xp/ut_string_class.cpp.orig Thu Jan 5 12:40:22 2006 ++++ abi/src/af/util/xp/ut_string_class.cpp Thu Jan 5 12:41:53 2006 +@@ -342,7 +342,9 @@ UT_printf_string_upper_bound (const char + return len; + } + +-#if !defined (VA_COPY) ++#if !defined (VA_COPY) && defined(__OpenBSD__) ++# define VA_COPY(ap1, ap2) va_copy((ap1),(ap2)) ++#elif !defined (VA_COPY) + # if defined (__GNUC__) && defined (__PPC__) && (defined (_CALL_SYSV) || defined (_WIN32) || defined(WIN32)) || defined(__s390__) || defined(__x86_64__) + # define VA_COPY(ap1, ap2) (*(ap1) = *(ap2)) + # elif defined (VA_COPY_AS_ARRAY)