From a6a9f89098f94094a239876682695c4db85b26f3 Mon Sep 17 00:00:00 2001 From: abs Date: Wed, 31 Jul 2002 14:02:44 +0000 Subject: Update mserv to 0.33nb3: Broadcast an information line both on server RESET initiation and on completion. --- audio/mserv/Makefile | 4 +-- audio/mserv/distinfo | 20 ++++++++------- audio/mserv/patches/patch-aa | 6 ++--- audio/mserv/patches/patch-ab | 24 ++++++++---------- audio/mserv/patches/patch-ac | 22 ++++++++-------- audio/mserv/patches/patch-ad | 59 ++++++++----------------------------------- audio/mserv/patches/patch-ae | 60 ++++++++++++++++++++++++++++++++++++-------- audio/mserv/patches/patch-af | 31 ++++++++--------------- audio/mserv/patches/patch-ag | 37 ++++++++++++++++----------- audio/mserv/patches/patch-ah | 22 ++++++---------- 10 files changed, 139 insertions(+), 146 deletions(-) (limited to 'audio/mserv') diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile index 4c2d1229532..e2cb8959d04 100644 --- a/audio/mserv/Makefile +++ b/audio/mserv/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2002/06/14 20:04:07 abs Exp $ +# $NetBSD: Makefile,v 1.4 2002/07/31 14:02:44 abs Exp $ # DISTNAME= mserv-0.33 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= audio MASTER_SITES= http://www.mserv.org/download/ diff --git a/audio/mserv/distinfo b/audio/mserv/distinfo index caf7384b0a9..e2c6eedf2b9 100644 --- a/audio/mserv/distinfo +++ b/audio/mserv/distinfo @@ -1,12 +1,14 @@ -$NetBSD: distinfo,v 1.3 2002/06/14 20:04:07 abs Exp $ +$NetBSD: distinfo,v 1.4 2002/07/31 14:02:44 abs Exp $ SHA1 (mserv-0.33.tar.gz) = 4aa66852057942341d9da9c6f839d7ee250f6785 Size (mserv-0.33.tar.gz) = 136456 bytes -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 +SHA1 (patch-aa) = 3048bb4253bdd1825495782ba1c3e26bbfb68255 +SHA1 (patch-ab) = cf95b1db0f6c5d58c45805195aaa6321d80abdaa +SHA1 (patch-ac) = a8c5fa8039b92318afae6e48329e799e3acc226a +SHA1 (patch-ad) = 59497df92f71a54b34752086a27db1e05482e7dc +SHA1 (patch-ae) = 6954c13dc501ff0ea55cee19301d584130ca0d24 +SHA1 (patch-af) = 819c178948b6aff9352ef35b45e13ab8f0ff84df +SHA1 (patch-ag) = e4e2f19bc1b14b20d5a03f7362026a61ffb291bc +SHA1 (patch-ah) = a1cf71e18c3775738af68328aa423277ddb21372 +SHA1 (patch-ai) = eed5668942fdc801685aeda8aa2c31ec24d03729 +SHA1 (patch-aj) = 91080a55922bbd46a4ba55dc4641dfa0171a553e diff --git a/audio/mserv/patches/patch-aa b/audio/mserv/patches/patch-aa index ccdbdac3183..84c680c95f9 100644 --- a/audio/mserv/patches/patch-aa +++ b/audio/mserv/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2002/06/14 20:04:07 abs Exp $ +$NetBSD: patch-aa,v 1.3 2002/07/31 14:02:44 abs Exp $ ---- Makefile.orig Sat Jul 15 18:29:10 2000 +--- Makefile.orig Sat Jul 15 19:29:10 2000 +++ Makefile -@@ -2,11 +2,11 @@ +@@ -2,11 +2,11 @@ PWD = ${shell pwd} BASE = ${shell basename ${PWD}} default: diff --git a/audio/mserv/patches/patch-ab b/audio/mserv/patches/patch-ab index 839817f000b..b6337b88f47 100644 --- a/audio/mserv/patches/patch-ab +++ b/audio/mserv/patches/patch-ab @@ -1,14 +1,12 @@ -$NetBSD: patch-ab,v 1.3 2002/06/14 20:04:07 abs Exp $ +$NetBSD: patch-ab,v 1.4 2002/07/31 14:02:44 abs 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/cmd.c.orig Wed Jul 31 14:59:21 2002 ++++ mserv/cmd.c +@@ -2790,6 +2790,7 @@ static void mserv_cmd_reset(t_client *cl + return; + } + mserv_log("Reset initiated by %s", cl->user); ++ mserv_broadcast("RESETGO", "%s", cl->user); + mserv_reset(); + mserv_broadcast("RESET", "%s", cl->user); + if (cl->mode != mode_human) diff --git a/audio/mserv/patches/patch-ac b/audio/mserv/patches/patch-ac index da2ed060c79..eb59292eb60 100644 --- a/audio/mserv/patches/patch-ac +++ b/audio/mserv/patches/patch-ac @@ -1,12 +1,14 @@ -$NetBSD: patch-ac,v 1.1 2002/06/14 20:04:07 abs Exp $ +$NetBSD: patch-ac,v 1.2 2002/07/31 14:02:44 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") +--- 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() */ diff --git a/audio/mserv/patches/patch-ad b/audio/mserv/patches/patch-ad index 7482045d097..5f83ec21ceb 100644 --- a/audio/mserv/patches/patch-ad +++ b/audio/mserv/patches/patch-ad @@ -1,51 +1,12 @@ -$NetBSD: patch-ad,v 1.1 2002/06/14 20:04:08 abs Exp $ +$NetBSD: patch-ad,v 1.2 2002/07/31 14:02:45 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 +--- 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") -+ 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 <&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 index 5911a5fc5b3..da9e0794120 100644 --- a/audio/mserv/patches/patch-ae +++ b/audio/mserv/patches/patch-ae @@ -1,13 +1,51 @@ -$NetBSD: patch-ae,v 1.1 2002/06/14 20:04:08 abs Exp $ +$NetBSD: patch-ae,v 1.2 2002/07/31 14:02:45 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 +--- mserv/configure.orig Sat Jul 15 19:33:45 2000 ++++ mserv/configure +@@ -1201,6 +1201,46 @@ else + 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 <&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-af b/audio/mserv/patches/patch-af index 29cb26b1efa..ecf4ccd1723 100644 --- a/audio/mserv/patches/patch-af +++ b/audio/mserv/patches/patch-af @@ -1,24 +1,13 @@ -$NetBSD: patch-af,v 1.1 2002/06/14 20:04:08 abs Exp $ +$NetBSD: patch-af,v 1.2 2002/07/31 14:02:45 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" - */ +--- mserv/defconf.c.orig Thu Jul 13 22:20:42 2000 ++++ mserv/defconf.c +@@ -15,7 +15,7 @@ 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 + # 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 -@@ -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 index 7681f64946d..715b72ec7fb 100644 --- a/audio/mserv/patches/patch-ag +++ b/audio/mserv/patches/patch-ag @@ -1,15 +1,24 @@ -$NetBSD: patch-ag,v 1.1 2002/06/14 20:04:08 abs Exp $ +$NetBSD: patch-ag,v 1.2 2002/07/31 14:02:45 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(); +--- mserv/defines.h.orig Thu Jul 13 22: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-ah b/audio/mserv/patches/patch-ah index 949d10d1478..2f1fc6e2f9e 100644 --- a/audio/mserv/patches/patch-ah +++ b/audio/mserv/patches/patch-ah @@ -1,15 +1,9 @@ -$NetBSD: patch-ah,v 1.1 2002/06/14 20:04:08 abs Exp $ +$NetBSD: patch-ah,v 1.2 2002/07/31 14:02:45 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, +--- mserv/english.lang.orig Wed Jul 31 14:58:06 2002 ++++ mserv/english.lang +@@ -207,3 +207,4 @@ DELAY 636 The delay between tracks has b + FILTER 637 Random play filter set to '%02' by %01 (%03 incl, %04 excl) + NFILTER 638 Random play filter turned off by %01 + MEMORY 639 Out of memory ++RESETGO 640 Server reset initiated by %01 -- cgit v1.2.3