3 files changed, 34 insertions, 19 deletions

diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 1484fea4fede..17a3bf14c5ac 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.9.3
-PORTREVISION=	4
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.9
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -49,13 +48,14 @@ USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-man \
-		--enable-info \
-		--with-mozilla=${MOZILLA}
+CONFIGURE_ARGS=	--with-mozilla=${MOZILLA}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 GCONF_SCHEMAS=	yelp.schemas
 
+OPTIONS=	MAN "Enable man page support" off \
+		INFO "Enable GNU info support" off
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
@@ -64,6 +64,14 @@ USE_GCC=	3.4
 .endif
 .endif
 
+.if defined(WITH_MAN)
+CONFIGURE_ARGS+=--enable-man
+.endif
+
+.if defined(WITH_INFO)
+CONFIGURE_ARGS+=--enable-info
+.endif
+
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} " By default yelp uses www/mozilla for html rendering, but you can"
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 626d42489854..118e19b6486c 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/yelp-2.9.3.tar.bz2) = a6ed659313698900a7170426881b874b
-SIZE (gnome2/yelp-2.9.3.tar.bz2) = 637236
+MD5 (gnome2/yelp-2.10.0.tar.bz2) = 326f85c8c0fd944e782a37b0589036c5
+SIZE (gnome2/yelp-2.10.0.tar.bz2) = 790852
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index e6dea27dee6a..c26d1638c222 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -4,10 +4,6 @@ bin/yelp
 bin/yelp-bin
 libdata/bonobo/servers/GNOME_Yelp.server
 share/gnome/applications/yelp.desktop
-share/gnome/sgml/docbook/yelp/db2html.xsl
-share/gnome/sgml/docbook/yelp/info2html.xsl
-share/gnome/sgml/docbook/yelp/man2html.xsl
-share/gnome/sgml/docbook/yelp/toc2html.xsl
 share/gnome/yelp/default.css
 share/gnome/yelp/icons/yelp-icon-caution.png
 share/gnome/yelp/icons/yelp-icon-important.png
@@ -25,6 +21,12 @@ share/gnome/yelp/scrollkeeper.xml
 share/gnome/yelp/toc.xml
 share/gnome/yelp/ui/yelp-ui.xml
 share/gnome/yelp/ui/yelp.glade
+share/gnome/yelp/xslt/db-title.xsl
+share/gnome/yelp/xslt/db2html.xsl
+share/gnome/yelp/xslt/info2html.xsl
+share/gnome/yelp/xslt/man2html.xsl
+share/gnome/yelp/xslt/toc2html.xsl
+share/icons/hicolor/192x192/apps/yelp-icon-big.png
 share/locale/af/LC_MESSAGES/yelp.mo
 share/locale/am/LC_MESSAGES/yelp.mo
 share/locale/ar/LC_MESSAGES/yelp.mo
@@ -82,6 +84,7 @@ share/locale/pt/LC_MESSAGES/yelp.mo
 share/locale/pt_BR/LC_MESSAGES/yelp.mo
 share/locale/ro/LC_MESSAGES/yelp.mo
 share/locale/ru/LC_MESSAGES/yelp.mo
+share/locale/rw/LC_MESSAGES/yelp.mo
 share/locale/sk/LC_MESSAGES/yelp.mo
 share/locale/sl/LC_MESSAGES/yelp.mo
 share/locale/sq/LC_MESSAGES/yelp.mo
@@ -92,19 +95,23 @@ share/locale/ta/LC_MESSAGES/yelp.mo
 share/locale/tg/LC_MESSAGES/yelp.mo
 share/locale/th/LC_MESSAGES/yelp.mo
 share/locale/tr/LC_MESSAGES/yelp.mo
+share/locale/ug/LC_MESSAGES/yelp.mo
 share/locale/uk/LC_MESSAGES/yelp.mo
 share/locale/vi/LC_MESSAGES/yelp.mo
 share/locale/wa/LC_MESSAGES/yelp.mo
+share/locale/xh/LC_MESSAGES/yelp.mo
 share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 share/locale/zu/LC_MESSAGES/yelp.mo
-@dirrm share/locale/zu/LC_MESSAGES
-@dirrm share/locale/zu
-@dirrm share/locale/nso/LC_MESSAGES
-@dirrm share/locale/nso
-@dirrm share/locale/mr/LC_MESSAGES
-@dirrm share/locale/mr
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ug 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 2> /dev/null || true
+@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mr 2> /dev/null || true
+@dirrm share/gnome/yelp/xslt
 @dirrm share/gnome/yelp/ui
 @dirrm share/gnome/yelp/icons
 @dirrm share/gnome/yelp
-@dirrm share/gnome/sgml/docbook/yelp