upgrade to 1.9.5c

5 files changed, 15 insertions, 58 deletions

diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index 6ef9437fd94f..c31054c1c280 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	wsdlpull
-PORTVERSION=	1.6.1
+PORTVERSION=	1.9.5.c
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ WSDL Parser
@@ -33,10 +34,14 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
 		-e "s,[$$][(]prefix[)]/docs,${DOCSDIR},"
 
+.include <bsd.port.pre.mk>
+
 post-install:
-	@${FIND} ${PREFIX}/include/wsdl ! -type d | \
+.for dir in ${PREFIX}/include/wsdl ${PREFIX}/share/${PORTNAME}
+	@${FIND} ${dir} ! -type d | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${PREFIX}/include/wsdl -type d | ${SORT} -r | \
+	@${FIND} ${dir} -type d | ${SORT} -r | \
 		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/wsdlpull/distinfo b/www/wsdlpull/distinfo
index 6df6c2bb62b9..5a9b9ce66f99 100644
--- a/www/wsdlpull/distinfo
+++ b/www/wsdlpull/distinfo
@@ -1,2 +1,3 @@
-MD5 (wsdlpull-1.6.1.tar.gz) = 38044807995b395ec1fecf6e9b0af5fd
-SIZE (wsdlpull-1.6.1.tar.gz) = 424650
+MD5 (wsdlpull-1.9.5c.tar.gz) = b4afd7f880b7ad7b693d183b014fe4d9
+SHA256 (wsdlpull-1.9.5c.tar.gz) = c76896900ee4cfacc65c4fd4333515181a0903107c10bde80660931846d384fe
+SIZE (wsdlpull-1.9.5c.tar.gz) = 1212977
diff --git a/www/wsdlpull/files/patch-WsdlParser.cpp b/www/wsdlpull/files/patch-WsdlParser.cpp
deleted file mode 100644
index 4376b303a77e..000000000000
--- a/www/wsdlpull/files/patch-WsdlParser.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/wsdlparser/WsdlParser.cpp.orig	Fri Mar 18 11:50:47 2005
-+++ src/wsdlparser/WsdlParser.cpp	Fri Mar 18 11:52:37 2005
-@@ -343,11 +343,11 @@
-         string tag = xParser->getName();

-         switch (event_type)

-         {

--            case xParser->START_DOCUMENT:

-+            case XmlPullParser::START_DOCUMENT:

-                 if (m_State != START)

-                     error("Syntax error at the start");

-                 break;

--            case xParser->START_TAG:

-+            case XmlPullParser::START_TAG:

-                 if (xParser->getNamespace() != wsdlUri

-                     &&xParser->getNamespace() != SchemaUri)

-                     m_State = EXTENSIBILITY;

-@@ -403,7 +403,7 @@
-                 else

-                     error("Unknown Tag " + tag);

-                 break;

--            case xParser->END_TAG:

-+            case XmlPullParser::END_TAG:

-                 if (tag == "definitions")

-                     m_State = END;

- 

-@@ -424,14 +424,14 @@
-                         return peek(lookahead);   //get the next tag

-                 }

-                 break;

--            case xParser->TEXT:

--            case xParser->ENTITY_REF:

--            case xParser->COMMENT:

--            case xParser->PROCESSING_INSTRUCTION:

--            case xParser->CDSECT:

-+            case XmlPullParser::TEXT:

-+            case XmlPullParser::ENTITY_REF:

-+            case XmlPullParser::COMMENT:

-+            case XmlPullParser::PROCESSING_INSTRUCTION:

-+            case XmlPullParser::CDSECT:

-                 xParser->getText();

-                 break;

--            case xParser->DOCDECL:

-+            case XmlPullParser::DOCDECL:

-                 error("Doc Declaration ??");

-                 break;

-             default:

diff --git a/www/wsdlpull/pkg-descr b/www/wsdlpull/pkg-descr
index add2a868e5ad..f79dc52f2f6d 100644
--- a/www/wsdlpull/pkg-descr
+++ b/www/wsdlpull/pkg-descr
@@ -2,3 +2,5 @@ An efficient C++ WSDL library which parses a WSDL file & provides APIs to
 access WSDL elements. It has a library for parsing xml schemas and
 validating instances. It uses xml pull parsing methodology,and is meant to
 be semantically equivalent to WSDL4J.
+
+http://wsdlpull.sourceforge.net/
diff --git a/www/wsdlpull/pkg-plist b/www/wsdlpull/pkg-plist
index b8689f52af73..a869dfe2e6f6 100644
--- a/www/wsdlpull/pkg-plist
+++ b/www/wsdlpull/pkg-plist
@@ -1,13 +1,8 @@
-bin/print
 bin/schema
-bin/typedefs.h
-bin/wsdl2cpp
+bin/wsdl
 lib/libschema.a
 lib/libschema.so
 lib/libschema.so.0
-lib/libutils.a
-lib/libutils.so
-lib/libutils.so.0
 lib/libwsdl.a
 lib/libwsdl.so
 lib/libwsdl.so.0