From 78b73ecee7ef5116f1da5c2756970726f94aea93 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 26 May 2008 16:29:26 +0000
Subject: [PATCH] - make help available by adding MODGNOME_HELP_FILES /
 ::x11/gnome/yelp to RUN_DEPENDS

"mkay" jasper@
---
 databases/mdbtools/snapshot/Makefile | 7 +++++--
 devel/gconf-editor/Makefile          | 4 +++-
 games/gcompris/Makefile              | 6 ++++--
 graphics/dia/Makefile                | 5 +++--
 mail/evolution/Makefile              | 5 +++--
 mail/mail-notification/Makefile      | 7 ++++---
 textproc/gtk-doc/Makefile            | 7 ++++---
 x11/gnome/applets2/Makefile          | 8 +++++---
 x11/gnome/controlcenter2/Makefile    | 5 +++--
 x11/gnome/dasher/Makefile            | 5 +++--
 x11/gnome/desktop/Makefile           | 5 +++--
 x11/gnome/devel-docs/Makefile        | 6 ++++--
 x11/gnome/doc-utils/Makefile         | 6 ++++--
 x11/gnome/eog/Makefile               | 5 +++--
 x11/gnome/file-roller/Makefile       | 5 +++--
 x11/gnome/gdm/Makefile               | 5 +++--
 x11/gnome/ggv/Makefile               | 4 +++-
 x11/gnome/ghex/Makefile              | 5 +++--
 x11/gnome/gok/Makefile               | 5 +++--
 x11/gnome/media/Makefile             | 5 +++--
 x11/gnome/panel/Makefile             | 5 +++--
 x11/gnome/terminal/Makefile          | 5 +++--
 x11/gnome/users-guide/Makefile       | 5 +++--
 x11/gnome/utils/Makefile             | 5 +++--
 x11/gnome/zenity/Makefile            | 5 +++--
 25 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/databases/mdbtools/snapshot/Makefile b/databases/mdbtools/snapshot/Makefile
index 24f42f211d4..70028b85e6b 100644
--- a/databases/mdbtools/snapshot/Makefile
+++ b/databases/mdbtools/snapshot/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/15 22:27:39 simon Exp $
+# $OpenBSD: Makefile,v 1.12 2008/05/26 16:29:26 ajacoutot Exp $
 
 COMMENT-main=	read microsoft Access MDB
 COMMENT-gmdb=	graphical interface to MDB tools
 DATE=		20070603
 DISTNAME=	mdbtools-${DATE}
 PKGNAME-main=	mdbtools-${DATE}
-PKGNAME-gmdb=	gmdb-${DATE}
+PKGNAME-gmdb=	gmdb-${DATE}p0
 HOMEPAGE=	http://mdbtools.sourceforge.net/
 
 CATEGORIES=	databases converters
@@ -40,6 +40,9 @@ MODULES=	devel/gettext
 LIB_DEPENDS-gmdb=${LIB_DEPENDS} \
 		gnomeui-2::x11/gnome/libgnomeui \
 		mdb,mdbsql::databases/mdbtools/snapshot
+RUN_DEPENDS-gmdb=${RUN_DEPENDS} \
+		:yelp-*:x11/gnome/yelp
+
 WANTLIB-gmdb=	${WANTLIB} \
 		audiofile bonobo-activation popt ORBit-2 pthread \
 		bonoboui-2  atk-1.0 gobject-2.0 m jpeg \
diff --git a/devel/gconf-editor/Makefile b/devel/gconf-editor/Makefile
index f44abc5f8a4..759d069bbc8 100644
--- a/devel/gconf-editor/Makefile
+++ b/devel/gconf-editor/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2008/04/29 18:24:55 jasper Exp $
+# $OpenBSD: Makefile,v 1.26 2008/05/26 16:29:26 ajacoutot Exp $
 
 COMMENT=		editor for the GConf configuration system
 
 GNOME_PROJECT=		gconf-editor
 GNOME_VERSION=		2.22.0
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.gnome.org/projects/gconf/
@@ -37,6 +38,7 @@ MODULES=		devel/gettext \
 
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
+MODGNOME_HELP_FILES=	Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS= 	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gconf-editor \
 			--disable-schemas-install
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 62ec7dbf3bf..d410857b1eb 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2008/02/15 12:29:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2008/05/26 16:29:26 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	educational game for children
 
 DISTNAME=	gcompris-8.4.4
+PKGNAME=	$(DISTNAME}p0
 CATEGORIES=	games education
 
 HOMEPAGE=	http://gcompris.net/
@@ -44,7 +45,8 @@ RUN_DEPENDS=	::games/gnuchess \
 		:desktop-file-utils-*:devel/desktop-file-utils \
 		::multimedia/gstreamer-0.10/plugins-base,-ogg \
 		::multimedia/gstreamer-0.10/plugins-base,-vorbis \
-		::multimedia/gstreamer-0.10/plugins-good,-gconf
+		::multimedia/gstreamer-0.10/plugins-good,-gconf \
+		:yelp-*:x11/gnome/yelp
 
 USE_X11=	Yes
 USE_LIBTOOL=	Yes
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 3c5aed9a248..0d9edae8b8f 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.51 2008/05/16 11:55:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.52 2008/05/26 16:29:26 ajacoutot Exp $
 
 COMMENT=	technical diagrams drawing tool
 
 DISTNAME=	dia-0.96.1
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://live.gnome.org/Dia/
@@ -60,6 +60,7 @@ WANTLIB+=	ICE ORBit-2 ORBitCosNaming-2 SM audiofile bonobo-2 \
 		bonobo-activation bonoboui-2 crypto dbus-1 dbus-glib-1 \
 		esd gailutil gconf-2 gnome-2 gnome-keyring \
 		gnomecanvas-2 gnomevfs-2 jpeg ssl util
+RUN_DEPENDS+=	:yelp-*:x11/gnome/yelp
 .else
 CONFIGURE_ARGS+=--disable-gnome \
 		--without-gnomeprint
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 1ede0849cca..21163aac836 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.40 2008/05/11 12:29:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.41 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		integrated email and PIM software for GNOME
 
 GNOME_PROJECT=		evolution
 GNOME_VERSION=		2.12.1
-PKGNAME=		${DISTNAME}p3
+PKGNAME=		${DISTNAME}p4
 CATEGORIES=    		mail
 
 HOMEPAGE=		http://www.gnome.org/projects/evolution/
@@ -53,6 +53,7 @@ LIB_DEPENDS=		camel-1.2,camel-provider-1.2.>=4.1,ebook-1.2.>=4.1,ecal-1.2.>=2.1,
 			notify.>=2::devel/libnotify
 
 USE_X11=		Yes
+MODGNOME_HELP_FILES=	Yes
 DESKTOP_FILES=		Yes
 YACC=			bison
 CONFIGURE_STYLE=	gnu
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index c3787f62780..9021c37cb56 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2008/04/17 08:10:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		mail notification for freedesktop.org-compliant system trays
 DISTNAME=		mail-notification-4.0
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 CATEGORIES=		mail	
 
 HOMEPAGE=		http://www.nongnu.org/mailnotify/
@@ -33,7 +33,8 @@ BUILD_DEPENDS=         :scrollkeeper-*:textproc/scrollkeeper \
 			:p5-XML-Parser-*:textproc/p5-XML-Parser
 RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper \
 			:gnome-icon-theme-*:x11/gnome/icon-theme \
-			:desktop-file-utils-*:devel/desktop-file-utils
+			:desktop-file-utils-*:devel/desktop-file-utils \
+			:yelp-*:x11/gnome/yelp
 LIB_DEPENDS=		notify::devel/libnotify \
 			eel-2::x11/gnome/eel
 
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index f807e1f277f..5129416b32b 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2007/09/15 20:59:38 merdely Exp $
+# $OpenBSD: Makefile,v 1.6 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=	GTK C code documentation system
 
 VERSION=	1.7
 DISTNAME=	gtk-doc-${VERSION}
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=    	textproc devel
 
 HOMEPAGE=	http://www.gtk.org/gtk-doc/
@@ -26,7 +26,8 @@ RUN_DEPENDS=	::textproc/openjade 	\
 		::textproc/docbook 	\
 		::textproc/docbook-xsl 	\
 		::textproc/libxslt	\
-		::textproc/scrollkeeper
+		::textproc/scrollkeeper	\
+		:yelp-*:x11/gnome/yelp
 
 post-extract:
 	cp ${LOCALBASE}/share/xml/docbook/catalog.xml \
diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile
index fc6b2371836..5286c70507b 100644
--- a/x11/gnome/applets2/Makefile
+++ b/x11/gnome/applets2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2008/05/01 08:52:31 bernd Exp $
+# $OpenBSD: Makefile,v 1.42 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT-main=		applets for use with the GNOME panel
 COMMENT-battstat=	GNOME applet for monitoring battery level
@@ -6,8 +6,8 @@ COMMENT-battstat=	GNOME applet for monitoring battery level
 GNOME_PROJECT=		gnome-applets
 GNOME_VERSION=		2.20.0
 
-PKGNAME-main=		gnome-applets2-${VERSION}p1
-PKGNAME-battstat=	gnome-applets2-battstat-${VERSION}p2
+PKGNAME-main=		gnome-applets2-${VERSION}p2
+PKGNAME-battstat=	gnome-applets2-battstat-${VERSION}p3
 SHARED_LIBS +=	gweather             0.0      # .0.0
 CATEGORIES=		x11
 
@@ -31,6 +31,8 @@ MODULES=		devel/gettext \
 			lang/python \
 			x11/gnome
 
+MODGNOME_HELP_FILES=	Yes
+
 BUILD_DEPENDS= 		:scrollkeeper-*:textproc/scrollkeeper \
 			:gnome-icon-theme->=2.15.91:x11/gnome/icon-theme
 RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper \
diff --git a/x11/gnome/controlcenter2/Makefile b/x11/gnome/controlcenter2/Makefile
index 2ccc0a313ad..ab39b57a00b 100644
--- a/x11/gnome/controlcenter2/Makefile
+++ b/x11/gnome/controlcenter2/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2008/05/12 19:40:17 jasper Exp $
+# $OpenBSD: Makefile,v 1.35 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		GNOME control center
 
 GNOME_PROJECT=		gnome-control-center
 GNOME_VERSION=		2.20.3
-PKGNAME=		control-center2-${VERSION}p3
+PKGNAME=		control-center2-${VERSION}p4
 SHARED_LIBS +=	gnome-window-settings 2.0      # .1.0
 CATEGORIES=		x11
 
@@ -48,6 +48,7 @@ RUN_DEPENDS=		:shared-mime-info->=0.21:misc/shared-mime-info \
 			:scrollkeeper-*:textproc/scrollkeeper
 
 USE_X11=		Yes
+MODGNOME_HELP_FILES=	Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/control-center2 \
 			--disable-schemas-install \
diff --git a/x11/gnome/dasher/Makefile b/x11/gnome/dasher/Makefile
index 22755e2a534..12d83b5df0d 100644
--- a/x11/gnome/dasher/Makefile
+++ b/x11/gnome/dasher/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2008/02/04 17:55:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		graphical predictive text input system
 
 GNOME_PROJECT=		dasher
 GNOME_VERSION=		4.6.1
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 
 CATEGORIES=		x11
 
@@ -32,6 +32,7 @@ LIB_DEPENDS=		gnomeui-2::x11/gnome/libgnomeui \
 			cspi,spi::x11/gnome/at-spi
 
 USE_X11=		Yes
+MODGNOME_HELP_FILES=	Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/dasher/ \
 			--disable-schema-install \
diff --git a/x11/gnome/desktop/Makefile b/x11/gnome/desktop/Makefile
index ae84a98db43..c1c0770c631 100644
--- a/x11/gnome/desktop/Makefile
+++ b/x11/gnome/desktop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2008/05/26 08:32:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.30 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		components for the GNOME desktop
 
@@ -6,7 +6,7 @@ GNOME_PROJECT=		gnome-desktop
 GNOME_VERSION=		2.20.3
 SHARED_LIBS +=  gnome-desktop-2      5.8      # .5.16
 CATEGORIES=		x11
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 
 # LGPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -32,6 +32,7 @@ RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper
 LIB_DEPENDS=		gnomeui-2::x11/gnome/libgnomeui \
 			startup-notification-1::devel/startup-notification
 
+MODGNOME_HELP_FILES=	Yes
 MODGNOME_DEVHELP_FILES=	Yes
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
diff --git a/x11/gnome/devel-docs/Makefile b/x11/gnome/devel-docs/Makefile
index decf21c8341..a98db99f1b0 100644
--- a/x11/gnome/devel-docs/Makefile
+++ b/x11/gnome/devel-docs/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2008/02/04 17:55:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.3 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		developer documentation for GNOME
 
 GNOME_PROJECT=		gnome-devel-docs
 GNOME_VERSION=		2.20.0
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -18,6 +18,8 @@ RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper
 BUILD_DEPENDS=		${RUN_DEPENDS} \
 			:gnome-doc-utils-*:x11/gnome/doc-utils
 
+MODGNOME_HELP_FILES=	Yes
+
 PKG_ARCH=		*
 USE_LIBTOOL=		No
 CONFIGURE_ARGS= 	--disable-scrollkeeper
diff --git a/x11/gnome/doc-utils/Makefile b/x11/gnome/doc-utils/Makefile
index 37fe2a3c721..8dbfabd2ceb 100644
--- a/x11/gnome/doc-utils/Makefile
+++ b/x11/gnome/doc-utils/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2008/04/14 19:06:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=	collection of documentation utilities for the GNOME project
 
 GNOME_PROJECT=	gnome-doc-utils
 GNOME_VERSION=	0.10.3
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	textproc
 
 # (L)GPLv2
@@ -23,6 +23,8 @@ RUN_DEPENDS=	:py-libxml-*:textproc/libxml,-python \
 		:libxslt-*:textproc/libxslt \
 		:scrollkeeper-*:textproc/scrollkeeper
 
+MODGNOME_HELP_FILES=	Yes
+
 USE_LIBTOOL=	No
 CONFIGURE_ARGS=	--disable-scrollkeeper
 CONFIGURE_ENV=	PYTHON=${MODPY_BIN} \
diff --git a/x11/gnome/eog/Makefile b/x11/gnome/eog/Makefile
index 70cd91369d7..2768a311002 100644
--- a/x11/gnome/eog/Makefile
+++ b/x11/gnome/eog/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2008/04/17 08:46:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		Eye of GNOME: an image viewing and cataloging program
 
 GNOME_PROJECT=		eog
 GNOME_VERSION=		2.20.4
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		graphics
 
 MAINTAINER=		Thomas Delaet <thomas@delaet.org>
@@ -37,6 +37,7 @@ RUN_DEPENDS=		:shared-mime-info->=0.21:misc/shared-mime-info \
 			:scrollkeeper-*:textproc/scrollkeeper \
 			:gnome-icon-theme->=2.18.0:x11/gnome/icon-theme
 
+MODGNOME_HELP_FILES=	Yes
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome/file-roller/Makefile b/x11/gnome/file-roller/Makefile
index d8339e25414..5d602e20353 100644
--- a/x11/gnome/file-roller/Makefile
+++ b/x11/gnome/file-roller/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2008/04/17 08:46:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		archive manager for GNOME
 
 GNOME_PROJECT=		file-roller
 GNOME_VERSION=		2.20.3
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 CATEGORIES=		archivers
 
 # GPL
@@ -34,6 +34,7 @@ LIB_DEPENDS=		gnomeui-2.>=1800::x11/gnome/libgnomeui \
 			nautilus-extension.>=1::x11/gnome/nautilus
 
 USE_X11=		Yes
+MODGNOME_HELP_FILES=	Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ARGS=		--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/file-roller \
 			--disable-schemas-install \
diff --git a/x11/gnome/gdm/Makefile b/x11/gnome/gdm/Makefile
index 30c50cff742..b2d10269406 100644
--- a/x11/gnome/gdm/Makefile
+++ b/x11/gnome/gdm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2008/05/09 10:51:44 bernd Exp $
+# $OpenBSD: Makefile,v 1.28 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		GNOME display manager
 
 GNOME_PROJECT=		gdm
 GNOME_VERSION=		2.20.2
-PKGNAME=		${DISTNAME}p4
+PKGNAME=		${DISTNAME}p5
 
 HOMEPAGE=		http://www.gnome.org/projects/gdm/
 
@@ -36,6 +36,7 @@ MODULES=		devel/gettext \
 
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
+MODGNOME_HELP_FILES=	Yes
 CONFIGURE_STYLE=	gnu old
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--sysconfdir="${SYSCONFDIR}/X11" \
diff --git a/x11/gnome/ggv/Makefile b/x11/gnome/ggv/Makefile
index 0c0840540a9..564a1fc8393 100644
--- a/x11/gnome/ggv/Makefile
+++ b/x11/gnome/ggv/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2008/02/04 17:55:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.17 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		GNOME frontend for GhostScript
 
 GNOME_PROJECT=		ggv
 GNOME_VERSION=		2.12.0
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		print
 
 MAINTAINER=		Thomas Delaet <thomas@delaet.org>	
@@ -31,6 +32,7 @@ LIB_DEPENDS=		gnomeui-2::x11/gnome/libgnomeui
 RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper \
 			:ghostscript-*:print/ghostscript/gnu
 
+MODGNOME_HELP_FILES=	Yes
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/x11/gnome/ghex/Makefile b/x11/gnome/ghex/Makefile
index 55608c710e9..2690bc30c16 100644
--- a/x11/gnome/ghex/Makefile
+++ b/x11/gnome/ghex/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2008/04/17 08:46:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		binary editor
 
@@ -6,7 +6,7 @@ GNOME_PROJECT=		ghex
 GNOME_VERSION=		2.20.1
 SHARED_LIBS=		gtkhex 0.0
 CATEGORIES=		sysutils editors
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -30,6 +30,7 @@ MODULES=		devel/gettext \
 LIB_DEPENDS=		gnomeui-2::x11/gnome/libgnomeui \
 			gnomeprintui-2-2::x11/gnome/libgnomeprintui
 
+MODGNOME_HELP_FILES=	Yes
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ARGS+=	${ENABLE_SHARED} \
diff --git a/x11/gnome/gok/Makefile b/x11/gnome/gok/Makefile
index c26c8029faf..0383339d0a2 100644
--- a/x11/gnome/gok/Makefile
+++ b/x11/gnome/gok/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2008/05/26 08:32:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		GNOME on-screen keyboard
 
 GNOME_PROJECT=		gok
 GNOME_VERSION=		1.3.7
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 
 HOMEPAGE=		http://gok.ca/
 
@@ -36,6 +36,7 @@ LIB_DEPENDS=		wnck-1::devel/libwnck \
 			gnomespeech::x11/gnome/speech
 
 MODGNOME_DEVHELP_FILES=	Yes
+MODGNOME_HELP_FILES=	Yes
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
diff --git a/x11/gnome/media/Makefile b/x11/gnome/media/Makefile
index ca1ea422c35..121e00db217 100644
--- a/x11/gnome/media/Makefile
+++ b/x11/gnome/media/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2008/05/14 15:26:14 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		GNOME media utilities
 
@@ -7,7 +7,7 @@ GNOME_VERSION=		2.20.1
 SHARED_LIBS +=	gnome-media-profiles 0.0      # .0.0
 SHARED_LIBS +=	cddb-slave2          0.0      # .0.0
 CATEGORIES=		x11
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -39,6 +39,7 @@ LIB_DEPENDS=		gconf-2::devel/gconf2 \
 			pango-1.0,pangocairo-1.0,pangoft2-1.0::devel/pango
 RUN_DEPENDS=		::textproc/scrollkeeper
 
+MODGNOME_HELP_FILES=	Yes
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-media \
diff --git a/x11/gnome/panel/Makefile b/x11/gnome/panel/Makefile
index 2655c5f6418..82b2c987e43 100644
--- a/x11/gnome/panel/Makefile
+++ b/x11/gnome/panel/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.36 2008/05/26 08:32:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		GNOME panel
 
 GNOME_PROJECT=		gnome-panel
 GNOME_VERSION=		2.20.2
-PKGNAME=		${DISTNAME}p5
+PKGNAME=		${DISTNAME}p6
 SHARED_LIBS=	panel-applet-2       2.18      # .2.26
 CATEGORIES=		x11
 
@@ -34,6 +34,7 @@ LIB_DEPENDS= 		gnome-desktop-2.>=5::x11/gnome/desktop \
 			wnck-1.>=21::devel/libwnck
 
 MODGNOME_DEVHELP_FILES=	Yes
+MODGNOME_HELP_FILES=	Yes
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ARGS+= 	--disable-eds \
diff --git a/x11/gnome/terminal/Makefile b/x11/gnome/terminal/Makefile
index 82119d301ba..1395dd2bb76 100644
--- a/x11/gnome/terminal/Makefile
+++ b/x11/gnome/terminal/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2008/04/09 13:28:50 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=	GNOME terminal
 
 GNOME_PROJECT=	gnome-terminal
 GNOME_VERSION=	2.18.4
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 
 # GPL/LGPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -32,6 +32,7 @@ LIB_DEPENDS=	gnomeui-2::x11/gnome/libgnomeui \
 		startup-notification-1::devel/startup-notification \
 		vte.>=11::devel/vte
 
+MODGNOME_HELP_FILES=	Yes
 USE_X11=	Yes
 DESKTOP_FILES=	Yes
 CONFIGURE_ARGS= --with-widget=vte \
diff --git a/x11/gnome/users-guide/Makefile b/x11/gnome/users-guide/Makefile
index ef77bf88e0e..15a2d6e87fb 100644
--- a/x11/gnome/users-guide/Makefile
+++ b/x11/gnome/users-guide/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2008/02/04 17:55:19 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2008/05/26 16:29:27 ajacoutot Exp $
 
 PKG_ARCH=		*
 
@@ -6,7 +6,7 @@ COMMENT=		general GNOME User Documentation
 
 GNOME_PROJECT=		gnome-user-docs
 GNOME_VERSION=		2.18.1
-PKGNAME=		gnome2-user-docs-${VERSION}p0
+PKGNAME=		gnome2-user-docs-${VERSION}p1
 
 # GNU FDL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -20,6 +20,7 @@ RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper
 BUILD_DEPENDS=		${RUN_DEPENDS} \
 			:gnome-doc-utils-*:x11/gnome/doc-utils
 
+MODGNOME_HELP_FILES=	Yes
 USE_LIBTOOL=		No
 CONFIGURE_ARGS= 	--disable-scrollkeeper
 
diff --git a/x11/gnome/utils/Makefile b/x11/gnome/utils/Makefile
index c52d18a9db5..10196b26f5a 100644
--- a/x11/gnome/utils/Makefile
+++ b/x11/gnome/utils/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2008/05/26 08:32:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		GNOME utility programs
 
 GNOME_PROJECT=		gnome-utils
 GNOME_VERSION=		2.20.0.1
 SHARED_LIBS +=  gdict-1.0      5.13      # .5.15
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -38,6 +38,7 @@ MODULES=		devel/gettext \
 			x11/gnome
 
 MODGNOME_DEVHELP_FILES=	Yes
+MODGNOME_HELP_FILES=	Yes
 USE_X11=		Yes
 DESKTOP_FILES=		Yes
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
diff --git a/x11/gnome/zenity/Makefile b/x11/gnome/zenity/Makefile
index 02b255fea9d..0f474e475b6 100644
--- a/x11/gnome/zenity/Makefile
+++ b/x11/gnome/zenity/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2008/02/04 17:55:19 jasper Exp $
+# $OpenBSD: Makefile,v 1.21 2008/05/26 16:29:27 ajacoutot Exp $
 
 COMMENT=		dialogs for Gnome
 
 GNOME_PROJECT=		zenity
 GNOME_VERSION=		2.20.1
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 
 # LGPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -29,6 +29,7 @@ LIB_DEPENDS=		dbus-glib-1.>=3::x11/dbus-glib \
 			gnomecanvas-2::x11/gnome/libgnomecanvas \
 			notify::devel/libnotify
 
+MODGNOME_HELP_FILES=	Yes
 USE_X11=		Yes
 USE_LIBTOOL=		No
 CONFIGURE_ARGS= 	--enable-libnotify