* Update to 1.99.1 (aka 2.0 Beta 1)

* Re-enable gucharmap support

3 files changed, 80 insertions, 11 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 7f896beb798e..4c8acf9b2d0c 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	1.9.1
+PORTVERSION=	1.99.1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -54,17 +54,17 @@ PKGNAMESUFFIX=		-gnome
 GNOME_ENABLED=		yes
 .endif
 
-#.if defined(WITH_GUCHARMAP) || exists(${X11BASE}/libdata/pkgconfig/gucharmap.pc)
-#LIB_DEPENDS+=		gucharmap.3:${PORTSDIR}/misc/gucharmap
-#.else
+.if defined(WITH_GUCHARMAP) || exists(${X11BASE}/libdata/pkgconfig/gucharmap.pc)
+LIB_DEPENDS+=		gucharmap.3:${PORTSDIR}/misc/gucharmap
+.else
 CONFIGURE_ARGS+=	--enable-cmap=no
-#.endif
+.endif
 
-#pre-everything::
-#	@${ECHO_MSG} ""
-#	@${ECHO_MSG} "AbiWord2 has the following tunable option(s):"
-#	@${ECHO_MSG} "	WITH_GUCHARMAP=yes	Enable use of Gucharmap as the symbol insertion tool (default: auto)"
-#	@${ECHO_MSG} ""
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "AbiWord2 has the following tunable option(s):"
+	@${ECHO_MSG} "	WITH_GUCHARMAP=yes	Enable use of Gucharmap as the symbol insertion tool (default: auto)"
+	@${ECHO_MSG} ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%AUTOMAKE%%|${AUTOMAKE}|g ; \
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index a0b9d1d9d298..f9c0cb1ad52d 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-1.9.1.tar.gz) = 23aefdf3495877ca661c216d29248552
+MD5 (AbiWord/abiword-1.99.1.tar.gz) = e96b50aea36ebf935d001b436b2bc582
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index d1463e962d23..0de96e71bb25 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -6,13 +6,23 @@ bin/ttftool
 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_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
@@ -174,6 +184,65 @@ 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/gnome/apps/Applications/abiword.desktop
 %%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
 share/gnome/pixmaps/abiword_48.png