Index: Makefile =================================================================== --- Makefile (revision 364823) +++ Makefile (working copy) @@ -2,18 +2,28 @@ # $FreeBSD$ PORTNAME= umurmur -PORTVERSION= 0.2.13 -PORTREVISION= 1 +PORTVERSION= 0.2.15 CATEGORIES= audio net -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= https://github.com/${GITHUB_USER}/${GITHUB_REPO}/archive/ \ + http://github.com/${GITHUB_USER}/${GITHUB_REPO}/archive/ +DISTNAME= ${PORTVERSION} 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 +GITHUB_USER= fatbob313 +GITHUB_REPO= umurmur +DIST_SUBDIR= ${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +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 +34,8 @@ 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}/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 Index: distinfo =================================================================== --- distinfo (revision 364823) +++ distinfo (working copy) @@ -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) = edadbda3ee17033d0ed9da1b6550634b6d3fca4226d0113a453b359ad9a88767 +SIZE (umurmur/0.2.15.tar.gz) = 86187 Index: files/patch-configure.ac =================================================================== --- files/patch-configure.ac (revision 0) +++ files/patch-configure.ac (working copy) @@ -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 Property changes on: files/patch-configure.ac ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: files/patch-src-conf.c =================================================================== --- files/patch-src-conf.c (revision 364823) +++ files/patch-src-conf.c (working copy) @@ -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: Index: files/patch-src-conf.h =================================================================== --- files/patch-src-conf.h (revision 364823) +++ files/patch-src-conf.h (working copy) @@ -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, Index: pkg-descr =================================================================== --- pkg-descr (revision 364823) +++ pkg-descr (working copy) @@ -2,4 +2,4 @@ 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/