- Fix sound playback

- Bump PORTREVISION
- Whitespace fixes

PR:		ports/180091
Submitted by:	maintainer

2 files changed, 30 insertions, 5 deletions

diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile
index 78f858fcc448..d50430caf179 100644
--- a/deskutils/cairo-dock/Makefile
+++ b/deskutils/cairo-dock/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cairo-dock
 DISTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpadlibrarian.net/137290048/ \
 		http://pazzle.otdux.com.ua/
@@ -13,7 +14,8 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 		curl:${PORTSDIR}/ftp/curl \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		gtkglext-x11-1:${PORTSDIR}/x11-toolkits/gtkglext
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		sox:${PORTSDIR}/audio/sox
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-3.2.1
 
@@ -24,18 +26,18 @@ USE_XORG=	xrender xtst
 USES=		cmake gettext pkgconfig
 MAKE_JOBS_SAFE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
-CMAKE_ARGS+=    -Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig"
+CMAKE_ARGS+=	-Dinstall-pc-path:STRING="${LOCALBASE}/libdata/pkgconfig"
 
 MAN1=		cairo-dock.1
 MANCOMPRESSED=	yes
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -i.orig -e \
+	@${FIND} ${WRKSRC} -type f -name "*" | ${XARGS} ${REINPLACE_CMD} -e \
 	    's|/usr/share/pixmaps/|${LOCALBASE}/share/pixmaps/|g; \
 	     s|/usr/bin/cairo-dock|${LOCALBASE}/bin/cairo-dock|g; \
 	     s|/bin/bash|${LOCALBASE}/bin/bash|g; \
-	     s|/usr/bin/*lay|${LOCALBASE}/bin/*lay|g; \
 	     s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
-	     s|/usr/share/icons|${LOCALBASE}/share/icons|g'
+	     s|/usr/share/icons|${LOCALBASE}/share/icons|g; \
+	     s|%%LOCALBASE%%|${LOCALBASE}|g;'
 
 .include <bsd.port.mk>
diff --git a/deskutils/cairo-dock/files/patch-cairo-dock-applet-facility.c b/deskutils/cairo-dock/files/patch-cairo-dock-applet-facility.c
new file mode 100644
index 000000000000..79b6d208189f
--- /dev/null
+++ b/deskutils/cairo-dock/files/patch-cairo-dock-applet-facility.c
@@ -0,0 +1,23 @@
+--- ./src/gldit/cairo-dock-applet-facility.c.orig	2013-06-29 16:54:06.000000000 +0300
++++ ./src/gldit/cairo-dock-applet-facility.c	2013-06-29 16:55:44.000000000 +0300
+@@ -225,14 +225,14 @@
+ 	}
+ 	
+ 	gchar *cSoundCommand = NULL;
+-	if (g_file_test ("/usr/bin/paplay", G_FILE_TEST_EXISTS))
+-		cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
++	if (g_file_test ("%%LOCALBASE%%/bin/play", G_FILE_TEST_EXISTS))
++		cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
+ 
+-	else if (g_file_test ("/usr/bin/aplay", G_FILE_TEST_EXISTS))
++	else if (g_file_test ("%%LOCALBASE%%/bin/paplay", G_FILE_TEST_EXISTS))
++		cSoundCommand = g_strdup_printf("paplay --client-name=cairo-dock \"%s\"", cSoundPath);
++	
++	else if (g_file_test ("%%LOCALBASE%%/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))
+-		cSoundCommand = g_strdup_printf("play \"%s\"", cSoundPath);
+ 	
+ 	
+ 	cairo_dock_launch_command (cSoundCommand);