editors/AbiWord2:

	-Update to 2.1.8

editors/abiword-plugins:
	- Chase AbiWord2 to 2.1.8.
	- Remove not work plugins: GIMP, GYPSYTHON, KWORD, MAGICK and PSION.
	  Any patches to fix those are welcome.
	- Remove PACKAGE_BUILDING from few plugins that are untested by me,
	  but they can be re-add back in the PACKAGE_BUILDING group if anyone
	  let us know one of it works.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2934 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 13 insertions, 70 deletions

diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index c71ef4573..06e804c6f 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	2.1.7
+PORTVERSION=	2.1.8
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo
index 4fd4e867e..4f9e82906 100644
--- a/editors/AbiWord2/distinfo
+++ b/editors/AbiWord2/distinfo
@@ -1,2 +1,2 @@
-MD5 (AbiWord/abiword-2.1.7.tar.bz2) = 3e53c91314647855978f0cf0ed4d83ef
-SIZE (AbiWord/abiword-2.1.7.tar.bz2) = 23435548
+MD5 (AbiWord/abiword-2.1.8.tar.bz2) = 8af20808d9be8001d155b1d2dfb080aa
+SIZE (AbiWord/abiword-2.1.8.tar.bz2) = 23484136
diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist
index 5693cf1c4..52c6ca6b0 100644
--- a/editors/AbiWord2/pkg-plist
+++ b/editors/AbiWord2/pkg-plist
@@ -18,6 +18,7 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_New.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Options.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Options_ColorSel.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_PageNumbers.glade
+share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_PageSetup.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Replace.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist.glade
 share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist_modal.glade
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 70441d732..342ad9cd4 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	abiword
-PORTVERSION=	2.1.7
+PORTVERSION=	2.1.8
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
@@ -77,7 +77,7 @@ PLIST_SUB+=		BZ2ABW:=""
 PLIST_SUB+=		BZ2ABW:="@comment "
 .endif
 
-.if defined(WITH_CLARISWORKS) || defined(PACKAGE_BUILDING) # Untest...
+.if defined(WITH_CLARISWORKS) # Untest...
 CONFIGURE_ARGS+=	--enable-clarisworks
 PLIST_SUB+=		CLARISWORKS:=""
 .else
@@ -91,14 +91,14 @@ PLIST_SUB+=		COMMAND:=""
 PLIST_SUB+=		COMMAND:="@comment "
 .endif
 
-.if defined(WITH_DOCBOOK) || defined(PACKAGE_BUILDING) # Untest...
+.if defined(WITH_DOCBOOK) # Untest...
 CONFIGURE_ARGS+=	--enable-docbook
 PLIST_SUB+=		DOCBOOK:=""
 .else
 PLIST_SUB+=		DOCBOOK:="@comment "
 .endif
 
-.if defined(WITH_EML) || defined(PACKAGE_BUILDING) # Untest...
+.if defined(WITH_EML) # Untest...
 CONFIGURE_ARGS+=	--enable-eml
 PLIST_SUB+=		EML:=""
 .else
@@ -120,14 +120,6 @@ PLIST_SUB+=		GDICT:=""
 PLIST_SUB+=		GDICT:="@comment "
 .endif
 
-.if defined(WITH_GIMP) # Doesn't work, can't load plugin.
-#RUN_DEPENDS+=
-CONFIGURE_ARGS+=	--enable-abigimp
-PLIST_SUB+=		GIMP:=""
-.else
-PLIST_SUB+=		GIMP:="@comment "
-.endif
-
 .if defined(WITH_GOOGLE) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-google
 PLIST_SUB+=		GOOGLE:=""
@@ -135,14 +127,6 @@ PLIST_SUB+=		GOOGLE:=""
 PLIST_SUB+=		GOOGLE:="@comment "
 .endif
 
-.if defined(WITH_GYPSYTHON) # Doesn't work, can load but no error.
-USE_PYTHON=		2.3+
-CONFIGURE_ARGS+=	--enable-gypsython
-PLIST_SUB+=		GYPSYTHON:=""
-.else
-PLIST_SUB+=		GYPSYTHON:="@comment "
-.endif
-
 .if defined(WITH_HANCOM) # Untest...
 CONFIGURE_ARGS+=	--enable-hancom
 PLIST_SUB+=		HANCOM:=""
@@ -150,7 +134,7 @@ PLIST_SUB+=		HANCOM:=""
 PLIST_SUB+=		HANCOM:="@comment "
 .endif
 
-.if defined(WITH_HRTEXT) || defined(PACKAGE_BUILDING) # Untest...
+.if defined(WITH_HRTEXT) # Untest...
 CONFIGURE_ARGS+=	--enable-hrtext
 PLIST_SUB+=		HRTEXT:=""
 .else
@@ -164,28 +148,13 @@ PLIST_SUB+=		JPEG:=""
 PLIST_SUB+=		JPEG:="@comment "
 .endif
 
-.if defined(WITH_KWORD) || defined(PACKAGE_BUILDING) # Unstable, crashed.
-CONFIGURE_ARGS+=	--enable-kword
-PLIST_SUB+=		KWORD:=""
-.else
-PLIST_SUB+=		KWORD:="@comment "
-.endif
-
-.if defined(WITH_LATEX) || defined(PACKAGE_BUILDING) # Untest...
+.if defined(WITH_LATEX) # Untest...
 CONFIGURE_ARGS+=	--enable-latex
 PLIST_SUB+=		LATEX:=""
 .else
 PLIST_SUB+=		LATEX:="@comment "
 .endif
 
-.if defined(WITH_MAGICK) # Unstable, crashed.
-BUILD_DEPENDS+=		Magick++-config:${PORTSDIR}/graphics/ImageMagick
-CONFIGURE_ARGS+=	--enable-magick
-PLIST_SUB+=		MAGICK:=""
-.else
-PLIST_SUB+=		MAGICK:="@comment "
-.endif
-
 .if defined(WITH_MSWRITE) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-mswrite
 PLIST_SUB+=		MSWRITE:=""
@@ -193,7 +162,7 @@ PLIST_SUB+=		MSWRITE:=""
 PLIST_SUB+=		MSWRITE:="@comment "
 .endif
 
-.if defined(WITH_NROFF) || defined(PACKAGE_BUILDING) # Untest...
+.if defined(WITH_NROFF) # Untest...
 CONFIGURE_ARGS+=	--enable-nroff
 PLIST_SUB+=		NROFF:=""
 .else
@@ -207,21 +176,13 @@ PLIST_SUB+=		OPENWRITER:=""
 PLIST_SUB+=		OPENWRITER:="@comment "
 .endif
 
-.if defined(WITH_PDB) || defined(PACKAGE_BUILDING) # Untest...
+.if defined(WITH_PDB) # Untest...
 CONFIGURE_ARGS+=	--enable-pdb
 PLIST_SUB+=		PDB:=""
 .else
 PLIST_SUB+=		PDB:="@comment "
 .endif
 
-# Need to update converters/psiconv to 0.9.6 first.
-#.if defined(WITH_PSION)
-#CONFIGURE_ARGS+=	--enable-psion
-#PLIST_SUB+=		PSION:=""
-#.else
-#PLIST_SUB+=		PSION:="@comment "
-#.endif
-
 .if defined(WITH_SDW)
 USE_GNOME+=		libgsf
 CONFIGURE_ARGS+=	--enable-sdw
@@ -237,7 +198,7 @@ PLIST_SUB+=		SHELL:=""
 PLIST_SUB+=		SHELL:="@comment "
 .endif
 
-.if defined(WITH_T602) || defined(PACKAGE_BUILDING) # Untest...
+.if defined(WITH_T602) # Untest...
 CONFIGURE_ARGS+=	--enable-t602
 PLIST_SUB+=		T602:=""
 .else
@@ -338,15 +299,9 @@ pre-everything::
 .if !defined(WITH_GDICT)
 	@${ECHO_MSG} "WITH_GDICT=yes		Look up definitions of selected text."
 .endif
-.if !defined(WITH_GIMP)
-	@${ECHO_MSG} "WITH_GIMP=yes		Edit Embedded Images with the Gimp."
-.endif
 .if !defined(WITH_GOOGLE)
 	@${ECHO_MSG} "WITH_GOOGLE=yes		Search Google for your selected text."
 .endif
-.if !defined(WITH_GYPSYTHON)
-	@${ECHO_MSG} "WITH_GYPSYTHON=yes	Python MailMerge."
-.endif
 .if !defined(WITH_HANCOM)
 	@${ECHO_MSG} "WITH_HANCOM=yes		Hancom Word Importer. Only does text."
 .endif
@@ -356,15 +311,9 @@ pre-everything::
 .if !defined(WITH_JPEG)
 	@${ECHO_MSG} "WITH_JPEG=yes		View JPEG Images."
 .endif
-.if !defined(WITH_KWORD)
-	@${ECHO_MSG} "WITH_KWORD=yes		KWord import/export."
-.endif
 .if !defined(WITH_LATEX)
 	@${ECHO_MSG} "WITH_LATEX=yes		LaTeX export."
 .endif
-.if !defined(WITH_MAGICK)
-	@${ECHO_MSG} "WITH_MAGICK=yes		View and format images that ImageMagick supports."
-.endif
 .if !defined(WITH_MSWRITE)
 	@${ECHO_MSG} "WITH_MSWRITE=yes	Import MSWrite files."
 .endif
@@ -377,9 +326,6 @@ pre-everything::
 .if !defined(WITH_PDB)
 	@${ECHO_MSG} "WITH_PDB=yes		Import/export Palm Database files."
 .endif
-#.if !defined(WITH_PSION)
-#	@${ECHO_MSG} "WITH_PSION=yes		Import/export Psion files."
-#.endif
 .if !defined(WITH_SDW)
 	@${ECHO_MSG} "WITH_SDW=yes		Import StarOffice 5.x files."
 .endif
diff --git a/editors/abiword-plugins/pkg-plist b/editors/abiword-plugins/pkg-plist
index 8cc081654..28c8a67f4 100644
--- a/editors/abiword-plugins/pkg-plist
+++ b/editors/abiword-plugins/pkg-plist
@@ -10,16 +10,12 @@
 %%FREETRANSLATION:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiFreeTranslation.so
 %%GDICT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGdict.so
 %%GTKPIXBUF:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGdkPixbuf.so
-%%GIMP:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGimp.so
 %%GOOGLE:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGoogle.so
-%%GYPSYTHON:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiGypsython.so
 %%HRTEXT:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiHRText.so
 %%HANCOM:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiHancom.so
 %%JPEG:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiJPEG.so
-%%KWORD:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiKWord.so
 %%LATEX:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiLaTeX.so
 %%MSWRITE:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiMSWrite.so
-%%MAGICK:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiMagick.so
 %%NROFF:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiNroff.so
 %%OPENWRITER:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiOpenWriter.so
 %%PDB:%%lib/AbiWord-%%ABIVERSION%%/plugins/libAbiPalmDoc.so