1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

audio/umurmur: update to 0.2.15

PR:		192177
Submitted by:	truckman
Approved by:	maintainer (timeout)
This commit is contained in:
William Grzybowski 2014-08-16 21:14:54 +00:00
parent f3ff426b00
commit c48c1b5658
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=365135
7 changed files with 52 additions and 49 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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:

View File

@ -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,

View File

@ -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

View File

@ -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