Update to dhcpcd-ui-0.4.0

Changes from dhcpcd-gtk-0.3.0 include
 * Native dbus support via the internal libdhcpcd
 * icons imported from the Tango Project are used if no GTK+ theme present
 * Now shows historical wireless network strength on all platforms

4 files changed, 76 insertions, 25 deletions

diff --git a/net/dhcpcd-gtk/Makefile b/net/dhcpcd-gtk/Makefile
index 61f0cdfa38c..c4070a88f30 100644
--- a/net/dhcpcd-gtk/Makefile
+++ b/net/dhcpcd-gtk/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2009/03/24 16:38:26 roy Exp $
+# $NetBSD: Makefile,v 1.5 2009/04/28 21:39:13 roy Exp $
 #
 
-DISTNAME=		dhcpcd-gtk-0.3.0
-PKGREVISION=		1
+DISTNAME=		dhcpcd-ui-0.4.0
+PKGNAME=		dhcpcd-gtk-0.4.0
 CATEGORIES=		net
+LICENSE=		modified-bsd
 MASTER_SITES=		ftp://roy.marples.name/pub/dhcpcd/
 MASTER_SITES+=		http://roy.aydogan.net/dhcpcd/
 EXTRACT_SUFX=		.tar.bz2
@@ -18,9 +19,8 @@ USE_TOOLS+=		pkg-config
 
 INSTALL_MAKE_FLAGS+=	SYSCONFDIR=${PREFIX}/share/gnome/autostart
 
-DEPENDS+=		dhcpcd-dbus>=0.3.0:../../net/dhcpcd-dbus
+DEPENDS+=		dhcpcd-dbus>=0.4.0:../../net/dhcpcd-dbus
 
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dhcpcd-gtk/PLIST b/net/dhcpcd-gtk/PLIST
index 491f502721a..b1ccc106c8a 100644
--- a/net/dhcpcd-gtk/PLIST
+++ b/net/dhcpcd-gtk/PLIST
@@ -1,4 +1,69 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/03/05 23:51:55 roy Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/04/28 21:39:13 roy Exp $
 bin/dhcpcd-gtk
+share/dhcpcd/icons/hicolor/16x16/actions/document-new.png
+share/dhcpcd/icons/hicolor/16x16/actions/document-save.png
+share/dhcpcd/icons/hicolor/16x16/devices/network-wired.png
+share/dhcpcd/icons/hicolor/16x16/devices/network-wireless.png
+share/dhcpcd/icons/hicolor/16x16/status/network-error.png
+share/dhcpcd/icons/hicolor/16x16/status/network-idle.png
+share/dhcpcd/icons/hicolor/16x16/status/network-offline.png
+share/dhcpcd/icons/hicolor/16x16/status/network-receive.png
+share/dhcpcd/icons/hicolor/16x16/status/network-transmit-receive.png
+share/dhcpcd/icons/hicolor/16x16/status/network-transmit.png
+share/dhcpcd/icons/hicolor/16x16/status/network-wireless-encrypted.png
+share/dhcpcd/icons/hicolor/22x22/actions/document-new.png
+share/dhcpcd/icons/hicolor/22x22/actions/document-save.png
+share/dhcpcd/icons/hicolor/22x22/devices/network-wired.png
+share/dhcpcd/icons/hicolor/22x22/devices/network-wireless.png
+share/dhcpcd/icons/hicolor/22x22/status/network-error.png
+share/dhcpcd/icons/hicolor/22x22/status/network-idle.png
+share/dhcpcd/icons/hicolor/22x22/status/network-offline.png
+share/dhcpcd/icons/hicolor/22x22/status/network-receive.png
+share/dhcpcd/icons/hicolor/22x22/status/network-transmit-receive.png
+share/dhcpcd/icons/hicolor/22x22/status/network-transmit.png
+share/dhcpcd/icons/hicolor/22x22/status/network-wireless-encrypted.png
+share/dhcpcd/icons/hicolor/24x24/actions/document-new.png
+share/dhcpcd/icons/hicolor/24x24/actions/document-save.png
+share/dhcpcd/icons/hicolor/24x24/devices/network-wired.png
+share/dhcpcd/icons/hicolor/24x24/devices/network-wireless.png
+share/dhcpcd/icons/hicolor/24x24/status/network-error.png
+share/dhcpcd/icons/hicolor/24x24/status/network-idle.png
+share/dhcpcd/icons/hicolor/24x24/status/network-offline.png
+share/dhcpcd/icons/hicolor/24x24/status/network-receive.png
+share/dhcpcd/icons/hicolor/24x24/status/network-transmit-receive.png
+share/dhcpcd/icons/hicolor/24x24/status/network-transmit.png
+share/dhcpcd/icons/hicolor/24x24/status/network-wireless-encrypted.png
+share/dhcpcd/icons/hicolor/32x32/actions/document-new.png
+share/dhcpcd/icons/hicolor/32x32/actions/document-save.png
+share/dhcpcd/icons/hicolor/32x32/devices/network-wired.png
+share/dhcpcd/icons/hicolor/32x32/devices/network-wireless.png
+share/dhcpcd/icons/hicolor/32x32/status/network-error.png
+share/dhcpcd/icons/hicolor/32x32/status/network-idle.png
+share/dhcpcd/icons/hicolor/32x32/status/network-offline.png
+share/dhcpcd/icons/hicolor/32x32/status/network-receive.png
+share/dhcpcd/icons/hicolor/32x32/status/network-transmit-receive.png
+share/dhcpcd/icons/hicolor/32x32/status/network-transmit.png
+share/dhcpcd/icons/hicolor/32x32/status/network-wireless-encrypted.png
+share/dhcpcd/icons/hicolor/48x48/actions/document-new.png
+share/dhcpcd/icons/hicolor/48x48/actions/document-save.png
+share/dhcpcd/icons/hicolor/48x48/devices/network-wired.png
+share/dhcpcd/icons/hicolor/48x48/devices/network-wireless.png
+share/dhcpcd/icons/hicolor/48x48/status/network-error.png
+share/dhcpcd/icons/hicolor/48x48/status/network-idle.png
+share/dhcpcd/icons/hicolor/48x48/status/network-offline.png
+share/dhcpcd/icons/hicolor/48x48/status/network-receive.png
+share/dhcpcd/icons/hicolor/48x48/status/network-transmit-receive.png
+share/dhcpcd/icons/hicolor/48x48/status/network-transmit.png
+share/dhcpcd/icons/hicolor/48x48/status/network-wireless-encrypted.png
+share/dhcpcd/icons/hicolor/scalable/actions/document-new.svg
+share/dhcpcd/icons/hicolor/scalable/actions/document-save.svg
+share/dhcpcd/icons/hicolor/scalable/devices/network-wired.svg
+share/dhcpcd/icons/hicolor/scalable/devices/network-wireless.svg
+share/dhcpcd/icons/hicolor/scalable/status/network-error.svg
+share/dhcpcd/icons/hicolor/scalable/status/network-idle.svg
+share/dhcpcd/icons/hicolor/scalable/status/network-offline.svg
+share/dhcpcd/icons/hicolor/scalable/status/network-receive.svg
+share/dhcpcd/icons/hicolor/scalable/status/network-transmit-receive.svg
+share/dhcpcd/icons/hicolor/scalable/status/network-transmit.svg
+share/dhcpcd/icons/hicolor/scalable/status/network-wireless-encrypted.svg
 share/gnome/autostart/dhcpcd-gtk.desktop
-@unexec ${RMDIR} %D/share/gnome/autostart 2>/dev/null || ${TRUE}
diff --git a/net/dhcpcd-gtk/distinfo b/net/dhcpcd-gtk/distinfo
index 9c26694cce5..23ec9543341 100644
--- a/net/dhcpcd-gtk/distinfo
+++ b/net/dhcpcd-gtk/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/03/06 01:55:27 jmcneill Exp $
+$NetBSD: distinfo,v 1.3 2009/04/28 21:39:13 roy Exp $
 
-SHA1 (dhcpcd-gtk-0.3.0.tar.bz2) = b16368ab39a7189b2056cef9f1d4b5bda46c539a
-RMD160 (dhcpcd-gtk-0.3.0.tar.bz2) = 01dbf5cf585359edcc5b05cc79147c46d872f0b3
-Size (dhcpcd-gtk-0.3.0.tar.bz2) = 14445 bytes
-SHA1 (patch-aa) = af08d0a93a3d4c5fc70edcfffe1661e2697e510b
+SHA1 (dhcpcd-ui-0.4.0.tar.bz2) = 4f35be6073a559b58d0be949658a891cc8bb158e
+RMD160 (dhcpcd-ui-0.4.0.tar.bz2) = 966c05597d24d042e36c33fe936ee24c02404090
+Size (dhcpcd-ui-0.4.0.tar.bz2) = 49068 bytes
diff --git a/net/dhcpcd-gtk/patches/patch-aa b/net/dhcpcd-gtk/patches/patch-aa
deleted file mode 100644
index 0b1d5f081be..00000000000
--- a/net/dhcpcd-gtk/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/03/06 01:55:27 jmcneill Exp $
-
---- menu.c.orig	2009-03-05 14:23:21.000000000 -0500
-+++ menu.c
-@@ -126,7 +126,7 @@ add_scan_results(GtkMenu *menu, const st
- 		bar = gtk_progress_bar_new();
- 		gtk_widget_set_size_request(bar, 100, -1);
- 		gtk_box_pack_end(GTK_BOX(box), bar, FALSE, TRUE, 0);
--		strength = CLAMP(ifa->quality, 0, 100);
-+		strength = CLAMP(ifa->level, 0, 100);
- 		perc = strength / 100.0;
- 		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(bar), perc);
-