From 211a37da215b1af4949af1f5f92772c0b3b77103 Mon Sep 17 00:00:00 2001 From: roy Date: Mon, 6 Oct 2014 19:46:59 +0000 Subject: Import dhcpcd-ui-0.7.3 with the following changes: * Removed dhcpcd-dbus dependency * Split icons off into dhcpcd-icons * Add dhcpcd-qt front end * Improved IPv6 support in dhcpcd-6 is now reported * Numerous bug fixes * SSID menus now update in realtime when new scans come in --- net/dhcpcd-gtk/Makefile | 22 +++--------- net/dhcpcd-gtk/PLIST | 70 ++----------------------------------- net/dhcpcd-gtk/distinfo | 8 ++--- net/dhcpcd-icons/DESCR | 1 + net/dhcpcd-icons/Makefile | 16 +++++++++ net/dhcpcd-icons/Makefile.common | 21 ++++++++++++ net/dhcpcd-icons/PLIST | 74 ++++++++++++++++++++++++++++++++++++++++ net/dhcpcd-icons/distinfo | 5 +++ net/dhcpcd-qt/DESCR | 3 ++ net/dhcpcd-qt/Makefile | 24 +++++++++++++ net/dhcpcd-qt/PLIST | 4 +++ net/dhcpcd-qt/distinfo | 5 +++ 12 files changed, 164 insertions(+), 89 deletions(-) create mode 100644 net/dhcpcd-icons/DESCR create mode 100644 net/dhcpcd-icons/Makefile create mode 100644 net/dhcpcd-icons/Makefile.common create mode 100644 net/dhcpcd-icons/PLIST create mode 100644 net/dhcpcd-icons/distinfo create mode 100644 net/dhcpcd-qt/DESCR create mode 100644 net/dhcpcd-qt/Makefile create mode 100644 net/dhcpcd-qt/PLIST create mode 100644 net/dhcpcd-qt/distinfo (limited to 'net') diff --git a/net/dhcpcd-gtk/Makefile b/net/dhcpcd-gtk/Makefile index c99835d8bb4..d01c0d979b1 100644 --- a/net/dhcpcd-gtk/Makefile +++ b/net/dhcpcd-gtk/Makefile @@ -1,30 +1,18 @@ -# $NetBSD: Makefile,v 1.36 2014/05/05 00:48:13 ryoon Exp $ +# $NetBSD: Makefile,v 1.37 2014/10/06 19:46:59 roy Exp $ # -DISTNAME= dhcpcd-ui-0.6.0 -PKGNAME= dhcpcd-gtk-0.6.0 -PKGREVISION= 14 +PKGNAME= dhcpcd-gtk-${DHCPCD_UI_VERSION} CATEGORIES= net -MASTER_SITES= http://roy.marples.name/downloads/dhcpcd/ -MASTER_SITES+= ftp://roy.marples.name/pub/dhcpcd/ -MASTER_SITES+= http://roy.aydogan.net/dhcpcd/ -EXTRACT_SUFX= .tar.bz2 -MAINTAINER= roy@NetBSD.org -HOMEPAGE= http://roy.marples.name/projects/dhcpcd-ui/ -COMMENT= GTK+ systray monitor for dhcpcd -LICENSE= modified-bsd +DEPENDS+= dhcpcd>=6.4.4:../../net/dhcpcd +DEPENDS+= dhcpcd-icons:../../net/dhcpcd-icons -DEPENDS+= dhcpcd-dbus>=0.6.0:../../net/dhcpcd-dbus +.include "../../net/dhcpcd-icons/Makefile.common" -USE_LANGUAGES= c99 USE_TOOLS+= pkg-config -HAS_CONFIGURE= yes CONFIGURE_ARGS+= --with-gtk+ -CONFIGURE_ARGS+= --mandir=${PREFIX:Q}/${PKGMANDIR:Q} .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../sysutils/dbus/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 7f5bf4ca8af..4fd1596ba2a 100644 --- a/net/dhcpcd-gtk/PLIST +++ b/net/dhcpcd-gtk/PLIST @@ -1,70 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2010/08/18 15:49:35 reed Exp $ +@comment $NetBSD: PLIST,v 1.4 2014/10/06 19:46:59 roy Exp $ bin/dhcpcd-gtk man/man8/dhcpcd-gtk.8 -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 +share/applications/dhcpcd-gtk.desktop diff --git a/net/dhcpcd-gtk/distinfo b/net/dhcpcd-gtk/distinfo index 4d1056e9f2e..34bbc89ac00 100644 --- a/net/dhcpcd-gtk/distinfo +++ b/net/dhcpcd-gtk/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.9 2012/02/06 15:54:30 roy Exp $ +$NetBSD: distinfo,v 1.10 2014/10/06 19:46:59 roy Exp $ -SHA1 (dhcpcd-ui-0.6.0.tar.bz2) = 55073db51de03de7611d01f80b32f18024dd7460 -RMD160 (dhcpcd-ui-0.6.0.tar.bz2) = 0161b62651e308419866f9cbd60544f0fe0ae02b -Size (dhcpcd-ui-0.6.0.tar.bz2) = 546660 bytes +SHA1 (dhcpcd-ui-0.7.3.tar.bz2) = 52082b49748cb9e744037274178eb400f965a329 +RMD160 (dhcpcd-ui-0.7.3.tar.bz2) = a67177b8af83f8e56d966667cc65648b7b15b3ce +Size (dhcpcd-ui-0.7.3.tar.bz2) = 169878 bytes diff --git a/net/dhcpcd-icons/DESCR b/net/dhcpcd-icons/DESCR new file mode 100644 index 00000000000..cdede2975bb --- /dev/null +++ b/net/dhcpcd-icons/DESCR @@ -0,0 +1 @@ +Shared icons for dhcpcd-gtk and dhcpcd-qt. diff --git a/net/dhcpcd-icons/Makefile b/net/dhcpcd-icons/Makefile new file mode 100644 index 00000000000..9c30c873d7e --- /dev/null +++ b/net/dhcpcd-icons/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.1 2014/10/06 19:46:59 roy Exp $ +# + +PKGNAME= dhcpcd-icons-${DHCPCD_UI_VERSION} +CATEGORIES= net +COMMENT= Shared icons for dhcpcd-gtk and dhcpcd-qt + +.include "Makefile.common" + +CONFIGURE_ARGS+= --with-icons + +# dhcpcd-gtk-0.6.0 installed its own icons +CONFLICTS= dhcpcd-gtk<0.7 + +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/dhcpcd-icons/Makefile.common b/net/dhcpcd-icons/Makefile.common new file mode 100644 index 00000000000..197fa791264 --- /dev/null +++ b/net/dhcpcd-icons/Makefile.common @@ -0,0 +1,21 @@ +# $NetBSD: Makefile.common,v 1.1 2014/10/06 19:46:59 roy Exp $ +# + +DHCPCD_UI_VERSION= 0.7.3 +DISTNAME= dhcpcd-ui-${DHCPCD_UI_VERSION} +MASTER_SITES= http://roy.marples.name/downloads/dhcpcd/ +MASTER_SITES+= ftp://roy.marples.name/pub/dhcpcd/ +MASTER_SITES+= http://roy.aydogan.net/dhcpcd/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= roy@NetBSD.org +HOMEPAGE= http://roy.marples.name/projects/dhcpcd-ui/ +LICENSE= modified-bsd + +USE_LANGUAGES= c99 +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= --without-dhcpcd-online +CONFIGURE_ARGS+= --without-gtk+ +CONFIGURE_ARGS+= --without-qt +CONFIGURE_ARGS+= --without-icons +CONFIGURE_ARGS+= --mandir=${PREFIX:Q}/${PKGMANDIR:Q} diff --git a/net/dhcpcd-icons/PLIST b/net/dhcpcd-icons/PLIST new file mode 100644 index 00000000000..c8223d4224e --- /dev/null +++ b/net/dhcpcd-icons/PLIST @@ -0,0 +1,74 @@ +@comment $NetBSD: PLIST,v 1.1 2014/10/06 19:46:59 roy Exp $ +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/apps/dhcpcd.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/icons/hicolor/16x16/apps/dhcpcd.png +share/icons/hicolor/22x22/apps/dhcpcd.png +share/icons/hicolor/24x24/apps/dhcpcd.png +share/icons/hicolor/32x32/apps/dhcpcd.png +share/icons/hicolor/48x48/apps/dhcpcd.png +share/icons/hicolor/scalable/apps/dhcpcd.svg diff --git a/net/dhcpcd-icons/distinfo b/net/dhcpcd-icons/distinfo new file mode 100644 index 00000000000..9c4585cdf0f --- /dev/null +++ b/net/dhcpcd-icons/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/10/06 19:46:59 roy Exp $ + +SHA1 (dhcpcd-ui-0.7.3.tar.bz2) = 52082b49748cb9e744037274178eb400f965a329 +RMD160 (dhcpcd-ui-0.7.3.tar.bz2) = a67177b8af83f8e56d966667cc65648b7b15b3ce +Size (dhcpcd-ui-0.7.3.tar.bz2) = 169878 bytes diff --git a/net/dhcpcd-qt/DESCR b/net/dhcpcd-qt/DESCR new file mode 100644 index 00000000000..eb5dc75acba --- /dev/null +++ b/net/dhcpcd-qt/DESCR @@ -0,0 +1,3 @@ +The dhcpcd-gtk package provides a monitor and configuration GUI +for dhcpcd. It is written in GTK+. It provides a notification area +icon and a menu showing available wireless access points. diff --git a/net/dhcpcd-qt/Makefile b/net/dhcpcd-qt/Makefile new file mode 100644 index 00000000000..c31cff83146 --- /dev/null +++ b/net/dhcpcd-qt/Makefile @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1 2014/10/06 19:46:59 roy Exp $ +# + +PKGNAME= dhcpcd-qt-${DHCPCD_UI_VERSION} +CATEGORIES= net + +DEPENDS+= dhcpcd>=6.4.4:../../net/dhcpcd +DEPENDS+= dhcpcd-icons:../../net/dhcpcd-icons + +.include "../../net/dhcpcd-icons/Makefile.common" + +USE_LANGUAGES= c99 c++ +CONFIGURE_ARGS+= --with-qt +# Until I can get KDE4 to install... +CONFIGURE_ARGS+= --disable-notification + +INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR:Q} + +BUILDLINK_DEPMETHOD.qt4-tools= build + +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../x11/qt4-libs/buildlink3.mk" +.include "../../x11/qt4-tools/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/dhcpcd-qt/PLIST b/net/dhcpcd-qt/PLIST new file mode 100644 index 00000000000..55bd3e214e0 --- /dev/null +++ b/net/dhcpcd-qt/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1 2014/10/06 19:46:59 roy Exp $ +bin/dhcpcd-qt +man/man8/dhcpcd-qt.8 +share/applications/dhcpcd-qt.desktop diff --git a/net/dhcpcd-qt/distinfo b/net/dhcpcd-qt/distinfo new file mode 100644 index 00000000000..9c4585cdf0f --- /dev/null +++ b/net/dhcpcd-qt/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1 2014/10/06 19:46:59 roy Exp $ + +SHA1 (dhcpcd-ui-0.7.3.tar.bz2) = 52082b49748cb9e744037274178eb400f965a329 +RMD160 (dhcpcd-ui-0.7.3.tar.bz2) = a67177b8af83f8e56d966667cc65648b7b15b3ce +Size (dhcpcd-ui-0.7.3.tar.bz2) = 169878 bytes -- cgit v1.2.3