[pkgsrc/trunk]: pkgsrc/audio/icecast Fix sysconfdir conversion:

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e9b24c2906c
branches:  trunk
changeset: 462335:5e9b24c2906c
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Sep 30 14:57:25 2003 +0000

description:
Fix sysconfdir conversion:
- Pass --sysconfdir to configure script.
- Make the program honour that directory to search for config files.
- Remove un-needed patch (everything can be done from configure).

diffstat:

 audio/icecast/Makefile         |   5 +++--
 audio/icecast/distinfo         |   5 ++---
 audio/icecast/patches/patch-ab |  10 ++++++----
 audio/icecast/patches/patch-ac |  14 --------------
 4 files changed, 11 insertions(+), 23 deletions(-)

diffs (73 lines):

diff -r 9fd8fb3706d0 -r 5e9b24c2906c audio/icecast/Makefile
--- a/audio/icecast/Makefile    Tue Sep 30 14:43:52 2003 +0000
+++ b/audio/icecast/Makefile    Tue Sep 30 14:57:25 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/30 14:43:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/30 14:57:25 jmmv Exp $
 #
 
 DISTNAME=      icecast-1.3.12
@@ -19,7 +19,8 @@
 
 CONFIGURE_ARGS+=       --with-readline \
                        --with-libwrap \
-                       --with-python
+                       --with-python \
+                       --sysconfdir=${PKG_SYSCONFDIR}
 CPPFLAGS+=             -I${BUILDLINK_PREFIX.readline}/include/readline
 CPPFLAGS+=             ${BUILDLINK_CPPFLAGS.${PYPACKAGE}}
 CFLAGS+=               ${PTHREAD_CFLAGS}
diff -r 9fd8fb3706d0 -r 5e9b24c2906c audio/icecast/distinfo
--- a/audio/icecast/distinfo    Tue Sep 30 14:43:52 2003 +0000
+++ b/audio/icecast/distinfo    Tue Sep 30 14:57:25 2003 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/09/30 10:30:33 xtraeme Exp $
+$NetBSD: distinfo,v 1.8 2003/09/30 14:57:25 jmmv Exp $
 
 SHA1 (icecast-1.3.12.tar.gz) = bacb760390453718de536b85979ff3a9a73c7710
 Size (icecast-1.3.12.tar.gz) = 269822 bytes
 SHA1 (patch-aa) = 169202f563e4e2812d8d532264dcdb4f9ffc8df2
-SHA1 (patch-ab) = a1039a552874ffcfc8fc25b867e259bf14aa46cc
-SHA1 (patch-ac) = 95454920dea0bb01a467920dd07b2a4f889bd3be
+SHA1 (patch-ab) = de33a89e6078721a7e9c3a09515846752e76680e
diff -r 9fd8fb3706d0 -r 5e9b24c2906c audio/icecast/patches/patch-ab
--- a/audio/icecast/patches/patch-ab    Tue Sep 30 14:43:52 2003 +0000
+++ b/audio/icecast/patches/patch-ab    Tue Sep 30 14:57:25 2003 +0000
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2003/09/09 17:11:17 jmmv Exp $
+$NetBSD: patch-ab,v 1.4 2003/09/30 14:57:25 jmmv Exp $
 
 --- configure.orig     2002-04-11 00:50:20.000000000 +0200
 +++ configure
-@@ -877,15 +877,15 @@ else
+@@ -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=conf
 -      ICECAST_ETCDIR_INST=${prefix}/conf
-+      ICECAST_ETCDIR_INST=${prefix}/etc/icecast
++      ICECAST_ETCDIR=${sysconfdir}
++      ICECAST_ETCDIR_INST=${prefix}/share/examples/icecast
        ICECAST_SHAREDIR=${prefix}
        ICECAST_LOGDIR=logs
 -      ICECAST_LOGDIR_INST=${prefix}/logs
diff -r 9fd8fb3706d0 -r 5e9b24c2906c audio/icecast/patches/patch-ac
--- a/audio/icecast/patches/patch-ac    Tue Sep 30 14:43:52 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/09/30 10:30:33 xtraeme Exp $
-
---- conf/Makefile.in.orig      2003-09-30 12:09:22.000000000 +0200
-+++ conf/Makefile.in   2003-09-30 12:09:58.000000000 +0200
-@@ -83,7 +83,8 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--etcdir = $(ICECAST_ETCDIR_INST)
-+EGDIR = $(prefix)/share/examples/icecast
-+etcdir = $(EGDIR)
- etc_DATA = groups.aut.dist icecast.conf.dist mounts.aut.dist users.aut.dist
- 
- EXTRA_DIST = $(etc_DATA)