-Update to 2.4.4, see release notes and changelogs for detail:

	http://www.abisource.com/release-notes/2.4.4.phtml
	http://www.abisource.com/changelogs/2.4.4.phtml
-Add CFLAGS=-g and STRIP= in WITH_DEBUG.
-Remove USE_REINPLACE.
-Use @dirrmtry.

5 files changed, 19 insertions, 19 deletions

diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index c922ee8547c4..7d75e72a3c59 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTVERSION=	2.4.4
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -26,7 +25,6 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20
 WANT_GNOME=	yes
 USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -133,7 +131,7 @@ PLIST_SUB+=		GOOGLE:="@comment "
 .endif
 
 .if defined(WITH_GRAMMAR) || defined(PACKAGE_BUILDING)
-LIB_DEPENDS+=		link-grammar.5:${PORTSDIR}/textproc/link-grammar
+LIB_DEPENDS+=		link-grammar.4:${PORTSDIR}/textproc/link-grammar
 CONFIGURE_ARGS+=	--enable-abigrammar
 PLIST_SUB+=		GRAMMAR:=""
 .else
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 709335930de6..4a6ac98cf821 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.4.4
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -31,7 +30,6 @@ USE_ICONV=	yes
 USE_GNOME=	libglade2 libxml2 libgnomeprintui desktopfileutils
 WANT_GNOME=	yes
 USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-xft \
 		--with-sys-wv \
@@ -54,6 +52,8 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xpf - ${EXTERNALS:C,^,--exclude ${DISTNAME}/,}
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug \
 			--enable-symbols
+CFLAGS+=		-g
+STRIP=
 .endif
 
 .ifndef(WITHOUT_GTKSPELL)
@@ -99,7 +99,7 @@ post-patch:
 		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g'
 
 post-install:
-	@${MKDIR} ${X11BASE}/lib/AbiWord-${ABIVERSION}/plugins
+	@${MKDIR} ${PREFIX}/lib/AbiWord-${ABIVERSION}/plugins
 	@${MKDIR} ${X11BASE}/share/applications
 	@${INSTALL_DATA} ${WRKSRC}/abiword.desktop \
 		${X11BASE}/share/applications/abiword.desktop
@@ -107,8 +107,10 @@ post-install:
 	@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/icons/abiword_48.png \
 		${X11BASE}/share/pixmaps/abiword_48.png
 .if defined(GNOME_ENABLED)
+	@${MKDIR} ${X11BASE}/libdata/bonobo/servers
 	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
 		${X11BASE}/libdata/bonobo/servers/
+	@${MKDIR} ${X11BASE}/share/gnome/gnome-2.0/ui
 	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/abi-nautilus-view-file.xml \
 		${X11BASE}/share/gnome/gnome-2.0/ui/
 .endif
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index c217ac54d779..00c6f25b6e12 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,3 +1,3 @@
-MD5 (AbiWord/abiword-2.4.2.tar.bz2) = 935f1218eab7ff96b7a23cfeba4e76d1
-SHA256 (AbiWord/abiword-2.4.2.tar.bz2) = 6a5921f9ab593637008bc0d5411ef9d8a689a4c89d9f7b273236331b14f66933
-SIZE (AbiWord/abiword-2.4.2.tar.bz2) = 24729796
+MD5 (AbiWord/abiword-2.4.4.tar.bz2) = 69dd69179b861a41613291afd10af9ab
+SHA256 (AbiWord/abiword-2.4.4.tar.bz2) = 94c83290dd056a1b49024dd40ca62305818508643b21b69a0b758bd12de96252
+SIZE (AbiWord/abiword-2.4.4.tar.bz2) = 24687425
diff --git a/editors/abiword/files/patch-abiword.desktop b/editors/abiword/files/patch-abiword.desktop
index d24058c96640..7eff00d9c6e4 100644
--- a/editors/abiword/files/patch-abiword.desktop
+++ b/editors/abiword/files/patch-abiword.desktop
@@ -1,16 +1,16 @@
---- abiword.desktop.orig	Tue Jan 10 00:02:54 2006
-+++ abiword.desktop	Tue Jan 10 00:03:49 2006
+--- abiword.desktop.orig	Fri Apr 14 12:43:24 2006
++++ abiword.desktop	Fri Apr 14 12:45:03 2006
 @@ -3,11 +3,11 @@
  Icon=abiword_48.png
  Terminal=false
  Type=Application
--Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
-+Categories=Application;Office;WordProcessor;
+-Categories=Application;Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
++Categories=Application;Office;WordProcessor;GNOME;GTK;
  StartupNotify=true
  Encoding=UTF-8
  X-Desktop-File-Install-Version=0.9
--MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
-+MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/vnd.ms-word;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
++MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
  Name=AbiWord
  GenericName=Word Processor
  Comment=AbiWord Word Processor
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index ca908a21e5b8..d2743bfc3671 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -291,7 +291,7 @@ share/pixmaps/abiword_48.png
 @dirrm share/AbiSuite-%%ABIVERSION%%/AbiWord
 @dirrm share/AbiSuite-%%ABIVERSION%%
 @exec /bin/mkdir -p %D/lib/AbiWord-%%ABIVERSION%%/plugins
-@unexec /bin/rmdir %D/lib/AbiWord-%%ABIVERSION%%/plugins 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/lib/AbiWord-%%ABIVERSION%% 2>/dev/null || /usr/bin/true
+@dirrmtry lib/AbiWord-%%ABIVERSION%%/plugins
+@dirrmtry lib/AbiWord-%%ABIVERSION%%
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true