- Add USES=libtool to textproc/raptor and bump dependent ports

- Add DOCS option and install documentation in standard location
- Silence post-patch

2 files changed, 90 insertions, 94 deletions

diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index d008b55dc826..66cf0554d715 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	raptor
 PORTVERSION=	1.4.21
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	SF/librdf/${PORTNAME}/${PORTVERSION} \
 		http://download.librdf.org/source/
@@ -13,19 +13,18 @@ COMMENT=	RDF Parser Toolkit for Redland
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
-USES=		pathfix
+USES=		libtool pathfix
 USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml2-config=${LOCALBASE}/bin/xml2-config \
 		--with-curl-config=${LOCALBASE}/bin/curl-config \
+		--with-html-dir=${PREFIX}/share/doc \
 		--with-xml-parser=libxml --with-www=curl
-CONFIGURE_ENV+=	DOC_MODULE_VERSION=1
-MAKE_ENV+=	DOC_MODULE_VERSION=1
 
-USE_LDCONFIG=	yes
+OPTIONS_DEFINE=	DOCS
 
-post-extract:
-	${REINPLACE_CMD} -e 's|utils ||' \
-		${WRKSRC}/Makefile.in
+post-patch:
+	@${REINPLACE_CMD} -e 's|utils ||' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/textproc/raptor/pkg-plist b/textproc/raptor/pkg-plist
index e4a88ef89605..6097d4ef7b7d 100644
--- a/textproc/raptor/pkg-plist
+++ b/textproc/raptor/pkg-plist
@@ -1,93 +1,90 @@
 bin/raptor-config
 include/raptor.h
 lib/libraptor.a
-lib/libraptor.la
 lib/libraptor.so
-lib/libraptor.so.3
+lib/libraptor.so.1
+lib/libraptor.so.1.2.0
 libdata/pkgconfig/raptor.pc
 man/man1/raptor-config.1.gz
 man/man3/libraptor.3.gz
-@exec mkdir -p %D/share/gtk-doc/html/raptor-1
-share/gtk-doc/html/raptor-1/parser-rdfa.html
-share/gtk-doc/html/raptor-1/serializer-json.html
-share/gtk-doc/html/raptor-1/raptor-section-sax2.html
-share/gtk-doc/html/raptor-1/home.png
-share/gtk-doc/html/raptor-1/index.html
-share/gtk-doc/html/raptor-1/index.sgml
-share/gtk-doc/html/raptor-1/introduction.html
-share/gtk-doc/html/raptor-1/ix01.html
-share/gtk-doc/html/raptor-1/left.png
-share/gtk-doc/html/raptor-1/parser-grddl.html
-share/gtk-doc/html/raptor-1/parser-guess.html
-share/gtk-doc/html/raptor-1/parser-ntriples.html
-share/gtk-doc/html/raptor-1/parser-rdfxml.html
-share/gtk-doc/html/raptor-1/parser-rss-tag-soup.html
-share/gtk-doc/html/raptor-1/parser-trig.html
-share/gtk-doc/html/raptor-1/parser-turtle.html
-share/gtk-doc/html/raptor-1/raptor-1.devhelp
-share/gtk-doc/html/raptor-1/raptor-1.devhelp2
-share/gtk-doc/html/raptor-1/raptor-parsers.html
-share/gtk-doc/html/raptor-1/raptor-section-constants.html
-share/gtk-doc/html/raptor-1/raptor-section-feature.html
-share/gtk-doc/html/raptor-1/raptor-section-general.html
-share/gtk-doc/html/raptor-1/raptor-section-iostream.html
-share/gtk-doc/html/raptor-1/raptor-section-locator.html
-share/gtk-doc/html/raptor-1/raptor-section-memory.html
-share/gtk-doc/html/raptor-1/raptor-section-parser.html
-share/gtk-doc/html/raptor-1/raptor-section-sequence.html
-share/gtk-doc/html/raptor-1/raptor-section-serializer.html
-share/gtk-doc/html/raptor-1/raptor-serializers.html
-share/gtk-doc/html/raptor-1/raptor-section-stringbuffer.html
-share/gtk-doc/html/raptor-1/raptor-section-triples.html
-share/gtk-doc/html/raptor-1/raptor-section-unicode.html
-share/gtk-doc/html/raptor-1/raptor-section-uri-factory.html
-share/gtk-doc/html/raptor-1/raptor-section-uri.html
-share/gtk-doc/html/raptor-1/raptor-section-world.html
-share/gtk-doc/html/raptor-1/raptor-section-www.html
-share/gtk-doc/html/raptor-1/raptor-section-xml-namespace.html
-share/gtk-doc/html/raptor-1/raptor-section-xml-qname.html
-share/gtk-doc/html/raptor-1/raptor-section-xml.html
-share/gtk-doc/html/raptor-1/reference-manual.html
-share/gtk-doc/html/raptor-1/restrict-parser-network-access.html
-share/gtk-doc/html/raptor-1/right.png
-share/gtk-doc/html/raptor-1/serializer-atom.html
-share/gtk-doc/html/raptor-1/serializer-dot.html
-share/gtk-doc/html/raptor-1/serializer-ntriples.html
-share/gtk-doc/html/raptor-1/serializer-rdfxml-abbrev.html
-share/gtk-doc/html/raptor-1/serializer-rdfxml-xmp.html
-share/gtk-doc/html/raptor-1/serializer-rdfxml.html
-share/gtk-doc/html/raptor-1/serializer-rss-1-0.html
-share/gtk-doc/html/raptor-1/serializer-turtle.html
-share/gtk-doc/html/raptor-1/style.css
-share/gtk-doc/html/raptor-1/tutorial-initialising-finishing.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-get-triples.html
-share/gtk-doc/html/raptor-1/tutorial.html
-share/gtk-doc/html/raptor-1/tutorial-parse-strictness.html
-share/gtk-doc/html/raptor-1/tutorial-parser-abort.html
-share/gtk-doc/html/raptor-1/tutorial-parser-content.html
-share/gtk-doc/html/raptor-1/tutorial-parser-create.html
-share/gtk-doc/html/raptor-1/tutorial-parser-destroy.html
-share/gtk-doc/html/raptor-1/tutorial-parser-example.html
-share/gtk-doc/html/raptor-1/tutorial-parser-features.html
-share/gtk-doc/html/raptor-1/tutorial-parser-runtime-info.html
-share/gtk-doc/html/raptor-1/tutorial-parser-set-error-warning-handlers.html
-share/gtk-doc/html/raptor-1/tutorial-parser-set-id-handler.html
-share/gtk-doc/html/raptor-1/tutorial-parser-set-namespace-handler.html
-share/gtk-doc/html/raptor-1/tutorial-parser-static-info.html
-share/gtk-doc/html/raptor-1/tutorial-parser-set-triple-handler.html
-share/gtk-doc/html/raptor-1/tutorial-parsing.html
-share/gtk-doc/html/raptor-1/tutorial-querying-functionality.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-create.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-declare-namespace.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-destroy.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-example.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-features.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-runtime-info.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-send-triples.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-set-error-warning-handlers.html
-share/gtk-doc/html/raptor-1/tutorial-serializer-to-destination.html
-share/gtk-doc/html/raptor-1/tutorial-serializing.html
-share/gtk-doc/html/raptor-1/up.png
-@dirrm share/gtk-doc/html/raptor-1
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
+%%PORTDOCS%%%%DOCSDIR%%/parser-rdfa.html
+%%PORTDOCS%%%%DOCSDIR%%/serializer-json.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-sax2.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/ix01.html
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/parser-grddl.html
+%%PORTDOCS%%%%DOCSDIR%%/parser-guess.html
+%%PORTDOCS%%%%DOCSDIR%%/parser-ntriples.html
+%%PORTDOCS%%%%DOCSDIR%%/parser-rdfxml.html
+%%PORTDOCS%%%%DOCSDIR%%/parser-rss-tag-soup.html
+%%PORTDOCS%%%%DOCSDIR%%/parser-trig.html
+%%PORTDOCS%%%%DOCSDIR%%/parser-turtle.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor.devhelp
+%%PORTDOCS%%%%DOCSDIR%%/raptor.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/raptor-parsers.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-constants.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-feature.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-general.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-iostream.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-locator.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-memory.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-parser.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-sequence.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-serializer.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-serializers.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-stringbuffer.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-triples.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-unicode.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-uri-factory.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-uri.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-world.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-www.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-xml-namespace.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-xml-qname.html
+%%PORTDOCS%%%%DOCSDIR%%/raptor-section-xml.html
+%%PORTDOCS%%%%DOCSDIR%%/reference-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/restrict-parser-network-access.html
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/serializer-atom.html
+%%PORTDOCS%%%%DOCSDIR%%/serializer-dot.html
+%%PORTDOCS%%%%DOCSDIR%%/serializer-ntriples.html
+%%PORTDOCS%%%%DOCSDIR%%/serializer-rdfxml-abbrev.html
+%%PORTDOCS%%%%DOCSDIR%%/serializer-rdfxml-xmp.html
+%%PORTDOCS%%%%DOCSDIR%%/serializer-rdfxml.html
+%%PORTDOCS%%%%DOCSDIR%%/serializer-rss-1-0.html
+%%PORTDOCS%%%%DOCSDIR%%/serializer-turtle.html
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-initialising-finishing.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-get-triples.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parse-strictness.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-abort.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-content.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-create.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-destroy.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-example.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-features.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-runtime-info.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-set-error-warning-handlers.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-set-id-handler.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-set-namespace-handler.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-static-info.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parser-set-triple-handler.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-parsing.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-querying-functionality.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-create.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-declare-namespace.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-destroy.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-example.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-features.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-runtime-info.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-send-triples.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-set-error-warning-handlers.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializer-to-destination.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial-serializing.html
+%%PORTDOCS%%%%DOCSDIR%%/up.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%