update to 2.28.0

This switches to the gnome-2.28 release branch.

3 files changed, 16 insertions, 17 deletions

diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 33d72f93fe2..f96495a1a36 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.84 2009/10/29 23:14:14 drochner Exp $
+# $NetBSD: Makefile,v 1.85 2009/10/30 17:00:31 drochner Exp $
 #
 
-DISTNAME=		yelp-2.26.0
-PKGREVISION=		3
+DISTNAME=		yelp-2.28.0
 CATEGORIES=		misc gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -27,8 +26,6 @@ CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 GCONF_SCHEMAS=		yelp.schemas
 
 BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.10.0
-BUILDLINK_API_DEPENDS.libgnome+=		libgnome>=2.14.0
-BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.14.0
 BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 BUILDLINK_API_DEPENDS.libxml2+=			libxml2>=2.6.5
 
@@ -39,16 +36,12 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/xulrunner/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
@@ -58,5 +51,6 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/yelp/PLIST b/misc/yelp/PLIST
index bed1c8377ed..d7b07e3dc20 100644
--- a/misc/yelp/PLIST
+++ b/misc/yelp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:07:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/10/30 17:00:31 drochner Exp $
 bin/gnome-help
 bin/yelp
 share/applications/yelp.desktop
@@ -18,6 +18,7 @@ share/locale/bn_IN/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/ca@valencia/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
@@ -63,7 +64,7 @@ share/locale/mn/LC_MESSAGES/yelp.mo
 share/locale/mr/LC_MESSAGES/yelp.mo
 share/locale/ms/LC_MESSAGES/yelp.mo
 share/locale/nb/LC_MESSAGES/yelp.mo
-share/locale/nds@NFE/LC_MESSAGES/yelp.mo
+share/locale/nds/LC_MESSAGES/yelp.mo
 share/locale/ne/LC_MESSAGES/yelp.mo
 share/locale/nl/LC_MESSAGES/yelp.mo
 share/locale/nn/LC_MESSAGES/yelp.mo
@@ -117,12 +118,16 @@ share/yelp/info.xml
 share/yelp/man.xml
 share/yelp/scrollkeeper.xml
 share/yelp/toc.xml
+share/yelp/ui/yelp-bookmarks-add.ui
+share/yelp/ui/yelp-bookmarks.ui
+share/yelp/ui/yelp-open-location.ui
+share/yelp/ui/yelp-preferences.ui
 share/yelp/ui/yelp-search-ui.xml
 share/yelp/ui/yelp-ui.xml
-share/yelp/ui/yelp.glade
 share/yelp/xslt/db-title.xsl
 share/yelp/xslt/db2html.xsl
 share/yelp/xslt/info2html.xsl
+share/yelp/xslt/mal2html.xsl
 share/yelp/xslt/man2html.xsl
 share/yelp/xslt/search2html.xsl
 share/yelp/xslt/toc2html.xsl
diff --git a/misc/yelp/distinfo b/misc/yelp/distinfo
index 8c30199cd52..a7bf6aa8546 100644
--- a/misc/yelp/distinfo
+++ b/misc/yelp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.26 2009/03/17 12:19:35 jmcneill Exp $
+$NetBSD: distinfo,v 1.27 2009/10/30 17:00:31 drochner Exp $
 
-SHA1 (yelp-2.26.0.tar.bz2) = c1c3262d77d4515a0fd0a7840307533fda9ed0ea
-RMD160 (yelp-2.26.0.tar.bz2) = 5f6f3f7b504d7522a39ba9e55e22cf2ca75589d7
-Size (yelp-2.26.0.tar.bz2) = 1021362 bytes
+SHA1 (yelp-2.28.0.tar.bz2) = e22c1f80662e9450990c20fc9a42441280925dbc
+RMD160 (yelp-2.28.0.tar.bz2) = d175584e7ef345137e43293171cf657016a39e5e
+Size (yelp-2.28.0.tar.bz2) = 1099965 bytes
 SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea