diff options
Diffstat (limited to 'audio/icecast/patches/patch-ab')
| -rw-r--r-- | audio/icecast/patches/patch-ab | 76 |
1 files changed, 43 insertions, 33 deletions
diff --git a/audio/icecast/patches/patch-ab b/audio/icecast/patches/patch-ab index 7e071373c2a..5c9894598c4 100644 --- a/audio/icecast/patches/patch-ab +++ b/audio/icecast/patches/patch-ab @@ -1,36 +1,46 @@ -$NetBSD: patch-ab,v 1.4 2003/09/30 14:57:25 jmmv Exp $ +$NetBSD: patch-ab,v 1.5 2004/01/08 20:49:39 xtraeme Exp $ ---- configure.orig 2002-04-11 00:50:20.000000000 +0200 -+++ configure -@@ -876,16 +876,16 @@ if test "x$enable_fsstd" = "xyes"; then - else - ICECAST_BINDIR=${prefix}/bin - ICECAST_SBINDIR=${prefix}/bin -- ICECAST_ETCDIR=conf -- ICECAST_ETCDIR_INST=${prefix}/conf -+ ICECAST_ETCDIR=${sysconfdir} -+ ICECAST_ETCDIR_INST=${prefix}/share/examples/icecast - ICECAST_SHAREDIR=${prefix} - ICECAST_LOGDIR=logs -- ICECAST_LOGDIR_INST=${prefix}/logs -+ ICECAST_LOGDIR_INST=/var/log/icecast - ICECAST_TEMPLATEDIR=templates -- ICECAST_TEMPLATEDIR_INST=${prefix}/templates -+ ICECAST_TEMPLATEDIR_INST=${prefix}/share/icecast/templates - ICECAST_STATICDIR=static -- ICECAST_STATICDIR_INST=${prefix}/static -- ICECAST_DOCDIR=${prefix}/doc -+ ICECAST_STATICDIR_INST=${prefix}/share/icecast/static -+ ICECAST_DOCDIR=${prefix}/share/doc/icecast - USE_FSSTD=no - fi +--- conf/icecast.fixme.orig 2004-01-08 19:10:14.000000000 +0100 ++++ conf/icecast.fixme 2004-01-08 19:14:15.000000000 +0100 +@@ -82,14 +82,15 @@ -@@ -1540,7 +1540,7 @@ EOF + <paths> + <!-- basedir is only used if chroot is enabled --> +- <basedir>@pkgdatadir@</basedir> ++ <basedir>@BASEDIR@</basedir> - echo "$ac_t""BSD/OS" 1>&6 - ;; -- *BSD*) -+ unused) - __SOMEBSD__=yes - cat >> confdefs.h <<\EOF - #define __SOMEBSD__ 1 + <!-- Note that if <chroot> is turned on below, these paths must both + be relative to the new root, not the original root --> +- <logdir>@localstatedir@/log/@PACKAGE@</logdir> +- <webroot>@pkgdatadir@/web</webroot> +- <adminroot>@pkgdatadir@/admin</adminroot> +- <!-- <pidfile>@pkgdatadir@/icecast.pid</pidfile> --> ++ ++ <logdir>@LOGDIR@/</logdir> ++ <webroot>@WEBROOT@</webroot> ++ <adminroot>@ADMINROOT@</adminroot> ++ <pidfile>@PIDDIR@/icecast.pid</pidfile> + + <!-- Aliases: treat requests for 'source' path as being for 'dest' path + May be made specific to a port or bound address using the "port" +@@ -103,16 +104,14 @@ + <logging> + <accesslog>access.log</accesslog> + <errorlog>error.log</errorlog> +- <loglevel>4</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error --> ++ <loglevel>2</loglevel> <!-- 4 Debug, 3 Info, 2 Warn, 1 Error --> + </logging> + + <security> +- <chroot>0</chroot> +- <!-- ++ <chroot>1</chroot> + <changeowner> +- <user>nobody</user> +- <group>nogroup</group> ++ <user>@ICECAST_USER@</user> ++ <group>@ICECAST_GROUP@</group> + </changeowner> +- --> + </security> + </icecast> |