4 files changed, 67 insertions, 25 deletions

diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index c9b8967ea749..17fa2f146ad3 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wsdlpull
-DISTVERSION=	1.9.5c
+PORTVERSION=	1.9.8
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,31 +17,28 @@ COMMENT=	C++ WSDL Parser
 
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
-USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
-USE_GETOPT_LONG=yes
 WRKSRC=		${WRKDIR}/${DISTNAME:R}
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+USE_GNOME=	gnometarget
+USE_GCC=	3.4+
+USE_GETOPT_LONG=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/wsdl
 INSTALLS_SHLIB=	yes
 
-DOCSDIR=	${PREFIX}/share/doc/wsdl
-PORTDOCS=	*
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
-		-e "s,[$$][(]prefix[)]/docs,${DOCSDIR},"
-
-.include <bsd.port.pre.mk>
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|: install-docsDATA|:|g'
 
 post-install:
-.for dir in ${PREFIX}/include/wsdl ${PREFIX}/share/${PORTNAME}
-	@${FIND} ${dir} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${dir} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-.endfor
-
-.include <bsd.port.post.mk>
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/wsdlpull.html ${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/www/wsdlpull/distinfo b/www/wsdlpull/distinfo
index 5a9b9ce66f99..b671ea976549 100644
--- a/www/wsdlpull/distinfo
+++ b/www/wsdlpull/distinfo
@@ -1,3 +1,3 @@
-MD5 (wsdlpull-1.9.5c.tar.gz) = b4afd7f880b7ad7b693d183b014fe4d9
-SHA256 (wsdlpull-1.9.5c.tar.gz) = c76896900ee4cfacc65c4fd4333515181a0903107c10bde80660931846d384fe
-SIZE (wsdlpull-1.9.5c.tar.gz) = 1212977
+MD5 (wsdlpull-1.9.8.tar.gz) = daa7deb74c5a0570b6f57572cb30d294
+SHA256 (wsdlpull-1.9.8.tar.gz) = c19b519db2e73a5f625b737437526c3cf7df77b68cbebf5bb9d9cb4630213430
+SIZE (wsdlpull-1.9.8.tar.gz) = 1272980
diff --git a/www/wsdlpull/pkg-descr b/www/wsdlpull/pkg-descr
index 8e4a84986836..c751029c53cc 100644
--- a/www/wsdlpull/pkg-descr
+++ b/www/wsdlpull/pkg-descr
@@ -1,6 +1,6 @@
 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
+validating instances. It uses xml pull parsing methodology, and is meant to
 be semantically equivalent to WSDL4J.
 
 WWW: http://wsdlpull.sourceforge.net/
diff --git a/www/wsdlpull/pkg-plist b/www/wsdlpull/pkg-plist
index a869dfe2e6f6..871a62250711 100644
--- a/www/wsdlpull/pkg-plist
+++ b/www/wsdlpull/pkg-plist
@@ -1,5 +1,36 @@
 bin/schema
 bin/wsdl
+include/wsdl/schemaparser/Attribute.h
+include/wsdl/schemaparser/AttributeGroup.h
+include/wsdl/schemaparser/ComplexType.h
+include/wsdl/schemaparser/Constraint.h
+include/wsdl/schemaparser/ContentModel.h
+include/wsdl/schemaparser/Element.h
+include/wsdl/schemaparser/Group.h
+include/wsdl/schemaparser/Schema.h
+include/wsdl/schemaparser/SchemaParser.h
+include/wsdl/schemaparser/SchemaParserException.h
+include/wsdl/schemaparser/SchemaValidator.h
+include/wsdl/schemaparser/SimpleType.h
+include/wsdl/schemaparser/TypeContainer.h
+include/wsdl/schemaparser/TypesTable.h
+include/wsdl/schemaparser/XSDType.h
+include/wsdl/wsdlparser/Binding.h
+include/wsdl/wsdlparser/Message.h
+include/wsdl/wsdlparser/Operation.h
+include/wsdl/wsdlparser/PortType.h
+include/wsdl/wsdlparser/Service.h
+include/wsdl/wsdlparser/Soap.h
+include/wsdl/wsdlparser/WsdlElement.h
+include/wsdl/wsdlparser/WsdlException.h
+include/wsdl/wsdlparser/WsdlExtension.h
+include/wsdl/wsdlparser/WsdlInvoker.h
+include/wsdl/wsdlparser/WsdlParser.h
+include/wsdl/xmlpull/Qname.h
+include/wsdl/xmlpull/XmlPullParser.h
+include/wsdl/xmlpull/XmlPullParserException.h
+include/wsdl/xmlpull/XmlSerializer.h
+include/wsdl/xmlpull/XmlUtils.h
 lib/libschema.a
 lib/libschema.so
 lib/libschema.so.0
@@ -9,3 +40,17 @@ lib/libwsdl.so.0
 lib/libxmlpull.a
 lib/libxmlpull.so
 lib/libxmlpull.so.0
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/wsdlpull.html
+%%DATADIR%%/http.xsd
+%%DATADIR%%/mime.xsd
+%%DATADIR%%/schema.dtd
+%%DATADIR%%/soap-encoding.xsd
+%%DATADIR%%/soap.xsd
+%%DATADIR%%/wsdl10.xsd
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/wsdl/xmlpull
+@dirrm include/wsdl/wsdlparser
+@dirrm include/wsdl/schemaparser
+@dirrm include/wsdl