Moved documentation from share/doc/html to share/doc/gdome2. Fixed pkglint

warnings. Bumped PKGREVISION.

5 files changed, 54 insertions, 45 deletions

diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile
index 6cd32452d69..c15e8bad786 100644
--- a/textproc/gdome2/Makefile
+++ b/textproc/gdome2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2012/10/25 06:55:50 asau Exp $
+# $NetBSD: Makefile,v 1.15 2016/07/24 21:02:45 rillig Exp $
 
 DISTNAME=	gdome2-0.8.1
-PKGREVISION=	7
-CATEGORIES=	games
+PKGREVISION=	8
+CATEGORIES=	devel
 MASTER_SITES=	http://gdome2.cs.unibo.it/tarball/
 
 MAINTAINER=	adam@NetBSD.org
@@ -12,9 +12,14 @@ COMMENT=	Gnome DOM (Document Object Model) engine
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-html-dir=${DESTDIR}${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${DESTDIR}${PREFIX}/share/doc/gdome2
 PKGCONFIG_OVERRIDE=	${WRKSRC}/gdome2.pc.in
 
+SUBST_CLASSES+=		docdir
+SUBST_STAGE.docdir=	pre-configure
+SUBST_FILES.docdir=	gtk-doc/Makefile.in
+SUBST_SED.docdir=	-e 's,^TARGET_DIR =.*,TARGET_DIR = $$(HTML_DIR),'
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gdome2/PLIST b/textproc/gdome2/PLIST
index 1e36cd4c604..28768474213 100644
--- a/textproc/gdome2/PLIST
+++ b/textproc/gdome2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:17:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/07/24 21:02:45 rillig Exp $
 bin/gdome-config
 include/libgdome/gdome-events.h
 include/libgdome/gdome-libxml-util.h
@@ -13,38 +13,38 @@ lib/libgdome.la
 lib/pkgconfig/gdome2.pc
 man/man1/gdome-config.1
 share/aclocal/gdome2.m4
-share/doc/html/gdome2-0.8.1/book1.html
-share/doc/html/gdome2-0.8.1/gdome2-basic-types-and-enumerations.html
-share/doc/html/gdome2-0.8.1/gdome2-core.html
-share/doc/html/gdome2-0.8.1/gdome2-events-basic-types-and-enumerations.html
-share/doc/html/gdome2-0.8.1/gdome2-events.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomeattr.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomecdatasection.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomecharacterdata.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomecomment.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomedocument.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomedocumentfragment.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomedocumenttype.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomedomimplementation.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomeelement.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomeentity.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomeentityreference.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomeevent.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomeeventlistener.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomemutationevent.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomenamednodemap.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomenode.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomenodelist.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomenotation.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomeprocessinginstruction.html
-share/doc/html/gdome2-0.8.1/gdome2-gdometext.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomexpathevaluator.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomexpathnamespace.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomexpathnsresolver.html
-share/doc/html/gdome2-0.8.1/gdome2-gdomexpathresult.html
-share/doc/html/gdome2-0.8.1/gdome2-memory.html
-share/doc/html/gdome2-0.8.1/gdome2-module-private-list.html
-share/doc/html/gdome2-0.8.1/gdome2-module-tree-garbage-collector.html
-share/doc/html/gdome2-0.8.1/gdome2-xpath-basic-types-and-enumerations.html
-share/doc/html/gdome2-0.8.1/gdome2-xpath.html
-share/doc/html/gdome2-0.8.1/index.sgml
+share/doc/gdome2/book1.html
+share/doc/gdome2/gdome2-basic-types-and-enumerations.html
+share/doc/gdome2/gdome2-core.html
+share/doc/gdome2/gdome2-events-basic-types-and-enumerations.html
+share/doc/gdome2/gdome2-events.html
+share/doc/gdome2/gdome2-gdomeattr.html
+share/doc/gdome2/gdome2-gdomecdatasection.html
+share/doc/gdome2/gdome2-gdomecharacterdata.html
+share/doc/gdome2/gdome2-gdomecomment.html
+share/doc/gdome2/gdome2-gdomedocument.html
+share/doc/gdome2/gdome2-gdomedocumentfragment.html
+share/doc/gdome2/gdome2-gdomedocumenttype.html
+share/doc/gdome2/gdome2-gdomedomimplementation.html
+share/doc/gdome2/gdome2-gdomeelement.html
+share/doc/gdome2/gdome2-gdomeentity.html
+share/doc/gdome2/gdome2-gdomeentityreference.html
+share/doc/gdome2/gdome2-gdomeevent.html
+share/doc/gdome2/gdome2-gdomeeventlistener.html
+share/doc/gdome2/gdome2-gdomemutationevent.html
+share/doc/gdome2/gdome2-gdomenamednodemap.html
+share/doc/gdome2/gdome2-gdomenode.html
+share/doc/gdome2/gdome2-gdomenodelist.html
+share/doc/gdome2/gdome2-gdomenotation.html
+share/doc/gdome2/gdome2-gdomeprocessinginstruction.html
+share/doc/gdome2/gdome2-gdometext.html
+share/doc/gdome2/gdome2-gdomexpathevaluator.html
+share/doc/gdome2/gdome2-gdomexpathnamespace.html
+share/doc/gdome2/gdome2-gdomexpathnsresolver.html
+share/doc/gdome2/gdome2-gdomexpathresult.html
+share/doc/gdome2/gdome2-memory.html
+share/doc/gdome2/gdome2-module-private-list.html
+share/doc/gdome2/gdome2-module-tree-garbage-collector.html
+share/doc/gdome2/gdome2-xpath-basic-types-and-enumerations.html
+share/doc/gdome2/gdome2-xpath.html
+share/doc/gdome2/index.sgml
diff --git a/textproc/gdome2/distinfo b/textproc/gdome2/distinfo
index c937c52a2a2..3328097d76b 100644
--- a/textproc/gdome2/distinfo
+++ b/textproc/gdome2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 01:59:29 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/07/24 21:02:45 rillig Exp $
 
 SHA1 (gdome2-0.8.1.tar.gz) = e9a3e4140c873d8232635ad10bb135ef7803c408
 RMD160 (gdome2-0.8.1.tar.gz) = 5cc3ff29e0ed040e3bbd02cba4d95b9b634c4072
 SHA512 (gdome2-0.8.1.tar.gz) = 40d9cb9ade2db3c7a196ac30cf8d9f5b48da4990250c14a53db53280ee76870b9247e973e2f2da523807faed3333d7c0f854f9546860ffbda251c12f6d404da7
 Size (gdome2-0.8.1.tar.gz) = 518965 bytes
 SHA1 (patch-aa) = 7e194447d1b4cf4a0799aef6c211e724e577c33c
-SHA1 (patch-ab) = 642f5e5319bdebf3fab8b346d68558e117cb5d26
-SHA1 (patch-libgdome_gdomecore_gdome-xml-documentt.c) = fb032a0f47d26d4f36cc9e3c720370fb227b14dc
+SHA1 (patch-ab) = 8879607c6ba6f03a14517df6342615ec8a55f156
+SHA1 (patch-libgdome_gdomecore_gdome-xml-documentt.c) = 80b32e734000ad035819b2fa6ebf2fa7b1b5fd62
diff --git a/textproc/gdome2/patches/patch-ab b/textproc/gdome2/patches/patch-ab
index 2be6d38e7fb..9d4795c7013 100644
--- a/textproc/gdome2/patches/patch-ab
+++ b/textproc/gdome2/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2006/02/10 12:09:24 adam Exp $
+$NetBSD: patch-ab,v 1.2 2016/07/24 21:02:45 rillig Exp $
+
+Header files must not define variables.
 
 --- libgdome/xpath/gdome-xpath-xpnsresolv.h.orig	2006-02-10 12:52:28.000000000 +0100
 +++ libgdome/xpath/gdome-xpath-xpnsresolv.h
diff --git a/textproc/gdome2/patches/patch-libgdome_gdomecore_gdome-xml-documentt.c b/textproc/gdome2/patches/patch-libgdome_gdomecore_gdome-xml-documentt.c
index deeec097e5d..421d397c717 100644
--- a/textproc/gdome2/patches/patch-libgdome_gdomecore_gdome-xml-documentt.c
+++ b/textproc/gdome2/patches/patch-libgdome_gdomecore_gdome-xml-documentt.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-libgdome_gdomecore_gdome-xml-documentt.c,v 1.1 2012/11/19 03:01:44 joerg Exp $
+$NetBSD: patch-libgdome_gdomecore_gdome-xml-documentt.c,v 1.2 2016/07/24 21:02:45 rillig Exp $
+
+Fix build with new libxml2 API.
 
 --- libgdome/gdomecore/gdome-xml-documentt.c.orig	2012-11-19 01:08:40.000000000 +0000
 +++ libgdome/gdomecore/gdome-xml-documentt.c