migrate devhelp docs to share/gtk-doc/html, bump PKGREVISION

8 files changed, 81 insertions, 85 deletions

diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index cc733118d3f..507a6cebe61 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2006/10/09 12:52:35 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2006/11/13 20:55:46 drochner Exp $
 #
 
 DISTNAME=		ORBit2-2.14.3
+PKGREVISION=		1
 CATEGORIES=		net gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ORBit2/2.14/}
 EXTRACT_SUFX=		.tar.bz2
@@ -21,7 +22,6 @@ GNU_CONFIGURE=		YES
 #TEST_TARGET=		check
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 PKGCONFIG_OVERRIDE=	ORBit-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	ORBit-CosNaming-2.0.pc.in
diff --git a/net/ORBit2/PLIST b/net/ORBit2/PLIST
index b88db4c6cfd..d1f44aceb0a 100644
--- a/net/ORBit2/PLIST
+++ b/net/ORBit2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/03/30 20:48:55 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/11/13 20:55:46 drochner Exp $
 bin/ior-decode-2
 bin/linc-cleanup-sockets
 bin/orbit-idl-2
@@ -59,22 +59,22 @@ lib/pkgconfig/ORBit-CosNaming-2.0.pc
 lib/pkgconfig/ORBit-idl-2.0.pc
 lib/pkgconfig/ORBit-imodule-2.0.pc
 share/aclocal/ORBit2.m4
-share/doc/ORBit2/ORBit2-orbit2-allocators.html
-share/doc/ORBit2/ORBit2-orbit2-small.html
-share/doc/ORBit2/ORBit2.devhelp
-share/doc/ORBit2/ORBit2.devhelp2
-share/doc/ORBit2/general.html
-share/doc/ORBit2/home.png
-share/doc/ORBit2/index.html
-share/doc/ORBit2/index.sgml
-share/doc/ORBit2/left.png
-share/doc/ORBit2/right.png
-share/doc/ORBit2/style.css
-share/doc/ORBit2/up.png
+share/gtk-doc/html/ORBit2/ORBit2-orbit2-allocators.html
+share/gtk-doc/html/ORBit2/ORBit2-orbit2-small.html
+share/gtk-doc/html/ORBit2/ORBit2.devhelp
+share/gtk-doc/html/ORBit2/ORBit2.devhelp2
+share/gtk-doc/html/ORBit2/general.html
+share/gtk-doc/html/ORBit2/home.png
+share/gtk-doc/html/ORBit2/index.html
+share/gtk-doc/html/ORBit2/index.sgml
+share/gtk-doc/html/ORBit2/left.png
+share/gtk-doc/html/ORBit2/right.png
+share/gtk-doc/html/ORBit2/style.css
+share/gtk-doc/html/ORBit2/up.png
 share/idl/orbit-2.0/CosNaming.idl
 @dirrm share/idl/orbit-2.0
 @unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}
-@dirrm share/doc/ORBit2
+@dirrm share/gtk-doc/html/ORBit2
 @dirrm lib/orbit-2.0
 @dirrm include/orbit-2.0/orbit/util
 @dirrm include/orbit-2.0/orbit/poa
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index da6005beca9..e8fb971481e 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2006/11/06 10:58:56 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2006/11/13 20:58:15 drochner Exp $
 #
 
 DISTNAME=	libgnomeprint-2.12.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,9 +22,6 @@ BUILDLINK_API_DEPENDS.freetype2+=	freetype2>=2.1.4
 
 PKGCONFIG_OVERRIDE=	libgnomeprint/libgnomeprint-2.2.pc.in
 
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libgnomeprint
 PKG_SUPPORTED_OPTIONS=	cups
 
diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index b21f42279cf..4fc0f8f98a8 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2006/04/17 07:07:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.17 2006/11/13 20:58:15 drochner Exp $
 include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-font.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h
@@ -51,30 +51,30 @@ lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.la
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.la
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.la
 lib/pkgconfig/libgnomeprint-2.2.pc
-share/doc/libgnomeprint/home.png
-share/doc/libgnomeprint/index.html
-share/doc/libgnomeprint/index.sgml
-share/doc/libgnomeprint/left.png
-share/doc/libgnomeprint/libgnomeprint-Pango-Integration.html
-share/doc/libgnomeprint/libgnomeprint-building.html
-share/doc/libgnomeprint/libgnomeprint-compiling.html
-share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
-share/doc/libgnomeprint/libgnomeprint-gnome-font.html
-share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html
-share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-job.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html
-share/doc/libgnomeprint/libgnomeprint-gnome-print.html
-share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html
-share/doc/libgnomeprint/libgnomeprint-resources.html
-share/doc/libgnomeprint/libgnomeprint.devhelp
-share/doc/libgnomeprint/libgnomeprint.html
-share/doc/libgnomeprint/libgnomeprintunsorted.html
-share/doc/libgnomeprint/right.png
-share/doc/libgnomeprint/style.css
-share/doc/libgnomeprint/up.png
+share/gtk-doc/html/libgnomeprint/home.png
+share/gtk-doc/html/libgnomeprint/index.html
+share/gtk-doc/html/libgnomeprint/index.sgml
+share/gtk-doc/html/libgnomeprint/left.png
+share/gtk-doc/html/libgnomeprint/libgnomeprint-Pango-Integration.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-building.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-compiling.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-font-face.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-font.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-glyphlist.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-pgl.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print-config.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print-job.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print-paper.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print-unit.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-print.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-gnome-rfont.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint-resources.html
+share/gtk-doc/html/libgnomeprint/libgnomeprint.devhelp
+share/gtk-doc/html/libgnomeprint/libgnomeprint.html
+share/gtk-doc/html/libgnomeprint/libgnomeprintunsorted.html
+share/gtk-doc/html/libgnomeprint/right.png
+share/gtk-doc/html/libgnomeprint/style.css
+share/gtk-doc/html/libgnomeprint/up.png
 share/libgnomeprint/${PKGVERSION}/globals.xml
 share/libgnomeprint/${PKGVERSION}/models/GNOME-GENERIC-PS.xml
 share/libgnomeprint/${PKGVERSION}/models/GNOME-PDF-WRITER.xml
@@ -156,7 +156,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
 @dirrm share/libgnomeprint/${PKGVERSION}/models
 @dirrm share/libgnomeprint/${PKGVERSION}
 @dirrm share/libgnomeprint
-@dirrm share/doc/libgnomeprint
+@dirrm share/gtk-doc/html/libgnomeprint
 @dirrm lib/libgnomeprint/${PKGVERSION}/modules/transports
 @dirrm lib/libgnomeprint/${PKGVERSION}/modules/filters
 @dirrm lib/libgnomeprint/${PKGVERSION}/modules
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index ff53389995d..d221d0d3661 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2006/05/31 18:13:54 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2006/11/13 21:00:39 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-glib-${POPPLER_VERS}
+PKGREVISION=		1
 
 COMMENT=		PDF rendering library (GLib wrapper)
 
@@ -23,8 +24,6 @@ CONFIGURE_ARGS+=	--disable-poppler-qt
 # Don't compile GTK+ test program.
 CONFIGURE_ARGS+=	--disable-gtk-test
 
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-
 BUILD_DIRS=		${WRKSRC}/goo ${WRKSRC}/fofi ${WRKSRC}/poppler \
 			${WRKSRC}/glib
 INSTALL_DIRS=		${WRKSRC}/glib
diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST
index b1bb764fd7f..aab3c3947e2 100644
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/05/31 18:13:54 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/11/13 21:00:39 drochner Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-attachment.h
 include/poppler/glib/poppler-document.h
@@ -9,20 +9,21 @@ include/poppler/glib/poppler.h
 lib/libpoppler-glib.la
 lib/pkgconfig/poppler-cairo.pc
 lib/pkgconfig/poppler-glib.pc
-share/doc/poppler/ch01.html
-share/doc/poppler/home.png
-share/doc/poppler/index.html
-share/doc/poppler/index.sgml
-share/doc/poppler/left.png
-share/doc/poppler/poppler-poppler-action.html
-share/doc/poppler/poppler-poppler-document.html
-share/doc/poppler/poppler-poppler-enums.html
-share/doc/poppler/poppler-poppler-page.html
-share/doc/poppler/poppler-poppler.html
-share/doc/poppler/poppler.devhelp
-share/doc/poppler/poppler.devhelp2
-share/doc/poppler/right.png
-share/doc/poppler/style.css
-share/doc/poppler/up.png
-@comment @dirrm share/doc/poppler
+share/gtk-doc/html/poppler/ch01.html
+share/gtk-doc/html/poppler/home.png
+share/gtk-doc/html/poppler/index.html
+share/gtk-doc/html/poppler/index.sgml
+share/gtk-doc/html/poppler/left.png
+share/gtk-doc/html/poppler/poppler-poppler-action.html
+share/gtk-doc/html/poppler/poppler-poppler-document.html
+share/gtk-doc/html/poppler/poppler-poppler-enums.html
+share/gtk-doc/html/poppler/poppler-poppler-page.html
+share/gtk-doc/html/poppler/poppler-poppler.html
+share/gtk-doc/html/poppler/poppler.devhelp
+share/gtk-doc/html/poppler/poppler.devhelp2
+share/gtk-doc/html/poppler/right.png
+share/gtk-doc/html/poppler/style.css
+share/gtk-doc/html/poppler/up.png
+@dirrm share/gtk-doc/html/poppler
 @dirrm include/poppler/glib
+@dirrm include/poppler
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 06089263fd1..92d4c0a5fd3 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2006/10/13 18:25:47 drochner Exp $
+# $NetBSD: Makefile,v 1.42 2006/11/13 21:02:53 drochner Exp $
 #
 
 DISTNAME=	vte-0.14.1
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vte/0.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,9 +17,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
-CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--disable-python
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	--with-ft-exec-prefix=${BUILDLINK_PREFIX.freetype2}
 
 PKGCONFIG_OVERRIDE+=	vte.pc.in
diff --git a/x11/vte/PLIST b/x11/vte/PLIST
index 18a4a91b750..efe9fb0b74b 100644
--- a/x11/vte/PLIST
+++ b/x11/vte/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/09/15 15:16:42 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/11/13 21:02:53 drochner Exp $
 bin/vte
 include/vte/pty.h
 include/vte/reaper.h
@@ -17,19 +17,19 @@ lib/vte/utf8mode
 lib/vte/vterdb
 lib/vte/window
 libexec/gnome-pty-helper
-share/doc/vte/VteReaper.html
-share/doc/vte/VteTerminal.html
-share/doc/vte/VteTerminalAccessible.html
-share/doc/vte/ch01.html
-share/doc/vte/home.png
-share/doc/vte/index.html
-share/doc/vte/index.sgml
-share/doc/vte/left.png
-share/doc/vte/right.png
-share/doc/vte/style.css
-share/doc/vte/up.png
-share/doc/vte/vte.devhelp
-share/doc/vte/vte.devhelp2
+share/gtk-doc/html/vte/VteReaper.html
+share/gtk-doc/html/vte/VteTerminal.html
+share/gtk-doc/html/vte/VteTerminalAccessible.html
+share/gtk-doc/html/vte/ch01.html
+share/gtk-doc/html/vte/home.png
+share/gtk-doc/html/vte/index.html
+share/gtk-doc/html/vte/index.sgml
+share/gtk-doc/html/vte/left.png
+share/gtk-doc/html/vte/right.png
+share/gtk-doc/html/vte/style.css
+share/gtk-doc/html/vte/up.png
+share/gtk-doc/html/vte/vte.devhelp
+share/gtk-doc/html/vte/vte.devhelp2
 share/locale/am/LC_MESSAGES/vte.mo
 share/locale/ang/LC_MESSAGES/vte.mo
 share/locale/ar/LC_MESSAGES/vte.mo
@@ -111,6 +111,6 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
 share/vte/termcap/xterm
 @dirrm share/vte/termcap
 @dirrm share/vte
-@dirrm share/doc/vte
+@dirrm share/gtk-doc/html/vte
 @dirrm lib/vte
 @dirrm include/vte