Update to the latest GNOME 2.0 snapshot, the "Stay on target!" release.

5 files changed, 14 insertions, 33 deletions

diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 112d0139068b..dbc7e2606889 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	yelp
-PORTVERSION=	0.7
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index ab45419dc8a7..c0b7f04dddc8 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1 +1 @@
-MD5 (gnome2/yelp-0.7.tar.bz2) = 7394c5ab597a3a4188c96e5720600381
+MD5 (gnome2/yelp-0.8.tar.bz2) = 0590082e2d0ecf1da3bef4019cb08130
diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure
index 16961b59b62f..a6e8fbc286f0 100644
--- a/x11/yelp/files/patch-configure
+++ b/x11/yelp/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Mon May 20 15:11:25 2002
-+++ configure	Mon May 20 15:12:24 2002
-@@ -7374,6 +7374,7 @@
+--- configure.orig	Tue May 28 02:02:29 2002
++++ configure	Tue May 28 02:03:10 2002
+@@ -7381,6 +7381,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9978,7 +9979,7 @@
+@@ -9979,7 +9980,7 @@
  
- YELP_MODULES="libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
+ YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
  
--YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
+-YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
 +YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
  
- echo "$as_me:9983: checking for bzread in -lbz2" >&5
+ echo "$as_me:9984: checking for bzread in -lbz2" >&5
  echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6
diff --git a/x11/yelp/files/patch-src_yelp-info.c b/x11/yelp/files/patch-src_yelp-info.c
deleted file mode 100644
index 6013c2faf2af..000000000000
--- a/x11/yelp/files/patch-src_yelp-info.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/yelp-info.c.orig	Mon May 20 17:53:50 2002
-+++ src/yelp-info.c	Mon May 20 17:54:27 2002
-@@ -105,7 +105,6 @@
- 	struct stat   stat_dir2;
- 	GSList       *info_list = NULL;
- 	GSList       *node;
--	YelpSection  *section;
- 	gchar       **infopathes;
- 	gchar        *infopath;
- 	gint          i;
-@@ -141,7 +140,7 @@
- 
- 	for (node = info_list; node; node = node->next) {
- 		g_node_append_data (root, node->data);
--		*index = g_list_prepend (*index, section);
-+		*index = g_list_prepend (*index, node->data);
- 	}
- 
- 	g_slist_free (info_list);
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 104aefe92305..ff8a8894291d 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -2,6 +2,9 @@ bin/gnome-help
 bin/yelp
 libdata/bonobo/servers/GNOME_Yelp.server
 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/l10n.xml
 share/gnome/sgml/docbook/yelp/yelp-custom.xsl
 share/gnome/sgml/docbook/yelp/yelp-customization.xsl
@@ -37,3 +40,4 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 @dirrm share/gnome/yelp
 @dirrm share/gnome/sgml/docbook/yelp
+@dirrm share/gnome/images/yelp