pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/mserv Update to mserv-0.35.
details: https://anonhg.NetBSD.org/pkgsrc/rev/94151db81d1d
branches: trunk
changeset: 460717:94151db81d1d
user: martin <martin%pkgsrc.org@localhost>
date: Wed Sep 03 12:35:12 2003 +0000
description:
Update to mserv-0.35.
Most previus patches have been integrated, various fixes.
This version is compatible with a new nifty win32 gui client, see the
homepage for links.
diffstat:
audio/mserv/Makefile | 10 +-
audio/mserv/distinfo | 25 +-
audio/mserv/patches/patch-aa | 26 +-
audio/mserv/patches/patch-ab | 24 +-
audio/mserv/patches/patch-ac | 25 +-
audio/mserv/patches/patch-ad | 12 -
audio/mserv/patches/patch-ae | 6099 ------------------------------------------
audio/mserv/patches/patch-af | 192 +-
audio/mserv/patches/patch-ag | 15 +-
audio/mserv/patches/patch-ah | 9 -
audio/mserv/patches/patch-ai | 124 -
audio/mserv/patches/patch-aj | 15 -
audio/mserv/patches/patch-ak | 51 -
audio/mserv/patches/patch-al | 15 -
audio/mserv/patches/patch-am | 8 +-
15 files changed, 162 insertions(+), 6488 deletions(-)
diffs (truncated from 6750 to 300 lines):
diff -r 28e9e8e503d5 -r 94151db81d1d audio/mserv/Makefile
--- a/audio/mserv/Makefile Wed Sep 03 12:32:50 2003 +0000
+++ b/audio/mserv/Makefile Wed Sep 03 12:35:12 2003 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 16:30:42 martti Exp $
+# $NetBSD: Makefile,v 1.11 2003/09/03 12:35:12 martin Exp $
#
-DISTNAME= mserv-0.33
-PKGREVISION= 7
+DISTNAME= mserv-0.35
CATEGORIES= audio
MASTER_SITES= http://www.mserv.org/download/
@@ -11,10 +10,13 @@
COMMENT= Local centralised music server environment
DEPENDS+= mpg123-[0-9]*:../mpg123
+GNU_CONFIGURE=
-ALL_TARGET= default
REPLACE_PERL= mserv/mservedit webclient/main.cgi webclient/margin.cgi webclient/mserv.cgi
+post-configure:
+ ${MV} ${WRKSRC}/mserv/soundcard.h ${WRKSRC}/mserv/mservsoundcard.h
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mserv
${INSTALL_DATA} \
diff -r 28e9e8e503d5 -r 94151db81d1d audio/mserv/distinfo
--- a/audio/mserv/distinfo Wed Sep 03 12:32:50 2003 +0000
+++ b/audio/mserv/distinfo Wed Sep 03 12:35:12 2003 +0000
@@ -1,17 +1,10 @@
-$NetBSD: distinfo,v 1.10 2003/07/16 12:22:44 abs Exp $
+$NetBSD: distinfo,v 1.11 2003/09/03 12:35:12 martin Exp $
-SHA1 (mserv-0.33.tar.gz) = 4aa66852057942341d9da9c6f839d7ee250f6785
-Size (mserv-0.33.tar.gz) = 136456 bytes
-SHA1 (patch-aa) = 3048bb4253bdd1825495782ba1c3e26bbfb68255
-SHA1 (patch-ab) = 920641a518272fc3b10c0d1fca4f4b926dd26c35
-SHA1 (patch-ac) = a8c5fa8039b92318afae6e48329e799e3acc226a
-SHA1 (patch-ad) = 59497df92f71a54b34752086a27db1e05482e7dc
-SHA1 (patch-ae) = d54b7eb2684e5b655e4f66858ec38215bc6e9a6a
-SHA1 (patch-af) = f8993697dd58a4c518dc78a98f176f811a056986
-SHA1 (patch-ag) = e4e2f19bc1b14b20d5a03f7362026a61ffb291bc
-SHA1 (patch-ah) = ca0dc3be3c02f82d033cab93aaa454d6918d45de
-SHA1 (patch-ai) = 62709c796913aae2e5866a94b22f929189b57d9a
-SHA1 (patch-aj) = 6638a7d9422332aaf9b435337c316cc882f51e9e
-SHA1 (patch-ak) = 73efa5d417a99fbeda36a6de80912631af9f4423
-SHA1 (patch-al) = eed5668942fdc801685aeda8aa2c31ec24d03729
-SHA1 (patch-am) = 91080a55922bbd46a4ba55dc4641dfa0171a553e
+SHA1 (mserv-0.35.tar.gz) = 850835946e4d5a0deccdd22a18f30170c0a7b57c
+Size (mserv-0.35.tar.gz) = 280299 bytes
+SHA1 (patch-aa) = 4bdcc9aa6ff563c91f0667966ff8256c28b6e063
+SHA1 (patch-ab) = 9d1b9fe0ee1b5392e2249b50d3e27426b17c9c04
+SHA1 (patch-ac) = dc28b407833857388717b614a0d739cc0042a765
+SHA1 (patch-af) = e4d07c5f70c2b45ed0c92255bdf713ed9031d60e
+SHA1 (patch-ag) = 232ce715468e8a59820b856a586dc708d65a2b5e
+SHA1 (patch-am) = 925a304562d89c3aca32a3f07f00eab912e8d2dd
diff -r 28e9e8e503d5 -r 94151db81d1d audio/mserv/patches/patch-aa
--- a/audio/mserv/patches/patch-aa Wed Sep 03 12:32:50 2003 +0000
+++ b/audio/mserv/patches/patch-aa Wed Sep 03 12:35:12 2003 +0000
@@ -1,19 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2002/10/03 15:46:56 abs Exp $
+$NetBSD: patch-aa,v 1.6 2003/09/03 12:35:12 martin Exp $
---- Makefile.orig Sat Jul 15 19:29:10 2000
-+++ Makefile
-@@ -2,11 +2,11 @@ PWD = ${shell pwd}
- BASE = ${shell basename ${PWD}}
+--- mserv/Makefile.in.orig 2003-08-03 16:57:19.000000000 +0200
++++ mserv/Makefile.in 2003-09-03 14:01:16.000000000 +0200
+@@ -130,7 +130,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
- default:
-- (cd mserv; ./configure)
-+ (cd mserv; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share)
- (cd mserv; make DEFS=${DEFS})
-- (cd mservcli; ./configure)
-+ (cd mservcli; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share)
- (cd mservcli; make DEFS=${DEFS})
-- (cd mservutils; ./configure)
-+ (cd mservutils; ./configure --prefix=${PREFIX} --datadir=${PREFIX}/share)
- (cd mservutils; make DEFS=${DEFS})
+-INCLUDES = -I../hdr -DDATADIR=\"${datadir}\"
++INCLUDES = -I../hdr -DDATADIR=\"${datadir}\" -DBINDIR=\"${prefix}/bin\"
- install:
+ bin_PROGRAMS = mserv
+
diff -r 28e9e8e503d5 -r 94151db81d1d audio/mserv/patches/patch-ab
--- a/audio/mserv/patches/patch-ab Wed Sep 03 12:32:50 2003 +0000
+++ b/audio/mserv/patches/patch-ab Wed Sep 03 12:35:12 2003 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2002/10/03 15:46:56 abs Exp $
+$NetBSD: patch-ab,v 1.7 2003/09/03 12:35:12 martin Exp $
---- mserv/cmd.c.orig Sat Jul 15 18:52:56 2000
-+++ mserv/cmd.c
-@@ -2789,6 +2789,8 @@ static void mserv_cmd_reset(t_client *cl
- mserv_response(cl, "RESETER", NULL);
- return;
- }
-+ mserv_broadcast("RESETGO", "%s", cl->user);
-+ mserv_flush();
- mserv_log("Reset initiated by %s", cl->user);
- mserv_reset();
- mserv_broadcast("RESET", "%s", cl->user);
+--- mserv/cmd.c.orig 2003-08-02 16:26:19.000000000 +0200
++++ mserv/cmd.c 2003-09-03 13:51:41.000000000 +0200
+@@ -51,7 +51,7 @@
+ #include <math.h>
+ #include "mserv.h"
+ #include "misc.h"
+-#include "soundcard.h"
++#include "mservsoundcard.h"
+ #include "acl.h"
+ #include "filter.h"
+ #include "cmd.h"
diff -r 28e9e8e503d5 -r 94151db81d1d audio/mserv/patches/patch-ac
--- a/audio/mserv/patches/patch-ac Wed Sep 03 12:32:50 2003 +0000
+++ b/audio/mserv/patches/patch-ac Wed Sep 03 12:35:12 2003 +0000
@@ -1,14 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2002/10/03 15:46:57 abs Exp $
+$NetBSD: patch-ac,v 1.5 2003/09/03 12:35:12 martin Exp $
---- mserv/config.h.in.orig Tue Jan 25 19:59:08 2000
-+++ mserv/config.h.in
-@@ -11,6 +11,9 @@
- #define RETSIGTYPE void
-
- /* Define if we have soundcard.h */
-+#undef HAVE_SOUNDCARD_H
-+
-+/* Define if we have sys/soundcard.h */
- #undef HAVE_SYS_SOUNDCARD_H
-
- /* Define if we have strsep() */
+--- mserv/mserv.c.orig 2003-08-03 16:57:20.000000000 +0200
++++ mserv/mserv.c 2003-09-03 13:52:35.000000000 +0200
+@@ -67,7 +67,7 @@
+ #include "cmd.h"
+ #include "acl.h"
+ #include "mp3info.h"
+-#include "soundcard.h"
++#include "mservsoundcard.h"
+ #include "defconf.h"
+ #include "conf.h"
+ #include "opt.h"
diff -r 28e9e8e503d5 -r 94151db81d1d audio/mserv/patches/patch-ad
--- a/audio/mserv/patches/patch-ad Wed Sep 03 12:32:50 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2002/10/03 15:46:57 abs Exp $
-
---- mserv/configure.in.orig Tue Jan 25 19:59:11 2000
-+++ mserv/configure.in
-@@ -28,6 +28,7 @@ dnl Checks for libraries.
- AC_CHECK_LIB(socket, main, XTRA_LIBS="$XTRA_LIBS -lsocket")
- AC_CHECK_LIB(malloc, main, XTRA_LIBS="$XTRA_LIBS -lmalloc")
- AC_CHECK_LIB(crypt, crypt, XTRA_LIBS="$XTRA_LIBS -lcrypt")
-+ AC_CHECK_LIB(ossaudio, _oss_ioctl, XTRA_LIBS="$XTRA_LIBS -lossaudio")
- AC_CHECK_LIB(nsl, inet_ntoa, XTRA_LIBS="$XTRA_LIBS -lnsl")
- # AC_CHECK_LIB(resolv, main, XTRA_LIBS="$XTRA_LIBS -lresolv")
-
diff -r 28e9e8e503d5 -r 94151db81d1d audio/mserv/patches/patch-ae
--- a/audio/mserv/patches/patch-ae Wed Sep 03 12:32:50 2003 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6099 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2003/07/16 12:22:45 abs Exp $
-
---- mserv/configure.orig Sat Jul 15 19:33:45 2000
-+++ mserv/configure
-@@ -1,27 +1,325 @@
- #! /bin/sh
--
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.13
--# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+# Generated by GNU Autoconf 2.57.
- #
-+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-+## --------------------- ##
-+## M4sh Initialization. ##
-+## --------------------- ##
-+
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-+ set -o posix
-+fi
-+
-+# Support unset when possible.
-+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+ as_unset=unset
-+else
-+ as_unset=false
-+fi
-+
-+
-+# Work around bugs in pre-3.0 UWIN ksh.
-+$as_unset ENV MAIL MAILPATH
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+for as_var in \
-+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+ LC_TELEPHONE LC_TIME
-+do
-+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+ eval $as_var=C; export $as_var
-+ else
-+ $as_unset $as_var
-+ fi
-+done
-+
-+# Required to use basename.
-+if expr a : '\(a\)' >/dev/null 2>&1; then
-+ as_expr=expr
-+else
-+ as_expr=false
-+fi
-+
-+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+ as_basename=basename
-+else
-+ as_basename=false
-+fi
-+
-+
-+# Name of the executable.
-+as_me=`$as_basename "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+ X"$0" : 'X\(/\)$' \| \
-+ . : '\(.\)' 2>/dev/null ||
-+echo X/"$0" |
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-+ /^X\/\(\/\/\)$/{ s//\1/; q; }
-+ /^X\/\(\/\).*/{ s//\1/; q; }
-+ s/.*/./; q'`
-+
-+
-+# PATH needs CR, and LINENO needs CR and PATH.
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x$as_lineno_3" = "x$as_lineno_2" || {
-+ # Find who we are. Look in the path if we contain no path at all
-+ # relative or not.
-+ case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+
-+ ;;
-+ esac
-+ # We did not find ourselves, most probably we were run as `sh COMMAND'
-+ # in which case we are not to be found in the path.
-+ if test "x$as_myself" = x; then
Home |
Main Index |
Thread Index |
Old Index