3 files changed, 22 insertions, 17 deletions

diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 98532139cc2f..a80939317c25 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,39 +3,38 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11/yelp/Makefile,v 1.63 2005/10/09 00:42:45 marcus Exp $
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.10.0
+PORTVERSION=	2.12.1
 PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A help browser for the GNOME 2 desktop
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \
-		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \
-		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
-MOZILLA=	mozilla
+MOZILLA=	firefox
 HEADERS_SUFX=
 
 .if !defined(WITH_MOZILLA)
-MOZILLA=	mozilla
+MOZILLA=	firefox
 HEADERS_SUFX=
 .else
-.if ${WITH_MOZILLA}=="firefox"
-MOZILLA=	firefox
+.if ${WITH_MOZILLA}=="mozilla"
+MOZILLA=	mozilla
 .else
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	mozilla-devel
 HEADERS_SUFX=	-devel
 .else
-MOZILLA=	mozilla
+MOZILLA=	firefox
 HEADERS_SUFX=
 .endif
 .endif
@@ -45,8 +44,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
-USE_LIBTOOL_VER=15
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils
+USE_AUTOTOOLS=	libtool:15
+INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-mozilla=${MOZILLA}
@@ -75,11 +75,11 @@ CONFIGURE_ARGS+=--enable-info
 
 pre-everything::
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default yelp uses www/mozilla for html rendering, but you can"
+	@${ECHO_MSG} " By default yelp uses www/firefox for html rendering, but you can"
 	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  mozilla-devel "
-	@${ECHO_MSG} "  firefox "
+	@${ECHO_MSG} "  mozilla"
 	@${ECHO_MSG} ""
 
 post-patch:
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 118e19b6486c..3a2d0eca6b3f 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/yelp-2.10.0.tar.bz2) = 326f85c8c0fd944e782a37b0589036c5
-SIZE (gnome2/yelp-2.10.0.tar.bz2) = 790852
+MD5 (gnome2/yelp-2.12.1.tar.bz2) = d6a9c142ca367447f06cee003b6d8a5d
+SIZE (gnome2/yelp-2.12.1.tar.bz2) = 815483
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index c26d1638c222..b51798ea50fa 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -26,6 +26,8 @@ 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/gnome/yelp/xslt/yelp-common.xsl
+share/gnome/yelp/yelp.js
 share/icons/hicolor/192x192/apps/yelp-icon-big.png
 share/locale/af/LC_MESSAGES/yelp.mo
 share/locale/am/LC_MESSAGES/yelp.mo
@@ -64,6 +66,7 @@ share/locale/ja/LC_MESSAGES/yelp.mo
 share/locale/ka/LC_MESSAGES/yelp.mo
 share/locale/kn/LC_MESSAGES/yelp.mo
 share/locale/ko/LC_MESSAGES/yelp.mo
+share/locale/ku/LC_MESSAGES/yelp.mo
 share/locale/li/LC_MESSAGES/yelp.mo
 share/locale/lt/LC_MESSAGES/yelp.mo
 share/locale/lv/LC_MESSAGES/yelp.mo
@@ -111,6 +114,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 @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
+@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ku 2> /dev/null || true
 @dirrm share/gnome/yelp/xslt
 @dirrm share/gnome/yelp/ui
 @dirrm share/gnome/yelp/icons