diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index b6b1ebe654d..75bbdd26990 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.32 2004/01/10 22:51:14 couderc Exp $ +# $OpenBSD: Makefile,v 1.33 2004/06/25 06:14:08 marcm Exp $ COMMENT= "open-source, cross-platform WYSIWYG word processor" -VERSION= 2.0.2 +VERSION= 2.0.7 DISTNAME= abiword-${VERSION} CATEGORIES= editors @@ -12,7 +12,7 @@ MAINTAINER= Damien Couderc MODULES= gettext -BUILD_DEPENDS= :pkgconfig->=0.14.0:devel/pkgconfig +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= fribidi::devel/fribidi \ gthread-2.0.0.0::devel/glib2 \ diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index 90ca6c41351..e0943044cc6 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,3 +1,3 @@ -MD5 (abiword-2.0.2.tar.bz2) = bcb7b45b04e285d5a8b82fb13ebaa170 -RMD160 (abiword-2.0.2.tar.bz2) = 50f89d1fb4d2cc32d7fc09fd6ce585f2a868a225 -SHA1 (abiword-2.0.2.tar.bz2) = 92bc26cf3c0696a86c8daf081837c5ed8b23b13d +MD5 (abiword-2.0.7.tar.bz2) = bb1de0c969f1b93280ff7e661efb1025 +RMD160 (abiword-2.0.7.tar.bz2) = c55cad338191c9466b3ebaf967fe76d69bd98c4c +SHA1 (abiword-2.0.7.tar.bz2) = 2420c02f7399163ea391fb043c94ef524a3faed2 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 index 358fd6b93d4..ad5cae60313 100644 --- 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 @@ -1,6 +1,6 @@ -$OpenBSD: patch-abi_src_af_util_xp_ut_string_class_cpp,v 1.1 2004/01/10 22:51:14 couderc Exp $ ---- abi/src/af/util/xp/ut_string_class.cpp.orig 2003-09-03 08:23:25.000000000 -0700 -+++ abi/src/af/util/xp/ut_string_class.cpp 2003-09-03 08:24:22.000000000 -0700 +$OpenBSD: patch-abi_src_af_util_xp_ut_string_class_cpp,v 1.2 2004/06/25 06:14:08 marcm Exp $ +--- abi/src/af/util/xp/ut_string_class.cpp.orig Wed Aug 27 23:50:00 2003 ++++ abi/src/af/util/xp/ut_string_class.cpp Thu Jun 24 12:49:54 2004 @@ -28,6 +28,7 @@ #include #include @@ -9,12 +9,12 @@ $OpenBSD: patch-abi_src_af_util_xp_ut_string_class_cpp,v 1.1 2004/01/10 22:51:14 #include "ut_string.h" #include "ut_string_class.h" -@@ -340,6 +341,8 @@ UT_printf_string_upper_bound (const char +@@ -339,6 +340,8 @@ UT_printf_string_upper_bound (const char + return len; } - -+#define VA_COPY G_VA_COPY + ++#define VA_COPY G_VA_COPY + #if !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)) diff --git a/editors/abiword/patches/patch-abi_src_af_util_xp_ut_types_h b/editors/abiword/patches/patch-abi_src_af_util_xp_ut_types_h index 8fe89a46df4..bd4e3de8046 100644 --- a/editors/abiword/patches/patch-abi_src_af_util_xp_ut_types_h +++ b/editors/abiword/patches/patch-abi_src_af_util_xp_ut_types_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-abi_src_af_util_xp_ut_types_h,v 1.1 2004/01/11 00:17:57 espie Exp $ +$OpenBSD: patch-abi_src_af_util_xp_ut_types_h,v 1.2 2004/06/25 06:14:08 marcm Exp $ --- abi/src/af/util/xp/ut_types.h.orig 2004-01-11 00:50:06.000000000 +0100 +++ abi/src/af/util/xp/ut_types.h 2004-01-11 00:50:41.000000000 +0100 @@ -259,7 +259,8 @@ ABI_EXPORT void * UT_calloc ( UT_uint32 @@ -7,7 +7,7 @@ $OpenBSD: patch-abi_src_af_util_xp_ut_types_h,v 1.1 2004/01/11 00:17:57 espie Ex defined(__BEOS__) || defined (__AIX__) || \ -(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) +(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) || \ -+(defined(__OpenBSD__) && defined(__GNUC__) && __GNUC__ >= 3) ++defined(__OpenBSD__) #define ICONV_CONST const #else diff --git a/editors/abiword/pkg/PFRAG.gnome b/editors/abiword/pkg/PFRAG.gnome new file mode 100644 index 00000000000..0ba777f54e8 --- /dev/null +++ b/editors/abiword/pkg/PFRAG.gnome @@ -0,0 +1,2 @@ +@comment $OpenBSD: PFRAG.gnome,v 1.3 2004/06/25 06:14:08 marcm Exp $ +share/AbiSuite-2.0/icons/abiword_logo.xpm diff --git a/editors/abiword/pkg/PLIST b/editors/abiword/pkg/PLIST index 14229d933e7..ca82e969991 100644 --- a/editors/abiword/pkg/PLIST +++ b/editors/abiword/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.11 2004/01/10 22:51:14 couderc Exp $ +@comment $OpenBSD: PLIST,v 1.12 2004/06/25 06:14:08 marcm Exp $ bin/AbiWord-2.0 bin/abiword bin/ttfadmin.sh @@ -29,6 +29,7 @@ share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_Zoom.glade share/AbiSuite-2.0/AbiWord/readme.txt share/AbiSuite-2.0/AbiWord/scripts/abw2html.pl share/AbiSuite-2.0/AbiWord/strings/am-ET.strings +share/AbiSuite-2.0/AbiWord/strings/ar.strings share/AbiSuite-2.0/AbiWord/strings/be-BY.strings share/AbiSuite-2.0/AbiWord/strings/bg-BG.strings share/AbiSuite-2.0/AbiWord/strings/br-FR.strings @@ -188,6 +189,9 @@ share/AbiSuite-2.0/templates/A4.awt share/AbiSuite-2.0/templates/Business-Report.awt share/AbiSuite-2.0/templates/Employee-Directory.awt share/AbiSuite-2.0/templates/Fax-Coversheet.awt +share/AbiSuite-2.0/templates/Memo.awt +share/AbiSuite-2.0/templates/Press-Release.awt +share/AbiSuite-2.0/templates/Resume.awt share/AbiSuite-2.0/templates/Two-Columns.awt share/AbiSuite-2.0/templates/US-Letter.awt share/AbiSuite-2.0/templates/normal.awt @@ -252,8 +256,8 @@ share/AbiSuite-2.0/templates/normal.awt-zh_CN share/AbiSuite-2.0/templates/normal.awt-zh_TW share/applications/abiword.desktop share/icons/abiword_48.png -@comment @dirrm share/icons -@comment @dirrm share/applications +@dirrm share/icons +@dirrm share/applications @dirrm share/AbiSuite-2.0/templates @dirrm share/AbiSuite-2.0/icons @dirrm share/AbiSuite-2.0/dictionary @@ -263,5 +267,5 @@ share/icons/abiword_48.png @dirrm share/AbiSuite-2.0/AbiWord/glade @dirrm share/AbiSuite-2.0/AbiWord @dirrm share/AbiSuite-2.0 -@comment @dirrm lib/bonobo/servers -@comment @dirrm lib/bonobo +@dirrm lib/bonobo/servers +@dirrm lib/bonobo