Update to 2.6.1:

  o Misc

	* Lookup the window icon according to the icon theme (Mark)
	* Fix interface stats code on FreeBSD (Joe Marcus Clarke)
	* Destroy the error dialog when the applet is removed (Paolo Borelli)

  o Translators

	* Kjartan Maraas (no)

3 files changed, 12 insertions, 9 deletions

diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 3bf51958861..f2c82eb7dbc 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/04/14 16:15:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/05/06 15:22:42 jmmv Exp $
 #
 
-DISTNAME=	gnome-netstatus-2.6.0
+DISTNAME=	gnome-netstatus-2.6.1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-netstatus/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -25,8 +25,9 @@ GCONF2_SCHEMAS=		netstatus.schemas
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/scrollkeeper/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnome-netstatus/PLIST b/net/gnome-netstatus/PLIST
index ce537ef36bc..15835eedc91 100644
--- a/net/gnome-netstatus/PLIST
+++ b/net/gnome-netstatus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/01 19:09:51 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/05/06 15:22:42 jmmv Exp $
 lib/bonobo/servers/GNOME_NetstatusApplet_Factory.server
 libexec/gnome-netstatus-applet
 share/gconf/schemas/netstatus.schemas
@@ -115,6 +115,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-netstatus.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-netstatus.mo
@@ -122,6 +123,7 @@ ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-netstatus.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-netstatus.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-netstatus.mo
@@ -152,10 +154,10 @@ share/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf
 share/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf
 share/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf
 share/pixmaps/gnome-netstatus-tx.png
-@comment in gnome2-dirs: @dirrm share/pixmaps
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnome-netstatus
 @comment in scrollkeeper: @dirrm share/omf
-@dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/gnome/help/gnome-netstatus/zh_TW/figures
 @dirrm share/gnome/help/gnome-netstatus/zh_TW
 @dirrm share/gnome/help/gnome-netstatus/zh_HK/figures
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
index b8198393bba..dcb8183775e 100644
--- a/net/gnome-netstatus/distinfo
+++ b/net/gnome-netstatus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/04/15 13:27:36 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2004/05/06 15:22:42 jmmv Exp $
 
-SHA1 (gnome-netstatus-2.6.0.tar.bz2) = 3bdaf17ee7d4cb2b0c130a72d886921c9c09e766
-Size (gnome-netstatus-2.6.0.tar.bz2) = 410334 bytes
+SHA1 (gnome-netstatus-2.6.1.tar.bz2) = 7dce26c0f89526357a77837efa451dac1cce76fb
+Size (gnome-netstatus-2.6.1.tar.bz2) = 427214 bytes
 SHA1 (patch-aa) = dc0d62809c63b9b48c37a5a534fc48034f18e739