Date: Sat, 16 Aug 2014 21:14:54 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365135 - in head/audio/umurmur: . files Message-ID: <201408162114.s7GLEtCX067482@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sat Aug 16 21:14:54 2014 New Revision: 365135 URL: http://svnweb.freebsd.org/changeset/ports/365135 QAT: https://qat.redports.org/buildarchive/r365135/ Log: audio/umurmur: update to 0.2.15 PR: 192177 Submitted by: truckman Approved by: maintainer (timeout) Added: head/audio/umurmur/files/patch-configure.ac (contents, props changed) Deleted: head/audio/umurmur/files/patch-src-conf.h Modified: head/audio/umurmur/Makefile head/audio/umurmur/distinfo head/audio/umurmur/files/patch-src-conf.c head/audio/umurmur/pkg-descr head/audio/umurmur/pkg-plist Modified: head/audio/umurmur/Makefile ============================================================================== --- head/audio/umurmur/Makefile Sat Aug 16 21:04:52 2014 (r365134) +++ head/audio/umurmur/Makefile Sat Aug 16 21:14:54 2014 (r365135) @@ -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 Modified: head/audio/umurmur/distinfo ============================================================================== --- head/audio/umurmur/distinfo Sat Aug 16 21:04:52 2014 (r365134) +++ head/audio/umurmur/distinfo Sat Aug 16 21:14:54 2014 (r365135) @@ -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 Added: head/audio/umurmur/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/umurmur/files/patch-configure.ac Sat Aug 16 21:14:54 2014 (r365135) @@ -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 Modified: head/audio/umurmur/files/patch-src-conf.c ============================================================================== --- head/audio/umurmur/files/patch-src-conf.c Sat Aug 16 21:04:52 2014 (r365134) +++ head/audio/umurmur/files/patch-src-conf.c Sat Aug 16 21:14:54 2014 (r365135) @@ -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: Modified: head/audio/umurmur/pkg-descr ============================================================================== --- head/audio/umurmur/pkg-descr Sat Aug 16 21:04:52 2014 (r365134) +++ head/audio/umurmur/pkg-descr Sat Aug 16 21:14:54 2014 (r365135) @@ -2,4 +2,4 @@ uMurmur is a minimalistic Mumble server 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 Modified: head/audio/umurmur/pkg-plist ============================================================================== --- head/audio/umurmur/pkg-plist Sat Aug 16 21:04:52 2014 (r365134) +++ head/audio/umurmur/pkg-plist Sat Aug 16 21:14:54 2014 (r365135) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408162114.s7GLEtCX067482>