- Update to 1.1.0.6

- Notes: 1.1.0.6 introduces full Aspell support and XML Schema-based
  element inspection.

PR:		ports/119905
Submitted by:	Jose Garcia Juanino <jjuanino@gmail.com> (maintainer)
Approved by:	linimon (mentor)

5 files changed, 56 insertions, 63 deletions

diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 33b339dc53c7..7babb84ee79d 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmlcopyeditor
-PORTVERSION=	1.1.0.3
+PORTVERSION=	1.1.0.6
 CATEGORIES=	editors
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=xml-copy-editor
@@ -19,13 +19,31 @@ WX_COMPS=	wx contrib
 WX_CONF_ARGS=	absolute
 WX_UNICODE=	yes
 USE_GETTEXT=	yes
-USE_DOS2UNIX=	src/mynotebook.cpp src/mynotebook.h \
-		src/xmlcopyeditor.cpp src/xmlcopyeditor.h
-SUB_FILES=	pkg-message
+USE_DOS2UNIX=	src/rulesets/ruleset.css \
+		src/rulesets/ruleset.xsd \
+		src/rulesets/Contractions.xml \
+		src/aspellpaths.h \
+		src/po/sk/backup/sk.po \
+		src/po/sk/sk.po \
+		src/po/fr/messages.po \
+		src/po/sv/messages.po \
+		src/po/translate.txt \
+		src/po/de/messages.po \
+		src/po/en_us/messages.po \
+		src/help/xmlcopyeditor.hhp \
+		src/help/html/generic.css \
+		src/rng/docbook.rnc \
+		src/rng/tei_all.rnc \
+		src/rng/tei_minimal.rnc \
+		src/rng/docbookxi.rnc \
+		src/templates/DTD.dtd \
+		src/filters/WordprocessingML.xml
 
 BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
 LIB_DEPENDS+=	xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
-		xslt.2:${PORTSDIR}/textproc/libxslt
+		xslt.2:${PORTSDIR}/textproc/libxslt \
+		aspell.16:${PORTSDIR}/textproc/aspell \
+		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_AUTOTOOLS=	autoconf:261 automake:19
 
@@ -35,7 +53,4 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/editors/xmlcopyeditor/distinfo b/editors/xmlcopyeditor/distinfo
index 80b9bfc839ab..e96c84859321 100644
--- a/editors/xmlcopyeditor/distinfo
+++ b/editors/xmlcopyeditor/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmlcopyeditor-1.1.0.3.tar.gz) = 95d422fcf9f5a924374780372df8099c
-SHA256 (xmlcopyeditor-1.1.0.3.tar.gz) = 1df5b9b24e9fba2870bce07fbb70bdeece4856d1ea70e417a0d1cfc2f1356960
-SIZE (xmlcopyeditor-1.1.0.3.tar.gz) = 2601213
+MD5 (xmlcopyeditor-1.1.0.6.tar.gz) = 29350234faca3ad978ff74dbbf7f3ef5
+SHA256 (xmlcopyeditor-1.1.0.6.tar.gz) = b4b9a203c23daddf926cc41841416c2fc08a6979f3019feae984d087e2851111
+SIZE (xmlcopyeditor-1.1.0.6.tar.gz) = 2202764
diff --git a/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff b/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff
index 8d5fd7a97148..d2a952a4ed57 100644
--- a/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff
+++ b/editors/xmlcopyeditor/files/patch-src_Makefile.am.diff
@@ -1,5 +1,5 @@
---- src/Makefile.am.orig	Tue Jan  1 12:20:45 2008
-+++ src/Makefile.am	Tue Jan  1 12:21:28 2008
+--- src/Makefile.am.orig	2008-01-22 18:07:11.000000000 +0100
++++ src/Makefile.am	2008-01-22 18:12:05.000000000 +0100
 @@ -9,8 +9,8 @@
  bin_PROGRAMS = xmlcopyeditor
  bindir = ${prefix}/bin
@@ -11,9 +11,9 @@
  
  # the application source, library search path, and link libraries
  xmlcopyeditor_SOURCES = xmlcopyeditor.cpp associatedialog.cpp casehandler.cpp \
-@@ -41,15 +41,13 @@
- 	xpm/*.xpm \
- 	templates/*.* \
+@@ -50,16 +50,6 @@
+ 	templates/*.lzx \
+ 	templates/*.xlf \
  	help/*.* help/html/*.* \
 -	copying/*.txt copying/boost_shared_ptr/* \
 -	copying/Expat/* copying/libxml2/* copying/libxslt/* \
@@ -22,19 +22,13 @@
 -	copying/wxStyledTextCtrl/* copying/ximian/* \
 -	copying/wxStEditor/* \
 -	copying/xmlcopyeditor/* \
+-	copying/Aspell/* \
 -	copying/Apache/LICENSE-2.0 \
 -	copying/Apache/LICENSE-2_files/* \
-+	copying/boost_license_1_0.txt copying/boost_shared_ptr/* \
-+	copying/scowl/copying.txt \
-+	copying/mit.txt \
-+	copying/libxslt/libxslt-lic.txt \
-+	copying/libxml2/libxml2-lic.txt \
-+	copying/Scintilla/scintilla-lic.txt \
-+	copying/Expat/copying.txt \
  	po/sk/messages.mo \
  	po/sv/messages.mo \
  	po/fr/messages.mo \
-@@ -58,7 +56,7 @@
+@@ -68,7 +58,7 @@
          po/zh_TW/messages.mo \
  	po/uk_UA/messages.mo \
          po/uk_UA/messages.mo \
diff --git a/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff b/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff
index 7c072324ad38..43f8918a4317 100644
--- a/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff
+++ b/editors/xmlcopyeditor/files/patch-src_xmlcopyeditor.cpp.diff
@@ -1,26 +1,26 @@
---- src/xmlcopyeditor.cpp.orig	Thu Dec 20 19:39:44 2007
-+++ src/xmlcopyeditor.cpp	Thu Dec 20 19:42:26 2007
-@@ -2977,10 +2977,7 @@
+--- src/xmlcopyeditor.cpp.orig	2008-01-22 18:07:12.000000000 +0100
++++ src/xmlcopyeditor.cpp	2008-01-22 18:15:34.000000000 +0100
+@@ -2984,10 +2984,7 @@
  
-         nconv = iconv (
-                     cd,
+ 		nconv = iconv (
+ 		            cd,
 -#ifdef __WXMSW__
--                    ( const char ** )
+-		            ( const char ** )
 -#endif
--                    &docBuffer,
-+                    ICONV_CHAR_CAST(&docBuffer),
-                     &docBufferLeft,
-                     &iconvBuffer,
-                     &iconvBufferLeft );
-@@ -4685,10 +4682,7 @@
+-		            &docBuffer,
++			    ICONV_CHAR_CAST(&docBuffer),
+ 		            &docBufferLeft,
+ 		            &iconvBuffer,
+ 		            &iconvBufferLeft );
+@@ -4637,10 +4634,7 @@
  
-                     nconv = iconv (
-                                 cd,
+ 					nconv = iconv (
+ 					            cd,
 -#ifdef __WXMSW__
--                                ( const char ** )
+-					            ( const char ** )
 -#endif
--                                &utf8BufferPtr,
-+                                ICONV_CHAR_CAST(&utf8BufferPtr),
-                                 &utf8BufferLeft,
-                                 &iconvBuffer,
-                                 &iconvBufferLeft );
+-					            &utf8BufferPtr,
++						    ICONV_CHAR_CAST(&utf8BufferPtr),
+ 					            &utf8BufferLeft,
+ 					            &iconvBuffer,
+ 					            &iconvBufferLeft );
diff --git a/editors/xmlcopyeditor/pkg-plist b/editors/xmlcopyeditor/pkg-plist
index 245b42e12367..4d5db1ad51b4 100644
--- a/editors/xmlcopyeditor/pkg-plist
+++ b/editors/xmlcopyeditor/pkg-plist
@@ -1,12 +1,6 @@
 bin/xmlcopyeditor
-%%DATADIR%%/copying/Expat/copying.txt
-%%DATADIR%%/copying/Scintilla/scintilla-lic.txt
-%%DATADIR%%/copying/boost_license_1_0.txt
-%%DATADIR%%/copying/boost_shared_ptr/copying.txt
-%%DATADIR%%/copying/libxml2/libxml2-lic.txt
-%%DATADIR%%/copying/libxslt/libxslt-lic.txt
-%%DATADIR%%/copying/mit.txt
-%%DATADIR%%/copying/scowl/copying.txt
+share/applications/xmlcopyeditor.desktop
+share/pixmaps/xmlcopyeditor.png
 %%DATADIR%%/filters/OpenDocument.xml
 %%DATADIR%%/filters/WordprocessingML.xml
 %%DATADIR%%/filters/filter.xsd
@@ -40,6 +34,7 @@ bin/xmlcopyeditor
 %%DATADIR%%/help/html/xmlcopyeditor.html
 %%DATADIR%%/help/xmlcopyeditor.chm
 %%DATADIR%%/help/xmlcopyeditor.hhp
+%%DATADIR%%/png/stock_calc-accept-green.png
 %%DATADIR%%/png/stock_calc-accept.png
 %%DATADIR%%/png/stock_close.png
 %%DATADIR%%/png/stock_copy-16.png
@@ -129,8 +124,6 @@ bin/xmlcopyeditor
 %%DATADIR%%/rulesets/American.xml
 %%DATADIR%%/rulesets/Commonwealth.xml
 %%DATADIR%%/rulesets/Contractions.xml
-%%DATADIR%%/rulesets/Default dictionary and style.xml
-%%DATADIR%%/rulesets/Default dictionary.xml
 %%DATADIR%%/rulesets/Default style.xml
 %%DATADIR%%/rulesets/Disability.xml
 %%DATADIR%%/rulesets/Diversity.xml
@@ -198,8 +191,6 @@ bin/xmlcopyeditor
 %%DATADIR%%/xpm/stock_spellcheck.xpm
 %%DATADIR%%/xpm/stock_spellcheck_16.xpm
 %%DATADIR%%/xpm/stock_undo_16.xpm
-share/pixmaps/xmlcopyeditor.png
-share/applications/xmlcopyeditor.desktop
 @dirrm %%DATADIR%%/xpm
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/rulesets
@@ -219,13 +210,6 @@ share/applications/xmlcopyeditor.desktop
 @dirrm %%DATADIR%%/help/html
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/filters
-@dirrm %%DATADIR%%/copying/scowl
-@dirrm %%DATADIR%%/copying/libxslt
-@dirrm %%DATADIR%%/copying/libxml2
-@dirrm %%DATADIR%%/copying/boost_shared_ptr
-@dirrm %%DATADIR%%/copying/Scintilla
-@dirrm %%DATADIR%%/copying/Expat
-@dirrm %%DATADIR%%/copying
 @dirrm %%DATADIR%%
 @dirrmtry share/pixmaps
 @dirrmtry share/applications