Package DeforaOS Panel 0.3.3

This is essentially a bugfix release, with:
- additional fixes to the helper utilities (panel-notify, wifibrowser...)
- minor improvement to the "network" applet and settings(1) utility
- build fixes

5 files changed, 10 insertions, 76 deletions

diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index a80a363e09b..0ae901361b6 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2015/08/29 15:11:17 khorben Exp $
-#
+# $NetBSD: Makefile,v 1.21 2015/09/02 23:18:45 khorben Exp $
 
-DISTNAME=	Panel-0.3.2
-PKGNAME=	deforaos-panel-0.3.2
+
+DISTNAME=	Panel-0.3.3
+PKGNAME=	deforaos-panel-0.3.3
 CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/4358/
+MASTER_SITES=	http://www.defora.org/os/download/download/4375/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
diff --git a/x11/deforaos-panel/buildlink3.mk b/x11/deforaos-panel/buildlink3.mk
index 3ba8da902ba..86a88124837 100644
--- a/x11/deforaos-panel/buildlink3.mk
+++ b/x11/deforaos-panel/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2015/08/23 16:16:37 khorben Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.11 2015/09/02 23:18:45 khorben Exp $
 
 BUILDLINK_TREE+=	deforaos-panel
 
diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo
index 851f16baab7..33cdae4cf67 100644
--- a/x11/deforaos-panel/distinfo
+++ b/x11/deforaos-panel/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.9 2015/08/27 09:14:52 khorben Exp $
+$NetBSD: distinfo,v 1.10 2015/09/02 23:18:45 khorben Exp $
 
-SHA1 (Panel-0.3.2.tar.gz) = bfcb5d33b94e2cfa3abd94450b75a7976abc2fac
-RMD160 (Panel-0.3.2.tar.gz) = 6877ffb5386e98babf29a092658a3bcbdcfa1b9a
-Size (Panel-0.3.2.tar.gz) = 141549 bytes
-SHA1 (patch-src_Makefile) = 2ba5d7442603d2a8f4b389465e5eeb776f7845aa
-SHA1 (patch-src_applets_Makefile) = 7dacfeab866a72b508713abdbfe724cda5c20d5a
+SHA1 (Panel-0.3.3.tar.gz) = fa6968414c3bea845a1f86dc325d6d6dd42e7a2a
+RMD160 (Panel-0.3.3.tar.gz) = 69c4a3ebc1f45f10ce1d8bfe954808a39f7b11ac
+Size (Panel-0.3.3.tar.gz) = 142212 bytes
 SHA1 (patch-tools_Makefile) = f05ebc04da359e181de0e7d44de8b960a3c266f8
diff --git a/x11/deforaos-panel/patches/patch-src_Makefile b/x11/deforaos-panel/patches/patch-src_Makefile
deleted file mode 100644
index a464077b1c0..00000000000
--- a/x11/deforaos-panel/patches/patch-src_Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-src_Makefile,v 1.1 2015/08/27 09:14:52 khorben Exp $
-
-Fix build on amd64
-
---- src/Makefile.orig	2015-08-10 23:33:27.000000000 +0000
-+++ src/Makefile
-@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
- CC	= cc
- CPPFLAGSF=
- CPPFLAGS=
--CFLAGSF	= -W
--CFLAGS	= -Wall -g -O2 -pedantic -fPIC -fstack-protector
-+CFLAGSF	= -fPIC
-+CFLAGS	= -W -Wall -g -O2 -pedantic -fstack-protector
- AR	= ar
- RANLIB	= ranlib
- CCSHARED= $(CC) -shared
-@@ -40,21 +40,21 @@ $(OBJDIR)libPanel.so: $(OBJDIR)libPanel.
- 
- panel_OBJS = $(OBJDIR)main.o
- panel_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop`
--panel_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl -L. -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lPanel -Wl,-pie
-+panel_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl -L. -L$(OBJDIR). -Wl,-rpath,$(LIBDIR) -lPanel
- 
- $(OBJDIR)panel: $(panel_OBJS) $(OBJDIR)libPanel.a
- 	$(CC) -o $(OBJDIR)panel $(panel_OBJS) $(panel_LDFLAGS)
- 
- panelctl_OBJS = $(OBJDIR)panelctl.o
- panelctl_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libDesktop`
--panelctl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl -Wl,-pie
-+panelctl_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libDesktop` -lintl
- 
- $(OBJDIR)panelctl: $(panelctl_OBJS)
- 	$(CC) -o $(OBJDIR)panelctl $(panelctl_OBJS) $(panelctl_LDFLAGS)
- 
- run_OBJS = $(OBJDIR)run.o
- run_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) -D PREFIX=\"$(PREFIX)\" $(CFLAGSF) $(CFLAGS) `pkg-config --cflags libSystem gtk+-2.0`
--run_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` -lintl -Wl,-pie
-+run_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs libSystem gtk+-2.0` -lintl
- 
- $(OBJDIR)run: $(run_OBJS)
- 	$(CC) -o $(OBJDIR)run $(run_OBJS) $(run_LDFLAGS)
diff --git a/x11/deforaos-panel/patches/patch-src_applets_Makefile b/x11/deforaos-panel/patches/patch-src_applets_Makefile
deleted file mode 100644
index b974deaaff4..00000000000
--- a/x11/deforaos-panel/patches/patch-src_applets_Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_applets_Makefile,v 1.1 2015/08/27 09:14:52 khorben Exp $
-
-Fix build on amd64
-
---- src/applets/Makefile.orig	2015-08-10 23:33:27.000000000 +0000
-+++ src/applets/Makefile
-@@ -6,10 +6,10 @@ LIBDIR	= $(PREFIX)/lib
- CC	= cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF	= -W `pkg-config --cflags libSystem gtk+-2.0`
--CFLAGS	= -Wall -g -O2 -pedantic -fPIC -fstack-protector
--LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0` -lPanel
--LDFLAGS	= -L$(OBJDIR)..
-+CFLAGSF	= `pkg-config --cflags libSystem gtk+-2.0` -fPIC
-+CFLAGS	= -W -Wall -g -O2 -pedantic -fstack-protector
-+LDFLAGSF= `pkg-config --libs libSystem gtk+-2.0` -lPanel -L$(OBJDIR)..
-+LDFLAGS	=
- AR	= ar
- RANLIB	= ranlib
- CCSHARED= $(CC) -shared