Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Jun 2016 11:01:55 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416587 - head/audio/quimup/files
Message-ID:  <201606091101.u59B1thV020888@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Jun  9 11:01:55 2016
New Revision: 416587
URL: https://svnweb.freebsd.org/changeset/ports/416587

Log:
  - Add patches missing in the previous commit
  
  PR:		209981
  Submitted by:	cmangin@arobas.net

Added:
  head/audio/quimup/files/patch-src__qm-config.cpp   (contents, props changed)
  head/audio/quimup/files/patch-src__qm-mpdcom.cpp   (contents, props changed)
Deleted:
  head/audio/quimup/files/patch-src_qtlocalpeer.cpp

Added: head/audio/quimup/files/patch-src__qm-config.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/quimup/files/patch-src__qm-config.cpp	Thu Jun  9 11:01:55 2016	(r416587)
@@ -0,0 +1,14 @@
+--- src/qm_config.cpp.orig	2016-02-28 04:52:29.000000000 -0500
++++ src/qm_config.cpp	2016-06-02 13:28:13.722103000 -0400
+@@ -168,9 +168,9 @@
+     version       	    = sts.value("version",			    "0.0" ).toString();  
+     // server related values
+     quitMPD_onquit    	= sts.value("quitMPD_onquit",		false ).toBool();
+-    onquit_mpd_command  = sts.value("onquit_mpd_command",	"mpd --kill").toString();
++    onquit_mpd_command  = sts.value("onquit_mpd_command",	"musicpd --kill").toString();
+     startMPD_onstart    = sts.value("startMPD_onstart",		false  ).toBool();
+-    onstart_mpd_command = sts.value("onstart_mpd_command",	"mpd"  ).toString();
++    onstart_mpd_command = sts.value("onstart_mpd_command",	"musicpd"  ).toString();
+     auto_connect     	= sts.value("auto_connect",			true   ).toBool();
+     
+     profile    			= sts.value("profile",				0   ).toInt();

Added: head/audio/quimup/files/patch-src__qm-mpdcom.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/quimup/files/patch-src__qm-mpdcom.cpp	Thu Jun  9 11:01:55 2016	(r416587)
@@ -0,0 +1,22 @@
+--- src/qm_mpdcom.cpp.orig	2016-02-28 04:52:46.000000000 -0500
++++ src/qm_mpdcom.cpp	2016-06-02 13:24:56.493027000 -0400
+@@ -2500,17 +2500,10 @@
+     struct stat sts;
+     bool b_isrunning = false;
+ 
+-    // try pidof
+-    if (stat("/bin/pidof", &sts) == 0)
+-    {
+-        if( system("pidof mpd > /dev/null") == 0)
+-        b_isrunning = true;
+-    }
+-    else
+     // try pgrep
+-    if (stat("/usr/bin/pgrep", &sts) == 0)
++    if (stat("/bin/pgrep", &sts) == 0)
+     {
+-        if( system("pgrep mpd > /dev/null") == 0)
++        if( system("pgrep musicpd > /dev/null") == 0)
+             b_isrunning = true;
+     }
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606091101.u59B1thV020888>