Update to version 0.2.8

PR:		ports/163067
Submitted by:	toddnni <toddnni@gmail.com>
Approved by:	maintainer with slight improvement

4 files changed, 21 insertions, 32 deletions

diff --git a/audio/umurmur/files/patch-Makefile b/audio/umurmur/files/patch-Makefile
deleted file mode 100644
index 4e4b179314f8..000000000000
--- a/audio/umurmur/files/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Makefile.orig	2011-02-24 13:06:56.000000000 +0900
-+++ src/Makefile	2011-02-24 13:07:54.000000000 +0900
-@@ -25,9 +25,10 @@
- # OpenSSL - usually installed at a standard place
- # EXTRA_CFLAGS:=
- # EXTRA_LDFLAGS:=-lcrypto -lssl 
-+EXTRA_LDFLAGS:=-lcrypto -lssl
- 
--CFLAGS:=$(CFLAGS) -I. -Wall $(EXTRA_CFLAGS)
--LDFLAGS:=$(EXTRA_LDFLAGS) $(LDFLAGS) -lconfig 
-+CFLAGS:=$(CFLAGS) -I. -I/usr/local/include -Wall $(EXTRA_CFLAGS)
-+LDFLAGS:=$(EXTRA_LDFLAGS) $(LDFLAGS) -L/usr/local/lib -lconfig 
- 
- umurmurd:google/protobuf-c/libprotobuf_c.a $(OBJS)
- 	$(CC) $(LDFLAGS) $(OBJS) $(SSL_LIB) google/protobuf-c/libprotobuf_c.a -o umurmurd
diff --git a/audio/umurmur/files/patch-conf.c b/audio/umurmur/files/patch-src-conf.c
index a1ec098a543f..2f3e1a9440e9 100644
--- a/audio/umurmur/files/patch-conf.c
+++ b/audio/umurmur/files/patch-src-conf.c
@@ -1,39 +1,30 @@
---- src/conf.c.orig	2011-02-24 13:16:42.000000000 +0900
-+++ src/conf.c	2011-02-24 13:17:50.000000000 +0900
-@@ -40,7 +40,7 @@
- 
- static config_t configuration;
- 
--#define DEFAULT_CONFIG "/etc/umurmur.conf"
-+#define DEFAULT_CONFIG "/usr/local/etc/umurmur/umurmur.conf"
- #define DEFAULT_WELCOME "Welcome to uMurmur!"
- #define DEFAULT_MAX_CLIENTS 10
- #define DEFAULT_MAX_BANDWIDTH 48000
-@@ -73,23 +73,23 @@
+--- src/conf.c.old	2011-12-04 19:11:54.718388035 +0200
++++ src/conf.c	2011-12-04 19:13:08.845299535 +0200
+@@ -87,23 +87,23 @@
  	case CERTIFICATE:
  		setting = config_lookup(&configuration, "certificate");
  		if (!setting)
 -			return "/etc/umurmur/certificate.crt";
-+			return "/usr/local/etc/umurmur/certificate.crt";
++			return "%%PREFIX%%/etc/umurmur/certificate.crt";
  		else {
  			if ((strsetting = config_setting_get_string(setting)) != NULL)
  				return strsetting;
  			else
 -				return "/etc/umurmur/certificate.crt";
-+				return "/usr/local/etc/umurmur/certificate.crt";
++				return "%%PREFIX%%/etc/umurmur/certificate.crt";
  		}
  		break;
  	case KEY:
  		setting = config_lookup(&configuration, "private_key");
  		if (!setting)
 -			return "/etc/umurmur/private_key.key";
-+			return "/usr/local/etc/umurmur/private_key.key";
++			return "%%PREFIX%%/etc/umurmur/private_key.key";
  		else {
  			if ((strsetting = config_setting_get_string(setting)) != NULL)
  				return strsetting;
  			else
 -				return "/etc/umurmur/private_key.key";
-+				return "/usr/local/etc/umurmur/private_key.key";
++				return "%%PREFIX%%/etc/umurmur/private_key.key";
  		}
  		break;
  	case PASSPHRASE:
diff --git a/audio/umurmur/files/patch-src-conf.h b/audio/umurmur/files/patch-src-conf.h
new file mode 100644
index 000000000000..06ae66d2ef86
--- /dev/null
+++ b/audio/umurmur/files/patch-src-conf.h
@@ -0,0 +1,11 @@
+--- src/conf.h.old	2011-12-04 19:11:49.751119971 +0200
++++ src/conf.h	2011-12-04 19:13:32.677786798 +0200
+@@ -33,7 +33,7 @@
+ 
+ #include "messages.h"
+ 
+-#define DEFAULT_CONFIG "/etc/umurmur.conf"
++#define DEFAULT_CONFIG "%%PREFIX%%/etc/umurmur/umurmur.conf"
+ 
+ typedef enum param {
+ 	CERTIFICATE,
diff --git a/audio/umurmur/files/umurmur.in b/audio/umurmur/files/umurmur.in
index 3a19eadc08cd..64d14b04a528 100644
--- a/audio/umurmur/files/umurmur.in
+++ b/audio/umurmur/files/umurmur.in
@@ -11,6 +11,8 @@
 #
 # umurmur_enable (bool):	Set to NO by default.
 #				Set it to YES to enable umurmur.
+# umurmur_user (str):		Set to "umurmur" by default.
+#				Set to change user account.
 # umurmur_flags (str):		Set to "" by default.
 #				Extra flags passed to start command.
 #
@@ -28,7 +30,7 @@ rcvar=${name}_enable
 # pidfile
 pidfile="/var/run/umurmur/umurmur.pid"
 
-command="%%PREFIX%%/sbin/umurmurd"
+command="%%PREFIX%%/bin/umurmurd"
 command_args="-p ${pidfile}"
 
 load_rc_config $name