abiword -> abiword1, abiword2 -> abiword.

7 files changed, 2 insertions, 385 deletions

diff --git a/editors/Makefile b/editors/Makefile
index 07319751b99..f11014d740a 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.93 2003/12/21 09:24:39 xtraeme Exp $
+# $NetBSD: Makefile,v 1.94 2003/12/26 18:27:57 wiz Exp $
 #
 
 COMMENT=	Editors
 
 SUBDIR+=	TeXmacs
 SUBDIR+=	abiword
-SUBDIR+=	abiword2
+SUBDIR+=	abiword1
 SUBDIR+=	beav
 SUBDIR+=	beaver
 SUBDIR+=	biew
diff --git a/editors/abiword2/DESCR b/editors/abiword2/DESCR
deleted file mode 100644
index 749a9c9cee0..00000000000
--- a/editors/abiword2/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-AbiWord is an open-source, cross-platform WYSIWYG word processor.
-This version uses GTK+2.
-
-Features include: 
-
- - Basic character formatting (bold, underline, italics, etc.) 
- - Paragraph alignment 
- - Spell-check 
- - Import of Word97 and RTF documents 
- - Export to RTF, Text, HTML, and LaTeX formats 
- - Interactive rulers and tabs 
- - Styles 
- - Unlimited undo/redo 
- - Multiple column control 
- - Widow/orphan control 
- - Find/Replace 
- - Anti-aliased fonts
- - Images
diff --git a/editors/abiword2/Makefile b/editors/abiword2/Makefile
deleted file mode 100644
index 2e325157a17..00000000000
--- a/editors/abiword2/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/12/21 09:23:12 xtraeme Exp $
-#
-
-DISTNAME=		abiword-${DIST_VER}
-PKGNAME=		${DISTNAME:S/word/word2/}
-WRKSRC=			${WRKDIR}/${DISTNAME}/abi
-CATEGORIES=		editors
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=abiword/}
-
-MAINTAINER=		xtraeme@NetBSD.org
-HOMEPAGE=		http://www.abisource.com/
-COMMENT=		Open Source cross-platform word processor (version 2)
-
-BUILD_USES_MSGFMT=	yes
-
-GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
-USE_PERL5=		run
-USE_X11=		yes
-
-REPLACE_PERL=		user/wp/scripts/abw2html.pl
-
-USE_GNU_ICONV=		yes # XXX
-
-MAKEFILE=		GNUmakefile
-
-DIST_VER=		2.0.2
-
-CONFIGURE_ARGS+=	--enable-threads
-CONFIGURE_ARGS+=	--with-sys-wv
-CONFIGURE_ARGS+=	--with-libxml2
-CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+=	--with-popt=${BUILDLINK_PREFIX.popt}
-CONFIGURE_ARGS+=	--with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg}
-CONFIGURE_ARGS+=	--with-libpng=${BUILDLINK_PREFIX.png}
-
-PATCHDIR=		${.CURDIR}/../../editors/abiword2/patches
-PLIST_SRC=		${.CURDIR}/../../editors/abiword2/PLIST
-DESCR_SRC=		${.CURDIR}/../../editors/abiword2/DESCR
-DISTINFO_FILE=		${.CURDIR}/../../editors/abiword2/distinfo
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+=			ABIWORD_USES_GUCHARMAP
-
-ABIWORD_USES_GUCHARMAP?=	NO
-
-.if !empty(ABIWORD_USES_GUCHARMAP:M[Yy][Ee][Ss])
-CONFIGURE_ARGS+=		--enable-gucharmap
-.include "../../fonts/gucharmap/buildlink2.mk"
-.else
-CONFIGURE_ARGS+=		--disable-gucharmap
-.endif
-
-.include "../../converters/fribidi/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../converters/wv/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../textproc/enchant/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
-
-.include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/editors/abiword2/PLIST b/editors/abiword2/PLIST
deleted file mode 100644
index 7e134e51689..00000000000
--- a/editors/abiword2/PLIST
+++ /dev/null
@@ -1,262 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/21 09:23:12 xtraeme Exp $
-bin/AbiWord-2.0
-bin/abiword
-bin/ttfadmin.sh
-bin/ttftool
-lib/bonobo/servers/GNOME_AbiWord_Control_2_0.server
-share/AbiSuite-2.0/AbiWord.exe.MANIFEST
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Break.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Field.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_FormatFootnotes.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_FormatTable.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_HdrFtr.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_InsertTable.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Insert_DateTime.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_MailMerge.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_MetaData.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_New.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_PageNumbers.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Replace.glade
-share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_WordCount.glade
-share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_About.glade
-share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_Encoding.glade
-share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_Image.glade
-share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_Language.glade
-share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_Password.glade
-share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_PluginManager.glade
-share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_WindowMore.glade
-share/AbiSuite-2.0/AbiWord/glade/xap_UnixDlg_Zoom.glade
-share/AbiSuite-2.0/AbiWord/readme.txt
-share/AbiSuite-2.0/AbiWord/scripts/abw2html.pl
-share/AbiSuite-2.0/AbiWord/strings/am-ET.strings
-share/AbiSuite-2.0/AbiWord/strings/be-BY.strings
-share/AbiSuite-2.0/AbiWord/strings/bg-BG.strings
-share/AbiSuite-2.0/AbiWord/strings/br-FR.strings
-share/AbiSuite-2.0/AbiWord/strings/ca-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/cs-CZ.strings
-share/AbiSuite-2.0/AbiWord/strings/cy-GB.strings
-share/AbiSuite-2.0/AbiWord/strings/da-DK.strings
-share/AbiSuite-2.0/AbiWord/strings/de-CH.strings
-share/AbiSuite-2.0/AbiWord/strings/de-DE.strings
-share/AbiSuite-2.0/AbiWord/strings/el-GR.strings
-share/AbiSuite-2.0/AbiWord/strings/en-AU.strings
-share/AbiSuite-2.0/AbiWord/strings/en-GB.strings
-share/AbiSuite-2.0/AbiWord/strings/en-IE.strings
-share/AbiSuite-2.0/AbiWord/strings/es-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/es-MX.strings
-share/AbiSuite-2.0/AbiWord/strings/eu-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/fi-FI.strings
-share/AbiSuite-2.0/AbiWord/strings/fr-FR.strings
-share/AbiSuite-2.0/AbiWord/strings/ga-IE.strings
-share/AbiSuite-2.0/AbiWord/strings/gl-ES.strings
-share/AbiSuite-2.0/AbiWord/strings/he-IL.strings
-share/AbiSuite-2.0/AbiWord/strings/hu-HU.strings
-share/AbiSuite-2.0/AbiWord/strings/id-ID.strings
-share/AbiSuite-2.0/AbiWord/strings/it-IT.strings
-share/AbiSuite-2.0/AbiWord/strings/ja-JP.strings
-share/AbiSuite-2.0/AbiWord/strings/jbo.strings
-share/AbiSuite-2.0/AbiWord/strings/lt-LT.strings
-share/AbiSuite-2.0/AbiWord/strings/lv-LV.strings
-share/AbiSuite-2.0/AbiWord/strings/mh-MH.strings
-share/AbiSuite-2.0/AbiWord/strings/ms-MY.strings
-share/AbiSuite-2.0/AbiWord/strings/nb-NO.strings
-share/AbiSuite-2.0/AbiWord/strings/nl-NL.strings
-share/AbiSuite-2.0/AbiWord/strings/nn-NO.strings
-share/AbiSuite-2.0/AbiWord/strings/pl-PL.strings
-share/AbiSuite-2.0/AbiWord/strings/pt-BR.strings
-share/AbiSuite-2.0/AbiWord/strings/pt-PT.strings
-share/AbiSuite-2.0/AbiWord/strings/ro-RO.strings
-share/AbiSuite-2.0/AbiWord/strings/ru-RU.strings
-share/AbiSuite-2.0/AbiWord/strings/sc-IT.strings
-share/AbiSuite-2.0/AbiWord/strings/sk-SK.strings
-share/AbiSuite-2.0/AbiWord/strings/sl-SI.strings
-share/AbiSuite-2.0/AbiWord/strings/sq-AL.strings
-share/AbiSuite-2.0/AbiWord/strings/sr.strings
-share/AbiSuite-2.0/AbiWord/strings/sv-SE.strings
-share/AbiSuite-2.0/AbiWord/strings/tr-TR.strings
-share/AbiSuite-2.0/AbiWord/strings/uk-UA.strings
-share/AbiSuite-2.0/AbiWord/strings/vi-VN.strings
-share/AbiSuite-2.0/AbiWord/strings/yi.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-CN.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-HK.strings
-share/AbiSuite-2.0/AbiWord/strings/zh-TW.strings
-share/AbiSuite-2.0/AbiWord/system.profile
-share/AbiSuite-2.0/AbiWord/system.profile-CP1254
-share/AbiSuite-2.0/AbiWord/system.profile-KOI8-R
-share/AbiSuite-2.0/AbiWord/system.profile-KOI8-U
-share/AbiSuite-2.0/AbiWord/system.profile-KOI8-UB
-share/AbiSuite-2.0/AbiWord/system.profile-am-ET
-share/AbiSuite-2.0/AbiWord/system.profile-ar
-share/AbiSuite-2.0/AbiWord/system.profile-ar-EG
-share/AbiSuite-2.0/AbiWord/system.profile-ar-SA
-share/AbiSuite-2.0/AbiWord/system.profile-bg-BG
-share/AbiSuite-2.0/AbiWord/system.profile-ca-ES
-share/AbiSuite-2.0/AbiWord/system.profile-cs-CZ
-share/AbiSuite-2.0/AbiWord/system.profile-da-DK
-share/AbiSuite-2.0/AbiWord/system.profile-de
-share/AbiSuite-2.0/AbiWord/system.profile-de-AT
-share/AbiSuite-2.0/AbiWord/system.profile-de-CH
-share/AbiSuite-2.0/AbiWord/system.profile-de-DE
-share/AbiSuite-2.0/AbiWord/system.profile-div-MV
-share/AbiSuite-2.0/AbiWord/system.profile-el-GR
-share/AbiSuite-2.0/AbiWord/system.profile-en
-share/AbiSuite-2.0/AbiWord/system.profile-en-AU
-share/AbiSuite-2.0/AbiWord/system.profile-en-CA
-share/AbiSuite-2.0/AbiWord/system.profile-en-GB
-share/AbiSuite-2.0/AbiWord/system.profile-en-IE
-share/AbiSuite-2.0/AbiWord/system.profile-en-NZ
-share/AbiSuite-2.0/AbiWord/system.profile-en-US
-share/AbiSuite-2.0/AbiWord/system.profile-en-ZA
-share/AbiSuite-2.0/AbiWord/system.profile-es
-share/AbiSuite-2.0/AbiWord/system.profile-es-ES
-share/AbiSuite-2.0/AbiWord/system.profile-es-MX
-share/AbiSuite-2.0/AbiWord/system.profile-eu
-share/AbiSuite-2.0/AbiWord/system.profile-eu-ES
-share/AbiSuite-2.0/AbiWord/system.profile-fa-IR
-share/AbiSuite-2.0/AbiWord/system.profile-fi-FI
-share/AbiSuite-2.0/AbiWord/system.profile-fr
-share/AbiSuite-2.0/AbiWord/system.profile-fr-BE
-share/AbiSuite-2.0/AbiWord/system.profile-fr-CA
-share/AbiSuite-2.0/AbiWord/system.profile-fr-CH
-share/AbiSuite-2.0/AbiWord/system.profile-fr-FR
-share/AbiSuite-2.0/AbiWord/system.profile-gl-ES
-share/AbiSuite-2.0/AbiWord/system.profile-he
-share/AbiSuite-2.0/AbiWord/system.profile-he-IL
-share/AbiSuite-2.0/AbiWord/system.profile-hu-HU
-share/AbiSuite-2.0/AbiWord/system.profile-it-IT
-share/AbiSuite-2.0/AbiWord/system.profile-ja-JP
-share/AbiSuite-2.0/AbiWord/system.profile-lt-LT
-share/AbiSuite-2.0/AbiWord/system.profile-nb-NO
-share/AbiSuite-2.0/AbiWord/system.profile-nl-NL
-share/AbiSuite-2.0/AbiWord/system.profile-nn-NO
-share/AbiSuite-2.0/AbiWord/system.profile-pl-PL
-share/AbiSuite-2.0/AbiWord/system.profile-ps
-share/AbiSuite-2.0/AbiWord/system.profile-pt-BR
-share/AbiSuite-2.0/AbiWord/system.profile-pt-PT
-share/AbiSuite-2.0/AbiWord/system.profile-ru
-share/AbiSuite-2.0/AbiWord/system.profile-ru-RU
-share/AbiSuite-2.0/AbiWord/system.profile-sk-SK
-share/AbiSuite-2.0/AbiWord/system.profile-sk-SK.CP1250
-share/AbiSuite-2.0/AbiWord/system.profile-sl
-share/AbiSuite-2.0/AbiWord/system.profile-sv
-share/AbiSuite-2.0/AbiWord/system.profile-sv-SE
-share/AbiSuite-2.0/AbiWord/system.profile-syr
-share/AbiSuite-2.0/AbiWord/system.profile-tr
-share/AbiSuite-2.0/AbiWord/system.profile-tr-TR
-share/AbiSuite-2.0/AbiWord/system.profile-tr-TR.CP1254
-share/AbiSuite-2.0/AbiWord/system.profile-uk-UA
-share/AbiSuite-2.0/AbiWord/system.profile-ur-PK
-share/AbiSuite-2.0/AbiWord/system.profile-yi
-share/AbiSuite-2.0/AbiWord/system.profile-zh-CN
-share/AbiSuite-2.0/AbiWord/system.profile-zh-TW
-share/AbiSuite-2.0/README
-share/AbiSuite-2.0/abi-nautilus-view-file.xml
-share/AbiSuite-2.0/clipart/book.png
-share/AbiSuite-2.0/clipart/chip.png
-share/AbiSuite-2.0/clipart/fun.png
-share/AbiSuite-2.0/clipart/gear.png
-share/AbiSuite-2.0/clipart/gnomea.png
-share/AbiSuite-2.0/clipart/gnomeb.png
-share/AbiSuite-2.0/clipart/gnomec.png
-share/AbiSuite-2.0/clipart/gnomecorner.png
-share/AbiSuite-2.0/clipart/gnomed.png
-share/AbiSuite-2.0/clipart/gnomedecor1.png
-share/AbiSuite-2.0/clipart/gnomedecor2.png
-share/AbiSuite-2.0/clipart/gnomee.png
-share/AbiSuite-2.0/clipart/gnomeflowers.png
-share/AbiSuite-2.0/clipart/gnomeline.png
-share/AbiSuite-2.0/clipart/idea.png
-share/AbiSuite-2.0/clipart/lamp.png
-share/AbiSuite-2.0/clipart/monitor.png
-share/AbiSuite-2.0/clipart/music1.png
-share/AbiSuite-2.0/clipart/pinceau.png
-share/AbiSuite-2.0/clipart/simca.png
-share/AbiSuite-2.0/clipart/surprise.png
-share/AbiSuite-2.0/clipart/together.png
-share/AbiSuite-2.0/clipart/toolbox.png
-share/AbiSuite-2.0/clipart/tree.png
-share/AbiSuite-2.0/clipart/tux_bordelais.png
-share/AbiSuite-2.0/clipart/weather.png
-share/AbiSuite-2.0/clipart/write.png
-share/AbiSuite-2.0/icons/abiword_16.xpm
-share/AbiSuite-2.0/icons/abiword_48.png
-share/AbiSuite-2.0/icons/abiword_48.tif
-share/AbiSuite-2.0/icons/abiword_48.xpm
-share/AbiSuite-2.0/templates/A4.awt
-share/AbiSuite-2.0/templates/Business-Report.awt
-share/AbiSuite-2.0/templates/Employee-Directory.awt
-share/AbiSuite-2.0/templates/Fax-Coversheet.awt
-share/AbiSuite-2.0/templates/Two-Columns.awt
-share/AbiSuite-2.0/templates/US-Letter.awt
-share/AbiSuite-2.0/templates/normal.awt
-share/AbiSuite-2.0/templates/normal.awt-am_ET
-share/AbiSuite-2.0/templates/normal.awt-ar
-share/AbiSuite-2.0/templates/normal.awt-ar_EG
-share/AbiSuite-2.0/templates/normal.awt-ar_SA
-share/AbiSuite-2.0/templates/normal.awt-bg_BG
-share/AbiSuite-2.0/templates/normal.awt-ca_ES
-share/AbiSuite-2.0/templates/normal.awt-cs_CZ
-share/AbiSuite-2.0/templates/normal.awt-da_DK
-share/AbiSuite-2.0/templates/normal.awt-de
-share/AbiSuite-2.0/templates/normal.awt-de_AT
-share/AbiSuite-2.0/templates/normal.awt-de_CH
-share/AbiSuite-2.0/templates/normal.awt-de_DE
-share/AbiSuite-2.0/templates/normal.awt-div_MV
-share/AbiSuite-2.0/templates/normal.awt-el_GR
-share/AbiSuite-2.0/templates/normal.awt-en_AU
-share/AbiSuite-2.0/templates/normal.awt-en_CA
-share/AbiSuite-2.0/templates/normal.awt-en_GB
-share/AbiSuite-2.0/templates/normal.awt-en_IE
-share/AbiSuite-2.0/templates/normal.awt-en_NZ
-share/AbiSuite-2.0/templates/normal.awt-en_ZA
-share/AbiSuite-2.0/templates/normal.awt-es
-share/AbiSuite-2.0/templates/normal.awt-es_ES
-share/AbiSuite-2.0/templates/normal.awt-es_FI
-share/AbiSuite-2.0/templates/normal.awt-es_IR
-share/AbiSuite-2.0/templates/normal.awt-es_MX
-share/AbiSuite-2.0/templates/normal.awt-fa_IR
-share/AbiSuite-2.0/templates/normal.awt-fr
-share/AbiSuite-2.0/templates/normal.awt-fr_BE
-share/AbiSuite-2.0/templates/normal.awt-fr_CA
-share/AbiSuite-2.0/templates/normal.awt-fr_CH
-share/AbiSuite-2.0/templates/normal.awt-fr_FR
-share/AbiSuite-2.0/templates/normal.awt-gl_ES
-share/AbiSuite-2.0/templates/normal.awt-he
-share/AbiSuite-2.0/templates/normal.awt-he_IL
-share/AbiSuite-2.0/templates/normal.awt-hu_HU
-share/AbiSuite-2.0/templates/normal.awt-it_IT
-share/AbiSuite-2.0/templates/normal.awt-ja_JP
-share/AbiSuite-2.0/templates/normal.awt-lt_LT
-share/AbiSuite-2.0/templates/normal.awt-nb_NO
-share/AbiSuite-2.0/templates/normal.awt-nl_NL
-share/AbiSuite-2.0/templates/normal.awt-nn_NO
-share/AbiSuite-2.0/templates/normal.awt-pl_PL
-share/AbiSuite-2.0/templates/normal.awt-ps
-share/AbiSuite-2.0/templates/normal.awt-pt_BR
-share/AbiSuite-2.0/templates/normal.awt-pt_PT
-share/AbiSuite-2.0/templates/normal.awt-ru
-share/AbiSuite-2.0/templates/normal.awt-ru_RU
-share/AbiSuite-2.0/templates/normal.awt-sk_SK
-share/AbiSuite-2.0/templates/normal.awt-sl
-share/AbiSuite-2.0/templates/normal.awt-sv
-share/AbiSuite-2.0/templates/normal.awt-sv_SE
-share/AbiSuite-2.0/templates/normal.awt-syr
-share/AbiSuite-2.0/templates/normal.awt-tr
-share/AbiSuite-2.0/templates/normal.awt-tr_TR
-share/AbiSuite-2.0/templates/normal.awt-uk_UA
-share/AbiSuite-2.0/templates/normal.awt-ur_PK
-share/AbiSuite-2.0/templates/normal.awt-yi
-share/AbiSuite-2.0/templates/normal.awt-zh_CN
-share/AbiSuite-2.0/templates/normal.awt-zh_TW
-share/applications/abiword.desktop
-share/icons/abiword_48.png
-@dirrm share/AbiSuite-2.0/templates
-@dirrm share/AbiSuite-2.0/icons
-@exec ${MKDIR} %D/share/AbiSuite-2.0/dictionary
-@dirrm share/AbiSuite-2.0/dictionary
-@dirrm share/AbiSuite-2.0/clipart
-@dirrm share/AbiSuite-2.0/AbiWord/strings
-@dirrm share/AbiSuite-2.0/AbiWord/scripts
-@dirrm share/AbiSuite-2.0/AbiWord/glade
-@dirrm share/AbiSuite-2.0/AbiWord
-@dirrm share/AbiSuite-2.0
diff --git a/editors/abiword2/distinfo b/editors/abiword2/distinfo
deleted file mode 100644
index 7755d44e5c4..00000000000
--- a/editors/abiword2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/12/21 09:23:12 xtraeme Exp $
-
-SHA1 (abiword-2.0.2.tar.gz) = cc4d12225941cfb866d8ca37af0b026906329978
-Size (abiword-2.0.2.tar.gz) = 25957833 bytes
-SHA1 (patch-aa) = 730e205f54516535394659c74e052bbe706e1bc2
-SHA1 (patch-ab) = a678cee31946b0102e6e62145b1d87eb3b323989
diff --git a/editors/abiword2/patches/patch-aa b/editors/abiword2/patches/patch-aa
deleted file mode 100644
index 5b05633d2b6..00000000000
--- a/editors/abiword2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/14 03:24:51 xtraeme Exp $
-
---- configure.orig	2003-11-28 17:04:17.000000000 +0100
-+++ configure	2003-11-28 17:04:36.000000000 +0100
-@@ -3571,7 +3571,7 @@
- 		WARNING_CFLAGS=""
- 		;;
- 	*BSD)
--		WARNING_CFLAGS="-Wall -pedantic -ansi -D_BSD_SOURCE -pipe"
-+		WARNING_CFLAGS="-Wall -D_BSD_SOURCE -pipe"
- 		;;
- 	IRIX*)
- 		case "$GCC" in
diff --git a/editors/abiword2/patches/patch-ab b/editors/abiword2/patches/patch-ab
deleted file mode 100644
index 400eb02b807..00000000000
--- a/editors/abiword2/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/14 03:24:51 xtraeme Exp $
-
---- src/af/util/xp/ut_iconv.cpp.orig	Thu Jul 17 15:12:55 2003
-+++ src/af/util/xp/ut_iconv.cpp	Thu Jul 17 15:16:40 2003
-@@ -295,8 +295,8 @@
-     return (size_t)-1;
- 
- 
--  ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf);
--  return iconv( cd, buf, inbytesleft, outbuf, outbytesleft );
-+  //ICONV_CONST char ** buf = const_cast<ICONV_CONST char**>(inbuf);
-+  return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft );
- }
- 
- int  UT_iconv_close( UT_iconv_t cd )