Attachment #122688 for bug #165925





PORTNAME=	cairo-dock
DISTVERSION=	2.3.0~3
PORTREVISION=	1
CATEGORIES=	deskutils
MASTER_SITES=	http://launchpadlibrarian.net/73753213/


		curl.6:${PORTSDIR}/ftp/curl \
		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash

GNU_CONFIGURE=	yes
USE_GETTEXT=	yes

post-patch:
	@${REINPLACE_CMD} -e 's|libdir}/pkgconfig|prefix}/libdata/pkgconfig| ; s|datadir}/man|prefix}/man|' \
		${WRKSRC}/CMakeLists.txt ${WRKSRC}/src/gldit/CMakeLists.txt
	${REINPLACE_CMD} -e 's,/usr,${PREFIX},g'	\
		${WRKSRC}/src/gldit/cairo-dock-gui-factory.c

.include <bsd.port.mk>

.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h)
# Glitz support can only be enabled if cairo is built with glitz support
CONFIGURE_ARGS+=--enable-glitz
LIB_DEPENDS+=	glitz:${PORTSDIR}/graphics/glitz
.else
CONFIGURE_ARGS+=--disable-glitz
.endif

.include <bsd.port.post.mk>




--- data/cairo-dock.orig	2012-03-10 14:08:41.784016085 +0200
+++ data/cairo-dock	2012-03-10 14:09:03.014030514 +0200
@@ -2,12 +2,12 @@
 	section="Applications/System" \
 	hints="dock" \
 	title="Cairo-Dock (no OpenGL)" \
-	icon="/usr/share/pixmaps/cairo-dock.svg" \
-	command="/usr/bin/cairo-dock -c"
+	icon="/usr/local/share/pixmaps/cairo-dock.svg" \
+	command="/usr/local/bin/cairo-dock -c"
 
 ?package(cairo-dock):needs="X11" \
 	section="Applications/System" \
 	hints="dock" \
 	title="GLX-Dock (Cairo-Dock with OpenGL)" \
-	icon="/usr/share/pixmaps/cairo-dock.svg" \
-	command="/usr/bin/cairo-dock -o"
+	icon="/usr/local/share/pixmaps/cairo-dock.svg" \
+	command="/usr/local/bin/cairo-dock -o"




--- src/gldit/cairo-dock-applet-facility.c.orig	2012-04-08 11:31:10.000000000 +0300
+++ src/gldit/cairo-dock-applet-facility.c	2012-04-08 11:32:21.000000000 +0300
@@ -350,13 +350,13 @@
 	
 	GError *erreur = NULL;
 	gchar *cSoundCommand = NULL;
-	if (g_file_test ("/usr/bin/paplay", G_FILE_TEST_EXISTS))
+	if (g_file_test ("/usr/local/bin/paplay", G_FILE_TEST_EXISTS))
 		cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
 
 	else if (g_file_test ("/usr/bin/aplay", G_FILE_TEST_EXISTS))
 		cSoundCommand = g_strdup_printf("aplay \"%s\"", cSoundPath);
 
-	else if (g_file_test ("/usr/bin/play", G_FILE_TEST_EXISTS))
+	else if (g_file_test ("/usr/local/bin/play", G_FILE_TEST_EXISTS))
 		cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
 	
 	




--- src/gldit/cairo-dock-class-manager.c.orig	2012-03-10 14:05:52.663999155 +0200
+++ src/gldit/cairo-dock-class-manager.c	2012-03-10 14:06:17.963989866 +0200
@@ -1189,13 +1189,13 @@
 {
 	gboolean bFound = TRUE;
 	GString *sDesktopFilePath = g_string_new ("");
-	g_string_printf (sDesktopFilePath, "/usr/share/applications/%s.desktop", cClass);
+	g_string_printf (sDesktopFilePath, "/usr/local/share/applications/%s.desktop", cClass);
 	if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
 	{
-		g_string_printf (sDesktopFilePath, "/usr/share/applications/xfce4/%s.desktop", cClass);
+		g_string_printf (sDesktopFilePath, "/usr/local/share/applications/xfce4/%s.desktop", cClass);
 		if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
 		{
-			g_string_printf (sDesktopFilePath, "/usr/share/applications/kde4/%s.desktop", cClass);
+			g_string_printf (sDesktopFilePath, "/usr/local/share/applications/kde4/%s.desktop", cClass);
 			if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
 			{
 				bFound = FALSE;

Added Link Here

(-)b/cairo-dock/files/patch-cairo-dock-gui-factory.c (+11 lines)
1	--- src/gldit/cairo-dock-gui-factory.c.orig 2011-06-19 02:27:14.000000000 +0300
2	+++ src/gldit/cairo-dock-gui-factory.c 2012-03-10 14:01:45.373972001 +0200
3	@@ -2429,7 +2429,7 @@
4	gchar *cUserPath = g_strdup_printf ("%s/.icons", g_getenv ("HOME"));
5	const gchar *path[3];
6	path[0] = (const gchar *)cUserPath;
7	- path[1] = "/usr/share/icons";
8	+ path[1] = "/usr/local/share/icons";
9	path[2] = NULL;
10
11	GHashTable *pHashTable = _cairo_dock_build_icon_themes_list (path);




--- src/cairo-dock-menu.c.orig	2012-03-10 14:07:34.504001097 +0200
+++ src/cairo-dock-menu.c	2012-03-10 14:07:43.434017412 +0200
@@ -293,7 +293,7 @@
 			return ;
 		}
 	}
-	gchar *cCommand = g_strdup_printf ("cp '/usr/share/applications/cairo-dock%s.desktop' '%s'", (g_bForceCairo ? "-cairo" : ""), cCairoAutoStartDirPath);
+	gchar *cCommand = g_strdup_printf ("cp '/usr/local/share/applications/cairo-dock%s.desktop' '%s'", (g_bForceCairo ? "-cairo" : ""), cCairoAutoStartDirPath);
 	int r = system (cCommand);
 	g_free (cCommand);
 	g_free (cCairoAutoStartDirPath);
@@ -861,11 +861,11 @@
 	
 	// on trouve le .desktop du programme.
 	cd_debug ("%s (%s)\n", __func__, icon->cClass);
-	gchar *cDesktopFilePath = g_strdup_printf ("/usr/share/applications/%s.desktop", icon->cClass);
+	gchar *cDesktopFilePath = g_strdup_printf ("/usr/local/share/applications/%s.desktop", icon->cClass);
 	if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS))  // on n'a pas trouve la, on cherche chez KDE.
 	{
 		g_free (cDesktopFilePath);
-		cDesktopFilePath = g_strdup_printf ("/usr/share/applications/kde4/%s.desktop", icon->cClass);
+		cDesktopFilePath = g_strdup_printf ("/usr/local/share/applications/kde4/%s.desktop", icon->cClass);
 		if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS))  // toujours rien, on utilise locate.
 		{
 			g_free (cDesktopFilePath);




--- cairo-dock-package-theme.orig	2011-06-19 02:27:14.000000000 +0300
+++ cairo-dock-package-theme	2012-03-10 13:56:42.504012481 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/local/bin/bash
 
 # Packager for Cairo-Dock
 #
@@ -125,7 +125,7 @@
 	if test "x${theme}" != "x"; then
 		#\__________ On cherche si ce theme est un theme officiel ou non.
 		echo "un theme est present ($theme)"
-		wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30
+		fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
 		if test -f "liste.tmp" ; then
 			grep "^\[${theme}\]" "liste.tmp"
 			if test "$?" != "0" -a  "$theme" != "Classic" -a "$theme" != "default"; then  # pas un theme officiel

Added Link Here

(-)b/cairo-dock/files/patch-cairo-dock_theme-creator.sh (+8 lines)
1	--- cairo-dock_theme-creator.sh.orig 2012-03-10 13:56:15.674011880 +0200
2	+++ cairo-dock_theme-creator.sh 2012-03-10 13:56:23.814030235 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Theme creator for Cairo-Dock
8	#

Removed Link Here

(-)a/cairo-dock/files/patch-fetch (-11 lines)
1	--- cairo-dock-package-theme.orig 2010-12-11 01:37:14.000000000 +0200
2	+++ cairo-dock-package-theme 2010-12-11 01:37:33.000000000 +0200
3	@@ -125,7 +125,7 @@
4	if test "x${theme}" != "x"; then
5	#\__________ On cherche si ce theme est un theme officiel ou non.
6	echo "un theme est present ($theme)"
7	- wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30
8	+ fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
9	if test -f "liste.tmp" ; then
10	grep "^\[${theme}\]" "liste.tmp"
11	if test "$?" != "0" -a "$theme" != "Classic" -a "$theme" != "default"; then # pas un theme officiel

Return to bug 165925

Lines 7-12 Link Here

(-)b/cairo-dock/Makefile (-13 / +3 lines)
7		7
8	PORTNAME= cairo-dock	8	PORTNAME= cairo-dock
9	DISTVERSION= 2.3.0~3	9	DISTVERSION= 2.3.0~3
		10	PORTREVISION= 1
10	CATEGORIES= deskutils	11	CATEGORIES= deskutils
11	MASTER_SITES= http://launchpadlibrarian.net/73753213/	12	MASTER_SITES= http://launchpadlibrarian.net/73753213/
12		13
Lines 17-22 LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ Link Here
17	curl.6:${PORTSDIR}/ftp/curl \	18	curl.6:${PORTSDIR}/ftp/curl \
18	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \	19	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
19	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext	20	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
		21	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
20		22
21	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
22	USE_GETTEXT= yes	24	USE_GETTEXT= yes
Lines 32-48 MANCOMPRESSED= yes Link Here
32	post-patch:	34	post-patch:
33	@${REINPLACE_CMD} -e 's\|libdir}/pkgconfig\|prefix}/libdata/pkgconfig\| ; s\|datadir}/man\|prefix}/man\|' \	35	@${REINPLACE_CMD} -e 's\|libdir}/pkgconfig\|prefix}/libdata/pkgconfig\| ; s\|datadir}/man\|prefix}/man\|' \
34	${WRKSRC}/CMakeLists.txt ${WRKSRC}/src/gldit/CMakeLists.txt	36	${WRKSRC}/CMakeLists.txt ${WRKSRC}/src/gldit/CMakeLists.txt
35	${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \
36	${WRKSRC}/src/gldit/cairo-dock-gui-factory.c
37		37
38	.include <bsd.port.pre.mk>	38	.include <bsd.port.mk>
39
40	.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h)
41	# Glitz support can only be enabled if cairo is built with glitz support
42	CONFIGURE_ARGS+=--enable-glitz
43	LIB_DEPENDS+= glitz:${PORTSDIR}/graphics/glitz
44	.else
45	CONFIGURE_ARGS+=--disable-glitz
46	.endif
47
48	.include <bsd.port.post.mk>

Added Link Here

(-)b/cairo-dock/files/patch-cairo-dock (+19 lines)
1	--- data/cairo-dock.orig 2012-03-10 14:08:41.784016085 +0200
2	+++ data/cairo-dock 2012-03-10 14:09:03.014030514 +0200
3	@@ -2,12 +2,12 @@
4	section="Applications/System" \
5	hints="dock" \
6	title="Cairo-Dock (no OpenGL)" \
7	- icon="/usr/share/pixmaps/cairo-dock.svg" \
8	- command="/usr/bin/cairo-dock -c"
9	+ icon="/usr/local/share/pixmaps/cairo-dock.svg" \
10	+ command="/usr/local/bin/cairo-dock -c"
11
12	?package(cairo-dock):needs="X11" \
13	section="Applications/System" \
14	hints="dock" \
15	title="GLX-Dock (Cairo-Dock with OpenGL)" \
16	- icon="/usr/share/pixmaps/cairo-dock.svg" \
17	- command="/usr/bin/cairo-dock -o"
18	+ icon="/usr/local/share/pixmaps/cairo-dock.svg" \
19	+ command="/usr/local/bin/cairo-dock -o"

Added Link Here

(-)b/cairo-dock/files/patch-cairo-dock-applet-facility.c (+18 lines)
1	--- src/gldit/cairo-dock-applet-facility.c.orig 2012-04-08 11:31:10.000000000 +0300
2	+++ src/gldit/cairo-dock-applet-facility.c 2012-04-08 11:32:21.000000000 +0300
3	@@ -350,13 +350,13 @@
4
5	GError *erreur = NULL;
6	gchar *cSoundCommand = NULL;
7	- if (g_file_test ("/usr/bin/paplay", G_FILE_TEST_EXISTS))
8	+ if (g_file_test ("/usr/local/bin/paplay", G_FILE_TEST_EXISTS))
9	cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
10
11	else if (g_file_test ("/usr/bin/aplay", G_FILE_TEST_EXISTS))
12	cSoundCommand = g_strdup_printf("aplay \"%s\"", cSoundPath);
13
14	- else if (g_file_test ("/usr/bin/play", G_FILE_TEST_EXISTS))
15	+ else if (g_file_test ("/usr/local/bin/play", G_FILE_TEST_EXISTS))
16	cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
17
18

Added Link Here

(-)b/cairo-dock/files/patch-cairo-dock-class-manager.c (+19 lines)
1	--- src/gldit/cairo-dock-class-manager.c.orig 2012-03-10 14:05:52.663999155 +0200
2	+++ src/gldit/cairo-dock-class-manager.c 2012-03-10 14:06:17.963989866 +0200
3	@@ -1189,13 +1189,13 @@
4	{
5	gboolean bFound = TRUE;
6	GString *sDesktopFilePath = g_string_new ("");
7	- g_string_printf (sDesktopFilePath, "/usr/share/applications/%s.desktop", cClass);
8	+ g_string_printf (sDesktopFilePath, "/usr/local/share/applications/%s.desktop", cClass);
9	if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
10	{
11	- g_string_printf (sDesktopFilePath, "/usr/share/applications/xfce4/%s.desktop", cClass);
12	+ g_string_printf (sDesktopFilePath, "/usr/local/share/applications/xfce4/%s.desktop", cClass);
13	if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
14	{
15	- g_string_printf (sDesktopFilePath, "/usr/share/applications/kde4/%s.desktop", cClass);
16	+ g_string_printf (sDesktopFilePath, "/usr/local/share/applications/kde4/%s.desktop", cClass);
17	if (! g_file_test (sDesktopFilePath->str, G_FILE_TEST_EXISTS))
18	{
19	bFound = FALSE;

Added Link Here

(-)b/cairo-dock/files/patch-cairo-dock-menu.c (+25 lines)
1	--- src/cairo-dock-menu.c.orig 2012-03-10 14:07:34.504001097 +0200
2	+++ src/cairo-dock-menu.c 2012-03-10 14:07:43.434017412 +0200
3	@@ -293,7 +293,7 @@
4	return ;
5	}
6	}
7	- gchar *cCommand = g_strdup_printf ("cp '/usr/share/applications/cairo-dock%s.desktop' '%s'", (g_bForceCairo ? "-cairo" : ""), cCairoAutoStartDirPath);
8	+ gchar *cCommand = g_strdup_printf ("cp '/usr/local/share/applications/cairo-dock%s.desktop' '%s'", (g_bForceCairo ? "-cairo" : ""), cCairoAutoStartDirPath);
9	int r = system (cCommand);
10	g_free (cCommand);
11	g_free (cCairoAutoStartDirPath);
12	@@ -861,11 +861,11 @@
13
14	// on trouve le .desktop du programme.
15	cd_debug ("%s (%s)\n", __func__, icon->cClass);
16	- gchar *cDesktopFilePath = g_strdup_printf ("/usr/share/applications/%s.desktop", icon->cClass);
17	+ gchar *cDesktopFilePath = g_strdup_printf ("/usr/local/share/applications/%s.desktop", icon->cClass);
18	if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS)) // on n'a pas trouve la, on cherche chez KDE.
19	{
20	g_free (cDesktopFilePath);
21	- cDesktopFilePath = g_strdup_printf ("/usr/share/applications/kde4/%s.desktop", icon->cClass);
22	+ cDesktopFilePath = g_strdup_printf ("/usr/local/share/applications/kde4/%s.desktop", icon->cClass);
23	if (! g_file_test (cDesktopFilePath, G_FILE_TEST_EXISTS)) // toujours rien, on utilise locate.
24	{
25	g_free (cDesktopFilePath);

Added Link Here

(-)b/cairo-dock/files/patch-cairo-dock-package-theme (+17 lines)
1	--- cairo-dock-package-theme.orig 2011-06-19 02:27:14.000000000 +0300
2	+++ cairo-dock-package-theme 2012-03-10 13:56:42.504012481 +0200
3	@@ -1,4 +1,4 @@
4	-#!/bin/bash
5	+#!/usr/local/bin/bash
6
7	# Packager for Cairo-Dock
8	#
9	@@ -125,7 +125,7 @@
10	if test "x${theme}" != "x"; then
11	#\__________ On cherche si ce theme est un theme officiel ou non.
12	echo "un theme est present ($theme)"
13	- wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30
14	+ fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf"
15	if test -f "liste.tmp" ; then
16	grep "^\[${theme}\]" "liste.tmp"
17	if test "$?" != "0" -a "$theme" != "Classic" -a "$theme" != "default"; then # pas un theme officiel