deforaos-panel: update to 0.4.2

Changes since 0.4.1:

* Renaming of the .desktop files
* Moved the configuration file to
  ~/.config/DeforaOS/Desktop/Panel/Panel.conf
* Build fixes and improved support for macOS
* Support for compilation modes with DeforaOS configure
* Improved compilation scripts (from DeforaOS configure)

This also makes use of the helper for DeforaOS configure, found in
devel/deforaos-configure/deforaos-configure.mk.

4 files changed, 14 insertions, 14 deletions

diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile
index 019fb8174be..55ed876ef09 100644
--- a/x11/deforaos-panel/Makefile
+++ b/x11/deforaos-panel/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2021/12/08 16:02:49 adam Exp $
+# $NetBSD: Makefile,v 1.42 2022/05/17 18:01:28 khorben Exp $
 #
 
-DISTNAME=	Panel-0.4.1
-PKGNAME=	deforaos-panel-0.4.1
-PKGREVISION=	1
+DISTNAME=	Panel-0.4.2
+PKGNAME=	deforaos-panel-0.4.2
 CATEGORIES=	x11
 MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Panel/
 
@@ -52,6 +51,7 @@ post-install:
 
 .include "options.mk"
 
+.include "../../devel/deforaos-configure/deforaos-configure.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
diff --git a/x11/deforaos-panel/PLIST b/x11/deforaos-panel/PLIST
index 49bd09fb3da..78b3c38e72e 100644
--- a/x11/deforaos-panel/PLIST
+++ b/x11/deforaos-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2020/09/13 04:32:35 khorben Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/05/17 18:01:28 khorben Exp $
 bin/panel
 bin/panel-embed
 bin/panel-message
@@ -62,9 +62,9 @@ man/man1/panel.1
 man/man1/panelctl.1
 man/man1/settings.1
 man/man1/wifibrowser.1
-share/applications/deforaos-panel-settings.desktop
-share/applications/deforaos-settings.desktop
-share/applications/deforaos-wifibrowser.desktop
+share/applications/org.defora.panel-settings.desktop
+share/applications/org.defora.settings.desktop
+share/applications/org.defora.wifibrowser.desktop
 share/doc/Panel/COPYING
 share/doc/Panel/README.md
 share/doc/Panel/wpa_supplicant.conf
diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo
index 644059db8fd..753bcde060c 100644
--- a/x11/deforaos-panel/distinfo
+++ b/x11/deforaos-panel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2021/10/26 11:33:45 nia Exp $
+$NetBSD: distinfo,v 1.20 2022/05/17 18:01:28 khorben Exp $
 
-BLAKE2s (Panel-0.4.1.tar.gz) = 76c3a96243ea39a4daa00b97ccd563eb778c7d6f651dc34a34f39ed984b8856e
-SHA512 (Panel-0.4.1.tar.gz) = 2af6c8a61fd17a606dd32a481099d49e655382e96f26bd48f6e9029e44f5c7151d521ec039912f7bbec92e5e9e07b84499633316e41860b2d897aa3276fd6217
-Size (Panel-0.4.1.tar.gz) = 158083 bytes
+BLAKE2s (Panel-0.4.2.tar.gz) = 6f9c4c10a54dd5e80cda40f06759ce1ee717bf3373c07f447c2fe09f7b27f43d
+SHA512 (Panel-0.4.2.tar.gz) = 52c53ba0abdb4d89c0cf8d87d1e5fcdf497809361342ef55066a20d30e382216bcc74a88ead30d243161be12f94b7a518f53730094f3cbc6302d2094e49c42f9
+Size (Panel-0.4.2.tar.gz) = 158202 bytes
diff --git a/x11/deforaos-panel/options.mk b/x11/deforaos-panel/options.mk
index 0d38a491496..7f1771c2cbc 100644
--- a/x11/deforaos-panel/options.mk
+++ b/x11/deforaos-panel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2012/12/17 00:32:49 khorben Exp $
+# $NetBSD: options.mk,v 1.2 2022/05/17 18:01:28 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.deforaos-panel
 PKG_SUPPORTED_OPTIONS=	embedded
@@ -6,5 +6,5 @@ PKG_SUPPORTED_OPTIONS=	embedded
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Membedded)
-MAKE_FLAGS+=	CPPFLAGS=-DEMBEDDED
+DEFORAOS_CONFIGURE_MODE=embedded-debug
 .endif