audio/umurmur: update to 0.2.15

PR:		192177
Submitted by:	truckman
Approved by:	maintainer (timeout)

7 files changed, 52 insertions, 49 deletions

diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index 244390158eb5..8d4c2a8ac60c 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -2,18 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	umurmur
-PORTVERSION=	0.2.13
-PORTREVISION=	1
+PORTVERSION=	0.2.15
 CATEGORIES=	audio net
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	ayu@commun.jp
 COMMENT=	Minimalistic Murmur (Mumble server)
 
+LICENSE=	BSD2CLAUSE
+
 LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig \
 		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
 
-USES=		gmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	fatbob313
+GH_COMMIT=	17daa7e
+
+USES=		gmake libtool
+USE_AUTOTOOLS=	aclocal autoconf autoheader automake
+AUTOMAKE_ARGS=	--add-missing
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-ssl=openssl
@@ -24,7 +30,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/conf.h
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/conf.c
 	@${REINPLACE_CMD} \
 		-e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/umurmur.conf.example
diff --git a/audio/umurmur/distinfo b/audio/umurmur/distinfo
index ea25f515e946..5260394968ae 100644
--- a/audio/umurmur/distinfo
+++ b/audio/umurmur/distinfo
@@ -1,2 +1,2 @@
-SHA256 (umurmur-0.2.13.tar.gz) = ac1595fa47ce6bd1e0706dd609293f745d73a59af00a7a04ddc0f9ae243997be
-SIZE (umurmur-0.2.13.tar.gz) = 167500
+SHA256 (umurmur-0.2.15.tar.gz) = d3cbdcb30cff40c8c76d36f54bbb743559038b694a4841b22141f20ccb8b3ec7
+SIZE (umurmur-0.2.15.tar.gz) = 86236
diff --git a/audio/umurmur/files/patch-configure.ac b/audio/umurmur/files/patch-configure.ac
new file mode 100644
index 000000000000..aab826e08b19
--- /dev/null
+++ b/audio/umurmur/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2014-08-07 23:37:03.000000000 -0700
++++ configure.ac	2014-08-15 00:54:12.000000000 -0700
+@@ -89,7 +89,7 @@
+ AM_CONDITIONAL(USE_OPENSSL, test x$with_ssl = xopenssl)
+ AM_CONDITIONAL(USE_GNUTLS, test x$with_ssl = xgnutls)
+ 
+-AC_DEFINE([DEFAULT_CONFIG], ["/etc/umurmur.conf"], [Default config])
++AC_DEFINE([DEFAULT_CONFIG], ["%%PREFIX%%/etc/umurmur.conf"], [Default config])
+ 
+ # Checks for header files.
+ AC_FUNC_ALLOCA
diff --git a/audio/umurmur/files/patch-src-conf.c b/audio/umurmur/files/patch-src-conf.c
index 2f3e1a9440e9..3e6d203007ff 100644
--- a/audio/umurmur/files/patch-src-conf.c
+++ b/audio/umurmur/files/patch-src-conf.c
@@ -1,30 +1,30 @@
---- 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 "%%PREFIX%%/etc/umurmur/certificate.crt";
- 		else {
- 			if ((strsetting = config_setting_get_string(setting)) != NULL)
- 				return strsetting;
- 			else
+--- src/conf.c.orig	2014-08-07 23:37:03.000000000 -0700
++++ src/conf.c	2014-08-14 11:47:27.000000000 -0700
+@@ -89,23 +89,23 @@
+ 		case CERTIFICATE:
+ 			setting = config_lookup(&configuration, "certificate");
+ 			if (!setting)
 -				return "/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 "%%PREFIX%%/etc/umurmur/private_key.key";
- 		else {
- 			if ((strsetting = config_setting_get_string(setting)) != NULL)
- 				return strsetting;
- 			else
+ 			else {
+ 				if ((strsetting = config_setting_get_string(setting)) != NULL)
+ 					return strsetting;
+ 				else
+-					return "/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 "%%PREFIX%%/etc/umurmur/private_key.key";
- 		}
- 		break;
- 	case PASSPHRASE:
+ 			else {
+ 				if ((strsetting = config_setting_get_string(setting)) != NULL)
+ 					return strsetting;
+ 				else
+-					return "/etc/umurmur/private_key.key";
++					return "%%PREFIX%%/etc/umurmur/private_key.key";
+ 			}
+ 			break;
+ 		case CAPATH:
diff --git a/audio/umurmur/files/patch-src-conf.h b/audio/umurmur/files/patch-src-conf.h
deleted file mode 100644
index 06ae66d2ef86..000000000000
--- a/audio/umurmur/files/patch-src-conf.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-descr b/audio/umurmur/pkg-descr
index 1e75e715659a..6880bab36b1d 100644
--- a/audio/umurmur/pkg-descr
+++ b/audio/umurmur/pkg-descr
@@ -2,4 +2,4 @@ uMurmur is a minimalistic Mumble server primarily targeted to run on
 routers with an open OS like OpenWRT.
 The server part of Mumble is called Murmur, hence the name uMurmur.
 
-WWW:	http://code.google.com/p/umurmur/
+WWW: http://code.google.com/p/umurmur
diff --git a/audio/umurmur/pkg-plist b/audio/umurmur/pkg-plist
index 318b39fdc84f..06f37fdde581 100644
--- a/audio/umurmur/pkg-plist
+++ b/audio/umurmur/pkg-plist
@@ -1,6 +1,3 @@
-@stopdaemon umurmur
-@unexec if cmp -s %D/etc/umurmur/umurmur.conf.sample %D/etc/umurmur/umurmur.conf; then rm -f %D/etc/umurmur/umurmur.conf; fi
-etc/umurmur/umurmur.conf.sample
-@exec if [ ! -f %D/etc/umurmur/umurmur.conf ] ; then cp -p %D/%F %B/umurmur/umurmur.conf; fi
+@sample etc/umurmur/umurmur.conf.sample
 bin/umurmurd
 @dirrmtry etc/umurmur