pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
abiword, abiword-plugins: remove, used for updating pkgsrc
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Wed Sep 23 14:53:38 2015 +0200
Changeset: 373ca5a15ec87a5d49d777c23cc8b739f06a741f
Modified Files:
Makefile
Removed Files:
abiword-plugins/DESCR
abiword-plugins/Makefile
abiword-plugins/PLIST
abiword/DESCR
abiword/Makefile
abiword/PLIST
abiword/README.package-developers
abiword/buildlink3.mk
abiword/distinfo
abiword/options.mk
abiword/patches/patch-configure.ac
abiword/patches/patch-plugin-configure.m4
abiword/patches/patch-plugins_aiksaurus_Makefile.am
abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am
abiword/patches/patch-plugins_applix_Makefile.am
abiword/patches/patch-plugins_babelfish_Makefile.am
abiword/patches/patch-plugins_bmp_Makefile.am
abiword/patches/patch-plugins_clarisworks_Makefile.am
abiword/patches/patch-plugins_collab_Makefile.am
abiword/patches/patch-plugins_command_Makefile.am
abiword/patches/patch-plugins_docbook_Makefile.am
abiword/patches/patch-plugins_eml_Makefile.am
abiword/patches/patch-plugins_epub_Makefile.am
abiword/patches/patch-plugins_freetranslation_Makefile.am
abiword/patches/patch-plugins_garble_Makefile.am
abiword/patches/patch-plugins_gda_Makefile.am
abiword/patches/patch-plugins_gdict_Makefile.am
abiword/patches/patch-plugins_gimp_Makefile.am
abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp
abiword/patches/patch-plugins_goffice_Makefile.am
abiword/patches/patch-plugins_google_Makefile.am
abiword/patches/patch-plugins_grammar_Makefile.am
abiword/patches/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp
abiword/patches/patch-plugins_hancom_Makefile.am
abiword/patches/patch-plugins_hrtext_Makefile.am
abiword/patches/patch-plugins_iscii_Makefile.am
abiword/patches/patch-plugins_kword_Makefile.am
abiword/patches/patch-plugins_latex_Makefile.am
abiword/patches/patch-plugins_loadbindings_Makefile.am
abiword/patches/patch-plugins_mathview_Makefile.am
abiword/patches/patch-plugins_mathview_xp_AbiMathView.cpp
abiword/patches/patch-plugins_mathview_xp_Makefile.am
abiword/patches/patch-plugins_mht_Makefile.am
abiword/patches/patch-plugins_mht_xp_ie__imp__MHT.cpp
abiword/patches/patch-plugins_mif_Makefile.am
abiword/patches/patch-plugins_mswrite_Makefile.am
abiword/patches/patch-plugins_opendocument_Makefile.am
abiword/patches/patch-plugins_openwriter_Makefile.am
abiword/patches/patch-plugins_openxml_Makefile.am
abiword/patches/patch-plugins_opml_Makefile.am
abiword/patches/patch-plugins_ots_Makefile.am
abiword/patches/patch-plugins_paint_Makefile.am
abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp
abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp
abiword/patches/patch-plugins_passepartout_Makefile.am
abiword/patches/patch-plugins_pdb_Makefile.am
abiword/patches/patch-plugins_pdf_Makefile.am
abiword/patches/patch-plugins_presentation_Makefile.am
abiword/patches/patch-plugins_psion_Makefile.am
abiword/patches/patch-plugins_rsvg_Makefile.am
abiword/patches/patch-plugins_s5_Makefile.am
abiword/patches/patch-plugins_sdw_Makefile.am
abiword/patches/patch-plugins_t602_Makefile.am
abiword/patches/patch-plugins_urldict_Makefile.am
abiword/patches/patch-plugins_wikipedia_Makefile.am
abiword/patches/patch-plugins_wmf_Makefile.am
abiword/patches/patch-plugins_wml_Makefile.am
abiword/patches/patch-plugins_wordperfect_Makefile.am
abiword/patches/patch-plugins_wordperfect_xp_Makefile.am
abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
abiword/patches/patch-plugins_wpg_Makefile.am
abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
abiword/patches/patch-plugins_xslfo_Makefile.am
abiword/patches/patch-src_Makefile.am
abiword/patches/patch-src_af_util_xp_ut__endian.h
abiword/patches/patch-src_af_util_xp_ut__iconv.cpp
abiword/patches/patch-src_af_util_xp_ut__iconv.h
abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
abiword/patches/patch-src_af_util_xp_ut__misc.cpp
abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h
Log Message:
abiword, abiword-plugins: remove, used for updating pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=373ca5a15ec87a5d49d777c23cc8b739f06a741f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 -
abiword-plugins/DESCR | 4 -
abiword-plugins/Makefile | 139 -----
abiword-plugins/PLIST | 73 ---
abiword/DESCR | 3 -
abiword/Makefile | 45 --
abiword/PLIST | 290 ---------
abiword/README.package-developers | 11 -
abiword/buildlink3.mk | 28 -
abiword/distinfo | 79 ---
abiword/options.mk | 37 --
abiword/patches/patch-configure.ac | 14 -
abiword/patches/patch-plugin-configure.m4 | 25 -
.../patches/patch-plugins_aiksaurus_Makefile.am | 16 -
...tch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am | 14 -
abiword/patches/patch-plugins_applix_Makefile.am | 14 -
.../patches/patch-plugins_babelfish_Makefile.am | 14 -
abiword/patches/patch-plugins_bmp_Makefile.am | 14 -
.../patches/patch-plugins_clarisworks_Makefile.am | 14 -
abiword/patches/patch-plugins_collab_Makefile.am | 14 -
abiword/patches/patch-plugins_command_Makefile.am | 17 -
abiword/patches/patch-plugins_docbook_Makefile.am | 14 -
abiword/patches/patch-plugins_eml_Makefile.am | 14 -
abiword/patches/patch-plugins_epub_Makefile.am | 14 -
.../patch-plugins_freetranslation_Makefile.am | 14 -
abiword/patches/patch-plugins_garble_Makefile.am | 14 -
abiword/patches/patch-plugins_gda_Makefile.am | 14 -
abiword/patches/patch-plugins_gdict_Makefile.am | 18 -
abiword/patches/patch-plugins_gimp_Makefile.am | 14 -
abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp | 15 -
abiword/patches/patch-plugins_goffice_Makefile.am | 24 -
abiword/patches/patch-plugins_google_Makefile.am | 14 -
abiword/patches/patch-plugins_grammar_Makefile.am | 14 -
...ins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp | 150 -----
abiword/patches/patch-plugins_hancom_Makefile.am | 14 -
abiword/patches/patch-plugins_hrtext_Makefile.am | 14 -
abiword/patches/patch-plugins_iscii_Makefile.am | 14 -
abiword/patches/patch-plugins_kword_Makefile.am | 14 -
abiword/patches/patch-plugins_latex_Makefile.am | 20 -
.../patches/patch-plugins_loadbindings_Makefile.am | 14 -
abiword/patches/patch-plugins_mathview_Makefile.am | 14 -
.../patch-plugins_mathview_xp_AbiMathView.cpp | 43 --
.../patches/patch-plugins_mathview_xp_Makefile.am | 16 -
abiword/patches/patch-plugins_mht_Makefile.am | 14 -
.../patches/patch-plugins_mht_xp_ie__imp__MHT.cpp | 41 --
abiword/patches/patch-plugins_mif_Makefile.am | 14 -
abiword/patches/patch-plugins_mswrite_Makefile.am | 14 -
.../patches/patch-plugins_opendocument_Makefile.am | 14 -
.../patches/patch-plugins_openwriter_Makefile.am | 14 -
abiword/patches/patch-plugins_openxml_Makefile.am | 14 -
abiword/patches/patch-plugins_opml_Makefile.am | 14 -
abiword/patches/patch-plugins_ots_Makefile.am | 13 -
abiword/patches/patch-plugins_paint_Makefile.am | 14 -
.../patches/patch-plugins_paint_xp_AbiGeneric.cpp | 15 -
.../patches/patch-plugins_paint_xp_AbiPaint.cpp | 25 -
.../patches/patch-plugins_passepartout_Makefile.am | 14 -
abiword/patches/patch-plugins_pdb_Makefile.am | 14 -
abiword/patches/patch-plugins_pdf_Makefile.am | 14 -
.../patches/patch-plugins_presentation_Makefile.am | 14 -
abiword/patches/patch-plugins_psion_Makefile.am | 18 -
abiword/patches/patch-plugins_rsvg_Makefile.am | 14 -
abiword/patches/patch-plugins_s5_Makefile.am | 14 -
abiword/patches/patch-plugins_sdw_Makefile.am | 14 -
abiword/patches/patch-plugins_t602_Makefile.am | 14 -
abiword/patches/patch-plugins_urldict_Makefile.am | 14 -
.../patches/patch-plugins_wikipedia_Makefile.am | 14 -
abiword/patches/patch-plugins_wmf_Makefile.am | 14 -
abiword/patches/patch-plugins_wml_Makefile.am | 20 -
.../patches/patch-plugins_wordperfect_Makefile.am | 14 -
.../patch-plugins_wordperfect_xp_Makefile.am | 14 -
...plugins_wordperfect_xp_ie__imp__WordPerfect.cpp | 653 ---------------------
...h-plugins_wordperfect_xp_ie__imp__WordPerfect.h | 165 ------
...gins_wordperfect_xp_ie__impexp__WordPerfect.cpp | 55 --
...lugins_wordperfect_xp_ie__impexp__WordPerfect.h | 13 -
abiword/patches/patch-plugins_wpg_Makefile.am | 14 -
.../patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp | 252 --------
abiword/patches/patch-plugins_xslfo_Makefile.am | 14 -
abiword/patches/patch-src_Makefile.am | 14 -
abiword/patches/patch-src_af_util_xp_ut__endian.h | 18 -
abiword/patches/patch-src_af_util_xp_ut__iconv.cpp | 17 -
abiword/patches/patch-src_af_util_xp_ut__iconv.h | 19 -
.../patches/patch-src_af_util_xp_ut__mbtowc.cpp | 31 -
abiword/patches/patch-src_af_util_xp_ut__misc.cpp | 22 -
.../patch-src_text_ptbl_xp_pd__DocumentRDF.cpp | 32 -
.../patch-src_text_ptbl_xp_pd__DocumentRDF.h | 15 -
85 files changed, 3123 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index f9ebdfb..c1e9138 100644
--- a/Makefile
+++ b/Makefile
@@ -64,8 +64,6 @@ SUBDIR+= Typewriter
SUBDIR+= VASSAL
SUBDIR+= WEPCrack
SUBDIR+= a2ps-sharatype
-SUBDIR+= abiword
-SUBDIR+= abiword-plugins
SUBDIR+= accountsservice
SUBDIR+= acpiclient
SUBDIR+= acpid
diff --git a/abiword-plugins/DESCR b/abiword-plugins/DESCR
deleted file mode 100644
index 4293859..0000000
--- a/abiword-plugins/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-These plugins will enhance your AbiWord-experience. Included are additional
-import/export filters for DocBook, HTML, KWord, Latex and MS-Write as well
-as plugins adding support for further graphic-formats (JPEG, GIF, BMP, WMF,
-etc.)
diff --git a/abiword-plugins/Makefile b/abiword-plugins/Makefile
deleted file mode 100644
index fbb8d23..0000000
--- a/abiword-plugins/Makefile
+++ /dev/null
@@ -1,139 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2015/06/30 09:36:32 nros Exp $
-
-ABIVERSION= 3.0.1
-DISTNAME= abiword-${ABIVERSION}
-PKGNAME= abiword-plugins-${ABIVERSION}
-PKGREVISION= 1
-CATEGORIES= editors
-MASTER_SITES= http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.abiword.com/
-COMMENT= Open Source cross-platform word processor
-LICENSE= gnu-gpl-v2
-
-DISTINFO_FILE= ${.CURDIR}/../../wip/abiword/distinfo
-PATCHDIR= ${.CURDIR}/../../wip/abiword/patches
-
-CONFLICTS= abiword-plugins-[0-9]* abiword-personal-[0-9]* abiword2-[0-9]*
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= autoconf automake gmake pkg-config
-USE_LANGUAGES= c c++
-
-BUILD_DIRS= plugins
-
-# All configure_args here
-CONFIGURE_ARGS+= --disable-default-plugins #do not build any plugins by default
-#CONFIGURE_ARGS+= --enable-plugins #build all plugins
-CONFIGURE_ARGS+= --enable-builtin-plugins
-CONFIGURE_ARGS+= --enable-spell # (Gtk+ only) include spell checking support
-
-# Disabled plugins: gda rsvg
-# rsvg is not needed with gtk and we don't have libgnomedb
-CONFIGURE_ARGS+= --enable-plugins="\
- aiksaurus \
- applix \
- babelfish \
- bmp \
- clarisworks \
- collab \
- command \
- docbook \
- eml \
- epub \
- freetranslation \
- garble \
- gdict \
- gimp \
- goffice \
- google \
- grammar \
- hancom \
- hrtext \
- iscii \
- kword \
- latex \
- loadbindings \
- mathview \
- mht \
- mif \
- mswrite \
- opendocument \
- openwriter \
- openxml \
- opml \
- ots \
- paint \
- passepartout \
- pdb \
- pdf \
- presentation \
- psion \
- s5 \
- sdw \
- t602 \
- urldict \
- wikipedia \
- wmf \
- wml \
- wordperfect \
- wpg \
- xslfo"
-
-
-PKGCONFIG_OVERRIDE+= libabiword.pc.in
-
-pre-configure:
- cd ${WRKSRC}; \
- autoreconf --force --install
-
-.include "../../wip/abiword/options.mk"
-
-# normal dependecies
-.include "../../converters/fribidi/buildlink3.mk"
-.include "../../converters/wv/buildlink3.mk"
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/enchant/buildlink3.mk"
-#.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../time/libical/buildlink3.mk"
-
-#plugin dependecies
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../converters/psiconv/buildlink3.mk"
-.include "../../converters/libwpd/buildlink3.mk"
-.include "../../converters/libwpg/buildlink3.mk"
-.include "../../converters/libwps/buildlink3.mk"
-.include "../../chat/loudmouth/buildlink3.mk"
-.include "../../chat/telepathy-glib/buildlink3.mk"
-#.include "../../databases/libgda/buildlink3.mk"
-#.include "../../databases/libgnomedb/buildlink3.mk"
-.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../misc/goffice0.10/buildlink3.mk"
-.include "../../mail/evolution-data-server/buildlink3.mk"
-.include "../../net/libsoup/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/aiksaurus/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/link-grammar/buildlink3.mk"
-.include "../../textproc/rasqal/buildlink3.mk"
-.include "../../textproc/redland/buildlink3.mk"
-.include "../../www/tidy/buildlink3.mk"
-.include "../../wip/abiword/buildlink3.mk"
-.include "../../wip/asio/buildlink3.mk"
-.include "../../wip/gtkmathview/buildlink3.mk"
-.include "../../wip/libchamplain012/buildlink3.mk"
-.include "../../wip/libeps/buildlink3.mk"
-.include "../../wip/ots/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/abiword-plugins/PLIST b/abiword-plugins/PLIST
deleted file mode 100644
index 7fb1f81..0000000
--- a/abiword-plugins/PLIST
+++ /dev/null
@@ -1,73 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/06/11 16:13:12 nros Exp $
-lib/abiword-3.0/plugins/aiksaurus.la
-lib/abiword-3.0/plugins/applix.la
-lib/abiword-3.0/plugins/babelfish.la
-lib/abiword-3.0/plugins/bmp.la
-lib/abiword-3.0/plugins/clarisworks.la
-lib/abiword-3.0/plugins/collab.la
-lib/abiword-3.0/plugins/command.la
-lib/abiword-3.0/plugins/docbook.la
-lib/abiword-3.0/plugins/eml.la
-lib/abiword-3.0/plugins/epub.la
-lib/abiword-3.0/plugins/freetranslation.la
-lib/abiword-3.0/plugins/garble.la
-lib/abiword-3.0/plugins/gdict.la
-lib/abiword-3.0/plugins/gimp.la
-lib/abiword-3.0/plugins/goffice.la
-lib/abiword-3.0/plugins/google.la
-lib/abiword-3.0/plugins/grammar.la
-lib/abiword-3.0/plugins/hancom.la
-lib/abiword-3.0/plugins/hrtext.la
-lib/abiword-3.0/plugins/iscii.la
-lib/abiword-3.0/plugins/kword.la
-lib/abiword-3.0/plugins/latex.la
-lib/abiword-3.0/plugins/loadbindings.la
-lib/abiword-3.0/plugins/mathview.la
-lib/abiword-3.0/plugins/mht.la
-lib/abiword-3.0/plugins/mif.la
-lib/abiword-3.0/plugins/mswrite.la
-lib/abiword-3.0/plugins/opendocument.la
-lib/abiword-3.0/plugins/openwriter.la
-lib/abiword-3.0/plugins/openxml.la
-lib/abiword-3.0/plugins/opml.la
-lib/abiword-3.0/plugins/ots.la
-lib/abiword-3.0/plugins/paint.la
-lib/abiword-3.0/plugins/passepartout.la
-lib/abiword-3.0/plugins/pdb.la
-lib/abiword-3.0/plugins/pdf.la
-lib/abiword-3.0/plugins/presentation.la
-lib/abiword-3.0/plugins/psion.la
-lib/abiword-3.0/plugins/s5.la
-lib/abiword-3.0/plugins/sdw.la
-lib/abiword-3.0/plugins/t602.la
-lib/abiword-3.0/plugins/urldict.la
-lib/abiword-3.0/plugins/wikipedia.la
-lib/abiword-3.0/plugins/wmf.la
-lib/abiword-3.0/plugins/wml.la
-lib/abiword-3.0/plugins/wordperfect.la
-lib/abiword-3.0/plugins/wpg.la
-lib/abiword-3.0/plugins/xslfo.la
-lib/libAiksaurusGtk3.la
-share/abiword-3.0/Presentation.xml
-share/abiword-3.0/certs/cacert.pem
-share/abiword-3.0/omml_xslt/mml2omml.xsl
-share/abiword-3.0/omml_xslt/omml2mml.xsl
-share/abiword-3.0/ui/ap_UnixDialog_CollaborationAccounts.ui
-share/abiword-3.0/ui/ap_UnixDialog_CollaborationAddAccount.ui
-share/abiword-3.0/ui/ap_UnixDialog_CollaborationAddBuddy.ui
-share/abiword-3.0/ui/ap_UnixDialog_CollaborationEditAccount.ui
-share/abiword-3.0/ui/ap_UnixDialog_CollaborationJoin.ui
-share/abiword-3.0/ui/ap_UnixDialog_CollaborationShare.ui
-share/abiword-3.0/ui/ap_UnixDialog_GenericInput.ui
-share/abiword-3.0/ui/ap_UnixDialog_GenericProgress.ui
-share/abiword-3.0/ui/ots.ui
-share/abiword-3.0/xsltml/README
-share/abiword-3.0/xsltml/cmarkup.xsl
-share/abiword-3.0/xsltml/entities.xsl
-share/abiword-3.0/xsltml/glayout.xsl
-share/abiword-3.0/xsltml/mmltex.xsl
-share/abiword-3.0/xsltml/scripts.xsl
-share/abiword-3.0/xsltml/tables.xsl
-share/abiword-3.0/xsltml/tokens.xsl
-share/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
-share/telepathy/clients/AbiCollab.client
diff --git a/abiword/DESCR b/abiword/DESCR
deleted file mode 100644
index 5bbfc99..0000000
--- a/abiword/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-AbiWord is a full-featured, efficient word processing application
-suitable for a wide range of word processing tasks, and extensible with
-a variety of plugins. It integrates with enchant to provide spell-checking.
diff --git a/abiword/Makefile b/abiword/Makefile
deleted file mode 100644
index 494f86c..0000000
--- a/abiword/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2015/07/16 14:09:37 thomasklausner Exp $
-
-DISTNAME= abiword-3.0.1
-CATEGORIES= editors
-MASTER_SITES= http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.abiword.com/
-COMMENT= Open Source cross-platform word processor
-LICENSE= gnu-gpl-v2
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= autoconf automake gmake pkg-config
-USE_LANGUAGES= c c++
-
-# plugins are in abiword-plugins package
-CONFIGURE_ARGS+= --disable-default-plugins
-CONFIGURE_ARGS+= --enable-plugins=""
-# (Gtk+ only) include spell checking support
-CONFIGURE_ARGS+= --enable-spell
-
-PKGCONFIG_OVERRIDE+= libabiword.pc.in
-
-pre-configure:
- cd ${WRKSRC}; \
- autoreconf --force --install
-
-.include "options.mk"
-
-.include "../../converters/fribidi/buildlink3.mk"
-.include "../../converters/wv/buildlink3.mk"
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/enchant/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/redland/buildlink3.mk"
-.include "../../time/libical/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/abiword/PLIST b/abiword/PLIST
deleted file mode 100644
index 991ce7c..0000000
--- a/abiword/PLIST
+++ /dev/null
@@ -1,290 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2015/06/11 16:26:40 nros Exp $
-bin/abiword
-include/abiword-3.0/abiwidget.h
-include/abiword-3.0/libabiword.h
-include/abiword-3.0/xap_UnixTableWidget.h
-lib/libabiword-3.0.la
-lib/pkgconfig/abiword-3.0.pc
-man/man1/abiword.1
-share/abiword-3.0/mime-info/abiword.keys
-share/abiword-3.0/readme.abw
-share/abiword-3.0/readme.txt
-share/abiword-3.0/strings/ach.strings
-share/abiword-3.0/strings/af-ZA.strings
-share/abiword-3.0/strings/ak.strings
-share/abiword-3.0/strings/am-ET.strings
-share/abiword-3.0/strings/ar.strings
-share/abiword-3.0/strings/ast-ES.strings
-share/abiword-3.0/strings/ayc-BO.strings
-share/abiword-3.0/strings/aym-BO.strings
-share/abiword-3.0/strings/be-BY.strings
-share/abiword-3.0/strings/be@latin.strings
-share/abiword-3.0/strings/bg-BG.strings
-share/abiword-3.0/strings/bm.strings
-share/abiword-3.0/strings/bn.strings
-share/abiword-3.0/strings/br-FR.strings
-share/abiword-3.0/strings/bs.strings
-share/abiword-3.0/strings/ca-ES.strings
-share/abiword-3.0/strings/cgg.strings
-share/abiword-3.0/strings/cs-CZ.strings
-share/abiword-3.0/strings/cy-GB.strings
-share/abiword-3.0/strings/da-DK.strings
-share/abiword-3.0/strings/de-CH.strings
-share/abiword-3.0/strings/de-DE.strings
-share/abiword-3.0/strings/el-GR.strings
-share/abiword-3.0/strings/en-AU.strings
-share/abiword-3.0/strings/en-CA.strings
-share/abiword-3.0/strings/en-GB.strings
-share/abiword-3.0/strings/en-IE.strings
-share/abiword-3.0/strings/eo.strings
-share/abiword-3.0/strings/es-ES.strings
-share/abiword-3.0/strings/es-MX.strings
-share/abiword-3.0/strings/et.strings
-share/abiword-3.0/strings/eu-ES.strings
-share/abiword-3.0/strings/fa-AF.strings
-share/abiword-3.0/strings/ff.strings
-share/abiword-3.0/strings/fi-FI.strings
-share/abiword-3.0/strings/fil.strings
-share/abiword-3.0/strings/fr-FR.strings
-share/abiword-3.0/strings/ga-IE.strings
-share/abiword-3.0/strings/gl.strings
-share/abiword-3.0/strings/he-IL.strings
-share/abiword-3.0/strings/hi.strings
-share/abiword-3.0/strings/hr-HR.strings
-share/abiword-3.0/strings/hu-HU.strings
-share/abiword-3.0/strings/id-ID.strings
-share/abiword-3.0/strings/it-IT.strings
-share/abiword-3.0/strings/ja-JP.strings
-share/abiword-3.0/strings/jbo.strings
-share/abiword-3.0/strings/kk-KZ.strings
-share/abiword-3.0/strings/km.strings
-share/abiword-3.0/strings/ko.strings
-share/abiword-3.0/strings/ku.strings
-share/abiword-3.0/strings/lg.strings
-share/abiword-3.0/strings/lt-LT.strings
-share/abiword-3.0/strings/lv-LV.strings
-share/abiword-3.0/strings/mg-MG.strings
-share/abiword-3.0/strings/mk-MK.strings
-share/abiword-3.0/strings/mnk-SN.strings
-share/abiword-3.0/strings/ms-MY.strings
-share/abiword-3.0/strings/nb-NO.strings
-share/abiword-3.0/strings/ne-NP.strings
-share/abiword-3.0/strings/nl-NL.strings
-share/abiword-3.0/strings/nn-NO.strings
-share/abiword-3.0/strings/pl-PL.strings
-share/abiword-3.0/strings/ps.strings
-share/abiword-3.0/strings/pt-BR.strings
-share/abiword-3.0/strings/pt-PT.strings
-share/abiword-3.0/strings/quh-BO.strings
-share/abiword-3.0/strings/qul-BO.strings
-share/abiword-3.0/strings/quz.strings
-share/abiword-3.0/strings/ro-RO.strings
-share/abiword-3.0/strings/ru-RU.strings
-share/abiword-3.0/strings/sc-IT.strings
-share/abiword-3.0/strings/sk-SK.strings
-share/abiword-3.0/strings/sl-SI.strings
-share/abiword-3.0/strings/son.strings
-share/abiword-3.0/strings/sq-AL.strings
-share/abiword-3.0/strings/sr.strings
-share/abiword-3.0/strings/sr@latin.strings
-share/abiword-3.0/strings/sv-SE.strings
-share/abiword-3.0/strings/sw.strings
-share/abiword-3.0/strings/ta-IN.strings
-share/abiword-3.0/strings/th.strings
-share/abiword-3.0/strings/tr-TR.strings
-share/abiword-3.0/strings/uk-UA.strings
-share/abiword-3.0/strings/vi-VN.strings
-share/abiword-3.0/strings/wo-SN.strings
-share/abiword-3.0/strings/yi.strings
-share/abiword-3.0/strings/zh-CN.strings
-share/abiword-3.0/strings/zh-HK.strings
-share/abiword-3.0/strings/zh-TW.strings
-share/abiword-3.0/strings/zu.strings
-share/abiword-3.0/system.profile
-share/abiword-3.0/system.profile-CP1254
-share/abiword-3.0/system.profile-KOI8-R
-share/abiword-3.0/system.profile-KOI8-U
-share/abiword-3.0/system.profile-KOI8-UB
-share/abiword-3.0/system.profile-am-ET
-share/abiword-3.0/system.profile-ar
-share/abiword-3.0/system.profile-ar-EG
-share/abiword-3.0/system.profile-ar-SA
-share/abiword-3.0/system.profile-bg-BG
-share/abiword-3.0/system.profile-ca-ES
-share/abiword-3.0/system.profile-cs-CZ
-share/abiword-3.0/system.profile-da-DK
-share/abiword-3.0/system.profile-de
-share/abiword-3.0/system.profile-de-AT
-share/abiword-3.0/system.profile-de-CH
-share/abiword-3.0/system.profile-de-DE
-share/abiword-3.0/system.profile-div-MV
-share/abiword-3.0/system.profile-el-GR
-share/abiword-3.0/system.profile-en
-share/abiword-3.0/system.profile-en-AU
-share/abiword-3.0/system.profile-en-CA
-share/abiword-3.0/system.profile-en-GB
-share/abiword-3.0/system.profile-en-IE
-share/abiword-3.0/system.profile-en-NZ
-share/abiword-3.0/system.profile-en-US
-share/abiword-3.0/system.profile-en-ZA
-share/abiword-3.0/system.profile-es
-share/abiword-3.0/system.profile-es-ES
-share/abiword-3.0/system.profile-es-MX
-share/abiword-3.0/system.profile-eu
-share/abiword-3.0/system.profile-eu-ES
-share/abiword-3.0/system.profile-fa-IR
-share/abiword-3.0/system.profile-fi-FI
-share/abiword-3.0/system.profile-fr
-share/abiword-3.0/system.profile-fr-BE
-share/abiword-3.0/system.profile-fr-CA
-share/abiword-3.0/system.profile-fr-CH
-share/abiword-3.0/system.profile-fr-FR
-share/abiword-3.0/system.profile-gl-ES
-share/abiword-3.0/system.profile-he
-share/abiword-3.0/system.profile-he-IL
-share/abiword-3.0/system.profile-hu-HU
-share/abiword-3.0/system.profile-it-IT
-share/abiword-3.0/system.profile-ja-JP
-share/abiword-3.0/system.profile-kk-KZ
-share/abiword-3.0/system.profile-lt-LT
-share/abiword-3.0/system.profile-nb-NO
-share/abiword-3.0/system.profile-nl-NL
-share/abiword-3.0/system.profile-nn-NO
-share/abiword-3.0/system.profile-pl-PL
-share/abiword-3.0/system.profile-ps
-share/abiword-3.0/system.profile-pt-BR
-share/abiword-3.0/system.profile-pt-PT
-share/abiword-3.0/system.profile-ro
-share/abiword-3.0/system.profile-ro-RO
-share/abiword-3.0/system.profile-ru
-share/abiword-3.0/system.profile-ru-RU
-share/abiword-3.0/system.profile-sk-SK
-share/abiword-3.0/system.profile-sk-SK.CP1250
-share/abiword-3.0/system.profile-sl
-share/abiword-3.0/system.profile-sv
-share/abiword-3.0/system.profile-sv-SE
-share/abiword-3.0/system.profile-syr
-share/abiword-3.0/system.profile-tr
-share/abiword-3.0/system.profile-tr-TR
-share/abiword-3.0/system.profile-tr-TR.CP1254
-share/abiword-3.0/system.profile-uk-UA
-share/abiword-3.0/system.profile-ur-PK
-share/abiword-3.0/system.profile-yi
-share/abiword-3.0/system.profile-zh-CN
-share/abiword-3.0/system.profile-zh-TW
-share/abiword-3.0/templates/normal.awt
-share/abiword-3.0/templates/normal.awt-am_ET
-share/abiword-3.0/templates/normal.awt-ar
-share/abiword-3.0/templates/normal.awt-ar_EG
-share/abiword-3.0/templates/normal.awt-ar_SA
-share/abiword-3.0/templates/normal.awt-bg_BG
-share/abiword-3.0/templates/normal.awt-ca_ES
-share/abiword-3.0/templates/normal.awt-cs_CZ
-share/abiword-3.0/templates/normal.awt-da_DK
-share/abiword-3.0/templates/normal.awt-de
-share/abiword-3.0/templates/normal.awt-de_AT
-share/abiword-3.0/templates/normal.awt-de_CH
-share/abiword-3.0/templates/normal.awt-de_DE
-share/abiword-3.0/templates/normal.awt-div_MV
-share/abiword-3.0/templates/normal.awt-el_GR
-share/abiword-3.0/templates/normal.awt-en_AU
-share/abiword-3.0/templates/normal.awt-en_CA
-share/abiword-3.0/templates/normal.awt-en_GB
-share/abiword-3.0/templates/normal.awt-en_IE
-share/abiword-3.0/templates/normal.awt-en_NZ
-share/abiword-3.0/templates/normal.awt-en_ZA
-share/abiword-3.0/templates/normal.awt-es
-share/abiword-3.0/templates/normal.awt-es_AR
-share/abiword-3.0/templates/normal.awt-es_ES
-share/abiword-3.0/templates/normal.awt-es_IR
-share/abiword-3.0/templates/normal.awt-es_MX
-share/abiword-3.0/templates/normal.awt-fa_IR
-share/abiword-3.0/templates/normal.awt-fi_FI
-share/abiword-3.0/templates/normal.awt-fr
-share/abiword-3.0/templates/normal.awt-fr_BE
-share/abiword-3.0/templates/normal.awt-fr_CA
-share/abiword-3.0/templates/normal.awt-fr_CH
-share/abiword-3.0/templates/normal.awt-fr_FR
-share/abiword-3.0/templates/normal.awt-gl_ES
-share/abiword-3.0/templates/normal.awt-he
-share/abiword-3.0/templates/normal.awt-he_IL
-share/abiword-3.0/templates/normal.awt-hu_HU
-share/abiword-3.0/templates/normal.awt-it_IT
-share/abiword-3.0/templates/normal.awt-ja_JP
-share/abiword-3.0/templates/normal.awt-kk_KZ
-share/abiword-3.0/templates/normal.awt-km_KH
-share/abiword-3.0/templates/normal.awt-lt_LT
-share/abiword-3.0/templates/normal.awt-nb_NO
-share/abiword-3.0/templates/normal.awt-nl_NL
-share/abiword-3.0/templates/normal.awt-nn_NO
-share/abiword-3.0/templates/normal.awt-pl_PL
-share/abiword-3.0/templates/normal.awt-ps
-share/abiword-3.0/templates/normal.awt-pt_BR
-share/abiword-3.0/templates/normal.awt-pt_PT
-share/abiword-3.0/templates/normal.awt-ro
-share/abiword-3.0/templates/normal.awt-ro_RO
-share/abiword-3.0/templates/normal.awt-ru
-share/abiword-3.0/templates/normal.awt-ru_RU
-share/abiword-3.0/templates/normal.awt-sk_SK
-share/abiword-3.0/templates/normal.awt-sl
-share/abiword-3.0/templates/normal.awt-sv
-share/abiword-3.0/templates/normal.awt-sv_SE
-share/abiword-3.0/templates/normal.awt-syr
-share/abiword-3.0/templates/normal.awt-tr
-share/abiword-3.0/templates/normal.awt-tr_TR
-share/abiword-3.0/templates/normal.awt-uk_UA
-share/abiword-3.0/templates/normal.awt-ur_PK
-share/abiword-3.0/templates/normal.awt-yi
-share/abiword-3.0/templates/normal.awt-zh_CN
-share/abiword-3.0/templates/normal.awt-zh_TW
-share/abiword-3.0/ui/ap_UnixDialog_Annotation.ui
-share/abiword-3.0/ui/ap_UnixDialog_Border_Shading.ui
-share/abiword-3.0/ui/ap_UnixDialog_Break.ui
-share/abiword-3.0/ui/ap_UnixDialog_Field.ui
-share/abiword-3.0/ui/ap_UnixDialog_FormatFootnotes.ui
-share/abiword-3.0/ui/ap_UnixDialog_FormatFrame.ui
-share/abiword-3.0/ui/ap_UnixDialog_FormatTOC.ui
-share/abiword-3.0/ui/ap_UnixDialog_FormatTable.ui
-share/abiword-3.0/ui/ap_UnixDialog_Goto.ui
-share/abiword-3.0/ui/ap_UnixDialog_HdrFtr.ui
-share/abiword-3.0/ui/ap_UnixDialog_InsertTable.ui
-share/abiword-3.0/ui/ap_UnixDialog_Insert_DateTime.ui
-share/abiword-3.0/ui/ap_UnixDialog_Latex.ui
-share/abiword-3.0/ui/ap_UnixDialog_MailMerge.ui
-share/abiword-3.0/ui/ap_UnixDialog_MetaData.ui
-share/abiword-3.0/ui/ap_UnixDialog_New.ui
-share/abiword-3.0/ui/ap_UnixDialog_Options.ui
-share/abiword-3.0/ui/ap_UnixDialog_Options_ColorSel.ui
-share/abiword-3.0/ui/ap_UnixDialog_PageNumbers.ui
-share/abiword-3.0/ui/ap_UnixDialog_PageSetup.ui
-share/abiword-3.0/ui/ap_UnixDialog_RDFEditor.ui
-share/abiword-3.0/ui/ap_UnixDialog_RDFQuery.ui
-share/abiword-3.0/ui/ap_UnixDialog_Replace.ui
-share/abiword-3.0/ui/ap_UnixDialog_SemanticStylesheets.ui
-share/abiword-3.0/ui/ap_UnixDialog_Spell.ui
-share/abiword-3.0/ui/ap_UnixDialog_Styles.ui
-share/abiword-3.0/ui/ap_UnixDialog_Stylist.ui
-share/abiword-3.0/ui/ap_UnixDialog_Tab.ui
-share/abiword-3.0/ui/ap_UnixDialog_WordCount.ui
-share/abiword-3.0/ui/pd_RDFContact.ui
-share/abiword-3.0/ui/pd_RDFEvent.ui
-share/abiword-3.0/ui/pd_RDFInsertReference.ui
-share/abiword-3.0/ui/pd_RDFLocation.ui
-share/abiword-3.0/ui/xap_UnixDlg_DocComparison.ui
-share/abiword-3.0/ui/xap_UnixDlg_Encoding.ui
-share/abiword-3.0/ui/xap_UnixDlg_History.ui
-share/abiword-3.0/ui/xap_UnixDlg_Image.ui
-share/abiword-3.0/ui/xap_UnixDlg_Language.ui
-share/abiword-3.0/ui/xap_UnixDlg_ListDocuments.ui
-share/abiword-3.0/ui/xap_UnixDlg_Password.ui
-share/abiword-3.0/ui/xap_UnixDlg_PluginManager.ui
-share/abiword-3.0/ui/xap_UnixDlg_WindowMore.ui
-share/abiword-3.0/ui/xap_UnixDlg_Zoom.ui
-share/applications/abiword.desktop
-share/icons/hicolor/16x16/apps/abiword.png
-share/icons/hicolor/22x22/apps/abiword.png
-share/icons/hicolor/256x256/apps/abiword.png
-share/icons/hicolor/32x32/apps/abiword.png
-share/icons/hicolor/48x48/apps/abiword.png
-share/icons/hicolor/512x512/apps/abiword.png
-share/icons/hicolor/scalable/apps/abiword.svg
diff --git a/abiword/README.package-developers b/abiword/README.package-developers
deleted file mode 100644
index 4437ddd..0000000
--- a/abiword/README.package-developers
+++ /dev/null
@@ -1,11 +0,0 @@
-This package might crash with a core.
-
-Please give it a look.
-
-It crashes on my Lenovo X61, but other users have offered
-a more optimistic feedback, see:
-
-
-http://mail-index.netbsd.org/tech-pkg/2014/12/17/msg013933.html
-
-Ottavio Caruso
diff --git a/abiword/buildlink3.mk b/abiword/buildlink3.mk
deleted file mode 100644
index 744378f..0000000
--- a/abiword/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/07/16 14:09:37 thomasklausner Exp $
-
-BUILDLINK_TREE+= abiword
-
-.if !defined(ABIWORD_BUILDLINK3_MK)
-ABIWORD_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.abiword+= abiword>=3.0.1
-BUILDLINK_PKGSRCDIR.abiword?= ../../wip/abiword
-
-# XXX
-# XXX Uncomment and keep only the buildlink3 lines below which are directly
-# XXX needed for dependencies to compile, link, and run. If this package
-# XXX provides a wrappered API or otherwise does not expose the APIs of the
-# XXX buildlink3 lines below to dependencies, remove them.
-# XXX
-#.include "../../converters/fribidi/buildlink3.mk"
-#.include "../../converters/wv/buildlink3.mk"
-#.include "../../devel/boost-headers/buildlink3.mk"
-#.include "../../devel/glib2/buildlink3.mk"
-#.include "../../graphics/librsvg/buildlink3.mk"
-#.include "../../graphics/png/buildlink3.mk"
-#.include "../../textproc/enchant/buildlink3.mk"
-#.include "../../textproc/libxslt/buildlink3.mk"
-#.include "../../time/libical/buildlink3.mk"
-.endif # ABIWORD_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -abiword
diff --git a/abiword/distinfo b/abiword/distinfo
deleted file mode 100644
index ec2cea6..0000000
--- a/abiword/distinfo
+++ /dev/null
@@ -1,79 +0,0 @@
-$NetBSD: distinfo,v 1.15 2015/08/27 16:22:27 thomasklausner Exp $
-
-SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
-RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
-Size (abiword-3.0.1.tar.gz) = 11144990 bytes
-SHA1 (patch-configure.ac) = bbffa133509affe43fdef7e420e3a96a14edf58f
-SHA1 (patch-plugin-configure.m4) = a8b8db3bdbd69339e32eefec1de7b1b59467db40
-SHA1 (patch-plugins_aiksaurus_Makefile.am) = e859a0af2b436616b1dae45f3be8593cf917c87d
-SHA1 (patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am) = 2790a45fa4590f8f5ac27ec6e1b0e9eacc5c7c6e
-SHA1 (patch-plugins_applix_Makefile.am) = d579e6620189bcdd5cb9286edb77936893d66727
-SHA1 (patch-plugins_babelfish_Makefile.am) = 9a14d52b882824a344e4189b210ea05f15cd5dc4
-SHA1 (patch-plugins_bmp_Makefile.am) = 9919326323259fdb717f1cc1b63be7b5fecb4d85
-SHA1 (patch-plugins_clarisworks_Makefile.am) = 20b149e4ccba72e54421e59f62cee8823737af5d
-SHA1 (patch-plugins_collab_Makefile.am) = 268b976c687e300326f1af9933cea7c060ecef90
-SHA1 (patch-plugins_command_Makefile.am) = 42bf4af0905f83faf21ceabfbf20756c39d9d268
-SHA1 (patch-plugins_docbook_Makefile.am) = 73ef7476c0eae93a79ffd1571081b545a7cf5f0b
-SHA1 (patch-plugins_eml_Makefile.am) = 23bccc8e3aa62275f441635675a2a34f53c5d118
-SHA1 (patch-plugins_epub_Makefile.am) = 0d4f2bca4e2a40d3f0c34f1c5b37284190979d48
-SHA1 (patch-plugins_freetranslation_Makefile.am) = f494b16bdd2d8cb484bec09a61c6e3e0d8f78b44
-SHA1 (patch-plugins_garble_Makefile.am) = b6c3f68a390c0b4a4e5e5d626a7532f4542b5e9f
-SHA1 (patch-plugins_gda_Makefile.am) = 73a112eb3118c6769bef00c5f4c3ad50a735b54a
-SHA1 (patch-plugins_gdict_Makefile.am) = 16e6fc9134bf96e8b924c8ef5f6f57988531684b
-SHA1 (patch-plugins_gimp_Makefile.am) = 0c284afb8e168dff87da0d4ae70936c8759b8cb5
-SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
-SHA1 (patch-plugins_goffice_Makefile.am) = 935af789858b3fbf3b928837acca024a1415bf86
-SHA1 (patch-plugins_google_Makefile.am) = ae883071f847b641ded349e5cb2ac3c126942d8d
-SHA1 (patch-plugins_grammar_Makefile.am) = 0c651d09ae690a22ce70f93fd091ceabb18a44d0
-SHA1 (patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp) = f3916dbc0b208bfe9dbb55eac850a3094683694c
-SHA1 (patch-plugins_hancom_Makefile.am) = 93e6b69160438a254a6c68b81a6385456d328999
-SHA1 (patch-plugins_hrtext_Makefile.am) = 439ecd0ac09b147c5a789bfb498e5da866d0cb59
-SHA1 (patch-plugins_iscii_Makefile.am) = ff740a1d6e308658d18c0102a67fa8c3f32cf95b
-SHA1 (patch-plugins_kword_Makefile.am) = bac30878f5eb8a3d7d037f13bdef81308c5a3e17
-SHA1 (patch-plugins_latex_Makefile.am) = 196edb99bcbc3040ec665bf422472558684c5fe5
-SHA1 (patch-plugins_loadbindings_Makefile.am) = e689adf52c0786f648435e259da3410a98036887
-SHA1 (patch-plugins_mathview_Makefile.am) = 8a779c043b3b9b483ec072e2780240e1ec6f575a
-SHA1 (patch-plugins_mathview_xp_AbiMathView.cpp) = 9029ba37ccd80c18b62a8135c13bbf19e9c861e1
-SHA1 (patch-plugins_mathview_xp_Makefile.am) = bf734c44422d863721b03582c6ff4667046ec07e
-SHA1 (patch-plugins_mht_Makefile.am) = a302d8af3cbcaa246b1d61cf90adb2276a95d502
-SHA1 (patch-plugins_mht_xp_ie__imp__MHT.cpp) = d1e037678651cccf85a4d4c8fe42ada3f93e7fc7
-SHA1 (patch-plugins_mif_Makefile.am) = 9dbd23cee5d1f5d56058eb95cf3f247766972110
-SHA1 (patch-plugins_mswrite_Makefile.am) = bd0d7546d07500ce74828e0414ee14278c49a396
-SHA1 (patch-plugins_opendocument_Makefile.am) = db01004db8480509f9c6060f82b7095bfe0b4715
-SHA1 (patch-plugins_openwriter_Makefile.am) = 40fc8135faa71918f02420ba5d527f74bc4e7999
-SHA1 (patch-plugins_openxml_Makefile.am) = 1eb9cf1df2fdd9e707e26412089b08f45ae59581
-SHA1 (patch-plugins_opml_Makefile.am) = 94fe9afb9d8145f36d50abec8c956cc295a6ff4d
-SHA1 (patch-plugins_ots_Makefile.am) = a674a0b2a222ba8d2acc8de002bf6d618c206573
-SHA1 (patch-plugins_paint_Makefile.am) = bbae6fdc2cfa162ccd2dd87178759997c6e7b71b
-SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
-SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
-SHA1 (patch-plugins_passepartout_Makefile.am) = c048ef9cdfab149394a6ecb02f7d5faf027c89ed
-SHA1 (patch-plugins_pdb_Makefile.am) = a01b5ed0ee10d3f72cf6fa2d20b96628844c8217
-SHA1 (patch-plugins_pdf_Makefile.am) = 68fd361019ab4f2a3bd9bc0ea9e5b2d697e13e45
-SHA1 (patch-plugins_presentation_Makefile.am) = 463c2bd628d4cdad9cee89ae1c10c56b0343366d
-SHA1 (patch-plugins_psion_Makefile.am) = 1f8836ea23aa38ad6716461fa4f0c6db1ec6eba0
-SHA1 (patch-plugins_rsvg_Makefile.am) = f844ee15921547e769da8dd5acfb64b57958b33f
-SHA1 (patch-plugins_s5_Makefile.am) = 4cf5ee72bd6878c5e3801141023c1e0ec5ec9002
-SHA1 (patch-plugins_sdw_Makefile.am) = b9a756c639225e7d57543f83d6db6e93be3d411e
-SHA1 (patch-plugins_t602_Makefile.am) = a4714fcefe149b874832683688a7537dcb04ae9f
-SHA1 (patch-plugins_urldict_Makefile.am) = 7cfb2775dd67cce045e31a01b79e4cb04887f7d5
-SHA1 (patch-plugins_wikipedia_Makefile.am) = 57e65f04b202f475c586d399a8c128f51d594630
-SHA1 (patch-plugins_wmf_Makefile.am) = 00bf982683d1d6c122b62a1df1bc241f6e276c4d
-SHA1 (patch-plugins_wml_Makefile.am) = 6c05337b5619864dde5a2100e1859684333fed47
-SHA1 (patch-plugins_wordperfect_Makefile.am) = d08d7d21ed8106bcbe77cc42ffca13d7ad18d3ac
-SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = e5cba76cfdba5caca672b801fa222b277a7522c1
-SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = 10a6d88e21f98e743b4443a09cd73ab8b7812fc9
-SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 6e1e264506edabf0e1cb359f664ed455d16fa05e
-SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = c87bc227eebcfcc2ab11ee6b5237ef8fcc47c0bc
-SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = 0a75276dc0d1d99b97155f61d9f98de7126fb0a3
-SHA1 (patch-plugins_wpg_Makefile.am) = a96fafec05866fb7c3480c8d2a041b970ad8e988
-SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e
-SHA1 (patch-plugins_xslfo_Makefile.am) = cceef8d780dc63c1253544f21bd123dac19eba0b
-SHA1 (patch-src_Makefile.am) = b2b898470b842e5bfa45e2b3b653ca9b51714b73
-SHA1 (patch-src_af_util_xp_ut__endian.h) = e73aef0db6ddef0316cca3f7a77fd4c71c870637
-SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4
-SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
-SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d
-SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
-SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = d07eaf64446efc83c24e02e5969e0921451269a8
-SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.h) = 59837727c060bc8f8f14478c3a0245b877c2d29a
diff --git a/abiword/options.mk b/abiword/options.mk
deleted file mode 100644
index 5db87bc..0000000
--- a/abiword/options.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2015/06/11 16:26:40 nros Exp $
-#
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.abiword
-PKG_OPTIONS_REQUIRED_GROUPS= gtk
-PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
-PKG_SUPPORTED_OPTIONS= debug
-PKG_SUGGESTED_OPTIONS= gtk3
-.include "../../mk/bsd.options.mk"
-
-#
-# Enable debugging funcionality
-# more verbose terminal output
-#
-.if !empty(PKG_OPTIONS:Mdebug)
-CC+= -ggdb
-CXX+= -ggdb
-CONFIGURE_ARGS+= --enable-debug
-INSTALL_UNSTRIPPED= yes
-CFLAGS+= -O0
-.endif
-
-#
-# Use GTK+ version 2
-#
-.if !empty(PKG_OPTIONS:Mgtk2)
-CONFIGURE_ARGS+= --with-gtk2
-.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
-
-#
-# Use GTK+ version 3
-#
-.if !empty(PKG_OPTIONS:Mgtk3)
-.include "../../x11/gtk3/buildlink3.mk"
-.endif
diff --git a/abiword/patches/patch-configure.ac b/abiword/patches/patch-configure.ac
deleted file mode 100644
index bdf12d6..0000000
--- a/abiword/patches/patch-configure.ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/06/11 16:26:40 nros Exp $
-Use the installed libabiword instead of the one in the build directory
-This is needed for the plugins so the can build as a separate package
---- configure.ac.orig 2015-06-06 23:11:58.000000000 +0000
-+++ configure.ac
-@@ -893,7 +893,7 @@ if test "$TOOLKIT" = "gtk" &&
- test "$enable_shared" = "yes"; then
- # link plugins to work around gcc visibility issue with
- # derived classes in dlopened modules
-- PLUGIN_LIBS='${top_builddir}/src/libabiword-'"$ABIWORD_SERIES"'.la'" $PLUGIN_LIBS"
-+ PLUGIN_LIBS='${prefix}/lib/libabiword-'"$ABIWORD_SERIES"'.la'" $PLUGIN_LIBS"
- elif test "$TOOLKIT" = "win"; then
- PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'-D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0500'
- PLUGIN_LIBS='${top_builddir}/src/libabiword-'"$ABIWORD_SERIES"'.la'" $PLUGIN_LIBS"
diff --git a/abiword/patches/patch-plugin-configure.m4 b/abiword/patches/patch-plugin-configure.m4
deleted file mode 100644
index c0da04b..0000000
--- a/abiword/patches/patch-plugin-configure.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-plugin-configure.m4,v 1.1 2014/12/28 15:57:09 nros Exp $
-* adapt wordperfect plugins to dependecies available in pkgsrc
- from abiword svn date 2014-12-27
---- plugin-configure.m4.orig 2014-12-23 05:13:14.000000000 +0000
-+++ plugin-configure.m4
-@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS])
- AC_SUBST([BMP_LIBS])
-
-
--wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
-+wpg_pkgs="libwpg-0.3 $gsf_req"
- wpg_deps="no"
-
- if test "$enable_wpg" != ""; then
-@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS])
- AC_SUBST([AIKSAURUS_LIBS])
-
-
--wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
--wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
-+wordperfect_pkgs="libwpd-0.10 $gsf_req"
-+wordperfect_wps_pkgs='libwps-0.3'
- wordperfect_deps="no"
-
- WORDPERFECT_CFLAGS=
diff --git a/abiword/patches/patch-plugins_aiksaurus_Makefile.am b/abiword/patches/patch-plugins_aiksaurus_Makefile.am
deleted file mode 100644
index b5d706d..0000000
--- a/abiword/patches/patch-plugins_aiksaurus_Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-plugins_aiksaurus_Makefile.am,v 1.3 2015/01/26 09:44:42 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
-Use CXX for linking.
---- plugins/aiksaurus/Makefile.am.orig 2014-03-21 23:51:31.000000000 +0000
-+++ plugins/aiksaurus/Makefile.am
-@@ -28,7 +28,8 @@ aiksaurus_la_LIBADD = \
- aiksaurus_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- aiksaurus_la_SOURCES =
-+nodist_EXTRA_aiksaurus_la_SOURCES = dummy.cpp
-
diff --git a/abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am b/abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am
deleted file mode 100644
index 269cbeb..0000000
--- a/abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/aiksaurus/aiksaurusgtk3/Makefile.am.orig 2014-03-08 02:55:42.000000000 +0000
-+++ plugins/aiksaurus/aiksaurusgtk3/Makefile.am
-@@ -2,7 +2,7 @@ AM_CXXFLAGS = $(AIKSAURUS_CFLAGS) -Wall
-
- lib_LTLIBRARIES = libAiksaurusGtk3.la
-
--libAiksaurusGtk3_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -export-dynamic
-+libAiksaurusGtk3_la_LDFLAGS = -Wl,-no-undefined -release $(LT_RELEASE) -export-dynamic
-
- libAiksaurusGtk3_la_LIBADD = $(AIKSAURUS_LIBS)
-
diff --git a/abiword/patches/patch-plugins_applix_Makefile.am b/abiword/patches/patch-plugins_applix_Makefile.am
deleted file mode 100644
index 754fc08..0000000
--- a/abiword/patches/patch-plugins_applix_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_applix_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/applix/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/applix/Makefile.am
-@@ -18,7 +18,7 @@ applix_la_LIBADD = \
- applix_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- applix_la_SOURCES =
-
diff --git a/abiword/patches/patch-plugins_babelfish_Makefile.am b/abiword/patches/patch-plugins_babelfish_Makefile.am
deleted file mode 100644
index f0b0bef..0000000
--- a/abiword/patches/patch-plugins_babelfish_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_babelfish_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/babelfish/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/babelfish/Makefile.am
-@@ -18,7 +18,7 @@ babelfish_la_LIBADD = \
- babelfish_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- babelfish_la_SOURCES =
-
diff --git a/abiword/patches/patch-plugins_bmp_Makefile.am b/abiword/patches/patch-plugins_bmp_Makefile.am
deleted file mode 100644
index 2cf6a00..0000000
--- a/abiword/patches/patch-plugins_bmp_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_bmp_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/bmp/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/bmp/Makefile.am
-@@ -18,7 +18,7 @@ bmp_la_LIBADD = \
- bmp_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- bmp_la_SOURCES =
- nodist_EXTRA_bmp_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_clarisworks_Makefile.am b/abiword/patches/patch-plugins_clarisworks_Makefile.am
deleted file mode 100644
index 630daf8..0000000
--- a/abiword/patches/patch-plugins_clarisworks_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_clarisworks_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/clarisworks/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/clarisworks/Makefile.am
-@@ -18,7 +18,7 @@ clarisworks_la_LIBADD = \
- clarisworks_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- clarisworks_la_SOURCES =
-
diff --git a/abiword/patches/patch-plugins_collab_Makefile.am b/abiword/patches/patch-plugins_collab_Makefile.am
deleted file mode 100644
index 3be0226..0000000
--- a/abiword/patches/patch-plugins_collab_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_collab_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/collab/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/collab/Makefile.am
-@@ -22,7 +22,7 @@ collab_la_LIBADD = \
- collab_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- collab_la_SOURCES =
- nodist_EXTRA_collab_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_command_Makefile.am b/abiword/patches/patch-plugins_command_Makefile.am
deleted file mode 100644
index 589c912..0000000
--- a/abiword/patches/patch-plugins_command_Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-plugins_command_Makefile.am,v 1.3 2015/01/26 09:44:42 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
-Use CXX for linking.
---- plugins/command/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/command/Makefile.am
-@@ -13,8 +13,9 @@ command_la_LIBADD = \
- command_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- command_la_SOURCES =
-+nodist_EXTRA_command_la_SOURCES = dummy.cpp
-
- endif
diff --git a/abiword/patches/patch-plugins_docbook_Makefile.am b/abiword/patches/patch-plugins_docbook_Makefile.am
deleted file mode 100644
index 126420d..0000000
--- a/abiword/patches/patch-plugins_docbook_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_docbook_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/docbook/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/docbook/Makefile.am
-@@ -18,7 +18,7 @@ docbook_la_LIBADD = \
- docbook_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
- if TOOLKIT_COCOA
- docbook_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/abiword/patches/patch-plugins_eml_Makefile.am b/abiword/patches/patch-plugins_eml_Makefile.am
deleted file mode 100644
index d207729..0000000
--- a/abiword/patches/patch-plugins_eml_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_eml_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/eml/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/eml/Makefile.am
-@@ -18,7 +18,7 @@ eml_la_LIBADD = \
- eml_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- eml_la_SOURCES =
- nodist_EXTRA_eml_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_epub_Makefile.am b/abiword/patches/patch-plugins_epub_Makefile.am
deleted file mode 100644
index c91cacc..0000000
--- a/abiword/patches/patch-plugins_epub_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_epub_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/epub/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/epub/Makefile.am
-@@ -28,7 +28,7 @@ epub_la_LIBADD += $(EPUB_LIBS)
- epub_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
- if TOOLKIT_COCOA
- epub_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/abiword/patches/patch-plugins_freetranslation_Makefile.am b/abiword/patches/patch-plugins_freetranslation_Makefile.am
deleted file mode 100644
index 401f7af..0000000
--- a/abiword/patches/patch-plugins_freetranslation_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_freetranslation_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/freetranslation/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/freetranslation/Makefile.am
-@@ -18,7 +18,7 @@ freetranslation_la_LIBADD = \
- freetranslation_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- freetranslation_la_SOURCES =
-
diff --git a/abiword/patches/patch-plugins_garble_Makefile.am b/abiword/patches/patch-plugins_garble_Makefile.am
deleted file mode 100644
index e47c584..0000000
--- a/abiword/patches/patch-plugins_garble_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_garble_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/garble/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/garble/Makefile.am
-@@ -13,7 +13,7 @@ garble_la_LIBADD = \
- garble_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- garble_la_SOURCES =
- nodist_EXTRA_garble_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_gda_Makefile.am b/abiword/patches/patch-plugins_gda_Makefile.am
deleted file mode 100644
index 1d480dc..0000000
--- a/abiword/patches/patch-plugins_gda_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_gda_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/gda/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/gda/Makefile.am
-@@ -11,7 +11,7 @@ gda_la_LIBADD = \
- gda_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- gda_la_SOURCES =
-
diff --git a/abiword/patches/patch-plugins_gdict_Makefile.am b/abiword/patches/patch-plugins_gdict_Makefile.am
deleted file mode 100644
index 5735b03..0000000
--- a/abiword/patches/patch-plugins_gdict_Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-plugins_gdict_Makefile.am,v 1.3 2015/01/26 09:44:42 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
-Use CXX for linking.
---- plugins/gdict/Makefile.am.orig 2011-12-11 05:10:10.000000000 +0000
-+++ plugins/gdict/Makefile.am
-@@ -18,9 +18,10 @@ gdict_la_LIBADD = \
- gdict_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- gdict_la_SOURCES =
-+nodist_EXTRA_gdict_la_SOURCES = dummy.cpp
-
- EXTRA_DIST = \
- plugin.m4
diff --git a/abiword/patches/patch-plugins_gimp_Makefile.am b/abiword/patches/patch-plugins_gimp_Makefile.am
deleted file mode 100644
index 55cc7f7..0000000
--- a/abiword/patches/patch-plugins_gimp_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_gimp_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/gimp/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/gimp/Makefile.am
-@@ -18,7 +18,7 @@ gimp_la_LIBADD = \
- gimp_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- gimp_la_SOURCES =
- nodist_EXTRA_gimp_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp b/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp
deleted file mode 100644
index 65c11f0..0000000
--- a/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-plugins_gimp_xp_AbiGimp.cpp,v 1.2 2015/02/26 14:24:09 nros Exp $
-* Fix seg fault.
---- plugins/gimp/xp/AbiGimp.cpp.orig 2013-12-23 02:37:58.000000000 +0000
-+++ plugins/gimp/xp/AbiGimp.cpp
-@@ -249,6 +249,10 @@ AbiGimp_invoke(AV_View* /*v*/, EV_EditMe
- {
- // Get the current view that the user is in.
- XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame();
-+ if (pFrame == NULL) {
-+ UT_DEBUGMSG(("Gimp plugin: getLastFocussedFrame() returned NULL\n"));
-+ return false;
-+ }
- FV_View* pView = static_cast<FV_View*>(pFrame->getCurrentView());
-
- //
diff --git a/abiword/patches/patch-plugins_goffice_Makefile.am b/abiword/patches/patch-plugins_goffice_Makefile.am
deleted file mode 100644
index d578dea..0000000
--- a/abiword/patches/patch-plugins_goffice_Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-plugins_goffice_Makefile.am,v 1.4 2015/04/04 22:46:03 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
-Use CXX for linking.
---- plugins/goffice/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/goffice/Makefile.am
-@@ -1,4 +1,5 @@
-
-+
- SUBDIRS = unix
-
- plugindir = $(ABIWORD_PLUGINSDIR)
-@@ -11,9 +12,10 @@ goffice_la_LIBADD = \
- goffice_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- goffice_la_SOURCES =
-+nodist_EXTRA_goffice_la_SOURCES = dummy.cpp
-
- EXTRA_DIST = \
- plugin.m4
diff --git a/abiword/patches/patch-plugins_google_Makefile.am b/abiword/patches/patch-plugins_google_Makefile.am
deleted file mode 100644
index 3b1bccc..0000000
--- a/abiword/patches/patch-plugins_google_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_google_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/google/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/google/Makefile.am
-@@ -18,7 +18,7 @@ google_la_LIBADD = \
- google_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- google_la_SOURCES =
- nodist_EXTRA_google_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_grammar_Makefile.am b/abiword/patches/patch-plugins_grammar_Makefile.am
deleted file mode 100644
index 404038d..0000000
--- a/abiword/patches/patch-plugins_grammar_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_grammar_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/grammar/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/grammar/Makefile.am
-@@ -12,7 +12,7 @@ grammar_la_LIBADD = \
- grammar_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- nodist_EXTRA_grammar_la_SOURCES = dummy.cpp
- grammar_la_SOURCES =
diff --git a/abiword/patches/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp b/abiword/patches/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp
deleted file mode 100644
index 5a5dbdb..0000000
--- a/abiword/patches/patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-$NetBSD: patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp,v 1.1 2015/08/27 16:22:27 thomasklausner Exp $
-
-First chunk:
-Remove obsolete function call, see
-http://bugzilla.abisource.com/show_bug.cgi?id=13726
-
-Other chunks:
-Fix build with link-grammar-5.2.5.
-http://www.abisource.com/viewvc/abiword/trunk/plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp?r1=32836&r2=34627
-
---- plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/grammar/linkgrammarwrap/LinkGrammarWrap.cpp
-@@ -87,7 +87,7 @@ bool LinkGrammarWrap::parseSentence(Piec
- parse_options_set_min_null_count(m_Opts, 0);
- parse_options_set_max_null_count(m_Opts, 0);
- parse_options_set_islands_ok(m_Opts, 0);
-- parse_options_set_panic_mode(m_Opts, TRUE);
-+ //parse_options_set_panic_mode(m_Opts, TRUE);
- parse_options_reset_resources(m_Opts);
- UT_sint32 num_linkages = sentence_parse(sent, m_Opts);
- bool res = (num_linkages >= 1);
-@@ -145,59 +145,57 @@ bool LinkGrammarWrap::parseSentence(Piec
- }
- AbiGrammarError * pWordMap = new AbiGrammarError();
- pWordMap->m_iErrLow = iLow;
-- pWordMap->m_iErrHigh = iLow + strlen(sentence_get_nth_word(sent, i));
-+ pWordMap->m_iErrHigh = iLow + strlen(linkage_get_word(linkage, i));
- pWordMap->m_iWordNum = i;
- vecMapOfWords.addItem(pWordMap);
- bool bNew = false;
-- if(!sentence_nth_word_has_disjunction(sent, i))
-+
-+ //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string));
-+ if(pErr == NULL)
-+ {
-+ pErr = new AbiGrammarError();
-+ bNew = true;
-+ }
-+ if(bNew || (pErr->m_iWordNum + 1 < i))
- {
-- //UT_DEBUGMSG(("|%s| NULL LINK\n",sent->word[i].string));
-- if(pErr == NULL)
-+ if(!bNew)
- {
-- pErr = new AbiGrammarError();
-- bNew = true;
-+ if(pErr)
-+ {
-+ delete pErr;
-+ }
-+ pErr = new AbiGrammarError();
- }
-- if(bNew || (pErr->m_iWordNum + 1 < i))
-+ iHigh = iLow + strlen(linkage_get_word(linkage, i));
-+ pErr->m_iErrLow = iLow + iOff -1;
-+ pErr->m_iErrHigh = iHigh + iOff -1;
-+ if(pErr->m_iErrLow < 0)
-+ {
-+ pErr->m_iErrLow = 0;
-+ }
-+ if(pErr->m_iErrHigh < totlen-1)
- {
-- if(!bNew)
-- {
-- if(pErr)
-- {
-- delete pErr;
-- }
-- pErr = new AbiGrammarError();
-- }
-- iHigh = iLow + strlen(sentence_get_nth_word(sent, i));
-- pErr->m_iErrLow = iLow + iOff -1;
-- pErr->m_iErrHigh = iHigh + iOff -1;
-- if(pErr->m_iErrLow < 0)
-- {
-- pErr->m_iErrLow = 0;
-- }
-- if(pErr->m_iErrHigh < totlen-1)
-- {
- pErr->m_iErrHigh += 1;
-- }
-- pErr->m_iWordNum = i;
-- // UT_DEBUGMSG(("Add Error %x low %d High %d\n",pErr,pErr->m_iErrLow,pErr->m_iErrHigh));
-- pT->m_vecGrammarErrors.addItem(pErr);
-- pErr = NULL;
- }
-- else
-+ pErr->m_iWordNum = i;
-+ // UT_DEBUGMSG(("Add Error %x low %d High %d\n",pErr,pErr->m_iErrLow,pErr->m_iErrHigh));
-+ pT->m_vecGrammarErrors.addItem(pErr);
-+ pErr = NULL;
-+ }
-+ else
-+ {
-+ //
-+ // Expand the sqiggle
-+ //
-+ iHigh = iLow + strlen(linkage_get_word(linkage, i)) + iOff;
-+ pErr->m_iErrHigh = iHigh;
-+ if(pErr->m_iErrHigh < totlen-1)
- {
-- //
-- // Expand the sqiggle
-- //
-- iHigh = iLow + strlen(sentence_get_nth_word(sent, i)) + iOff;
-- pErr->m_iErrHigh = iHigh;
-- if(pErr->m_iErrHigh < totlen-1)
-- {
- pErr->m_iErrHigh += 1;
-- }
-- pErr->m_iWordNum = i;
- }
-+ pErr->m_iWordNum = i;
- }
-- iLow += strlen(sentence_get_nth_word(sent, i));
-+ iLow += strlen(linkage_get_word(linkage, i));
- }
- //
- // No NULL links but still an error , mark the whole sentence bad.
-@@ -229,30 +227,6 @@ bool LinkGrammarWrap::parseSentence(Piec
- // }
- UT_UTF8String sErr = linkage_get_violation_name(linkage);
- // UT_DEBUGMSG(("Top Level error message |%s|\n",sErr.utf8_str()));
-- UT_sint32 count = linkage_get_num_sublinkages(linkage);
-- //
-- // Find linkages with violations
-- //
-- for(i=0; i<count;i++)
-- {
-- UT_sint32 iok = linkage_set_current_sublinkage(linkage, i);
-- if(iok == 0)
-- continue;
-- UT_sint32 j = 0;
-- UT_sint32 iNum = linkage_get_num_links(linkage);
-- for(j=0;j< iNum;j++)
-- // char * szViolation = linkage_get_violation_name(linkage);
-- //if(szViolation != NULL)
-- {
-- // debug disabled
-- //UT_sint32 iLword = linkage_get_link_lword(linkage,j);
-- //const char * szLword = linkage_get_word(linkage,iLword);
-- //UT_sint32 iRword = linkage_get_link_rword(linkage,j);
-- //const char * szRword = linkage_get_word(linkage,iRword);
-- //UT_DEBUGMSG(("Link %d |%s| and |%s|\n",i,szLword,szRword));
-- //UT_DEBUGMSG(("Left Word num %d Right Word num %d\n",iLword,iRword));
-- }
-- }
- linkage_delete(linkage);
- for(i=0; i< vecMapOfWords.getItemCount(); i++)
- {
diff --git a/abiword/patches/patch-plugins_hancom_Makefile.am b/abiword/patches/patch-plugins_hancom_Makefile.am
deleted file mode 100644
index a477c58..0000000
--- a/abiword/patches/patch-plugins_hancom_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_hancom_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/hancom/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/hancom/Makefile.am
-@@ -18,7 +18,7 @@ hancom_la_LIBADD = \
- hancom_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- hancom_la_SOURCES =
- nodist_EXTRA_hancom_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_hrtext_Makefile.am b/abiword/patches/patch-plugins_hrtext_Makefile.am
deleted file mode 100644
index b80a462..0000000
--- a/abiword/patches/patch-plugins_hrtext_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_hrtext_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/hrtext/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/hrtext/Makefile.am
-@@ -18,7 +18,7 @@ hrtext_la_LIBADD = \
- hrtext_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- hrtext_la_SOURCES =
- nodist_EXTRA_hrtext_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_iscii_Makefile.am b/abiword/patches/patch-plugins_iscii_Makefile.am
deleted file mode 100644
index bbec7dd..0000000
--- a/abiword/patches/patch-plugins_iscii_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_iscii_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/iscii/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/iscii/Makefile.am
-@@ -18,7 +18,7 @@ iscii_la_LIBADD = \
- iscii_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- iscii_la_SOURCES =
- nodist_EXTRA_iscii_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_kword_Makefile.am b/abiword/patches/patch-plugins_kword_Makefile.am
deleted file mode 100644
index ef94928..0000000
--- a/abiword/patches/patch-plugins_kword_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_kword_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/kword/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/kword/Makefile.am
-@@ -18,7 +18,7 @@ kword_la_LIBADD = \
- kword_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- kword_la_SOURCES =
- nodist_EXTRA_kword_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_latex_Makefile.am b/abiword/patches/patch-plugins_latex_Makefile.am
deleted file mode 100644
index a450b5c..0000000
--- a/abiword/patches/patch-plugins_latex_Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-plugins_latex_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/latex/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/latex/Makefile.am
-@@ -1,4 +1,5 @@
-
-+
- if HAVE_LIBXSLT
- SUBDIRS = xp xsltml
- else
-@@ -22,7 +23,7 @@ latex_la_LIBADD = \
- latex_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
- if TOOLKIT_COCOA
- latex_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/abiword/patches/patch-plugins_loadbindings_Makefile.am b/abiword/patches/patch-plugins_loadbindings_Makefile.am
deleted file mode 100644
index fed900a..0000000
--- a/abiword/patches/patch-plugins_loadbindings_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_loadbindings_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/loadbindings/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/loadbindings/Makefile.am
-@@ -18,7 +18,7 @@ loadbindings_la_LIBADD = \
- loadbindings_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- loadbindings_la_SOURCES =
- nodist_EXTRA_loadbindings_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_mathview_Makefile.am b/abiword/patches/patch-plugins_mathview_Makefile.am
deleted file mode 100644
index 1f14a83..0000000
--- a/abiword/patches/patch-plugins_mathview_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mathview_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/mathview/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/mathview/Makefile.am
-@@ -12,7 +12,7 @@ mathview_la_LIBADD = \
- mathview_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- nodist_EXTRA_mathview_la_SOURCES = dummy.cpp
- mathview_la_SOURCES =
diff --git a/abiword/patches/patch-plugins_mathview_xp_AbiMathView.cpp b/abiword/patches/patch-plugins_mathview_xp_AbiMathView.cpp
deleted file mode 100644
index 053380b..0000000
--- a/abiword/patches/patch-plugins_mathview_xp_AbiMathView.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-plugins_mathview_xp_AbiMathView.cpp,v 1.1 2015/01/23 14:30:11 nros Exp $
-* read config files installed by gtkmathview
---- plugins/mathview/xp/AbiMathView.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/mathview/xp/AbiMathView.cpp
-@@ -591,6 +591,19 @@ void GR_MathManager::initialize(void)
- libCombiningDictDir += "/math/dictionary-combining.xml";
- libLocalDictDir += "/math/dictionary-local.xml";
- #endif
-+ // ... or from gtkmathview it self
-+
-+ UT_UTF8String gmvConfDir(SYSCONFDIR);
-+ UT_UTF8String gmvDictDir(DATADIR);
-+ UT_UTF8String gmvCombiningDictDir(DATADIR);
-+ UT_UTF8String gmvLocalDictDir(DATADIR);
-+
-+ gmvConfDir += "/gtkmathview/gtkmathview.conf.xml";
-+ gmvDictDir += "/gtkmathview/dictionary.xml";
-+ gmvCombiningDictDir += "/gtkmathview/dictionary-combining.xml";
-+ gmvLocalDictDir += "/gtkmathview/dictionary-local.xml";
-+
-+
-
- // add the configuration paths
-
-@@ -602,6 +615,7 @@ void GR_MathManager::initialize(void)
- Configuration::addConfigurationPath(bundleConfDir.utf8_str());
- }
- #endif
-+ Configuration::addConfigurationPath( gmvConfDir.utf8_str() );
- Configuration::addConfigurationPath( libConfDir.utf8_str() );
- Configuration::addConfigurationPath( userConfDir.utf8_str() );
-
-@@ -628,6 +642,10 @@ void GR_MathManager::initialize(void)
- configuration->add("dictionary/path", bundleLocalDictDir.utf8_str());
- }
- #endif
-+ configuration->add("dictionary/path", gmvDictDir.utf8_str());
-+ configuration->add("dictionary/path", gmvCombiningDictDir.utf8_str());
-+ configuration->add("dictionary/path", gmvLocalDictDir.utf8_str());
-+
- configuration->add("dictionary/path", libDictDir.utf8_str());
- configuration->add("dictionary/path", libCombiningDictDir.utf8_str());
- configuration->add("dictionary/path", libLocalDictDir.utf8_str());
diff --git a/abiword/patches/patch-plugins_mathview_xp_Makefile.am b/abiword/patches/patch-plugins_mathview_xp_Makefile.am
deleted file mode 100644
index f4b1f84..0000000
--- a/abiword/patches/patch-plugins_mathview_xp_Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-plugins_mathview_xp_Makefile.am,v 1.1 2015/01/23 14:30:11 nros Exp $
-* make sure AbiMathview.cpp can find sysconfdir and datarootdir
---- plugins/mathview/xp/Makefile.am.orig 2011-12-28 03:11:08.000000000 +0000
-+++ plugins/mathview/xp/Makefile.am
-@@ -5,7 +5,10 @@ AM_CPPFLAGS = \
- $(MATHVIEW_CFLAGS) \
- -Wno-deprecated \
- -I$(srcdir)/../itex2mml \
-- -DABI_BUILD_VERSION=\"$(VERSION)\"
-+ -DABI_BUILD_VERSION=\"$(VERSION)\" \
-+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
-+ -DDATADIR=\""$(datarootdir)"\"
-+
-
- libxp_la_SOURCES = \
- mathview_proxy.h \
diff --git a/abiword/patches/patch-plugins_mht_Makefile.am b/abiword/patches/patch-plugins_mht_Makefile.am
deleted file mode 100644
index 6837dd7..0000000
--- a/abiword/patches/patch-plugins_mht_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mht_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/mht/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/mht/Makefile.am
-@@ -11,7 +11,7 @@ mht_la_LIBADD = \
- mht_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- mht_la_SOURCES =
- nodist_EXTRA_mht_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_mht_xp_ie__imp__MHT.cpp b/abiword/patches/patch-plugins_mht_xp_ie__imp__MHT.cpp
deleted file mode 100644
index dac278d..0000000
--- a/abiword/patches/patch-plugins_mht_xp_ie__imp__MHT.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-plugins_mht_xp_ie__imp__MHT.cpp,v 1.1 2014/12/29 20:31:15 nros Exp $
-* constructImporters first argument is &var so pBB must dereferenced
-* Refer to the importFile method that takes const char *.
---- plugins/mht/xp/ie_imp_MHT.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/mht/xp/ie_imp_MHT.cpp
-@@ -292,7 +292,7 @@ FG_Graphic * IE_Imp_MHT::importImage (co
- }
-
- IE_ImpGraphic * pieg = 0;
-- if (IE_ImpGraphic::constructImporter (pBB, IEGFT_Unknown, &pieg) != UT_OK)
-+ if (IE_ImpGraphic::constructImporter (*pBB, IEGFT_Unknown, &pieg) != UT_OK)
- {
- UT_DEBUGMSG(("unable to construct image importer!\n"));
- return 0;
-@@ -323,7 +323,7 @@ UT_Error IE_Imp_MHT::importXHTML (const
-
- setReader (&wrapper);
-
-- return IE_Imp_XHTML::importFile (szFilename);
-+ return IE_Imp_MHT::importFile (szFilename);
- }
-
- UT_Error IE_Imp_MHT::importHTML4 (const char * szFilename)
-@@ -337,7 +337,7 @@ UT_Error IE_Imp_MHT::importHTML4 (const
- TidyReader wrapper(buffer,length);
- setReader (&wrapper);
-
-- e = IE_Imp_XHTML::importFile (szFilename);
-+ e = IE_Imp_MHT::importFile (szFilename);
-
- setReader (0);
- #endif
-@@ -351,7 +351,7 @@ UT_Error IE_Imp_MHT::importHTML4 (const
- UT_HTML parser;
- setParser (&parser);
-
-- e = IE_Imp_XHTML::importFile (szFilename);
-+ e = IE_Imp_MHT::importFile (szFilename);
-
- setParser (0);
- setReader (0);
diff --git a/abiword/patches/patch-plugins_mif_Makefile.am b/abiword/patches/patch-plugins_mif_Makefile.am
deleted file mode 100644
index eb5b753..0000000
--- a/abiword/patches/patch-plugins_mif_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mif_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/mif/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/mif/Makefile.am
-@@ -18,7 +18,7 @@ mif_la_LIBADD = \
- mif_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- mif_la_SOURCES =
- nodist_EXTRA_mif_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_mswrite_Makefile.am b/abiword/patches/patch-plugins_mswrite_Makefile.am
deleted file mode 100644
index 880e380..0000000
--- a/abiword/patches/patch-plugins_mswrite_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mswrite_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/mswrite/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/mswrite/Makefile.am
-@@ -18,7 +18,7 @@ mswrite_la_LIBADD = \
- mswrite_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- mswrite_la_SOURCES =
- nodist_EXTRA_mswrite_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_opendocument_Makefile.am b/abiword/patches/patch-plugins_opendocument_Makefile.am
deleted file mode 100644
index 2b1cbc3..0000000
--- a/abiword/patches/patch-plugins_opendocument_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_opendocument_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/opendocument/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/opendocument/Makefile.am
-@@ -21,7 +21,7 @@ opendocument_la_LIBADD = \
- opendocument_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
- if TOOLKIT_COCOA
- opendocument_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/abiword/patches/patch-plugins_openwriter_Makefile.am b/abiword/patches/patch-plugins_openwriter_Makefile.am
deleted file mode 100644
index 589f8f4..0000000
--- a/abiword/patches/patch-plugins_openwriter_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_openwriter_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/openwriter/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/openwriter/Makefile.am
-@@ -18,7 +18,7 @@ openwriter_la_LIBADD = \
- openwriter_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
- if TOOLKIT_COCOA
- openwriter_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/abiword/patches/patch-plugins_openxml_Makefile.am b/abiword/patches/patch-plugins_openxml_Makefile.am
deleted file mode 100644
index d4683ad..0000000
--- a/abiword/patches/patch-plugins_openxml_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_openxml_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/openxml/Makefile.am.orig 2012-11-25 18:08:57.000000000 +0000
-+++ plugins/openxml/Makefile.am
-@@ -20,7 +20,7 @@ openxml_la_LIBADD = \
- openxml_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
- if TOOLKIT_COCOA
- openxml_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/abiword/patches/patch-plugins_opml_Makefile.am b/abiword/patches/patch-plugins_opml_Makefile.am
deleted file mode 100644
index 22e7ab6..0000000
--- a/abiword/patches/patch-plugins_opml_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_opml_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/opml/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/opml/Makefile.am
-@@ -18,7 +18,7 @@ opml_la_LIBADD = \
- opml_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
- if TOOLKIT_COCOA
- opml_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/abiword/patches/patch-plugins_ots_Makefile.am b/abiword/patches/patch-plugins_ots_Makefile.am
deleted file mode 100644
index 39fda06..0000000
--- a/abiword/patches/patch-plugins_ots_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-plugins_ots_Makefile.am,v 1.1 2014/12/30 17:31:37 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/ots/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/ots/Makefile.am
-@@ -9,6 +9,7 @@ ots_la_LIBADD = \
- $(OTS_LIBS)
-
- ots_la_LDFLAGS = \
-+ -Wl, \
- -avoid-version \
- -module \
- -no-undefined
diff --git a/abiword/patches/patch-plugins_paint_Makefile.am b/abiword/patches/patch-plugins_paint_Makefile.am
deleted file mode 100644
index 56d0577..0000000
--- a/abiword/patches/patch-plugins_paint_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_paint_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/paint/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/paint/Makefile.am
-@@ -20,7 +20,7 @@ paint_la_LIBADD = \
- paint_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- paint_la_SOURCES =
- nodist_EXTRA_paint_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp b/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp
deleted file mode 100644
index c3b32a8..0000000
--- a/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-plugins_paint_xp_AbiGeneric.cpp,v 1.1 2015/01/23 14:30:11 nros Exp $
-If pFrame is NULL an image is obviously not selected.
-Fixes seg fault.
---- plugins/paint/xp/AbiGeneric.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/paint/xp/AbiGeneric.cpp
-@@ -297,6 +297,9 @@ bool isImageSelected (void)
- {
- // Get the current view that the user is in.
- XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame();
-+ if (pFrame == NULL) {
-+ return false;
-+ }
- FV_View* pView = static_cast<FV_View*>(pFrame->getCurrentView());
-
- return (pView->getSelectedImage(NULL) != 0);
diff --git a/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp b/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp
deleted file mode 100644
index 00156db..0000000
--- a/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-plugins_paint_xp_AbiPaint.cpp,v 1.1 2015/01/23 14:30:11 nros Exp $
-* Fix seg fault.
---- plugins/paint/xp/AbiPaint.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/paint/xp/AbiPaint.cpp
-@@ -177,6 +177,9 @@ static DECLARE_ABI_PLUGIN_METHOD(specify
-
- // Get a frame in case we need to show an error message
- XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame();
-+ if (pFrame == NULL) {
-+ return false;
-+ }
-
- {
- const char * szDescList[3];
-@@ -254,6 +257,10 @@ static DECLARE_ABI_PLUGIN_METHOD(saveAsB
- {
- // Get a frame (for error messages) and (to) get the current view that the user is in.
- XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame();
-+ if (pFrame == NULL) {
-+ g_varning("paint saveAsBmp: getLastFocussedFrame returned NULL\n");
-+ return false;
-+ }
- FV_View* pView = static_cast<FV_View*>(pFrame->getCurrentView());
-
- char *szTempFileName = NULL;
diff --git a/abiword/patches/patch-plugins_passepartout_Makefile.am b/abiword/patches/patch-plugins_passepartout_Makefile.am
deleted file mode 100644
index 17ddd0c..0000000
--- a/abiword/patches/patch-plugins_passepartout_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_passepartout_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/passepartout/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/passepartout/Makefile.am
-@@ -18,7 +18,7 @@ passepartout_la_LIBADD = \
- passepartout_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- passepartout_la_SOURCES =
- nodist_EXTRA_passepartout_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_pdb_Makefile.am b/abiword/patches/patch-plugins_pdb_Makefile.am
deleted file mode 100644
index 83cf2f4..0000000
--- a/abiword/patches/patch-plugins_pdb_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_pdb_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/pdb/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/pdb/Makefile.am
-@@ -18,7 +18,7 @@ pdb_la_LIBADD = \
- pdb_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- pdb_la_SOURCES =
- nodist_EXTRA_pdb_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_pdf_Makefile.am b/abiword/patches/patch-plugins_pdf_Makefile.am
deleted file mode 100644
index 0a8085b..0000000
--- a/abiword/patches/patch-plugins_pdf_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_pdf_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/pdf/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/pdf/Makefile.am
-@@ -18,7 +18,7 @@ pdf_la_LIBADD = \
- pdf_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- pdf_la_SOURCES =
- nodist_EXTRA_pdf_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_presentation_Makefile.am b/abiword/patches/patch-plugins_presentation_Makefile.am
deleted file mode 100644
index 859c8ac..0000000
--- a/abiword/patches/patch-plugins_presentation_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_presentation_Makefile.am,v 1.2 2015/01/24 21:41:38 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/presentation/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/presentation/Makefile.am
-@@ -18,7 +18,7 @@ presentation_la_LIBADD = \
- presentation_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- presentation_la_SOURCES =
- nodist_EXTRA_presentation_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_psion_Makefile.am b/abiword/patches/patch-plugins_psion_Makefile.am
deleted file mode 100644
index 8f8287f..0000000
--- a/abiword/patches/patch-plugins_psion_Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-plugins_psion_Makefile.am,v 1.3 2015/01/26 09:44:42 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
-Use CXX for linking.
---- plugins/psion/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/psion/Makefile.am
-@@ -11,9 +11,10 @@ psion_la_LIBADD = \
- psion_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- psion_la_SOURCES =
-+nodist_EXTRA_psion_la_SOURCES = dummy.cpp
-
- EXTRA_DIST = \
- plugin.m4
diff --git a/abiword/patches/patch-plugins_rsvg_Makefile.am b/abiword/patches/patch-plugins_rsvg_Makefile.am
deleted file mode 100644
index ae3a6be..0000000
--- a/abiword/patches/patch-plugins_rsvg_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_rsvg_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/rsvg/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/rsvg/Makefile.am
-@@ -12,7 +12,7 @@ rsvg_la_LIBADD = \
- rsvg_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- rsvg_la_SOURCES =
- nodist_EXTRA_rsvg_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_s5_Makefile.am b/abiword/patches/patch-plugins_s5_Makefile.am
deleted file mode 100644
index 5e5983e..0000000
--- a/abiword/patches/patch-plugins_s5_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_s5_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/s5/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/s5/Makefile.am
-@@ -18,7 +18,7 @@ s5_la_LIBADD = \
- s5_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- s5_la_SOURCES =
- nodist_EXTRA_s5_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_sdw_Makefile.am b/abiword/patches/patch-plugins_sdw_Makefile.am
deleted file mode 100644
index 6206807..0000000
--- a/abiword/patches/patch-plugins_sdw_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_sdw_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/sdw/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/sdw/Makefile.am
-@@ -18,7 +18,7 @@ sdw_la_LIBADD = \
- sdw_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- sdw_la_SOURCES =
- nodist_EXTRA_sdw_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_t602_Makefile.am b/abiword/patches/patch-plugins_t602_Makefile.am
deleted file mode 100644
index a0d880c..0000000
--- a/abiword/patches/patch-plugins_t602_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_t602_Makefile.am,v 1.3 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/t602/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/t602/Makefile.am
-@@ -18,7 +18,7 @@ t602_la_LIBADD = \
- t602_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- t602_la_SOURCES =
- nodist_EXTRA_t602_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_urldict_Makefile.am b/abiword/patches/patch-plugins_urldict_Makefile.am
deleted file mode 100644
index f40c133..0000000
--- a/abiword/patches/patch-plugins_urldict_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_urldict_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/urldict/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/urldict/Makefile.am
-@@ -18,7 +18,7 @@ urldict_la_LIBADD = \
- urldict_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- urldict_la_SOURCES =
- nodist_EXTRA_urldict_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_wikipedia_Makefile.am b/abiword/patches/patch-plugins_wikipedia_Makefile.am
deleted file mode 100644
index 1ea8e26..0000000
--- a/abiword/patches/patch-plugins_wikipedia_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_wikipedia_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/wikipedia/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wikipedia/Makefile.am
-@@ -18,7 +18,7 @@ wikipedia_la_LIBADD = \
- wikipedia_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- wikipedia_la_SOURCES =
- nodist_EXTRA_wikipedia_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_wmf_Makefile.am b/abiword/patches/patch-plugins_wmf_Makefile.am
deleted file mode 100644
index 68f5080..0000000
--- a/abiword/patches/patch-plugins_wmf_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_wmf_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/wmf/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wmf/Makefile.am
-@@ -11,7 +11,7 @@ wmf_la_LIBADD = \
- wmf_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- wmf_la_SOURCES =
- nodist_EXTRA_wmf_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_wml_Makefile.am b/abiword/patches/patch-plugins_wml_Makefile.am
deleted file mode 100644
index 30bb75c..0000000
--- a/abiword/patches/patch-plugins_wml_Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-plugins_wml_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/wml/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wml/Makefile.am
-@@ -1,4 +1,5 @@
-
-+
- SUBDIRS = xp
-
- if WML_BUILTIN
-@@ -18,7 +19,7 @@ wml_la_LIBADD = \
- wml_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- wml_la_SOURCES =
- nodist_EXTRA_wml_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_wordperfect_Makefile.am b/abiword/patches/patch-plugins_wordperfect_Makefile.am
deleted file mode 100644
index f98f6c9..0000000
--- a/abiword/patches/patch-plugins_wordperfect_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_wordperfect_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/wordperfect/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wordperfect/Makefile.am
-@@ -11,7 +11,7 @@ wordperfect_la_LIBADD = \
- wordperfect_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- wordperfect_la_SOURCES =
- nodist_EXTRA_wordperfect_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am b/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am
deleted file mode 100644
index d39ec35..0000000
--- a/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_wordperfect_xp_Makefile.am,v 1.1 2014/12/28 15:57:09 nros Exp $
-* adapt wordperfect plugins to dependecies available in pkgsrc
- from abiword svn date 2014-12-27
---- plugins/wordperfect/xp/Makefile.am.orig 2008-05-08 13:12:53.000000000 +0000
-+++ plugins/wordperfect/xp/Makefile.am
-@@ -6,8 +6,6 @@ AM_CPPFLAGS = \
- -DABI_BUILD_VERSION=\"$(VERSION)\"
-
- libxp_la_SOURCES = \
-- ie_exp_WordPerfect.cpp \
-- ie_exp_WordPerfect.h \
- ie_impexp_WordPerfect.cpp \
- ie_impexp_WordPerfect.h \
- ie_imp_WordPerfect.cpp \
diff --git a/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp b/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
deleted file mode 100644
index 6bfaa23..0000000
--- a/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
+++ /dev/null
@@ -1,653 +0,0 @@
-$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp,v 1.1 2014/12/28 15:57:09 nros Exp $
-* adapt wordperfect plugins to dependecies available in pkgsrc
- from abiword svn date 2014-12-27
---- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
-@@ -31,6 +31,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
-+#include <map>
-+#include <string>
- #include <gsf/gsf-utils.h>
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
-@@ -60,42 +62,47 @@
-
- // Stream class
-
--#include <libwpd-stream/libwpd-stream.h>
-+#include <librevenge-stream/librevenge-stream.h>
-+#include <libwpd/libwpd.h>
-
- #include <gsf/gsf-input.h>
- #include <gsf/gsf-infile.h>
- #include <gsf/gsf-infile-msole.h>
-+#include <gsf/gsf-infile-zip.h>
-
- #ifdef HAVE_LIBWPS
- #include <libwps/libwps.h>
- #endif
-
--class AbiWordperfectInputStream : public WPXInputStream
-+class AbiWordperfectInputStream : public librevenge::RVNGInputStream
- {
- public:
- AbiWordperfectInputStream(GsfInput *input);
- ~AbiWordperfectInputStream();
-
-- virtual bool isOLEStream();
-- virtual WPXInputStream * getDocumentOLEStream();
--
-- virtual WPXInputStream * getDocumentOLEStream(const char * name);
--
-+ virtual bool isStructured();
-+ virtual unsigned subStreamCount();
-+ virtual const char* subStreamName(unsigned);
-+ bool existsSubStream(const char*);
-+ virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
-+ virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
- virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
-- virtual int seek(long offset, WPX_SEEK_TYPE seekType);
-+ virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
- virtual long tell();
-- virtual bool atEOS();
-+ virtual bool isEnd();
-
- private:
-
- GsfInput *m_input;
- GsfInfile *m_ole;
-+ std::map<unsigned, std::string> m_substreams;
- };
-
- AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
-- WPXInputStream(),
-+ librevenge::RVNGInputStream(),
- m_input(input),
-- m_ole(NULL)
-+ m_ole(NULL),
-+ m_substreams()
- {
- g_object_ref(G_OBJECT(input));
- }
-@@ -120,45 +127,115 @@ const unsigned char * AbiWordperfectInpu
- return buf;
- }
-
--int AbiWordperfectInputStream::seek(long offset, WPX_SEEK_TYPE seekType)
-+int AbiWordperfectInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
- {
- GSeekType gsfSeekType = G_SEEK_SET;
- switch(seekType)
- {
-- case WPX_SEEK_CUR:
-+ case librevenge::RVNG_SEEK_CUR:
- gsfSeekType = G_SEEK_CUR;
- break;
-- case WPX_SEEK_SET:
-+ case librevenge::RVNG_SEEK_SET:
- gsfSeekType = G_SEEK_SET;
- break;
-+ case librevenge::RVNG_SEEK_END:
-+ gsfSeekType = G_SEEK_END;
-+ break;
- }
-
- return gsf_input_seek(m_input, offset, gsfSeekType);
- }
-
--bool AbiWordperfectInputStream::isOLEStream()
-+bool AbiWordperfectInputStream::isStructured()
- {
- if (!m_ole)
- m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-
-- if (m_ole != NULL)
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
-+ if (m_ole)
- return true;
-
- return false;
- }
-
--WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream()
-+unsigned AbiWordperfectInputStream::subStreamCount()
- {
-- return getDocumentOLEStream("PerfectOffice_MAIN");
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
-+ if (m_ole)
-+ {
-+ int numChildren = gsf_infile_num_children(m_ole);
-+ if (numChildren > 0)
-+ return numChildren;
-+ return 0;
-+ }
-+
-+ return 0;
- }
-
--WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream(const char * name)
-+const char * AbiWordperfectInputStream::subStreamName(unsigned id)
- {
-- WPXInputStream *documentStream = NULL;
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-
- if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
-+ if (m_ole)
-+ {
-+ if ((int)id >= gsf_infile_num_children(m_ole))
-+ {
-+ return 0;
-+ }
-+ std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
-+ if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
-+ {
-+ std::string name = gsf_infile_name_by_index(m_ole, (int)id);
-+ i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
-+ }
-+ return i->second.c_str();
-+ }
-+
-+ return 0;
-+}
-+
-+bool AbiWordperfectInputStream::existsSubStream(const char * name)
-+{
-+ if (!m_ole)
- m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
-+ if (m_ole)
-+ {
-+ GsfInput *document = gsf_infile_child_by_name(m_ole, name);
-+ if (document)
-+ {
-+ g_object_unref(G_OBJECT (document));
-+ return true;
-+ }
-+ }
-+
-+ return false;
-+}
-+
-+librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamByName(const char * name)
-+{
-+ librevenge::RVNGInputStream *documentStream = NULL;
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
- if (m_ole)
- {
- GsfInput *document = gsf_infile_child_by_name(m_ole, name);
-@@ -172,12 +249,35 @@ WPXInputStream * AbiWordperfectInputStre
- return documentStream;
- }
-
-+librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamById(unsigned id)
-+{
-+ librevenge::RVNGInputStream *documentStream = NULL;
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
-+ if (m_ole)
-+ {
-+ GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
-+ if (document)
-+ {
-+ documentStream = new AbiWordperfectInputStream(document);
-+ g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
-+ }
-+ }
-+
-+ return documentStream;
-+}
-+
- long AbiWordperfectInputStream::tell()
- {
- return gsf_input_tell(m_input);
- }
-
--bool AbiWordperfectInputStream::atEOS()
-+bool AbiWordperfectInputStream::isEnd()
- {
- return gsf_input_eof(m_input);
- }
-@@ -247,13 +347,13 @@ UT_Confidence_t IE_Imp_WordPerfect_Sniff
- {
- AbiWordperfectInputStream gsfInput(input);
-
-- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
--
-+ libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(&gsfInput);
-+
- switch (confidence)
- {
-- case WPD_CONFIDENCE_NONE:
-+ case libwpd::WPD_CONFIDENCE_NONE:
- return UT_CONFIDENCE_ZILCH;
-- case WPD_CONFIDENCE_EXCELLENT:
-+ case libwpd::WPD_CONFIDENCE_EXCELLENT:
- return UT_CONFIDENCE_PERFECT;
- default:
- return UT_CONFIDENCE_ZILCH;
-@@ -312,9 +412,9 @@ IE_Imp_WordPerfect::~IE_Imp_WordPerfect(
- UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
- {
- AbiWordperfectInputStream gsfInput(input);
-- WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
-+ libwpd::WPDResult error = libwpd::WPDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this), NULL);
-
-- if (error != WPD_OK)
-+ if (error != libwpd::WPD_OK)
- {
- UT_DEBUGMSG(("AbiWordPerfect: ERROR: %i!\n", (int)error));
- return UT_IE_IMPORTERROR;
-@@ -329,7 +429,7 @@ void IE_Imp_WordPerfect::pasteFromBuffer
- // nada
- }
-
--void IE_Imp_WordPerfect::setDocumentMetaData(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::setDocumentMetaData(const librevenge::RVNGPropertyList &propList)
- {
- if (propList["dc:author"])
- getDoc()->setMetaDataProp(PD_META_KEY_CREATOR, propList["dc:author"]->getStr().cstr());
-@@ -339,15 +439,15 @@ void IE_Imp_WordPerfect::setDocumentMeta
- getDoc()->setMetaDataProp(PD_META_KEY_PUBLISHER, propList["dc:publisher"]->getStr().cstr());
- if (propList["dc:type"])
- getDoc()->setMetaDataProp(PD_META_KEY_TYPE, propList["dc:category"]->getStr().cstr());
-- if (propList["libwpd:keywords"])
-- getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["libwpd:keywords"]->getStr().cstr());
-+ if (propList["librevenge:keywords"])
-+ getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["librevenge:keywords"]->getStr().cstr());
- if (propList["dc:language"])
- getDoc()->setMetaDataProp(PD_META_KEY_LANGUAGE, propList["dc:language"]->getStr().cstr());
-- if (propList["libwpd:abstract"])
-- getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["libwpd:abstract"]->getStr().cstr());
-+ if (propList["librevenge:abstract"])
-+ getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["librevenge:abstract"]->getStr().cstr());
- }
-
--void IE_Imp_WordPerfect::startDocument()
-+void IE_Imp_WordPerfect::startDocument(const librevenge::RVNGPropertyList & /* propList */)
- {
- UT_DEBUGMSG(("AbiWordPerfect: startDocument\n"));
- }
-@@ -357,7 +457,7 @@ void IE_Imp_WordPerfect::endDocument()
- UT_DEBUGMSG(("AbiWordPerfect: endDocument\n"));
- }
-
--void IE_Imp_WordPerfect::openPageSpan(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openPageSpan(const librevenge::RVNGPropertyList &propList)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- UT_DEBUGMSG(("AbiWordPerfect: openPageSpan\n"));
-@@ -378,7 +478,7 @@ void IE_Imp_WordPerfect::openPageSpan(co
-
- }
-
--void IE_Imp_WordPerfect::openHeader(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openHeader(const librevenge::RVNGPropertyList & /*propList*/)
- {
- m_bHdrFtrOpenCount++;
-
-@@ -420,7 +520,7 @@ void IE_Imp_WordPerfect::closeHeader()
- */
- }
-
--void IE_Imp_WordPerfect::openFooter(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openFooter(const librevenge::RVNGPropertyList & /*propList*/)
- {
- m_bHdrFtrOpenCount++;
- // see above comments re: openHeader
-@@ -432,7 +532,7 @@ void IE_Imp_WordPerfect::closeFooter()
- // see above comments re: closeHeader
- }
-
--void IE_Imp_WordPerfect::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
-+void IE_Imp_WordPerfect::openParagraph(const librevenge::RVNGPropertyList &propList)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- UT_DEBUGMSG(("AbiWordPerfect: openParagraph()\n"));
-@@ -478,13 +578,15 @@ void IE_Imp_WordPerfect::openParagraph(c
- (int)(m_topMargin*72), (int)(m_bottomMargin*72), m_leftMarginOffset, m_rightMarginOffset, m_textIndent, lineSpacing);
- propBuffer += tmpBuffer;
-
-- if (tabStops.count() > 0) // Append the tabstop information
-+ const librevenge::RVNGPropertyListVector *tabStops = propList.child("style:tab-stops");
-+
-+ if (tabStops && tabStops->count()) // Append the tabstop information
- {
- propBuffer += "; tabstops:";
- tmpBuffer = "";
-- WPXPropertyListVector::Iter i(tabStops);
-- for (i.rewind(); i.next();)
-- {
-+ librevenge::RVNGPropertyListVector::Iter i(*tabStops);
-+ for (i.rewind(); i.next();)
-+ {
- propBuffer += tmpBuffer;
- if (i()["style:position"])
- {
-@@ -515,8 +617,8 @@ void IE_Imp_WordPerfect::openParagraph(c
- propBuffer += "0";
-
- tmpBuffer = ",";
-- }
-- }
-+ }
-+ }
-
-
-
-@@ -543,7 +645,7 @@ void IE_Imp_WordPerfect::openParagraph(c
- }
- }
-
--void IE_Imp_WordPerfect::openSpan(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openSpan(const librevenge::RVNGPropertyList &propList)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- UT_DEBUGMSG(("AbiWordPerfect: Appending current text properties\n"));
-@@ -614,13 +716,14 @@ void IE_Imp_WordPerfect::openSpan(const
- X_CheckDocumentError(appendFmt(propsArray));
- }
-
--void IE_Imp_WordPerfect::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
-+void IE_Imp_WordPerfect::openSection(const librevenge::RVNGPropertyList &propList)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- UT_DEBUGMSG(("AbiWordPerfect: openSection\n"));
-
- float marginLeft = 0.0f, marginRight = 0.0f;
-- int columnsCount = ((columns.count() == 0) ? 1 : columns.count());
-+ const librevenge::RVNGPropertyListVector *columns = propList.child("style:columns");
-+ int columnsCount = ((!columns || !columns->count()) ? 1 : columns->count());
-
- // TODO: support spaceAfter
- if (propList["fo:start-indent"])
-@@ -647,7 +750,7 @@ void IE_Imp_WordPerfect::insertTab()
- X_CheckDocumentError(appendSpan(&ucs,1));
- }
-
--void IE_Imp_WordPerfect::insertText(const WPXString &text)
-+void IE_Imp_WordPerfect::insertText(const librevenge::RVNGString &text)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- if (text.len())
-@@ -658,6 +761,15 @@ void IE_Imp_WordPerfect::insertText(cons
- }
- }
-
-+void IE_Imp_WordPerfect::insertSpace()
-+{
-+ if (m_bHdrFtrOpenCount) return; // HACK
-+ UT_DEBUGMSG(("AbiWordPerfect: insertSpace\n"));
-+
-+ UT_UCS4Char ucs = UCS_SPACE;
-+ X_CheckDocumentError(appendSpan(&ucs,1));
-+}
-+
- void IE_Imp_WordPerfect::insertLineBreak()
- {
- if (m_bHdrFtrOpenCount) return; // HACK
-@@ -668,24 +780,23 @@ void IE_Imp_WordPerfect::insertLineBreak
- }
-
-
--
--void IE_Imp_WordPerfect::defineOrderedListLevel(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openOrderedListLevel(const librevenge::RVNGPropertyList &propList)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
-- UT_DEBUGMSG(("AbiWordPerfect: defineOrderedListLevel\n"));
--
-+ UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
-+
- int listID = 0, startingNumber = 0, level = 1;
- char listType = '1';
- UT_UTF8String textBeforeNumber, textAfterNumber;
- float listLeftOffset = 0.0f;
- float listMinLabelWidth = 0.0f;
-
-- if (propList["libwpd:id"])
-- listID = propList["libwpd:id"]->getInt();
-+ if (propList["librevenge:id"])
-+ listID = propList["librevenge:id"]->getInt();
- if (propList["text:start-value"])
- startingNumber = propList["text:start-value"]->getInt();
-- if (propList["libwpd:level"])
-- level = propList["libwpd:level"]->getInt();
-+ if (propList["librevenge:level"])
-+ level = propList["librevenge:level"]->getInt();
- if (propList["style:num-prefix"])
- textBeforeNumber += propList["style:num-prefix"]->getStr().cstr();
- if (propList["style:num-suffix"])
-@@ -716,22 +827,38 @@ void IE_Imp_WordPerfect::defineOrderedLi
- m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
- _updateDocumentOrderedListDefinition(m_pCurrentListDefinition, level, listType, textBeforeNumber, textAfterNumber, startingNumber);
- }
-+
-+ m_iCurrentListLevel++;
- }
-
--void IE_Imp_WordPerfect::defineUnorderedListLevel(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::closeOrderedListLevel()
- {
- if (m_bHdrFtrOpenCount) return; // HACK
-- UT_DEBUGMSG(("AbiWordPerfect: defineUnorderedListLevel\n"));
-+ UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
-+ UT_ASSERT(m_iCurrentListLevel > 0);
-+
-+ // every time we close a list level, the level above it is normally renumbered to start at "1"
-+ // again. this code takes care of that.
-+ if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
-+ m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
-+
-+ m_iCurrentListLevel--;
-+}
-
-+void IE_Imp_WordPerfect::openUnorderedListLevel(const librevenge::RVNGPropertyList &propList)
-+{
-+ if (m_bHdrFtrOpenCount) return; // HACK
-+ UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
-+
- int listID = 0, level = 1;
-- WPXString textBeforeNumber, textAfterNumber;
-+ librevenge::RVNGString textBeforeNumber, textAfterNumber;
- float listLeftOffset = 0.0f;
- float listMinLabelWidth = 0.0f;
-
-- if (propList["libwpd:id"])
-- listID = propList["libwpd:id"]->getInt();
-- if (propList["libwpd:level"])
-- level = propList["libwpd:level"]->getInt();
-+ if (propList["librevenge:id"])
-+ listID = propList["librevenge:id"]->getInt();
-+ if (propList["librevenge:level"])
-+ level = propList["librevenge:level"]->getInt();
- if (propList["text:space-before"])
- listLeftOffset = propList["text:space-before"]->getDouble();
- if (propList["text:min-label-width"])
-@@ -752,36 +879,7 @@ void IE_Imp_WordPerfect::defineUnordered
- m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
- _updateDocumentUnorderedListDefinition(m_pCurrentListDefinition, level);
- }
--}
-
--//void IE_Imp_WordPerfect::openOrderedListLevel(const int listID)
--void IE_Imp_WordPerfect::openOrderedListLevel(const WPXPropertyList & /*propList*/)
--{
-- if (m_bHdrFtrOpenCount) return; // HACK
-- UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
--
-- m_iCurrentListLevel++;
--}
--
--void IE_Imp_WordPerfect::closeOrderedListLevel()
--{
-- if (m_bHdrFtrOpenCount) return; // HACK
-- UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
-- UT_ASSERT(m_iCurrentListLevel > 0);
--
-- // every time we close a list level, the level above it is normally renumbered to start at "1"
-- // again. this code takes care of that.
-- if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
-- m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
--
-- m_iCurrentListLevel--;
--}
--
--void IE_Imp_WordPerfect::openUnorderedListLevel(const WPXPropertyList & /*propList*/)
--{
-- if (m_bHdrFtrOpenCount) return; // HACK
-- UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
--
- m_iCurrentListLevel++;
- }
-
-@@ -796,7 +894,7 @@ void IE_Imp_WordPerfect::closeUnorderedL
-
- // ASSUMPTION: We assume that unordered lists will always pass a number of "0". unpredictable behaviour
- // may result otherwise
--void IE_Imp_WordPerfect::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector & /*tabStops*/)
-+void IE_Imp_WordPerfect::openListElement(const librevenge::RVNGPropertyList &propList)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- UT_DEBUGMSG(("AbiWordPerfect: openListElement\n"));
-@@ -885,7 +983,7 @@ void IE_Imp_WordPerfect::openListElement
- X_CheckDocumentError(appendSpan(&ucs,1));
- }
-
--void IE_Imp_WordPerfect::openFootnote(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openFootnote(const librevenge::RVNGPropertyList & /*propList*/)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
-
-@@ -934,7 +1032,7 @@ void IE_Imp_WordPerfect::closeFootnote()
- X_CheckDocumentError(appendStrux(PTX_EndFootnote,NULL));
- }
-
--void IE_Imp_WordPerfect::openEndnote(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openEndnote(const librevenge::RVNGPropertyList & /*propList*/)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- const gchar** propsArray = NULL;
-@@ -975,7 +1073,7 @@ void IE_Imp_WordPerfect::closeEndnote()
- X_CheckDocumentError(appendStrux(PTX_EndEndnote,NULL));
- }
-
--void IE_Imp_WordPerfect::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
-+void IE_Imp_WordPerfect::openTable(const librevenge::RVNGPropertyList &propList)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- // TODO: handle 'marginLeftOffset' and 'marginRightOffset'
-@@ -1000,14 +1098,18 @@ void IE_Imp_WordPerfect::openTable(const
- }
- }
-
-- propBuffer += "table-column-props:";
-- WPXPropertyListVector::Iter i(columns);
-- for (i.rewind(); i.next();)
-- {
-- UT_String tmpBuffer;
-- if (i()["style:column-width"])
-- UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
-- propBuffer += tmpBuffer;
-+ const librevenge::RVNGPropertyListVector *columns = propList.child("librevenge:table-columns");
-+ if (columns)
-+ {
-+ propBuffer += "table-column-props:";
-+ librevenge::RVNGPropertyListVector::Iter i(*columns);
-+ for (i.rewind(); i.next();)
-+ {
-+ UT_String tmpBuffer;
-+ if (i()["style:column-width"])
-+ UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
-+ propBuffer += tmpBuffer;
-+ }
- }
-
- const gchar* propsArray[3];
-@@ -1018,7 +1120,7 @@ void IE_Imp_WordPerfect::openTable(const
- X_CheckDocumentError(appendStrux(PTX_SectionTable, propsArray));
- }
-
--void IE_Imp_WordPerfect::openTableRow(const WPXPropertyList & /*propList*/)
-+void IE_Imp_WordPerfect::openTableRow(const librevenge::RVNGPropertyList & /*propList*/)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- UT_DEBUGMSG(("AbiWordPerfect: openRow\n"));
-@@ -1030,14 +1132,14 @@ void IE_Imp_WordPerfect::openTableRow(co
- m_bInCell = false;
- }
-
--void IE_Imp_WordPerfect::openTableCell(const WPXPropertyList &propList)
-+void IE_Imp_WordPerfect::openTableCell(const librevenge::RVNGPropertyList &propList)
- {
- if (m_bHdrFtrOpenCount) return; // HACK
- int col =0, row = 0, colSpan = 0, rowSpan = 0;
-- if (propList["libwpd:column"])
-- col = propList["libwpd:column"]->getInt();
-- if (propList["libwpd:row"])
-- row = propList["libwpd:row"]->getInt();
-+ if (propList["librevenge:column"])
-+ col = propList["librevenge:column"]->getInt();
-+ if (propList["librevenge:row"])
-+ row = propList["librevenge:row"]->getInt();
- if (propList["table:number-columns-spanned"])
- colSpan = propList["table:number-columns-spanned"]->getInt();
- if (propList["table:number-rows-spanned"])
-@@ -1247,9 +1349,9 @@ protected:
- virtual UT_Error _loadFile(GsfInput * input)
- {
- AbiWordperfectInputStream gsfInput(input);
-- WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
-+ libwps::WPSResult error = libwps::WPSDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this));
-
-- if (error != WPS_OK)
-+ if (error != libwps::WPS_OK)
- {
- UT_DEBUGMSG(("AbiMSWorks: ERROR: %i!\n", (int)error));
- return UT_IE_IMPORTERROR;
-@@ -1286,13 +1388,17 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::
- {
- AbiWordperfectInputStream gsfInput(input);
-
-- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
-+ libwps::WPSKind kind;
-+ libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
-+
-+ if (kind != libwps::WPS_TEXT)
-+ confidence = libwps::WPS_CONFIDENCE_NONE;
-
- switch (confidence)
- {
-- case WPS_CONFIDENCE_NONE:
-+ case libwps::WPS_CONFIDENCE_NONE:
- return UT_CONFIDENCE_ZILCH;
-- case WPS_CONFIDENCE_EXCELLENT:
-+ case libwps::WPS_CONFIDENCE_EXCELLENT:
- return UT_CONFIDENCE_PERFECT;
- default:
- return UT_CONFIDENCE_ZILCH;
diff --git a/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h b/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
deleted file mode 100644
index 070ca7d..0000000
--- a/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
+++ /dev/null
@@ -1,165 +0,0 @@
-$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h,v 1.1 2014/12/28 15:57:09 nros Exp $
-* adapt wordperfect plugins to dependecies available in pkgsrc
- from abiword svn date 2014-12-27
---- plugins/wordperfect/xp/ie_imp_WordPerfect.h.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/wordperfect/xp/ie_imp_WordPerfect.h
-@@ -30,7 +30,7 @@
- #define IE_IMP_WP_H
-
- #include <stdio.h>
--#include <libwpd/libwpd.h>
-+#include <librevenge/librevenge.h>
- #include "ie_imp.h"
- #include "ut_string.h"
- #include "ut_string_class.h"
-@@ -92,7 +92,7 @@ public:
- IE_Imp ** ppie);
- };
-
--class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
-+class IE_Imp_WordPerfect : public IE_Imp, public librevenge::RVNGTextInterface
- {
- public:
- IE_Imp_WordPerfect(PD_Document * pDocument);
-@@ -101,68 +101,82 @@ public:
- virtual void pasteFromBuffer(PD_DocumentRange * pDocRange,
- UT_uint8 * pData, UT_uint32 lenData, const char * szEncoding = 0);
-
-- virtual void setDocumentMetaData(const WPXPropertyList &propList);
-+ virtual void setDocumentMetaData(const librevenge::RVNGPropertyList &propList);
-
-- virtual void startDocument();
-- virtual void endDocument();
-+ virtual void startDocument(const librevenge::RVNGPropertyList &propList);
-+ virtual void endDocument();
-
-- virtual void openPageSpan(const WPXPropertyList &propList);
-- virtual void closePageSpan() {}
-- virtual void openHeader(const WPXPropertyList &propList);
-- virtual void closeHeader();
-- virtual void openFooter(const WPXPropertyList &propList);
-- virtual void closeFooter();
--
-- virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
-- virtual void closeParagraph() {}
--
-- virtual void openSpan(const WPXPropertyList &propList);
-- virtual void closeSpan() {}
--
-- virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
-- virtual void closeSection() {}
--
-- virtual void insertTab();
-- virtual void insertText(const WPXString &text);
-- virtual void insertLineBreak();
--
-- virtual void defineOrderedListLevel(const WPXPropertyList &propList);
-- virtual void defineUnorderedListLevel(const WPXPropertyList &propList);
-- virtual void openOrderedListLevel(const WPXPropertyList &propList);
-- virtual void openUnorderedListLevel(const WPXPropertyList &propList);
-- virtual void closeOrderedListLevel();
-- virtual void closeUnorderedListLevel();
-- virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
-- virtual void closeListElement() {}
--
-- virtual void openFootnote(const WPXPropertyList &propList);
-- virtual void closeFootnote();
-- virtual void openEndnote(const WPXPropertyList &propList);
-- virtual void closeEndnote();
--
-- virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
-- virtual void openTableRow(const WPXPropertyList &propList);
-- virtual void closeTableRow() {}
-- virtual void openTableCell(const WPXPropertyList &propList);
-- virtual void closeTableCell() {}
-- virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
-- virtual void closeTable();
--
-- virtual void definePageStyle(const WPXPropertyList&) {}
-- virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-- virtual void defineCharacterStyle(const WPXPropertyList&) {}
-- virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
-- virtual void insertSpace() {}
-- virtual void insertField(const WPXString&, const WPXPropertyList&) {}
-- virtual void openComment(const WPXPropertyList&) {}
-- virtual void closeComment() {}
-- virtual void openTextBox(const WPXPropertyList&) {}
-- virtual void closeTextBox() {}
-- virtual void openFrame(const WPXPropertyList&) {}
-- virtual void closeFrame() {}
-- virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
-- virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
-+ virtual void defineEmbeddedFont(const librevenge::RVNGPropertyList & /* propList */) {}
-
-+ virtual void definePageStyle(const librevenge::RVNGPropertyList &) {}
-+ virtual void openPageSpan(const librevenge::RVNGPropertyList &propList);
-+ virtual void closePageSpan() {}
-+ virtual void openHeader(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeHeader();
-+ virtual void openFooter(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeFooter();
-+
-+ virtual void defineSectionStyle(const librevenge::RVNGPropertyList &) {}
-+ virtual void openSection(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeSection() {}
-+
-+ virtual void defineParagraphStyle(const librevenge::RVNGPropertyList &) {}
-+ virtual void openParagraph(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeParagraph() {}
-+
-+ virtual void defineCharacterStyle(const librevenge::RVNGPropertyList &) {}
-+ virtual void openSpan(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeSpan() {}
-+
-+ virtual void openLink(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void closeLink() {}
-+
-+ virtual void insertTab();
-+ virtual void insertText(const librevenge::RVNGString &text);
-+ virtual void insertSpace();
-+ virtual void insertLineBreak();
-+ virtual void insertField(const librevenge::RVNGPropertyList & /* propList */) {}
-+
-+ virtual void openOrderedListLevel(const librevenge::RVNGPropertyList &propList);
-+ virtual void openUnorderedListLevel(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeOrderedListLevel();
-+ virtual void closeUnorderedListLevel();
-+ virtual void openListElement(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeListElement() {}
-+
-+ virtual void openFootnote(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeFootnote();
-+ virtual void openEndnote(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeEndnote();
-+ virtual void openComment(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void closeComment() {}
-+ virtual void openTextBox(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void closeTextBox() {}
-+
-+ virtual void openTable(const librevenge::RVNGPropertyList &propList);
-+ virtual void openTableRow(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeTableRow() {}
-+ virtual void openTableCell(const librevenge::RVNGPropertyList &propList);
-+ virtual void closeTableCell() {}
-+ virtual void insertCoveredTableCell(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void closeTable();
-+
-+ virtual void openFrame(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void closeFrame() {}
-+
-+ virtual void openGroup(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void closeGroup() {}
-+
-+ virtual void defineGraphicStyle(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void drawRectangle(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void drawEllipse(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void drawPolygon(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void drawPolyline(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void drawPath(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void drawConnector(const librevenge::RVNGPropertyList & /* propList */) {}
-+
-+ virtual void insertBinaryObject(const librevenge::RVNGPropertyList & /* propList */) {}
-+ virtual void insertEquation(const librevenge::RVNGPropertyList & /* propList */) {}
-
- protected:
- virtual UT_Error _loadFile(GsfInput * input);
diff --git a/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp b/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
deleted file mode 100644
index e254a41..0000000
--- a/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp,v 1.1 2014/12/28 15:57:09 nros Exp $
-* adapt wordperfect plugins to dependecies available in pkgsrc
- from abiword svn date 2014-12-27
---- plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp
-@@ -35,7 +35,6 @@
- ABI_PLUGIN_DECLARE("WordPerfect")
-
- static IE_Imp_WordPerfect_Sniffer * m_ImpSniffer = 0;
--static IE_Exp_WordPerfect_Sniffer * m_ExpSniffer = 0;
-
- #ifdef HAVE_LIBWPS
- static IE_Imp_MSWorks_Sniffer * m_MSWorks_ImpSniffer = 0;
-@@ -49,13 +48,7 @@ int abi_plugin_register (XAP_ModuleInfo
- m_ImpSniffer = new IE_Imp_WordPerfect_Sniffer ();
- }
-
-- if (!m_ExpSniffer)
-- {
-- m_ExpSniffer = new IE_Exp_WordPerfect_Sniffer ();
-- }
--
- UT_ASSERT (m_ImpSniffer);
-- UT_ASSERT (m_ExpSniffer);
-
- #ifdef HAVE_LIBWPS
- if (!m_MSWorks_ImpSniffer)
-@@ -79,7 +72,7 @@ int abi_plugin_register (XAP_ModuleInfo
- mi->usage = "No Usage";
-
- IE_Imp::registerImporter (m_ImpSniffer);
-- //IE_Exp::registerExporter (m_ExpSniffer);
-+
- return 1;
- }
-
-@@ -93,18 +86,11 @@ int abi_plugin_unregister (XAP_ModuleInf
- mi->usage = 0;
-
- UT_ASSERT (m_ImpSniffer);
-- UT_ASSERT (m_ExpSniffer);
-
- IE_Imp::unregisterImporter (m_ImpSniffer);
- delete m_ImpSniffer;
- m_ImpSniffer = 0;
-
-- /*
-- IE_Exp::unregisterExporter (m_ExpSniffer);
-- delete m_ExpSniffer;
-- m_ExpSniffer = 0;
-- */
--
- #ifdef HAVE_LIBWPS
- IE_Imp::unregisterImporter (m_MSWorks_ImpSniffer);
- delete m_MSWorks_ImpSniffer;
diff --git a/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h b/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
deleted file mode 100644
index d0480ea..0000000
--- a/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h,v 1.1 2014/12/28 15:57:09 nros Exp $
-* adapt wordperfect plugins to dependecies available in pkgsrc
- from abiword svn date 2014-12-27
---- plugins/wordperfect/xp/ie_impexp_WordPerfect.h.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/wordperfect/xp/ie_impexp_WordPerfect.h
-@@ -24,7 +24,6 @@
- */
-
- #include "ie_imp_WordPerfect.h"
--#include "ie_exp_WordPerfect.h"
- #include "xap_Module.h"
-
- #define IE_MIMETYPE_WP_51 "application/wordperfect5.1"
diff --git a/abiword/patches/patch-plugins_wpg_Makefile.am b/abiword/patches/patch-plugins_wpg_Makefile.am
deleted file mode 100644
index 66ff60b..0000000
--- a/abiword/patches/patch-plugins_wpg_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_wpg_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/wpg/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wpg/Makefile.am
-@@ -11,7 +11,7 @@ wpg_la_LIBADD = \
- wpg_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- wpg_la_SOURCES =
- nodist_EXTRA_wpg_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp b/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
deleted file mode 100644
index e9355f3..0000000
--- a/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-$NetBSD: patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp,v 1.2 2014/12/29 20:31:15 nros Exp $
-* adapt wordperfect plugins to dependecies available in pkgsrc
- from abiword svn date 2014-12-27
---- plugins/wpg/xp/ie_impGraphic_WPG.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ plugins/wpg/xp/ie_impGraphic_WPG.cpp
-@@ -31,37 +31,43 @@
- #include <gsf/gsf-input-memory.h>
- #include <gsf/gsf-input-stdio.h>
- #include <gsf/gsf-infile-msole.h>
--#include <libwpd-stream/libwpd-stream.h>
-+#include <gsf/gsf-infile-zip.h>
-+#include <librevenge-stream/librevenge-stream.h>
- #include "xap_Module.h"
-
- using libwpg::WPGraphics;
-
- ABI_PLUGIN_DECLARE("WPG")
-
--class AbiWordPerfectGraphicsInputStream : public WPXInputStream
-+class AbiWordPerfectGraphicsInputStream : public librevenge::RVNGInputStream
- {
- public:
- AbiWordPerfectGraphicsInputStream(GsfInput *input);
- ~AbiWordPerfectGraphicsInputStream();
-
-- virtual bool isOLEStream();
-- virtual WPXInputStream * getDocumentOLEStream();
-- virtual WPXInputStream * getDocumentOLEStream(const char * name);
-+ virtual bool isStructured();
-+ virtual unsigned subStreamCount();
-+ virtual const char* subStreamName(unsigned);
-+ bool existsSubStream(const char*);
-+ virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
-+ virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
- virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
-- virtual int seek(long offset, WPX_SEEK_TYPE seekType);
-+ virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
- virtual long tell();
-- virtual bool atEOS();
-+ virtual bool isEnd();
-
- private:
-
- GsfInput *m_input;
- GsfInfile *m_ole;
-+ std::map<unsigned, std::string> m_substreams;
- };
-
- AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
-- WPXInputStream(),
-+ librevenge::RVNGInputStream(),
- m_input(input),
-- m_ole(NULL)
-+ m_ole(NULL),
-+ m_substreams()
- {
- g_object_ref(G_OBJECT(input));
- }
-@@ -86,45 +92,115 @@ const unsigned char * AbiWordPerfectGrap
- return buf;
- }
-
--int AbiWordPerfectGraphicsInputStream::seek(long offset, WPX_SEEK_TYPE seekType)
-+int AbiWordPerfectGraphicsInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType)
- {
- GSeekType gsfSeekType = G_SEEK_SET;
- switch(seekType)
- {
-- case WPX_SEEK_CUR:
-+ case librevenge::RVNG_SEEK_CUR:
- gsfSeekType = G_SEEK_CUR;
- break;
-- case WPX_SEEK_SET:
-+ case librevenge::RVNG_SEEK_SET:
- gsfSeekType = G_SEEK_SET;
- break;
-+ case librevenge::RVNG_SEEK_END:
-+ gsfSeekType = G_SEEK_END;
-+ break;
- }
-
- return gsf_input_seek(m_input, offset, gsfSeekType);
- }
-
--bool AbiWordPerfectGraphicsInputStream::isOLEStream()
-+bool AbiWordPerfectGraphicsInputStream::isStructured()
- {
- if (!m_ole)
- m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-
-- if (m_ole != NULL)
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
-+ if (m_ole)
- return true;
-
- return false;
- }
-
--WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream()
-+unsigned AbiWordPerfectGraphicsInputStream::subStreamCount()
- {
-- return getDocumentOLEStream("PerfectOffice_MAIN");
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
-+ if (m_ole)
-+ {
-+ int numChildren = gsf_infile_num_children(m_ole);
-+ if (numChildren > 0)
-+ return numChildren;
-+ return 0;
-+ }
-+
-+ return 0;
- }
-
--WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream(const char * name)
-+const char * AbiWordPerfectGraphicsInputStream::subStreamName(unsigned id)
- {
-- WPXInputStream *documentStream = NULL;
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-
-+ if (m_ole)
-+ {
-+ if ((int)id >= gsf_infile_num_children(m_ole))
-+ {
-+ return 0;
-+ }
-+ std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
-+ if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
-+ {
-+ std::string name = gsf_infile_name_by_index(m_ole, (int)id);
-+ i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
-+ }
-+ return i->second.c_str();
-+ }
-+
-+ return 0;
-+}
-+
-+bool AbiWordPerfectGraphicsInputStream::existsSubStream(const char * name)
-+{
- if (!m_ole)
- m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
-+ if (m_ole)
-+ {
-+ GsfInput *document = gsf_infile_child_by_name(m_ole, name);
-+ if (document)
-+ {
-+ g_object_unref(G_OBJECT (document));
-+ return true;
-+ }
-+ }
-+
-+ return false;
-+}
-+
-+librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamByName(const char * name)
-+{
-+ librevenge::RVNGInputStream *documentStream = NULL;
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
- if (m_ole)
- {
- GsfInput *document = gsf_infile_child_by_name(m_ole, name);
-@@ -138,12 +214,35 @@ WPXInputStream * AbiWordPerfectGraphicsI
- return documentStream;
- }
-
-+librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamById(unsigned id)
-+{
-+ librevenge::RVNGInputStream *documentStream = NULL;
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL));
-+
-+ if (!m_ole)
-+ m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL));
-+
-+ if (m_ole)
-+ {
-+ GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
-+ if (document)
-+ {
-+ documentStream = new AbiWordPerfectGraphicsInputStream(document);
-+ g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
-+ }
-+ }
-+
-+ return documentStream;
-+}
-+
- long AbiWordPerfectGraphicsInputStream::tell()
- {
- return gsf_input_tell(m_input);
- }
-
--bool AbiWordPerfectGraphicsInputStream::atEOS()
-+bool AbiWordPerfectGraphicsInputStream::isEnd()
- {
- return gsf_input_eof(m_input);
- }
-@@ -244,14 +343,24 @@ UT_Error IE_Imp_WordPerfectGraphics_Snif
- UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
- {
- AbiWordPerfectGraphicsInputStream gsfInput(input);
-- WPXString svgOutput;
-- if (WPGraphics::generateSVG(&gsfInput, svgOutput))
-+ librevenge::RVNGString svgOutput;
-+ librevenge::RVNGStringVector vec;
-+ librevenge::RVNGSVGDrawingGenerator generator(vec, "");
-+
-+ if (!libwpg::WPGraphics::parse(&gsfInput, &generator) || vec.empty() || vec[0].empty())
- {
-- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
-- UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
-- g_object_unref(svgInput);
-- return result;
-+ return UT_ERROR;
- }
-- return UT_ERROR;
-+
-+ svgOutput.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
-+ svgOutput.append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"");
-+ svgOutput.append(" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\";>\n");
-+ svgOutput.append(vec[0]);
-+ svgOutput.append("\n");
-+
-+ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
-+ UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
-+ g_object_unref(svgInput);
-+ return result;
- }
-
diff --git a/abiword/patches/patch-plugins_xslfo_Makefile.am b/abiword/patches/patch-plugins_xslfo_Makefile.am
deleted file mode 100644
index caa64be..0000000
--- a/abiword/patches/patch-plugins_xslfo_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_xslfo_Makefile.am,v 1.2 2015/01/24 21:41:39 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- plugins/xslfo/Makefile.am.orig 2011-11-15 21:25:46.000000000 +0000
-+++ plugins/xslfo/Makefile.am
-@@ -18,7 +18,7 @@ xslfo_la_LIBADD = \
- xslfo_la_LDFLAGS = \
- -avoid-version \
- -module \
-- -no-undefined
-+ -Wl,-no-undefined
-
- xslfo_la_SOURCES =
- nodist_EXTRA_xslfo_la_SOURCES = dummy.cpp
diff --git a/abiword/patches/patch-src_Makefile.am b/abiword/patches/patch-src_Makefile.am
deleted file mode 100644
index fd5f71b..0000000
--- a/abiword/patches/patch-src_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_Makefile.am,v 1.2 2014/12/30 17:31:37 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall
-to the linker. Prefix with "-Wl," to fix build.
---- src/Makefile.am.orig 2013-02-20 00:39:42.000000000 +0000
-+++ src/Makefile.am
-@@ -58,7 +58,7 @@ libabiword_@ABIWORD_SERIES@_la_CPPFLAGS
- libabiword_@ABIWORD_SERIES@_la_LDFLAGS = \
- $(DEPS_LIBS) \
- $(CHAMPLAIN_LIBS) \
-- -no-undefined \
-+ -Wl,-no-undefined \
- -avoid-version \
- -export-dynamic
-
diff --git a/abiword/patches/patch-src_af_util_xp_ut__endian.h b/abiword/patches/patch-src_af_util_xp_ut__endian.h
deleted file mode 100644
index 6454930..0000000
--- a/abiword/patches/patch-src_af_util_xp_ut__endian.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_af_util_xp_ut__endian.h,v 1.1 2014/12/28 15:57:09 nros Exp $
-
---- src/af/util/xp/ut_endian.h.orig 2013-04-07 13:53:03.000000000 +0000
-+++ src/af/util/xp/ut_endian.h
-@@ -49,6 +49,13 @@
- #else
- #define UT_BIG_ENDIAN
- #endif
-+#elif defined(__DragonFly__)
-+ #include <sys/endian.h>
-+ #if _BYTE_ORDER == _LITTLE_ENDIAN
-+ #define UT_LITTLE_ENDIAN
-+ #else
-+ #define UT_BIG_ENDIAN
-+ #endif
- #elif defined(__FreeBSD__)
- #include <machine/endian.h>
- #if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp b/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp
deleted file mode 100644
index 9bbf893..0000000
--- a/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_af_util_xp_ut__iconv.cpp,v 1.1 2015/02/27 17:20:26 nros Exp $
-* NetBSD uses citrus iconv that has UCS-4
---- src/af/util/xp/ut_iconv.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ src/af/util/xp/ut_iconv.cpp
-@@ -267,9 +267,11 @@ const char * ucs4Internal ()
- #elif defined(_LIBICONV_H)
- // libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE
- return "UCS-4-INTERNAL";
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
- // we special case the BSDs since spelling just doesn't work
- return "UCS4";
-+#elif defined(__NetBSD__)
-+ return "UCS-4";
- #else
- // general case, found by hub and dom
- if (s_ucs4_internal == 0)
diff --git a/abiword/patches/patch-src_af_util_xp_ut__iconv.h b/abiword/patches/patch-src_af_util_xp_ut__iconv.h
deleted file mode 100644
index 8e9f548..0000000
--- a/abiword/patches/patch-src_af_util_xp_ut__iconv.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_af_util_xp_ut__iconv.h,v 1.1 2014/12/28 15:57:09 nros Exp $
-
---- src/af/util/xp/ut_iconv.h.orig 2013-04-07 13:53:03.000000000 +0000
-+++ src/af/util/xp/ut_iconv.h
-@@ -30,8 +30,14 @@
- #include "ut_types.h"
- #endif
-
-+#include <sys/param.h>
-+
- typedef void * UT_iconv_t;
-
-+#if defined(__NetBSD__) && __NetBSD_Version__ >= 200000000
-+struct __tag_iconv_t { }; /* XXX: for catch/throw (ISO C++ 15.1)*/
-+#endif
-+
- #define UT_ICONV_INVALID ((UT_iconv_t)(-1))
-
- #ifdef __cplusplus
diff --git a/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp b/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
deleted file mode 100644
index c2e2d2d..0000000
--- a/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_af_util_xp_ut__mbtowc.cpp,v 1.2 2015/06/16 09:33:22 nros Exp $
-* remove bom if it comes with the conversion
- makes the rulers look correct on startup
---- src/af/util/xp/ut_mbtowc.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ src/af/util/xp/ut_mbtowc.cpp
-@@ -192,7 +192,24 @@ int UT_UCS4_mbtowc::mbtowc (UT_UCS4Char
- gsize bytes_read = 0;
- gsize bytes_written = 0;
- GError* error = NULL;
-- gchar* out = g_convert_with_iconv(inptr, inlen, (GIConv)cd, &bytes_read, &bytes_written, &error);
-+ gchar* out = NULL;
-+ unsigned char bom_le[4] = {0xFF,0xFE,0,0};
-+ unsigned char bom_be[4] = {0,0,0xFE,0xFF};
-+
-+ out = g_convert_with_iconv(inptr, inlen, (GIConv)cd, &bytes_read, &bytes_written, &error);
-+ // if we get a bom with the conversion redo it to get one without a bom
-+ if (out && bytes_written == 8)
-+ {
-+ if (memcmp(out, bom_be, 4) == 0 || memcmp(out, bom_le, 4) == 0)
-+ {
-+ bytes_read = 0;
-+ bytes_written = 0;
-+ error = NULL;
-+ FREEP(out);
-+ out = g_convert_with_iconv(inptr, inlen, (GIConv)cd, &bytes_read, &bytes_written, &error);
-+ }
-+ }
-+
- if (out && bytes_written == 4)
- {
- memcpy(&wc, out, 4);
diff --git a/abiword/patches/patch-src_af_util_xp_ut__misc.cpp b/abiword/patches/patch-src_af_util_xp_ut__misc.cpp
deleted file mode 100644
index 1e8fc95..0000000
--- a/abiword/patches/patch-src_af_util_xp_ut__misc.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_af_util_xp_ut__misc.cpp,v 1.1 2014/12/28 15:57:09 nros Exp $
-
---- src/af/util/xp/ut_misc.cpp.orig 2013-04-07 13:53:03.000000000 +0000
-+++ src/af/util/xp/ut_misc.cpp
-@@ -589,7 +589,7 @@ const gchar ** UT_splitPropsToArray(gcha
- }
-
- char * semi = NULL;
-- const char * p = pProps;
-+ char * p = pProps;
- while((semi = (char *) strchr(p, ';')))
- {
- *semi = 0;
-@@ -603,7 +603,7 @@ const gchar ** UT_splitPropsToArray(gcha
- const gchar ** pPropsArray = new const gchar *[2 * iPropCount + 1];
- UT_return_val_if_fail( pPropsArray, NULL );
-
-- const char * pStart = pProps;
-+ char * pStart = pProps;
-
- // we want to include the 0-terminator
- for(i = 0; i <= iLen; i++)
diff --git a/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp b/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
deleted file mode 100644
index 4acc35a..0000000
--- a/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.1 2015/04/04 22:46:03 nros Exp $
-
-* fixes build on FreeBSD 10 with clang. From FreeBSD ports mailing list.
- Applied upstream.
- https://lists.freebsd.org/pipermail/freebsd-ports/2015-March/098621.html
-
---- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig 2015-04-04 22:33:15.000000000 +0000
-+++ src/text/ptbl/xp/pd_DocumentRDF.cpp
-@@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin
- return m_value == b;
- }
-
-+bool PD_URI::operator<(const PD_URI& b) const
-+{
-+return m_value < b.m_value;
-+}
-+
- PD_URI
- PD_URI::prefixedToURI( PD_RDFModelHandle model ) const
- {
-@@ -611,11 +616,6 @@ bool PD_URI::write( std::ostream& ss ) c
- return true;
- }
-
--bool operator<( PD_URI a, PD_URI b)
--{
-- return a.toString() < b.toString();
--}
--
- bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b)
- {
- return a.first.toString() < b.toString();
diff --git a/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h b/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h
deleted file mode 100644
index f93e918..0000000
--- a/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.h,v 1.1 2015/04/04 22:46:03 nros Exp $
-* Fixes build on FreeBSD 10 with clang. From freebsd-ports mailing list.
- Applied upstream.
- https://lists.freebsd.org/pipermail/freebsd-ports/2015-March/098621.html
-
---- src/text/ptbl/xp/pd_DocumentRDF.h.orig 2015-04-04 22:38:01.000000000 +0000
-+++ src/text/ptbl/xp/pd_DocumentRDF.h
-@@ -68,6 +68,7 @@ class ABI_EXPORT PD_URI
- bool isValid() const;
- bool operator==(const PD_URI& b) const;
- bool operator==(const std::string& b) const;
-+ bool operator<(const PD_URI& b) const;
-
- virtual bool read( std::istream& ss );
- virtual bool write( std::ostream& ss ) const;
Home |
Main Index |
Thread Index |
Old Index