- Update to 1.2.0.11

- Convert to new LIB_DEPENDS format
- STAGE-clean

PR:		184145
Submitted by:	gahr@
Approved by:	maintainer

7 files changed, 42 insertions, 41 deletions

diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index df27701a748d..32de794c6ec3 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmlcopyeditor
-PORTVERSION=	1.2.0.9
-PORTREVISION=	1
+PORTVERSION=	1.2.0.11
 CATEGORIES=	editors
 MASTER_SITES=	SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}
 
@@ -16,16 +15,15 @@ USE_WX=		2.8+
 WX_COMPS=	wx contrib
 WX_CONF_ARGS=	absolute
 WX_UNICODE=	yes
-USES=		gettext iconv
-USE_DOS2UNIX=	yes
+USES=		gettext iconv dos2unix
 
 BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-LIB_DEPENDS=	xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \
-		xslt:${PORTSDIR}/textproc/libxslt \
-		aspell:${PORTSDIR}/textproc/aspell \
-		pcre:${PORTSDIR}/devel/pcre \
-		xml2:${PORTSDIR}/textproc/libxml2 \
-		expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3 \
+		libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libaspell.so:${PORTSDIR}/textproc/aspell \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
+		libexpat.so:${PORTSDIR}/textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -34,5 +32,4 @@ CPPFLAGS+=	-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/libxml2 ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${ICONV_LIB}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/editors/xmlcopyeditor/distinfo b/editors/xmlcopyeditor/distinfo
index ff0400fbcb59..a6a92ef6098c 100644
--- a/editors/xmlcopyeditor/distinfo
+++ b/editors/xmlcopyeditor/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmlcopyeditor-1.2.0.9.tar.gz) = 850df750f3561320f6ab1b612e00cd2b9ecc2bed49ab1dcc261af78d0a28b7f7
-SIZE (xmlcopyeditor-1.2.0.9.tar.gz) = 1815995
+SHA256 (xmlcopyeditor-1.2.0.11.tar.gz) = b63a1f5c124d163cf93760fd60cc86c179d4d2b474a875132648f305bc44757b
+SIZE (xmlcopyeditor-1.2.0.11.tar.gz) = 1965438
diff --git a/editors/xmlcopyeditor/files/patch-src_housestyle.h b/editors/xmlcopyeditor/files/patch-src_housestyle.h
deleted file mode 100644
index 4e9d0f14cff4..000000000000
--- a/editors/xmlcopyeditor/files/patch-src_housestyle.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/housestyle.h.orig	2013-08-07 15:30:44.000000000 +0200
-+++ src/housestyle.h	2013-08-07 15:31:08.000000000 +0200
-@@ -68,8 +68,9 @@
- 		           filterDirectory,
- 		           filterFile,
- 		           pathSeparator,
--		           error,
-+		           error
- #ifdef __WXMSW__
-+                   ,
-                    aspellDataPath,
-                    aspellDictPath
- #endif
diff --git a/editors/xmlcopyeditor/files/patch-src_styledialog.cpp b/editors/xmlcopyeditor/files/patch-src_styledialog.cpp
new file mode 100644
index 000000000000..223b5237e8df
--- /dev/null
+++ b/editors/xmlcopyeditor/files/patch-src_styledialog.cpp
@@ -0,0 +1,11 @@
+--- src/styledialog.cpp.orig	2013-11-21 15:48:45.000000000 +0100
++++ src/styledialog.cpp	2013-11-21 15:50:28.000000000 +0100
+@@ -705,7 +705,7 @@
+ 
+ 	WrapExpat we;
+ 	ofs << "<table><tr><th>Term</th><th>Frequency</th></tr>";
+-	std::map<std::string, int>::iterator mapIterator;
++	std::map<std::string, int, NoCaseCompare>::iterator mapIterator;
+ 	int matchTotal = 0;
+ 
+ 	for (
diff --git a/editors/xmlcopyeditor/files/patch-src_wrapxerces.cpp b/editors/xmlcopyeditor/files/patch-src_wrapxerces.cpp
new file mode 100644
index 000000000000..19f928cd2394
--- /dev/null
+++ b/editors/xmlcopyeditor/files/patch-src_wrapxerces.cpp
@@ -0,0 +1,17 @@
+--- src/wrapxerces.cpp.orig	2013-11-21 15:51:13.000000000 +0100
++++ src/wrapxerces.cpp	2013-11-21 16:01:41.000000000 +0100
+@@ -201,12 +201,12 @@
+ 		return wxConvUTF8;
+ 	case 2:
+ 	{
+-		const static wxMBConvUTF16 conv;
++		static wxMBConvUTF16 conv;
+ 		return conv;
+ 	}
+ 	case 4:
+ 	{
+-		const static wxMBConvUTF32 conv;
++		static wxMBConvUTF32 conv;
+ 		return conv;
+ 	}
+ 	default:
diff --git a/editors/xmlcopyeditor/files/patch-src_xmlschemagenerator.cpp b/editors/xmlcopyeditor/files/patch-src_xmlschemagenerator.cpp
deleted file mode 100644
index aa48ef7c6a57..000000000000
--- a/editors/xmlcopyeditor/files/patch-src_xmlschemagenerator.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xmlschemagenerator.cpp.orig	2013-08-07 15:53:21.000000000 +0200
-+++ src/xmlschemagenerator.cpp	2013-08-07 15:54:00.000000000 +0200
-@@ -203,7 +203,7 @@
- 			continue;
- 		for ( attrItr = attrMap.begin(); attrItr != attrMap.end(); attrItr++ )
- 		{
--			const static wxMBConvUTF16 conv;
-+			static wxMBConvUTF16 conv;
- 			if ( attrs->getNamedItem ( ( const XMLCh * ) ( const char * )
- 					attrItr->first.mb_str ( conv ) ) == NULL )
- 			{
diff --git a/editors/xmlcopyeditor/pkg-plist b/editors/xmlcopyeditor/pkg-plist
index 33aaa4b3d1a2..695290ccae19 100644
--- a/editors/xmlcopyeditor/pkg-plist
+++ b/editors/xmlcopyeditor/pkg-plist
@@ -66,7 +66,7 @@ share/pixmaps/xmlcopyeditor.png
 %%DATADIR%%/dtd/docbook/4.4/ent/isotech.ent
 %%DATADIR%%/dtd/docbook/4.4/htmltblx.mod
 %%DATADIR%%/dtd/docbook/4.4/soextblx.dtd
-%%DATADIR%%/dtd/docbook/5.0b/docbook.dtd
+%%DATADIR%%/dtd/docbook/5.0/docbook.dtd
 %%DATADIR%%/dtd/lzx.dtd
 %%DATADIR%%/dtd/moodle_glossary.dtd
 %%DATADIR%%/dtd/moodle_xml.dtd
@@ -289,8 +289,8 @@ share/pixmaps/xmlcopyeditor.png
 %%DATADIR%%/templates/DTD.dtd
 %%DATADIR%%/templates/DocBook_4.4_article.xml
 %%DATADIR%%/templates/DocBook_4.4_book.xml
-%%DATADIR%%/templates/DocBook_5.0b_article.xml
-%%DATADIR%%/templates/DocBook_5.0b_book.xml
+%%DATADIR%%/templates/DocBook_5.0_article.xml
+%%DATADIR%%/templates/DocBook_5.0_book.xml
 %%DATADIR%%/templates/Moodle_glossary.xml
 %%DATADIR%%/templates/Moodle_quiz.xml
 %%DATADIR%%/templates/NewsML_1.2.xml
@@ -363,7 +363,7 @@ share/pixmaps/xmlcopyeditor.png
 @dirrm %%DATADIR%%/dtd/tei/p5
 @dirrm %%DATADIR%%/dtd/tei/p4
 @dirrm %%DATADIR%%/dtd/tei
-@dirrm %%DATADIR%%/dtd/docbook/5.0b
+@dirrm %%DATADIR%%/dtd/docbook/5.0
 @dirrm %%DATADIR%%/dtd/docbook/4.4/ent
 @dirrm %%DATADIR%%/dtd/docbook/4.4
 @dirrm %%DATADIR%%/dtd/docbook