From 371da9636a7ce9a97b68ce4bdc2f9de3ce93b3fd Mon Sep 17 00:00:00 2001 From: khorben Date: Fri, 24 Oct 2014 18:21:06 +0000 Subject: Packaged DeforaOS Panel 0.3.1, with: * dropped dependency on x11/deforaos-keyboard moved to DeforaOS Integration) * new and updated applets for network interfaces, username, wpa_supplicant... * additional wireless browser * improved compatibility with Gtk+ 3 * support for lateral panels... --- x11/deforaos-panel/Makefile | 21 +++++++++++++----- x11/deforaos-panel/PLIST | 25 +++++++++++++++------- x11/deforaos-panel/distinfo | 15 +++++++------ x11/deforaos-panel/patches/patch-data_pkgconfig.sh | 12 +++++++---- .../patches/patch-src_applets_main.c | 24 ++++++++++----------- .../patches/patch-src_applets_memory.c | 13 ++++++----- x11/deforaos-panel/patches/patch-tools_Makefile | 12 +++++++++++ 7 files changed, 79 insertions(+), 43 deletions(-) create mode 100644 x11/deforaos-panel/patches/patch-tools_Makefile (limited to 'x11') diff --git a/x11/deforaos-panel/Makefile b/x11/deforaos-panel/Makefile index 502b9b36ebb..a3afa230839 100644 --- a/x11/deforaos-panel/Makefile +++ b/x11/deforaos-panel/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2014/05/05 00:48:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.11 2014/10/24 18:21:06 khorben Exp $ # -DISTNAME= Panel-0.2.18 -PKGNAME= deforaos-panel-0.2.18 -PKGREVISION= 4 +DISTNAME= Panel-0.3.1 +PKGNAME= deforaos-panel-0.3.1 CATEGORIES= x11 -MASTER_SITES= http://www.defora.org/os/download/download/4295/ +MASTER_SITES= http://www.defora.org/os/download/download/4338/ MAINTAINER= khorben@defora.org HOMEPAGE= http://www.defora.org/ @@ -23,14 +22,26 @@ MAKE_FLAGS+= DESTDIR=${DESTDIR} MAKE_FLAGS+= PREFIX=${PREFIX} AUTO_MKDIRS= yes +.include "../../mk/bsd.prefs.mk" + +.if ${PKGMANDIR} != "share/man" post-install: + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panel-embed.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panel-embed.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panel-message.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panel-message.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panel-notify.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panel-notify.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panel.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panel.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/panelctl.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/panelctl.html + ${MV} ${DESTDIR}${PREFIX}/share/man/html1/wifibrowser.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/wifibrowser.html ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panel-embed.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panel-embed.1 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panel-message.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panel-message.1 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panel-notify.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panel-notify.1 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panel.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panel.1 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/panelctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/panelctl.1 + ${MV} ${DESTDIR}${PREFIX}/share/man/man1/wifibrowser.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/wifibrowser.1 + ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1 ${RMDIR} ${DESTDIR}${PREFIX}/share/man +.endif .include "options.mk" diff --git a/x11/deforaos-panel/PLIST b/x11/deforaos-panel/PLIST index bc57afcd010..005eabff021 100644 --- a/x11/deforaos-panel/PLIST +++ b/x11/deforaos-panel/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2013/06/15 12:47:46 khorben Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/10/24 18:21:06 khorben Exp $ bin/panel bin/panel-embed bin/panel-message bin/panel-notify bin/panelctl bin/run +bin/wifibrowser include/Desktop/Panel.h lib/Panel/applets/battery.so lib/Panel/applets/bluetooth.so @@ -16,12 +17,12 @@ lib/Panel/applets/desktop.so lib/Panel/applets/embed.so lib/Panel/applets/gps.so lib/Panel/applets/gsm.so -lib/Panel/applets/keyboard.so lib/Panel/applets/lock.so lib/Panel/applets/logout.so lib/Panel/applets/main.so lib/Panel/applets/memory.so lib/Panel/applets/mixer.so +lib/Panel/applets/network.so lib/Panel/applets/pager.so lib/Panel/applets/phone.so lib/Panel/applets/player.so @@ -33,20 +34,28 @@ lib/Panel/applets/systray.so lib/Panel/applets/tasks.so lib/Panel/applets/title.so lib/Panel/applets/usb.so +lib/Panel/applets/user.so lib/Panel/applets/volume.so lib/Panel/applets/wpa_supplicant.so +lib/libPanel.a +lib/libPanel.so +lib/libPanel.so.0 +lib/libPanel.so.0.0 lib/pkgconfig/Panel.pc +man/html1/panel-embed.html +man/html1/panel-message.html +man/html1/panel-notify.html +man/html1/panel.html +man/html1/panelctl.html +man/html1/wifibrowser.html man/man1/panel-embed.1 man/man1/panel-message.1 man/man1/panel-notify.1 man/man1/panel.1 man/man1/panelctl.1 -share/applications/panel-settings.desktop -share/doc/html/Panel/panel-embed.html -share/doc/html/Panel/panel-message.html -share/doc/html/Panel/panel-notify.html -share/doc/html/Panel/panel.html -share/doc/html/Panel/panelctl.html +man/man1/wifibrowser.1 +share/applications/deforaos-panel-settings.desktop +share/applications/deforaos-wifibrowser.desktop share/icons/hicolor/16x16/apps/panel-applet-bluetooth.png share/icons/hicolor/16x16/apps/panel-applet-desktop.png share/icons/hicolor/16x16/apps/panel-applet-usb.png diff --git a/x11/deforaos-panel/distinfo b/x11/deforaos-panel/distinfo index 9b258ed8b59..923600de31b 100644 --- a/x11/deforaos-panel/distinfo +++ b/x11/deforaos-panel/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.4 2014/03/21 14:38:01 jperkin Exp $ +$NetBSD: distinfo,v 1.5 2014/10/24 18:21:06 khorben Exp $ -SHA1 (Panel-0.2.18.tar.gz) = 2920631f99b3c9f4d91de1765b2588dfbf0f6645 -RMD160 (Panel-0.2.18.tar.gz) = c8dae6a9cb028814a24b01a5fcf04b6b34f4c6c6 -Size (Panel-0.2.18.tar.gz) = 111036 bytes -SHA1 (patch-data_pkgconfig.sh) = a4fae097b46becc6d98fb6b42707188d8ed3e048 -SHA1 (patch-src_applets_main.c) = 239eebc72b7d113a72e42633e838c3294003e931 -SHA1 (patch-src_applets_memory.c) = bcc44e38c03fc60e6720e71d815178f7129fa798 +SHA1 (Panel-0.3.1.tar.gz) = 0a2d9d424b8b316d8a6db087c8cb2dddaaa47347 +RMD160 (Panel-0.3.1.tar.gz) = 3e2fe1e8f1cf2a4c27cdf355bf5c00685d5ada9a +Size (Panel-0.3.1.tar.gz) = 133677 bytes +SHA1 (patch-data_pkgconfig.sh) = 7c40652087c604cff593a320e97259c453633c74 +SHA1 (patch-src_applets_main.c) = cadf28200335c4642b54c504a51e4a91a02de635 +SHA1 (patch-src_applets_memory.c) = 858dc9f03fa32e01d3d02d49d13742cda7b0193e SHA1 (patch-src_applets_swap.c) = 75599dd9b7aed08895c542376d2a6b7883a91f7f SHA1 (patch-src_applets_volume.c) = 10a4dfe01b6576a7f39a344ddd669725666d72a7 +SHA1 (patch-tools_Makefile) = 642887110b585cd6b78d0cf43acc4f826b1abcae diff --git a/x11/deforaos-panel/patches/patch-data_pkgconfig.sh b/x11/deforaos-panel/patches/patch-data_pkgconfig.sh index 5783593c4cf..42c49b15bd0 100644 --- a/x11/deforaos-panel/patches/patch-data_pkgconfig.sh +++ b/x11/deforaos-panel/patches/patch-data_pkgconfig.sh @@ -1,11 +1,15 @@ -$NetBSD: patch-data_pkgconfig.sh,v 1.1 2014/03/21 14:38:01 jperkin Exp $ +$NetBSD: patch-data_pkgconfig.sh,v 1.2 2014/10/24 18:21:06 khorben Exp $ Use correct rpath flag on SunOS. ---- data/pkgconfig.sh.orig 2013-02-04 22:23:50.000000000 +0000 +--- data/pkgconfig.sh.orig 2014-04-23 15:37:45.000000000 +0000 +++ data/pkgconfig.sh -@@ -114,6 +114,9 @@ while [ $# -gt 0 ]; do - Darwin) +@@ -129,9 +129,12 @@ while [ $# -gt 0 ]; do + if [ "$PREFIX" != "/usr" ]; then + RPATH="-Wl,-rpath-link,\${libdir} -Wl,-rpath,\${libdir}" + case $(uname -s) in +- Darwin|SunOS) ++ Darwin) RPATH="-Wl,-rpath,\${libdir}" ;; + SunOS) diff --git a/x11/deforaos-panel/patches/patch-src_applets_main.c b/x11/deforaos-panel/patches/patch-src_applets_main.c index 62aeffaacbd..de566330742 100644 --- a/x11/deforaos-panel/patches/patch-src_applets_main.c +++ b/x11/deforaos-panel/patches/patch-src_applets_main.c @@ -1,16 +1,16 @@ -$NetBSD: patch-src_applets_main.c,v 1.1 2014/03/21 14:38:01 jperkin Exp $ +$NetBSD: patch-src_applets_main.c,v 1.2 2014/10/24 18:21:06 khorben Exp $ -Need sys/fcntl.h for O_RDONLY on SunOS. +Need fcntl.h for open() on SunOS. ---- src/applets/main.c.orig 2013-06-01 23:34:31.000000000 +0000 +--- src/applets/main.c.orig 2014-10-23 17:34:42.000000000 +0000 +++ src/applets/main.c -@@ -23,6 +23,9 @@ - #include - #include - #include -+#ifdef __sun -+#include +@@ -16,6 +16,9 @@ + + + #include ++#if defined(__sun__) ++# include +#endif - #include "Panel.h" - #include "../../config.h" - #define _(string) gettext(string) + #include + #include + #include diff --git a/x11/deforaos-panel/patches/patch-src_applets_memory.c b/x11/deforaos-panel/patches/patch-src_applets_memory.c index e4ebb2ac24a..b08e21ac432 100644 --- a/x11/deforaos-panel/patches/patch-src_applets_memory.c +++ b/x11/deforaos-panel/patches/patch-src_applets_memory.c @@ -1,23 +1,22 @@ -$NetBSD: patch-src_applets_memory.c,v 1.1 2013/01/15 15:34:12 joerg Exp $ +$NetBSD: patch-src_applets_memory.c,v 1.2 2014/10/24 18:21:06 khorben Exp $ ---- src/applets/memory.c.orig 2013-01-15 13:21:08.000000000 +0000 +--- src/applets/memory.c.orig 2014-06-27 11:22:53.000000000 +0000 +++ src/applets/memory.c @@ -21,12 +21,13 @@ #include #if defined(__linux__) # include -#elif defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__NetBSD__) ++#elif defined(__FreeBSD__) +# include +# include -+#elif defined(__FreeBSD__) ++# include ++#elif defined(__NetBSD__) # include + # include -# if defined(__FreeBSD__) --# include -# include -# endif -+# include -+# include #endif #include #include "Panel.h" diff --git a/x11/deforaos-panel/patches/patch-tools_Makefile b/x11/deforaos-panel/patches/patch-tools_Makefile new file mode 100644 index 00000000000..81f844cfdae --- /dev/null +++ b/x11/deforaos-panel/patches/patch-tools_Makefile @@ -0,0 +1,12 @@ +$NetBSD: patch-tools_Makefile,v 1.1 2014/10/24 18:21:06 khorben Exp $ + +--- tools/Makefile.orig 2014-10-23 17:35:58.000000000 +0000 ++++ tools/Makefile +@@ -2,6 +2,7 @@ TARGETS = panel-embed panel-message pane + PREFIX = /usr/local + DESTDIR = + BINDIR = $(PREFIX)/bin ++LIBDIR = $(PREFIX)/lib + SBINDIR = $(PREFIX)/sbin + CC = cc + CPPFLAGSF= -- cgit v1.2.3