From d6bab7a71cd71f08b6484ea5393d6321184dc4cd Mon Sep 17 00:00:00 2001 From: bernd Date: Wed, 14 Jun 2006 12:37:52 +0000 Subject: [PATCH] - Remove trailing whitespaces. (From Jasper) - Install daemon into ${LOCALBASE}/sbin. (From steven@) - Fix pkg/DESCR (From steven@) - Really fix the OSS mixer stuff. ok Tobias Ulmer (MAINTAINER) ok naddy@ (for the mixer stuff) --- audio/mpd/Makefile | 5 +++-- audio/mpd/patches/patch-configure | 13 +++++++++++-- audio/mpd/patches/patch-doc_mpdconf_example | 6 +++--- audio/mpd/patches/patch-src_volume_c | 15 ++++++++++++--- audio/mpd/pkg/DESCR | 6 +++--- audio/mpd/pkg/MESSAGE | 4 ++-- audio/mpd/pkg/PLIST | 4 ++-- 7 files changed, 36 insertions(+), 17 deletions(-) diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile index 32b911da451..7ef16a9dc6a 100644 --- a/audio/mpd/Makefile +++ b/audio/mpd/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ +# $OpenBSD: Makefile,v 1.2 2006/06/14 12:37:52 bernd Exp $ COMMENT= "music player daemon" DISTNAME= mpd-0.11.5 +PKGNAME= ${DISTNAME}p0 CATEGORIES= audio HOMEPAGE= http://www.musicpd.org/ @@ -13,7 +14,7 @@ MAINTAINER= Tobias Ulmer PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_DISTFILES_FTP= Yes WANTLIB= c m pthread z ossaudio diff --git a/audio/mpd/patches/patch-configure b/audio/mpd/patches/patch-configure index cf0306d8fb4..595f0c69f44 100644 --- a/audio/mpd/patches/patch-configure +++ b/audio/mpd/patches/patch-configure @@ -1,6 +1,15 @@ -$OpenBSD: patch-configure,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ +$OpenBSD: patch-configure,v 1.2 2006/06/14 12:37:52 bernd Exp $ --- configure.orig Tue Nov 2 05:39:55 2004 -+++ configure Tue Apr 4 16:00:51 2006 ++++ configure Fri May 26 17:47:58 2006 +@@ -494,7 +494,7 @@ x_libraries=NONE + # and all the variables that are supposed to be based on exec_prefix + # by default will actually change. + # Use braces instead of parens because sh, perl, etc. also accept them. +-bindir='${exec_prefix}/bin' ++bindir='${exec_prefix}/sbin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' + datadir='${prefix}/share' @@ -19274,7 +19274,7 @@ fi { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} diff --git a/audio/mpd/patches/patch-doc_mpdconf_example b/audio/mpd/patches/patch-doc_mpdconf_example index cf0b2ed2d37..5de84e5d7f9 100644 --- a/audio/mpd/patches/patch-doc_mpdconf_example +++ b/audio/mpd/patches/patch-doc_mpdconf_example @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_mpdconf_example,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ +$OpenBSD: patch-doc_mpdconf_example,v 1.2 2006/06/14 12:37:52 bernd Exp $ --- doc/mpdconf.example.orig Tue Nov 2 05:03:21 2004 -+++ doc/mpdconf.example Fri Apr 7 18:46:01 2006 ++++ doc/mpdconf.example Tue Jun 13 17:26:48 2006 @@ -4,10 +4,10 @@ ##################### REQUIRED ########################### @@ -43,7 +43,7 @@ $OpenBSD: patch-doc_mpdconf_example,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ -#mixer_control "PCM" +mixer_type "oss" +mixer_device "/dev/mixer" -+mixer_control "master" ++mixer_control "vol" # # Software Mixer #mixer_type "software" diff --git a/audio/mpd/patches/patch-src_volume_c b/audio/mpd/patches/patch-src_volume_c index 03054ae82f3..7198b9bca1a 100644 --- a/audio/mpd/patches/patch-src_volume_c +++ b/audio/mpd/patches/patch-src_volume_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_volume_c,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ ---- src/volume.c.orig Tue Apr 4 16:03:01 2006 -+++ src/volume.c Tue Apr 4 16:03:09 2006 +$OpenBSD: patch-src_volume_c,v 1.2 2006/06/14 12:37:52 bernd Exp $ +--- src/volume.c.orig Tue Nov 2 05:03:22 2004 ++++ src/volume.c Tue Jun 13 17:26:31 2006 @@ -30,7 +30,7 @@ #include #include @@ -10,3 +10,12 @@ $OpenBSD: patch-src_volume_c,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ #endif #ifdef HAVE_ALSA #include +@@ -67,7 +67,7 @@ int volume_alsaSet = -1; + int prepOssMixer(char * device) { + int devmask = 0; + +- if((volume_ossFd = open(device,O_RDONLY))<0) { ++ if((volume_ossFd = open(device,O_RDWR))<0) { + WARNING("unable to open oss mixer \"%s\"\n",device); + return -1; + } diff --git a/audio/mpd/pkg/DESCR b/audio/mpd/pkg/DESCR index e278c9ec65a..8511915599e 100644 --- a/audio/mpd/pkg/DESCR +++ b/audio/mpd/pkg/DESCR @@ -1,6 +1,6 @@ Music Player Daemon allows remote access for playing music (mp3, ogg, flac, aac, mod and wav files) and managing playlists. MPD is designed for integrating a computer into a stereo system that -provides control for music playback over a local network. It is -also makes a great desktop music player and has serveral frontend -options. +provides control for music playback over a local network. +It also makes a great desktop music player and has serveral +frontend options. diff --git a/audio/mpd/pkg/MESSAGE b/audio/mpd/pkg/MESSAGE index 0183bb796da..0ce23232d30 100644 --- a/audio/mpd/pkg/MESSAGE +++ b/audio/mpd/pkg/MESSAGE @@ -7,6 +7,6 @@ otherwise MPD won't start. If you wish to have MPD started automatically at boot time, simply add the follow lines to /etc/rc.local: -if [ -x ${PREFIX}/bin/mpd ]; then - echo -n ' mpd'; ${PREFIX}/bin/mpd +if [ -x ${PREFIX}/sbin/mpd ]; then + echo -n ' mpd'; ${PREFIX}/sbin/mpd fi diff --git a/audio/mpd/pkg/PLIST b/audio/mpd/pkg/PLIST index 7f86d259645..bbb1c4f60d9 100644 --- a/audio/mpd/pkg/PLIST +++ b/audio/mpd/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2006/05/13 09:52:49 bernd Exp $ +@comment $OpenBSD: PLIST,v 1.2 2006/06/14 12:37:52 bernd Exp $ @newgroup _mpd:560 @newuser _mpd:560:560:daemon:Music Player Daemon:/var/empty:/sbin/nologin -bin/mpd @man man/man1/mpd.1 +sbin/mpd share/doc/mpd/ share/doc/mpd/COMMANDS share/doc/mpd/README