- Add USES=libtool and bump dependent ports

- Add USE_GNOME=gnomehier to fix leftovers
- Simplify documentation handling with staging and install documentation
  in standard location

3 files changed, 44 insertions, 59 deletions

diff --git a/sysutils/libzeitgeist/Makefile b/sysutils/libzeitgeist/Makefile
index 7db2bb365af8..0588c71988f7 100644
--- a/sysutils/libzeitgeist/Makefile
+++ b/sysutils/libzeitgeist/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libzeitgeist
 PORTVERSION=	0.3.18
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://launchpadlibrarian.net/100152436/ \
 	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ \
@@ -10,24 +11,12 @@ MASTER_SITES=	https://launchpadlibrarian.net/100152436/ \
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Zeitgeist client library
 
-USES=	pathfix pkgconfig gettext gmake
 GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 intltool intlhack
+USES=		gettext gmake libtool pathfix pkgconfig
+USE_GNOME=	glib20 gnomehier intltool intlhack
 USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
-CONFIGURE_ARGS+=--enable-gtk-doc-html \
-	--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	DOCS=""
-.else
-CONFIGURE_ARGS+=--disable-gtk-doc-html \
-	--without-html-dir
-PLIST_SUB+=	DOCS="@comment "
-.endif
-
 .include <bsd.port.mk>
diff --git a/sysutils/libzeitgeist/pkg-plist b/sysutils/libzeitgeist/pkg-plist
index d87ed085e7b5..d12540505b00 100644
--- a/sysutils/libzeitgeist/pkg-plist
+++ b/sysutils/libzeitgeist/pkg-plist
@@ -16,51 +16,47 @@ include/zeitgeist-1.0/zeitgeist-timerange.h
 include/zeitgeist-1.0/zeitgeist-timestamp.h
 include/zeitgeist-1.0/zeitgeist.h
 lib/libzeitgeist-1.0.a
-lib/libzeitgeist-1.0.la
 lib/libzeitgeist-1.0.so
-lib/libzeitgeist-1.0.so.2
+lib/libzeitgeist-1.0.so.1
+lib/libzeitgeist-1.0.so.1.1.4
 libdata/pkgconfig/zeitgeist-1.0.pc
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/MAINTAINERS
-%%DOCSDIR%%/README
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ZeitgeistDataSource.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ZeitgeistDataSourceRegistry.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ZeitgeistEvent.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ZeitgeistIndex.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ZeitgeistLog.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ZeitgeistMonitor.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ZeitgeistResultSet.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ZeitgeistSubject.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ZeitgeistTimeRange.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/annotation-glossary.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/api-index-full.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ch01.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ch02.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ch03.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/ch04.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/home.png
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/index.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/index.sgml
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/left.png
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/object-tree.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/right.png
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/style.css
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/up.png
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/zeitgeist-1.0-Enumerations.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/zeitgeist-1.0-Interpretation-Ontology.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/zeitgeist-1.0-Manifestation-Ontology.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/zeitgeist-1.0-Mimetype-mapping-and-URI-comprehension.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/zeitgeist-1.0-Symbol-comprehension.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/zeitgeist-1.0-Timestamp-handling.html
-%%DOCS%%share/gtk-doc/html/zeitgeist-1.0/zeitgeist-1.0.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistDataSource.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistDataSourceRegistry.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistEvent.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistIndex.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistLog.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistMonitor.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistResultSet.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistSubject.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ZeitgeistTimeRange.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/annotation-glossary.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/api-index-full.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ch01.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ch02.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ch03.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/ch04.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/home.png
+%%PORTDOCS%%share/doc/zeitgeist-1.0/index.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/index.sgml
+%%PORTDOCS%%share/doc/zeitgeist-1.0/left.png
+%%PORTDOCS%%share/doc/zeitgeist-1.0/object-tree.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/right.png
+%%PORTDOCS%%share/doc/zeitgeist-1.0/style.css
+%%PORTDOCS%%share/doc/zeitgeist-1.0/up.png
+%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Enumerations.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Interpretation-Ontology.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Manifestation-Ontology.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Mimetype-mapping-and-URI-comprehension.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Symbol-comprehension.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0-Timestamp-handling.html
+%%PORTDOCS%%share/doc/zeitgeist-1.0/zeitgeist-1.0.devhelp2
 share/vala/vapi/zeitgeist-1.0.deps
 share/vala/vapi/zeitgeist-1.0.vapi
-@comment @dirrmtry share/vala/vapi
-@comment @dirrmtry share/vala
-%%DOCS%%@dirrm share/gtk-doc/html/zeitgeist-1.0
-%%DOCS%%@dirrmtry share/gtk-doc/html
-%%DOCS%%@dirrmtry share/gtk-doc
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm share/doc/zeitgeist-1.0
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/zeitgeist-1.0
diff --git a/www/midori/Makefile b/www/midori/Makefile
index bf14c870d9ec..3db553296bab 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	midori
 PORTVERSION=	0.5.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www xfce
 MASTER_SITES=	http://www.midori-browser.org/downloads/
 DISTNAME=	${PORTNAME}_${PORTVERSION}_all_