Update to 2.5.2.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1566 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 26 insertions, 14 deletions

diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 8b8d678b3..f72467b05 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -19,14 +19,10 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui libgtkhtml
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgtkhtml
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
-#post-patch:
-#	@${REINPLACE_CMD} -e 's|\@prefix\@/share|\@datadir\@|g' \
-#		${WRKSRC}/stylesheets/docbook/catalog.in
-
 .include <bsd.port.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index e6b9aad32..43e7a234c 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1 +1 @@
-MD5 (gnome2/yelp-2.5.1.tar.bz2) = a72633c531d57d22469f363ef0cb4dd1
+MD5 (gnome2/yelp-2.5.2.1.tar.bz2) = 2ba73d5cf746d76498618ada5c85854c
diff --git a/x11/yelp/files/patch-src_yelp-window.c b/x11/yelp/files/patch-src_yelp-window.c
new file mode 100644
index 000000000..f21b7ca09
--- /dev/null
+++ b/x11/yelp/files/patch-src_yelp-window.c
@@ -0,0 +1,17 @@
+--- src/yelp-window.c.orig	Tue Dec 30 13:24:05 2003
++++ src/yelp-window.c	Tue Dec 30 13:24:34 2003
+@@ -1029,11 +1029,12 @@
+     YelpWindow *window = YELP_WINDOW (user_data);
+     YelpURI    *uri;
+     GError     *error = NULL;
++    gchar      *frag, *page;
+ 
+     uri  = yelp_window_get_current_uri (window);
+ 
+-    gchar *frag = yelp_uri_get_fragment (uri);
+-    gchar *page = yelp_pager_resolve_uri (pager, uri);
++    frag = yelp_uri_get_fragment (uri);
++    page = yelp_pager_resolve_uri (pager, uri);
+ 
+     if (!page && (frag && strcmp (frag, ""))) {
+ 	gchar *frag_id = yelp_uri_get_fragment (uri);
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 1780beb84..8c3dd7167 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -6,9 +6,6 @@ libexec/yelp-db2html
 libexec/yelp-info2html
 libexec/yelp-man2html
 share/gnome/applications/yelp.desktop
-share/gnome/images/yelp/bcg.png
-share/gnome/images/yelp/empty.png
-share/gnome/images/yelp/gnome2-button.png
 share/gnome/sgml/docbook/yelp/db2html-admon.xsl
 share/gnome/sgml/docbook/yelp/db2html-biblio.xsl
 share/gnome/sgml/docbook/yelp/db2html-block.xsl
@@ -18,14 +15,12 @@ share/gnome/sgml/docbook/yelp/db2html-common.xsl
 share/gnome/sgml/docbook/yelp/db2html-division.xsl
 share/gnome/sgml/docbook/yelp/db2html-ebnf.xsl
 share/gnome/sgml/docbook/yelp/db2html-footnote.xsl
-share/gnome/sgml/docbook/yelp/db2html-formal.xsl
 share/gnome/sgml/docbook/yelp/db2html-glossary.xsl
 share/gnome/sgml/docbook/yelp/db2html-header.xsl
 share/gnome/sgml/docbook/yelp/db2html-html.xsl
 share/gnome/sgml/docbook/yelp/db2html-index.xsl
 share/gnome/sgml/docbook/yelp/db2html-inline.xsl
 share/gnome/sgml/docbook/yelp/db2html-list.xsl
-share/gnome/sgml/docbook/yelp/db2html-lists.xsl
 share/gnome/sgml/docbook/yelp/db2html-math.xsl
 share/gnome/sgml/docbook/yelp/db2html-media.xsl
 share/gnome/sgml/docbook/yelp/db2html-navbar.xsl
@@ -37,12 +32,15 @@ share/gnome/sgml/docbook/yelp/db2html-synopsis.xsl
 share/gnome/sgml/docbook/yelp/db2html-table.xsl
 share/gnome/sgml/docbook/yelp/db2html-title.xsl
 share/gnome/sgml/docbook/yelp/db2html-titlepage.xsl
-share/gnome/sgml/docbook/yelp/db2html-tmp.xsl
 share/gnome/sgml/docbook/yelp/db2html-toc.xsl
 share/gnome/sgml/docbook/yelp/db2html-xref.xsl
 share/gnome/sgml/docbook/yelp/db2html.xsl
 share/gnome/sgml/docbook/yelp/gettext.xsl
-share/gnome/sgml/docbook/yelp/yelp-customization.xsl
+share/gnome/yelp/icons/caution.png
+share/gnome/yelp/icons/important.png
+share/gnome/yelp/icons/note.png
+share/gnome/yelp/icons/tip.png
+share/gnome/yelp/icons/warning.png
 share/gnome/yelp/important_docs.xml
 share/gnome/yelp/toc.xml
 share/gnome/yelp/ui/yelp.glade
@@ -107,6 +105,7 @@ share/locale/wa/LC_MESSAGES/yelp.mo
 share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 @dirrm share/gnome/yelp/ui
+@dirrm share/gnome/yelp/icons
 @dirrm share/gnome/yelp
 @dirrm share/gnome/sgml/docbook/yelp
 @dirrm share/gnome/sgml/docbook