- Update to 2.3.1.

- Disable WITH_OPENWRITER for now, which it requires libgsf 1.12.1. I think,
  it is in MarcusCom CVS with GNOME 2.11.x (2.12). I am not sure if I should
  move abiword(-plugins)-devel in MarcusCom CVS yet.

7 files changed, 28 insertions, 28 deletions

diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 822e06dad0ce..be92f09b9fbc 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.3.0
-PORTREVISION=	3
+PORTVERSION=	2.3.1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index 4e1bdb05f0a1..dcf453dc7e06 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.3.0.tar.bz2) = 93c188a373a65dfb17d91d08e9fa3cb9
-SIZE (AbiWord/abiword-2.3.0.tar.bz2) = 24052384
+MD5 (AbiWord/abiword-2.3.1.tar.bz2) = 4e0230224ec93286d0c21e60261c8fb3
+SIZE (AbiWord/abiword-2.3.1.tar.bz2) = 24112311
diff --git a/editors/abiword-devel/files/patch-GNUmakefile.in b/editors/abiword-devel/files/patch-GNUmakefile.in
index e7b1b3f4059a..d3b652ea1edf 100644
--- a/editors/abiword-devel/files/patch-GNUmakefile.in
+++ b/editors/abiword-devel/files/patch-GNUmakefile.in
@@ -1,6 +1,6 @@
---- GNUmakefile.in.orig	Wed Jan  5 15:28:11 2005
-+++ GNUmakefile.in	Wed Jan  5 15:30:55 2005
-@@ -315,15 +315,15 @@
+--- GNUmakefile.in.orig	Sun Jun 12 16:03:48 2005
++++ GNUmakefile.in	Sun Jun 12 16:04:57 2005
+@@ -326,15 +326,15 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  SUBDIRS = src
@@ -25,7 +25,7 @@
  @BIGENDIAN_FALSE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/LittleEndian32.american.hash
  @BIGENDIAN_TRUE@dictionary = $(top_srcdir)/../abidistfiles/dictionary/BigEndian32.american.hash
  @WITH_ISPELL_FALSE@INSTALLDICTIONARY = no
-@@ -816,7 +816,6 @@
+@@ -829,7 +829,6 @@
  
  # Install the datafiles. This is quick-and-dirty.
  install-data-local:
@@ -33,7 +33,7 @@
  	if test -d $(top_srcdir)/../abidistfiles ; then \
  	  for dir in `cd $(top_srcdir)/../abidistfiles; find . -type d ! -name CVS` ; do \
  	    $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$dir ;\
-@@ -829,11 +828,7 @@
+@@ -842,11 +841,7 @@
  	      for file in `echo $(top_srcdir)/../abidistfiles/$$dir/* | grep -v MANIFEST`; do \
  	        if test -f $$file ; then \
  		  sfile=`echo "$$file" | sed 's/\.[^.]*$$//'`; \
diff --git a/editors/abiword-devel/files/patch-aq b/editors/abiword-devel/files/patch-aq
index e00bf0585c14..98ce2809346a 100644
--- a/editors/abiword-devel/files/patch-aq
+++ b/editors/abiword-devel/files/patch-aq
@@ -1,6 +1,6 @@
---- src/config/abi_defs.mk.orig	Thu Jun 17 14:54:58 2004
-+++ src/config/abi_defs.mk	Thu Jun 17 14:55:04 2004
-@@ -217,11 +217,11 @@
+--- src/config/abi_defs.mk.orig	Sun Jun 12 16:07:25 2005
++++ src/config/abi_defs.mk	Sun Jun 12 16:08:49 2005
+@@ -202,11 +202,11 @@
  ## INSTALL program...
  
  define MAKE_OBJDIR
@@ -10,11 +10,11 @@
  
  define VERIFY_DIRECTORY
 -if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
-+if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p  xxxx; fi
++if test ! -d xxxx; then rm -rf xxxx; $(ABIMKDIR) -p xxxx; fi
  endef
  
  ifeq ($(OS_NAME), WIN32)
-@@ -266,7 +266,9 @@
+@@ -251,7 +251,9 @@
  ##################################################################
  ##################################################################
  
diff --git a/editors/abiword-devel/files/patch-src_wp_main_unix_GNUmakefile.in b/editors/abiword-devel/files/patch-src_wp_main_unix_GNUmakefile.in
index f1aba8428231..dffefdd47235 100644
--- a/editors/abiword-devel/files/patch-src_wp_main_unix_GNUmakefile.in
+++ b/editors/abiword-devel/files/patch-src_wp_main_unix_GNUmakefile.in
@@ -1,6 +1,6 @@
---- src/wp/main/unix/GNUmakefile.in.orig	Thu May 12 16:03:35 2005
-+++ src/wp/main/unix/GNUmakefile.in	Thu May 12 16:03:59 2005
-@@ -733,8 +733,6 @@
+--- src/wp/main/unix/GNUmakefile.in.orig	Sun Jun 12 16:12:49 2005
++++ src/wp/main/unix/GNUmakefile.in	Sun Jun 12 16:13:12 2005
+@@ -735,8 +735,6 @@
  install-exec-local:	
  	@if test -f $(DESTDIR)/$(bindir)/abiword; then \
  	  echo "$(DESTDIR)/$(bindir)/abiword is a regular file - I'm not going to create a link."; \
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index ad06f4a122f0..c51698f4f158 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -236,6 +236,7 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-en_IE
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-en_NZ
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-en_ZA
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es
+share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es_AR
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es_ES
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es_IR
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-es_MX
diff --git a/editors/abiword-plugins-devel/Makefile b/editors/abiword-plugins-devel/Makefile
index 5158812b490d..75e476c384a3 100644
--- a/editors/abiword-plugins-devel/Makefile
+++ b/editors/abiword-plugins-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.3.1
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -177,13 +176,14 @@ PLIST_SUB+=		NROFF:=""
 PLIST_SUB+=		NROFF:="@comment "
 .endif
 
-.if defined(WITH_OPENWRITER) || defined(PACKAGE_BUILDING)
-USE_GNOME+=		libgsf
-CONFIGURE_ARGS+=	--enable-OpenWriter
-PLIST_SUB+=		OPENWRITER:=""
-.else
+# Disable for now, it requires libgsf 1.12.1.
+#.if defined(WITH_OPENWRITER) || defined(PACKAGE_BUILDING)
+#USE_GNOME+=		libgsf
+#CONFIGURE_ARGS+=	--enable-OpenWriter
+#PLIST_SUB+=		OPENWRITER:=""
+#.else
 PLIST_SUB+=		OPENWRITER:="@comment "
-.endif
+#.endif
 
 .if defined(WITH_PDB) # Need to be tested
 CONFIGURE_ARGS+=	--enable-pdb
@@ -311,9 +311,9 @@ pre-everything::
 .if !defined(WITH_NROFF)
 	@${ECHO_MSG} "WITH_NROFF=yes		Nroff/Man file format."
 .endif
-.if !defined(WITH_OPENWRITER)
-	@${ECHO_MSG} "WITH_OPENWRITER=yes	Import/export OpenOffice files."
-.endif
+#.if !defined(WITH_OPENWRITER)
+#	@${ECHO_MSG} "WITH_OPENWRITER=yes	Import/export OpenOffice files."
+#.endif
 .if !defined(WITH_PDB)
 	@${ECHO_MSG} "WITH_PDB=yes		Import/export Palm Database files."
 .endif