Repocopy from editors/abiword and editors/abiword-plugins, this is a

development version of AbiWord 2.3.0. You can view the details:

	http://www.abisource.com/release-notes/2.3.0.phtml

As you can see, there have few awsome new plugins. I haven't port the
dependencies and enable for those new plugins yet, so you are welcome to do it
if you want to as long you let me know.

PR:		ports/80996
Repocopy by:	marcus

6 files changed, 43 insertions, 24 deletions

diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index e41d31bc12c0..3633e61fa817 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.2.7
+PORTVERSION=	2.3.0
 CATEGORIES=	editors
 MASTER_SITES=	http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
 MASTER_SITE_SUBDIR=	abiword
@@ -41,8 +41,8 @@ CONFIGURE_ARGS=	--enable-xft \
 		--disable-peer-config
 MAKEFILE=	GNUmakefile
 
-ABIVERSION=	2.2
-PLIST_SUB+=	"ABIVERSION=${ABIVERSION}"
+ABIVERSION=	2.4
+PLIST_SUB+=	ABIVERSION=${ABIVERSION}
 WRKSRC=		${WRKDIR}/abiword-${PORTVERSION}/abi
 
 .if defined(WITH_DEBUG)
@@ -96,13 +96,13 @@ post-install:
 	@${MKDIR} ${PREFIX}/lib/AbiWord-${ABIVERSION}/plugins
 .if defined(GNOME_ENABLED)
 	@${INSTALL_DATA} ${WRKSRC}/abiword.desktop \
-		${X11BASE}/share/gnome/applications/abiword.desktop
+		${X11BASE}/share/gnome/applications/abiword24.desktop
 	@${LN} -sf ${PREFIX}/share/AbiSuite-${ABIVERSION}/icons/abiword_48.png \
-		${X11BASE}/share/gnome/pixmaps/abiword_48.png
-	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
-		${X11BASE}/libdata/bonobo/servers/
-	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/abi-nautilus-view-file.xml \
-		${X11BASE}/share/gnome/gnome-2.0/ui/
+		${X11BASE}/share/gnome/pixmaps/abiword24_48.png
+#	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/GNOME_AbiWord_Control_${ABIVERSION:S/./_/}.server \
+#		${X11BASE}/libdata/bonobo/servers/
+#	@${INSTALL_DATA} ${WRKDIR}/abiword-${PORTVERSION}/abidistfiles/abi-nautilus-view-file.xml \
+#		${X11BASE}/share/gnome/gnome-2.0/ui/
 	@-update-desktop-database
 .endif
 
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index 0376eb3b06c6..4e1bdb05f0a1 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.2.7.tar.bz2) = 9c74bf00601fc4c8bb0667a1696803de
-SIZE (AbiWord/abiword-2.2.7.tar.bz2) = 23896960
+MD5 (AbiWord/abiword-2.3.0.tar.bz2) = 93c188a373a65dfb17d91d08e9fa3cb9
+SIZE (AbiWord/abiword-2.3.0.tar.bz2) = 24052384
diff --git a/editors/abiword-devel/files/patch-abiword.desktop b/editors/abiword-devel/files/patch-abiword.desktop
index ed4c342fc33a..9776d14d5698 100644
--- a/editors/abiword-devel/files/patch-abiword.desktop
+++ b/editors/abiword-devel/files/patch-abiword.desktop
@@ -1,7 +1,11 @@
---- abiword.desktop.orig	Mon Apr  4 00:10:55 2005
-+++ abiword.desktop	Mon Apr  4 00:12:20 2005
-@@ -3,11 +3,11 @@
- Icon=abiword_48.png
+--- abiword.desktop.orig	Thu May 12 16:11:31 2005
++++ abiword.desktop	Thu May 12 16:11:37 2005
+@@ -1,15 +1,15 @@
+ [Desktop Entry]
+-Exec=abiword
+-Icon=abiword_48.png
++Exec=AbiWord-2.4
++Icon=abiword24_48.png
  Terminal=false
  Type=Application
 -Categories=Application;Office;WordProcessor;X-Red-Hat-Base;
@@ -10,7 +14,11 @@
  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;
+-Name=Word Processor
+-Comment=AbiWord Word Processor
 +MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
- Name=Word Processor
- Comment=AbiWord Word Processor
++Name=Word Processor (2.3)
++Comment=AbiWord Word Processor (2.3.x)
  Name[de]=Textverarbeitung
+ Comment[de]=AbiWord Textverarbeitung
+ Name[nb]=Tekstbehandling
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
new file mode 100644
index 000000000000..f1aba8428231
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_wp_main_unix_GNUmakefile.in
@@ -0,0 +1,11 @@
+--- 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 @@
+ 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."; \
+-	else \
+-	  (cd $(DESTDIR)/$(bindir) && ln -sf AbiWord-2.4 abiword); \
+ 	fi
+ 
+ libAbiCommand.a:	$(abiword_plugins)/tools/abicommand/xp/$(ltsubdir)libAbiCommand.a
diff --git a/editors/abiword-devel/pkg-install b/editors/abiword-devel/pkg-install
index a499e32b76b6..79ce89789f81 100644
--- a/editors/abiword-devel/pkg-install
+++ b/editors/abiword-devel/pkg-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 if [ "$2" = "POST-INSTALL" ]; then
-	mkdir -p ${PKG_PREFIX}/lib/AbiWord-2.2/plugins
+	mkdir -p ${PKG_PREFIX}/lib/AbiWord-2.4/plugins
 fi
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index ad1603cc836c..dedf3a71befb 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -1,17 +1,17 @@
 bin/AbiWord-%%ABIVERSION%%
-bin/abiword
 bin/ttfadmin.sh
 bin/ttftool
-%%GNOME:%%libdata/bonobo/servers/GNOME_AbiWord_Control_2_2.server
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Break.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Field.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatFootnotes.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatFrame.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatTOC.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_FormatTable.glade
+share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Goto.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_HdrFtr.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_InsertTable.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Insert_DateTime.glade
+share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Latex.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_MailMerge.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_MetaData.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_New.glade
@@ -24,6 +24,7 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Spell.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Styles.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist_modal.glade
+share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Tab.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_WordCount.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_About.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/xap_UnixDlg_DocComparison.glade
@@ -273,10 +274,8 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-ur_PK
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-yi
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_CN
 share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
-%%GNOME:%%share/gnome/applications/abiword.desktop
-%%GNOME:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
-%%GNOME:%%share/gnome/pixmaps/abiword_48.png
+%%GNOME:%%share/gnome/applications/abiword24.desktop
+%%GNOME:%%share/gnome/pixmaps/abiword24_48.png
 @dirrm share/AbiSuite-%%ABIVERSION%%/templates
 @dirrm share/AbiSuite-%%ABIVERSION%%/icons
 @dirrm share/AbiSuite-%%ABIVERSION%%/dictionary
@@ -288,4 +287,5 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
 @dirrm share/AbiSuite-%%ABIVERSION%%
 @dirrm lib/AbiWord-%%ABIVERSION%%/plugins
 @dirrm lib/AbiWord-%%ABIVERSION%%
+%%GNOME:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 %%GNOME:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true