Update mserv to mserv-0.33nb2

    - Clip TRACKSPERALBUM to 250 not 1200 as more than 255 loses
    - Fix default pathname to mpg123
    - Add DEPENDS for mpg123
    - Fix soundcard support

11 files changed, 179 insertions, 32 deletions

diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile
index d7fc81a9d88..4c2d1229532 100644
--- a/audio/mserv/Makefile
+++ b/audio/mserv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/02/15 00:42:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2002/06/14 20:04:07 abs Exp $
 #
 
 DISTNAME=	mserv-0.33
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mserv.org/download/
 
@@ -10,6 +10,8 @@ MAINTAINER=	martin@netbsd.org
 HOMEPAGE=	http://www.mserv.org/
 COMMENT=	local centralised music server environment
 
+DEPENDS+=	mpg123-[0-9]*:../mpg123
+
 ALL_TARGET=	default
 REPLACE_PERL=	mserv/mservedit webclient/main.cgi webclient/margin.cgi webclient/mserv.cgi
 
diff --git a/audio/mserv/PLIST b/audio/mserv/PLIST
index 018ff1cbb22..e301a024277 100644
--- a/audio/mserv/PLIST
+++ b/audio/mserv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2002/02/12 14:22:14 martin Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/14 20:04:07 abs Exp $
 bin/mserv
 bin/mservcmd
 bin/mservedit
@@ -9,4 +9,12 @@ lib/libmservplus.a
 man/man1/mserv.1
 man/man1/mservcmd.1
 share/mserv/english.lang
+share/mserv/webclient/README
+share/mserv/webclient/back.gif
+share/mserv/webclient/index.html
+share/mserv/webclient/main.cgi
+share/mserv/webclient/margin.cgi
+share/mserv/webclient/mserv.cgi
+share/mserv/webclient/mserv7.gif
+@dirrm share/mserv/webclient
 @dirrm share/mserv
diff --git a/audio/mserv/distinfo b/audio/mserv/distinfo
index dee3578f9d1..caf7384b0a9 100644
--- a/audio/mserv/distinfo
+++ b/audio/mserv/distinfo
@@ -1,6 +1,12 @@
-$NetBSD: distinfo,v 1.2 2002/02/12 14:49:46 martin Exp $
+$NetBSD: distinfo,v 1.3 2002/06/14 20:04:07 abs Exp $
 
 SHA1 (mserv-0.33.tar.gz) = 4aa66852057942341d9da9c6f839d7ee250f6785
 Size (mserv-0.33.tar.gz) = 136456 bytes
-SHA1 (patch-aa) = 14cd015a4d8a02daf7708c566026ae6c985f3260
-SHA1 (patch-ab) = ba829dd06621a8034989e8e44812a3937b7002cd
+SHA1 (patch-aa) = 1b98fc3141aa2991697d3ce243b1d36b7c396c79
+SHA1 (patch-ab) = a8c5fa8039b92318afae6e48329e799e3acc226a
+SHA1 (patch-ac) = a84b11a87a794980570c8c4fbbd66d4e68a13a3e
+SHA1 (patch-ad) = 62fbf36cd77f10909602baefcb1d6ab031bc3010
+SHA1 (patch-ae) = 0b2dd28cfc3a9845a1543f08738e0251334f1b87
+SHA1 (patch-af) = 2d35f18de17ddb98a5b5d8b8fd101b5fe8290e59
+SHA1 (patch-ag) = eed5668942fdc801685aeda8aa2c31ec24d03729
+SHA1 (patch-ah) = 23c8b611ea84670aea10bcc4b12f9670cf15a060
diff --git a/audio/mserv/patches/patch-aa b/audio/mserv/patches/patch-aa
index 82876d97dbe..ccdbdac3183 100644
--- a/audio/mserv/patches/patch-aa
+++ b/audio/mserv/patches/patch-aa
@@ -1,13 +1,19 @@
-$NetBSD: patch-aa,v 1.1 2002/02/12 14:22:15 martin Exp $
+$NetBSD: patch-aa,v 1.2 2002/06/14 20:04:07 abs Exp $
 
---- mserv/defines.h.orig	Thu Jul 13 23:35:18 2000
-+++ mserv/defines.h	Tue Feb 12 14:49:02 2002
-@@ -57,7 +57,7 @@
- #define MISCINFOLEN 128
+--- Makefile.orig	Sat Jul 15 18:29:10 2000
++++ Makefile
+@@ -2,11 +2,11 @@
+ BASE = ${shell basename ${PWD}}
  
- /* maximum number of tracks in each album */
--#define TRACKSPERALBUM 200
-+#define TRACKSPERALBUM 1200
+ 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})
  
- /* maximum language line length */
- #define LANGLINELEN 1024
+ install:
diff --git a/audio/mserv/patches/patch-ab b/audio/mserv/patches/patch-ab
index 756ef58bab8..839817f000b 100644
--- a/audio/mserv/patches/patch-ab
+++ b/audio/mserv/patches/patch-ab
@@ -1,19 +1,14 @@
-$NetBSD: patch-ab,v 1.2 2002/02/12 14:49:46 martin Exp $
+$NetBSD: patch-ab,v 1.3 2002/06/14 20:04:07 abs Exp $
 
---- Makefile.orig	Sat Jul 15 20:29:10 2000
-+++ Makefile	Tue Feb 12 15:13:35 2002
-@@ -2,11 +2,11 @@
- BASE = ${shell basename ${PWD}}
+--- mserv/config.h.in.orig	Tue Jan 25 19:59:08 2000
++++ mserv/config.h.in
+@@ -11,6 +11,9 @@
+ #define RETSIGTYPE void
  
- 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})
+ /* Define if we have soundcard.h */
++#undef HAVE_SOUNDCARD_H
++
++/* Define if we have sys/soundcard.h */
+ #undef HAVE_SYS_SOUNDCARD_H
  
- install:
+ /* Define if we have strsep() */
diff --git a/audio/mserv/patches/patch-ac b/audio/mserv/patches/patch-ac
new file mode 100644
index 00000000000..da2ed060c79
--- /dev/null
+++ b/audio/mserv/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2002/06/14 20:04:07 abs Exp $
+
+--- mserv/configure.in.orig	Tue Jan 25 19:59:11 2000
++++ mserv/configure.in
+@@ -28,6 +28,7 @@
+ 	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 --git a/audio/mserv/patches/patch-ad b/audio/mserv/patches/patch-ad
new file mode 100644
index 00000000000..7482045d097
--- /dev/null
+++ b/audio/mserv/patches/patch-ad
@@ -0,0 +1,51 @@
+$NetBSD: patch-ad,v 1.1 2002/06/14 20:04:08 abs Exp $
+
+--- mserv/configure.orig	Sat Jul 15 18:33:45 2000
++++ mserv/configure
+@@ -1201,6 +1201,46 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++	echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6
++echo "configure:1206: checking for _oss_ioctl in -lossaudio" >&5
++ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lossaudio  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1214 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char _oss_ioctl();
++
++int main() {
++_oss_ioctl()
++; return 0; }
++EOF
++if { (eval echo configure:1225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  XTRA_LIBS="$XTRA_LIBS -lossaudio"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
+ 	echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6
+ echo "configure:1206: checking for inet_ntoa in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'`
diff --git a/audio/mserv/patches/patch-ae b/audio/mserv/patches/patch-ae
new file mode 100644
index 00000000000..5911a5fc5b3
--- /dev/null
+++ b/audio/mserv/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/06/14 20:04:08 abs Exp $
+
+--- mserv/defconf.c.orig	Thu Jul 13 21:20:42 2000
++++ mserv/defconf.c
+@@ -15,7 +15,7 @@
+ 
+ # Define player invokation methods
+ # mservplay is our special wrapper, the first parameter is a 'nice' level
+-mpg123=/usr/local/bin/mpg123 -b 1024
++mpg123=" PATH_MPG123 " -b 1024
+ freeamp=/usr/local/bin/freeamp -ui mpg123
+ mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024
+ 
diff --git a/audio/mserv/patches/patch-af b/audio/mserv/patches/patch-af
new file mode 100644
index 00000000000..29cb26b1efa
--- /dev/null
+++ b/audio/mserv/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1 2002/06/14 20:04:08 abs Exp $
+
+--- mserv/defines.h.orig	Thu Jul 13 21:35:18 2000
++++ mserv/defines.h
+@@ -16,6 +16,10 @@
+ #define PATH_LANGUAGE		SHAREDIR "/english.lang"
+ */
+ 
++#ifndef PATH_MPG123
++#define PATH_MPG123 		BINDIR "/mpg123"
++#endif
++
+ /* maximum amount to queue in each output buffer */
+ #define OUTBUFLEN 32*1024
+ 
+@@ -57,7 +61,7 @@
+ #define MISCINFOLEN 128
+ 
+ /* maximum number of tracks in each album */
+-#define TRACKSPERALBUM 200
++#define TRACKSPERALBUM 250
+ 
+ /* maximum language line length */
+ #define LANGLINELEN 1024
diff --git a/audio/mserv/patches/patch-ag b/audio/mserv/patches/patch-ag
new file mode 100644
index 00000000000..7681f64946d
--- /dev/null
+++ b/audio/mserv/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2002/06/14 20:04:08 abs Exp $
+
+--- mserv/mservplay.c.orig	Tue Jan 25 19:59:16 2000
++++ mserv/mservplay.c
+@@ -14,10 +14,6 @@
+ #include "defines.h"
+ #include "misc.h"
+ 
+-#ifndef PATH_MPG123
+-#define PATH_MPG123 "/usr/local/bin/mpg123"
+-#endif
+-
+ int main(int argc, char *argv[])
+ {
+   const pid_t pid = getpid();
diff --git a/audio/mserv/patches/patch-ah b/audio/mserv/patches/patch-ah
new file mode 100644
index 00000000000..949d10d1478
--- /dev/null
+++ b/audio/mserv/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2002/06/14 20:04:08 abs Exp $
+
+--- mserv/opt.c.orig	Thu Jul 13 21:14:41 2000
++++ mserv/opt.c
+@@ -164,8 +164,8 @@
+   /* special case - player variable is an indirected to another variable */
+   if ((val = conf_getvalue("player")) == NULL) {
+     if (mserv_verbose)
+-      printf("No player specified, defaulting to /usr/local/bin/mpg123\n");
+-    opt_player = "/usr/local/bin/mpg123";
++      printf("No player specified, defaulting to " PATH_MPG123 "\n");
++    opt_player = PATH_MPG123;
+   } else {
+     if ((opt_player = conf_getvalue(val)) == NULL) {
+       fprintf(stderr, "%s: player setting '%s' not found\n", progname,