Attachment #122690 for bug #165926

Lines 7-15 Link Here

(-)b/cairo-dock-plugins/Makefile (-3 / +10 lines)
7		7
8	PORTNAME= cairo-dock-plugins	8	PORTNAME= cairo-dock-plugins
9	DISTVERSION= 2.3.0~3	9	DISTVERSION= 2.3.0~3
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= deskutils	11	CATEGORIES= deskutils
12	MASTER_SITES= http://launchpadlibrarian.net/73753265/	12	MASTER_SITES= http://launchpadlibrarian.net/73753265/ \
		13	http://pazzle.otdux.com.ua/
		14	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ICONS_PACKAGE}${EXTRACT_SUFX}
13		15
14	MAINTAINER= fidaj@ukr.net	16	MAINTAINER= fidaj@ukr.net
15	COMMENT= Cairo-Dock-Plugins for Cairo-Dock	17	COMMENT= Cairo-Dock-Plugins for Cairo-Dock
Lines 20-25 LIB_DEPENDS= etpan:${PORTSDIR}/mail/libetpan \ Link Here
20		22
21	DATADIR= ${PREFIX}/share/cairo-dock	23	DATADIR= ${PREFIX}/share/cairo-dock
22		24
		25	ICONS_PACKAGE= cairo-dock-plugins-png-icons
23	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
24	USE_GETTEXT= yes	27	USE_GETTEXT= yes
25	USE_GMAKE= yes	28	USE_GMAKE= yes
Lines 29-35 USE_PYTHON= yes Link Here
29	USE_XORG= xrender	32	USE_XORG= xrender
30	USE_DOS2UNIX= YES	33	USE_DOS2UNIX= YES
31	USE_CMAKE= yes	34	USE_CMAKE= yes
32	USE_GCC= 4.5+	35	USE_GCC= 4.6+
33	MAKE_JOBS_SAFE= YES	36	MAKE_JOBS_SAFE= YES
34	PLIST_SUB+= PYVER="${PYTHON_VERSION:S/thon//}"	37	PLIST_SUB+= PYVER="${PYTHON_VERSION:S/thon//}"
35		38
Lines 42-47 OPTIONS= GMENU "Common Applications menu" On \ Link Here
42		45
43	.include <bsd.port.options.mk>	46	.include <bsd.port.options.mk>
44		47
		48	post-patch:
		49	@${CP} -R ${WRKDIR}/${ICONS_PACKAGE}/* ${WRKSRC}
		50
45	.if defined(WITH_GMENU)	51	.if defined(WITH_GMENU)
46	LIB_DEPENDS+= gnome-menu.2:${PORTSDIR}/x11/gnome-menus	52	LIB_DEPENDS+= gnome-menu.2:${PORTSDIR}/x11/gnome-menus
47	CMAKE_ARGS+= -Denable_gmenu:STRING=yes	53	CMAKE_ARGS+= -Denable_gmenu:STRING=yes
Lines 91-96 PLIST_SUB+= XFCE_INTEGRATION="@comment " Link Here
91		97
92	.if defined(WITH_ALSA_MIXER)	98	.if defined(WITH_ALSA_MIXER)
93	LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib	99	LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib
		100	RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
94	CMAKE_ARGS+= -Denable_alsa_mixer:STRING=yes	101	CMAKE_ARGS+= -Denable_alsa_mixer:STRING=yes
95	PLIST_SUB+= ALSA_MIXER=""	102	PLIST_SUB+= ALSA_MIXER=""
96	.else	103	.else

Lines 1-2 Link Here

(-)b/cairo-dock-plugins/distinfo (+2 lines)
1	SHA256 (cairo-dock-plugins-2.3.0~3.tar.gz) = 2bcfae5b6876a0a9a36ce7e0deb42a2d72234299da651c24f34e398f956a25cf	1	SHA256 (cairo-dock-plugins-2.3.0~3.tar.gz) = 2bcfae5b6876a0a9a36ce7e0deb42a2d72234299da651c24f34e398f956a25cf
2	SIZE (cairo-dock-plugins-2.3.0~3.tar.gz) = 5959407	2	SIZE (cairo-dock-plugins-2.3.0~3.tar.gz) = 5959407
		3	SHA256 (cairo-dock-plugins-png-icons.tar.gz) = f88327b073ac3673ea8765c608c7fe7beb1357b2c16c4dd8a26c14ec9cc2244a
		4	SIZE (cairo-dock-plugins-png-icons.tar.gz) = 1446489

Added Link Here

(-)b/cairo-dock-plugins/files/patch-CDBashApplet.sh (+8 lines)
1	--- Dbus/interfaces/bash/CDBashApplet.sh.orig 2012-03-09 17:46:25.024862245 +0200
2	+++ Dbus/interfaces/bash/CDBashApplet.sh 2012-03-09 17:46:37.734860652 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# This is a part of the external applets for Cairo-Dock
8	# Copyright : (C) 2010-2011 by Nochka85

Added Link Here

(-)b/cairo-dock-plugins/files/patch-Doncky-data-nvidia-config (+8 lines)
1	--- Doncky/data/nvidia-config.orig 2012-03-09 17:35:57.094857454 +0200
2	+++ Doncky/data/nvidia-config 2012-03-09 17:36:09.384875249 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Compiz check for Cairo-Dock
8	#




--- GMenu/src/applet-menu.c.orig	2011-06-19 02:27:29.000000000 +0300
+++ GMenu/src/applet-menu.c	2012-04-08 11:24:51.000000000 +0300
@@ -693,15 +693,15 @@
 	
 	// workaround pour KDE, qui ne loupe pas une occasion de se distinguer.
 	const gchar *cMenuFileName = NULL;
-	if (! g_file_test ("/etc/xdg/menus/applications.menu", G_FILE_TEST_EXISTS))  // on pourrait aussi aller lire le start-here.menu, mais je suis pas sur que ce soit standard.
+	if (! g_file_test ("/usr/local/etc/xdg/menus/gnome-applications.menu", G_FILE_TEST_EXISTS))  // on pourrait aussi aller lire le start-here.menu, mais je suis pas sur que ce soit standard.
 	{
-		if (g_file_test ("/etc/xdg/menus/kde-applications.menu", G_FILE_TEST_EXISTS))
+		if (g_file_test ("/usr/local/etc/xdg/menus/kde-applications.menu", G_FILE_TEST_EXISTS))
 			cMenuFileName = "kde-applications.menu";
-		else if (g_file_test ("/etc/xdg/menus/xfce-applications.menu", G_FILE_TEST_EXISTS))
+		else if (g_file_test ("/usr/local/etc/xdg/menus/xfce-applications.menu", G_FILE_TEST_EXISTS))
 			cMenuFileName = "xfce-applications.menu";
 	}
 	if (cMenuFileName == NULL)
-		cMenuFileName = "applications.menu";
+		cMenuFileName = "gnome-applications.menu";
 	
 	main_menu = create_applications_menu (cMenuFileName, NULL, NULL);
 	




--- Network-Monitor/data/access-point.orig	2012-03-10 14:23:34.754015275 +0200
+++ Network-Monitor/data/access-point	2012-03-10 14:27:01.954034690 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 
 # Compiz check for Cairo-Dock
 #
@@ -17,4 +17,5 @@
 # GNU General Public License for more details.
 # http://www.gnu.org/licenses/licenses.html#GPL
 
-iwlist $1 scan | grep "ESSID"
+#iwlist $1 scan | grep "ESSID"
+ifconfig $1 scan




--- Network-Monitor/data/wifi.orig	2012-03-10 14:33:22.124016420 +0200
+++ Network-Monitor/data/wifi	2012-03-10 14:42:50.174065239 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 
 # Compiz check for Cairo-Dock
 #
@@ -17,4 +17,8 @@
 # GNU General Public License for more details.
 # http://www.gnu.org/licenses/licenses.html#GPL
 
-iwconfig 2>/dev/null
+#iwconfig 2>/dev/null
+
+lwlan = `ifconfig | awk -F": " '{print $1}' | awk '{print $1}' | grep wlan`
+
+ifconfig $lwlan

Added Link Here

(-)b/cairo-dock-plugins/files/patch-System-Monitor-data-nvidia-config (+8 lines)
1	--- System-Monitor/data/nvidia-config.orig 2012-03-09 17:41:19.754859912 +0200
2	+++ System-Monitor/data/nvidia-config 2012-03-09 17:41:43.364873894 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# nVidia parameters script for Cairo-Dock
8	#

Added Link Here

(-)b/cairo-dock-plugins/files/patch-System-Monitor.conf.in (+11 lines)
1	--- System-Monitor/data/System-Monitor.conf.in.orig 2012-03-10 14:48:59.993985159 +0200
2	+++ System-Monitor/data/System-Monitor.conf.in 2012-03-10 14:49:10.124034439 +0200
3	@@ -183,7 +183,7 @@
4	asound=true
5
6	#u Path to sound file:
7	-sound path = /usr/share/sounds/error.wav
8	+sound path = /usr/local/share/sounds/error.wav
9
10	#F[System-Monitor;gtk-execute]
11	frame_sysmon=




--- Scooby-Do/src/applet-appli-finder.c.orig	2012-03-10 14:50:21.113987701 +0200
+++ Scooby-Do/src/applet-appli-finder.c	2012-03-10 14:50:35.394070505 +0200
@@ -70,7 +70,7 @@
 	cd_debug ("la liste des applis a change dans %s!\n", cURI);
 	// on reconstruit la liste des applis.
 	cd_do_reset_applications_list ();
-	_browse_dir ("/usr/share/applications");  // oui c'est bourrin, ca ne doit pas arriver tres souvent?
+	_browse_dir ("/usr/local/share/applications");  // oui c'est bourrin, ca ne doit pas arriver tres souvent?
 	myData.pApplications = g_list_sort (myData.pApplications, (GCompareFunc) _compare_appli);
 }
 static void _browse_dir (const gchar *cDirPath)
@@ -210,7 +210,7 @@
 	//\_______________ On liste les applis.
 	if (myData.pApplications == NULL)  // on n'a pas encore liste les applications, on le fait maintenant.
 	{
-		_browse_dir ("/usr/share/applications");
+		_browse_dir ("/usr/local/share/applications");
 		myData.pApplications = g_list_sort (myData.pApplications, (GCompareFunc) _compare_appli);  // on parcourt tout d'un coup (plutot que par exemple seulement les .desktop correspondant a la 1ere lettre car il y'a les sous-rep a parcourir, donc il faut de toute maniere se farcir la totale; de plus la commande peut differer du nom du .desktop.
 	}
 	

Added Link Here

(-)b/cairo-dock-plugins/files/patch-applet-notifications.c (+11 lines)
1	--- logout/src/applet-notifications.c.orig 2012-03-10 14:47:11.714017314 +0200
2	+++ logout/src/applet-notifications.c 2012-03-10 14:47:23.824032902 +0200
3	@@ -26,7 +26,7 @@
4	#include "applet-struct.h"
5	#include "applet-notifications.h"
6
7	-#define GUEST_SESSION_LAUNCHER "/usr/share/gdm/guest-session/guest-session-launch"
8	+#define GUEST_SESSION_LAUNCHER "/usr/local/share/gdm/guest-session/guest-session-launch"
9
10
11	static void _logout (void)

Added Link Here

(-)b/cairo-dock-plugins/files/patch-calc.sh (+8 lines)
1	--- Scooby-Do/data/calc.sh.orig 2012-03-09 17:33:51.704873391 +0200
2	+++ Scooby-Do/data/calc.sh 2012-03-09 17:34:12.744872958 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Compiz check for Cairo-Dock
8	#

Added Link Here

(-)b/cairo-dock-plugins/files/patch-demo_bash.sh (+17 lines)
1	--- Dbus/demos/demo_bash/demo_bash.sh.orig 2012-03-10 14:49:47.073972280 +0200
2	+++ Dbus/demos/demo_bash/demo_bash.sh 2012-03-10 14:51:40.554027497 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# This is a part of the external demo applets for Cairo-Dock
8	#
9	@@ -24,7 +24,7 @@
10	### Contact : nochka85@glx-dock.org
11	### Rev : 09/02/2011
12
13	-. /usr/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $*
14	+. /usr/local/share/cairo-dock/plug-ins/Dbus/CDBashApplet.sh $*
15
16	#############################################################################################################
17

Added Link Here

(-)b/cairo-dock-plugins/files/patch-netspeed (+17 lines)
1	--- netspeed/data/netspeed.orig 2012-03-09 17:36:57.984857300 +0200
2	+++ netspeed/data/netspeed 2012-03-09 17:38:25.094870374 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Compiz check for Cairo-Dock
8	#
9	@@ -19,7 +19,7 @@
10
11	rm -f /tmp/netspeed
12	#Il est pas beau mon script hein ^^
13	-cat /proc/net/dev \| sed -e '{1d;2d;3d}' -e "s/:/é/g" -e "s/ /_/g" -e "s/_$.$é_$[0-9][0-9]$__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__$[0-9][0-9]$__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]/\1>\2>\3/" > /tmp/netspeed
14	+cat /compat/linux/proc/net/dev \| sed -e '{1d;2d;3d}' -e "s/:/é/g" -e "s/ /_/g" -e "s/_$.$é_$[0-9][0-9]$__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__$[0-9][0-9]$__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]__[0-9][0-9]/\1>\2>\3/" > /tmp/netspeed
15	echo time >> /tmp/netspeed
16	date +%s%N >> /tmp/netspeed
17	echo stop >> /tmp/netspeed

Added Link Here

(-)b/cairo-dock-plugins/files/patch-updatedb.sh (+8 lines)
1	--- Scooby-Do/data/updatedb.sh.orig 2012-03-09 17:32:56.414874523 +0200
2	+++ Scooby-Do/data/updatedb.sh 2012-03-09 17:33:01.154874299 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Compiz check for Cairo-Dock
8	#

Added Link Here

(-)b/cairo-dock-plugins/files/patch-upload2free.sh (+8 lines)
1	--- dnd2share/data/upload2free.sh.orig 2012-03-09 17:43:14.294869326 +0200
2	+++ dnd2share/data/upload2free.sh 2012-03-09 17:43:57.334859814 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6	# This program is free software; you can redistribute it and/or
7	# modify it under the terms of the GNU General Public License
8	# as published by the Free Software Foundation; either version 2




--- wifi/data/access-point.orig	2012-03-10 14:23:34.754015275 +0200
+++ wifi/data/access-point	2012-03-10 14:27:01.954034690 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 
 # Compiz check for Cairo-Dock
 #
@@ -17,4 +17,5 @@
 # GNU General Public License for more details.
 # http://www.gnu.org/licenses/licenses.html#GPL
 
-iwlist $1 scan | grep "ESSID"
+#iwlist $1 scan | grep "ESSID"
+ifconfig $1 scan




--- wifi/data/wifi.orig	2012-03-10 14:33:22.124016420 +0200
+++ wifi/data/wifi	2012-03-10 14:42:50.174065239 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 
 # Compiz check for Cairo-Dock
 #
@@ -17,4 +17,8 @@
 # GNU General Public License for more details.
 # http://www.gnu.org/licenses/licenses.html#GPL
 
-iwconfig 2>/dev/null
+#iwconfig 2>/dev/null
+
+lwlan = `ifconfig | awk -F": " '{print $1}' | awk '{print $1}' | grep wlan`
+
+ifconfig $lwlan

Return to bug 165926

Added Link Here

(-)b/cairo-dock-plugins/files/patch-GMenu-applet-menu (+22 lines)
1	--- GMenu/src/applet-menu.c.orig 2011-06-19 02:27:29.000000000 +0300
2	+++ GMenu/src/applet-menu.c 2012-04-08 11:24:51.000000000 +0300
3	@@ -693,15 +693,15 @@
4
5	// workaround pour KDE, qui ne loupe pas une occasion de se distinguer.
6	const gchar *cMenuFileName = NULL;
7	- if (! g_file_test ("/etc/xdg/menus/applications.menu", G_FILE_TEST_EXISTS)) // on pourrait aussi aller lire le start-here.menu, mais je suis pas sur que ce soit standard.
8	+ if (! g_file_test ("/usr/local/etc/xdg/menus/gnome-applications.menu", G_FILE_TEST_EXISTS)) // on pourrait aussi aller lire le start-here.menu, mais je suis pas sur que ce soit standard.
9	{
10	- if (g_file_test ("/etc/xdg/menus/kde-applications.menu", G_FILE_TEST_EXISTS))
11	+ if (g_file_test ("/usr/local/etc/xdg/menus/kde-applications.menu", G_FILE_TEST_EXISTS))
12	cMenuFileName = "kde-applications.menu";
13	- else if (g_file_test ("/etc/xdg/menus/xfce-applications.menu", G_FILE_TEST_EXISTS))
14	+ else if (g_file_test ("/usr/local/etc/xdg/menus/xfce-applications.menu", G_FILE_TEST_EXISTS))
15	cMenuFileName = "xfce-applications.menu";
16	}
17	if (cMenuFileName == NULL)
18	- cMenuFileName = "applications.menu";
19	+ cMenuFileName = "gnome-applications.menu";
20
21	main_menu = create_applications_menu (cMenuFileName, NULL, NULL);
22

Added Link Here

(-)b/cairo-dock-plugins/files/patch-Network-Monitor-data-access-point (+15 lines)
1	--- Network-Monitor/data/access-point.orig 2012-03-10 14:23:34.754015275 +0200
2	+++ Network-Monitor/data/access-point 2012-03-10 14:27:01.954034690 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Compiz check for Cairo-Dock
8	#
9	@@ -17,4 +17,5 @@
10	# GNU General Public License for more details.
11	# http://www.gnu.org/licenses/licenses.html#GPL
12
13	-iwlist $1 scan \| grep "ESSID"
14	+#iwlist $1 scan \| grep "ESSID"
15	+ifconfig $1 scan

Added Link Here

(-)b/cairo-dock-plugins/files/patch-Network-Monitor-data-wifi (+18 lines)
1	--- Network-Monitor/data/wifi.orig 2012-03-10 14:33:22.124016420 +0200
2	+++ Network-Monitor/data/wifi 2012-03-10 14:42:50.174065239 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Compiz check for Cairo-Dock
8	#
9	@@ -17,4 +17,8 @@
10	# GNU General Public License for more details.
11	# http://www.gnu.org/licenses/licenses.html#GPL
12
13	-iwconfig 2>/dev/null
14	+#iwconfig 2>/dev/null
15	+
16	+lwlan = `ifconfig \| awk -F": " '{print $1}' \| awk '{print $1}' \| grep wlan`
17	+
18	+ifconfig $lwlan

Added Link Here

(-)b/cairo-dock-plugins/files/patch-applet-appli-finder.c (+20 lines)
1	--- Scooby-Do/src/applet-appli-finder.c.orig 2012-03-10 14:50:21.113987701 +0200
2	+++ Scooby-Do/src/applet-appli-finder.c 2012-03-10 14:50:35.394070505 +0200
3	@@ -70,7 +70,7 @@
4	cd_debug ("la liste des applis a change dans %s!\n", cURI);
5	// on reconstruit la liste des applis.
6	cd_do_reset_applications_list ();
7	- _browse_dir ("/usr/share/applications"); // oui c'est bourrin, ca ne doit pas arriver tres souvent?
8	+ _browse_dir ("/usr/local/share/applications"); // oui c'est bourrin, ca ne doit pas arriver tres souvent?
9	myData.pApplications = g_list_sort (myData.pApplications, (GCompareFunc) _compare_appli);
10	}
11	static void _browse_dir (const gchar *cDirPath)
12	@@ -210,7 +210,7 @@
13	//\_______________ On liste les applis.
14	if (myData.pApplications == NULL) // on n'a pas encore liste les applications, on le fait maintenant.
15	{
16	- _browse_dir ("/usr/share/applications");
17	+ _browse_dir ("/usr/local/share/applications");
18	myData.pApplications = g_list_sort (myData.pApplications, (GCompareFunc) _compare_appli); // on parcourt tout d'un coup (plutot que par exemple seulement les .desktop correspondant a la 1ere lettre car il y'a les sous-rep a parcourir, donc il faut de toute maniere se farcir la totale; de plus la commande peut differer du nom du .desktop.
19	}
20

Added Link Here

(-)b/cairo-dock-plugins/files/patch-wifi-data-access-point (+15 lines)
1	--- wifi/data/access-point.orig 2012-03-10 14:23:34.754015275 +0200
2	+++ wifi/data/access-point 2012-03-10 14:27:01.954034690 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Compiz check for Cairo-Dock
8	#
9	@@ -17,4 +17,5 @@
10	# GNU General Public License for more details.
11	# http://www.gnu.org/licenses/licenses.html#GPL
12
13	-iwlist $1 scan \| grep "ESSID"
14	+#iwlist $1 scan \| grep "ESSID"
15	+ifconfig $1 scan

Added Link Here

(-)b/cairo-dock-plugins/files/patch-wifi-data-wifi (+18 lines)
1	--- wifi/data/wifi.orig 2012-03-10 14:33:22.124016420 +0200
2	+++ wifi/data/wifi 2012-03-10 14:42:50.174065239 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Compiz check for Cairo-Dock
8	#
9	@@ -17,4 +17,8 @@
10	# GNU General Public License for more details.
11	# http://www.gnu.org/licenses/licenses.html#GPL
12
13	-iwconfig 2>/dev/null
14	+#iwconfig 2>/dev/null
15	+
16	+lwlan = `ifconfig \| awk -F": " '{print $1}' \| awk '{print $1}' \| grep wlan`
17	+
18	+ifconfig $lwlan