3 files changed, 24 insertions, 25 deletions

diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index cfdcb9e8545f..dfbba72b23bc 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,27 +3,27 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/yelp/Makefile,v 1.70 2005/11/28 07:30:27 ahze Exp $
+#   $MCom: ports/x11/yelp/Makefile,v 1.88 2006/04/16 13:36:49 ahze Exp $
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.12.2
-PORTREVISION=	2
+PORTVERSION=	2.14.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A help browser for the GNOME 2 desktop
 
-USE_GECKO=	firefox mozilla seamonkey thunderbird
+USE_GECKO=	firefox seamonkey xulrunner # mozilla
 
+USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \
+		libgnomeprintui
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -33,22 +33,7 @@ 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>
 .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
 
-.if ${OSVERSION} < 500000
-USE_GCC=	2.95
-.endif
-
-.if defined(WITH_MAN)
-CONFIGURE_ARGS+=--enable-man
-.endif
-
-.if defined(WITH_INFO)
-CONFIGURE_ARGS+=--enable-info
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index e7956303c668..fd4d68591cd9 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/yelp-2.12.2.tar.bz2) = e229529aa1dacfd269024511e2c12ad2
-SHA256 (gnome2/yelp-2.12.2.tar.bz2) = ee56b279131f7d2c40da332eece9eee4a7fc4ec36425d29f201038f8a2f382c9
-SIZE (gnome2/yelp-2.12.2.tar.bz2) = 815933
+MD5 (gnome2/yelp-2.14.1.tar.bz2) = 3d569f8e9372bc88c7f9fca6a94388a9
+SHA256 (gnome2/yelp-2.14.1.tar.bz2) = db7a8c89bfdfc720a4d3f1e6883a4ac547ac039b4a32bb2b5e7546ac4d051a64
+SIZE (gnome2/yelp-2.14.1.tar.bz2) = 765371
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 6bf7535b9df2..d92f49b29f35 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -14,15 +14,18 @@ share/gnome/yelp/icons/yelp-watermark-blockquote-201C.png
 share/gnome/yelp/icons/yelp-watermark-blockquote-201D.png
 share/gnome/yelp/icons/yelp-watermark-blockquote-201E.png
 share/gnome/yelp/important_docs.xml
+share/gnome/yelp/info.xml
 share/gnome/yelp/man.xml
 share/gnome/yelp/scrollkeeper.xml
 share/gnome/yelp/toc.xml
+share/gnome/yelp/ui/yelp-search-ui.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/search2html.xsl
 share/gnome/yelp/xslt/toc2html.xsl
 share/gnome/yelp/xslt/yelp-common.xsl
 share/gnome/yelp/yelp.js
@@ -34,12 +37,14 @@ share/locale/az/LC_MESSAGES/yelp.mo
 share/locale/be/LC_MESSAGES/yelp.mo
 share/locale/bg/LC_MESSAGES/yelp.mo
 share/locale/bn/LC_MESSAGES/yelp.mo
+share/locale/br/LC_MESSAGES/yelp.mo
 share/locale/bs/LC_MESSAGES/yelp.mo
 share/locale/ca/LC_MESSAGES/yelp.mo
 share/locale/cs/LC_MESSAGES/yelp.mo
 share/locale/cy/LC_MESSAGES/yelp.mo
 share/locale/da/LC_MESSAGES/yelp.mo
 share/locale/de/LC_MESSAGES/yelp.mo
+share/locale/dz/LC_MESSAGES/yelp.mo
 share/locale/el/LC_MESSAGES/yelp.mo
 share/locale/en_CA/LC_MESSAGES/yelp.mo
 share/locale/en_GB/LC_MESSAGES/yelp.mo
@@ -65,6 +70,7 @@ 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/ky/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
@@ -79,6 +85,7 @@ share/locale/nl/LC_MESSAGES/yelp.mo
 share/locale/nn/LC_MESSAGES/yelp.mo
 share/locale/no/LC_MESSAGES/yelp.mo
 share/locale/nso/LC_MESSAGES/yelp.mo
+share/locale/or/LC_MESSAGES/yelp.mo
 share/locale/pa/LC_MESSAGES/yelp.mo
 share/locale/pl/LC_MESSAGES/yelp.mo
 share/locale/pt/LC_MESSAGES/yelp.mo
@@ -102,6 +109,7 @@ 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_HK/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 share/locale/zu/LC_MESSAGES/yelp.mo
 @dirrmtry share/locale/zu/LC_MESSAGES
@@ -112,8 +120,14 @@ share/locale/zu/LC_MESSAGES/yelp.mo
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/br/LC_MESSAGES
+@dirrmtry share/locale/br
 @dirrm share/gnome/yelp/xslt
 @dirrm share/gnome/yelp/ui
 @dirrm share/gnome/yelp/icons