diff options
author | mjl <mjl@pkgsrc.org> | 2005-01-06 14:43:09 +0000 |
---|---|---|
committer | mjl <mjl@pkgsrc.org> | 2005-01-06 14:43:09 +0000 |
commit | 79d3d0e9973146dca48a48137b2db3fbc0661253 (patch) | |
tree | 0af52dfc3c9ca0980950076fda87e9a6eef47ab5 | |
parent | 6c45ee26da52caae512699572d01a440e5e6fd5d (diff) | |
download | pkgsrc-79d3d0e9973146dca48a48137b2db3fbc0661253.tar.gz |
Update to daapd 0.2.4a
- Bugfixes and additions to static playlists.
- Adds static playlists. daapd reads playlists in M3U, M3U extended
and PLS format.
-rw-r--r-- | audio/daapd/Makefile | 6 | ||||
-rw-r--r-- | audio/daapd/PLIST | 4 | ||||
-rw-r--r-- | audio/daapd/distinfo | 8 | ||||
-rw-r--r-- | audio/daapd/files/daapd.sh | 12 | ||||
-rw-r--r-- | audio/daapd/patches/patch-aa | 33 |
5 files changed, 27 insertions, 36 deletions
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile index 97322450f86..85c3350b472 100644 --- a/audio/daapd/Makefile +++ b/audio/daapd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:41 reed Exp $ +# $NetBSD: Makefile,v 1.6 2005/01/06 14:43:09 mjl Exp $ -DISTNAME= daapd-0.2.3d -PKGREVISION= 1 +DISTNAME= daapd-0.2.4a +#PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tgz diff --git a/audio/daapd/PLIST b/audio/daapd/PLIST index aa0fe17751b..54f0c32a932 100644 --- a/audio/daapd/PLIST +++ b/audio/daapd/PLIST @@ -1,3 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/05 19:07:51 nathanw Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/01/06 14:43:09 mjl Exp $ bin/daapd man/man8/daapd.8 +share/examples/daapd/daapd.conf +@dirrm share/examples/daapd diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo index e7ed73f174c..24e953cd85d 100644 --- a/audio/daapd/distinfo +++ b/audio/daapd/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2004/11/20 15:08:23 mjl Exp $ +$NetBSD: distinfo,v 1.3 2005/01/06 14:43:09 mjl Exp $ -SHA1 (daapd-0.2.3d.tgz) = 3ca12f0cb608a0be2d8351dbc341aa7d2a4f08f8 -Size (daapd-0.2.3d.tgz) = 202317 bytes -SHA1 (patch-aa) = 2378e996076279750f4373ce75c53f7f796ff2e3 +SHA1 (daapd-0.2.4a.tgz) = 175130c8b709fcac124857fe5a9eacdfbe00153c +Size (daapd-0.2.4a.tgz) = 205231 bytes +SHA1 (patch-aa) = 10fb4dfeac9a9e880ec323727ebaf0fdc6cadd35 SHA1 (patch-ac) = a3e203dcf6e7686795f8348fef5cc2272abdfc48 diff --git a/audio/daapd/files/daapd.sh b/audio/daapd/files/daapd.sh index 217fa200f43..8908f8a37f3 100644 --- a/audio/daapd/files/daapd.sh +++ b/audio/daapd/files/daapd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: daapd.sh,v 1.1 2004/11/20 15:08:23 mjl Exp $ +# $NetBSD: daapd.sh,v 1.2 2005/01/06 14:43:09 mjl Exp $ # # PROVIDE: daapd @@ -14,8 +14,14 @@ rcvar=$name command="@PREFIX@/bin/${name}" required_files="@PKG_SYSCONFDIR@/daapd.conf" command_args="-c $required_files 2>&1 > /dev/null &" -# pidfile="@JABBERD_PIDDIR@/${help_name}.pid" -# jabberd_user="@JABBERD_USER@" + +#if ps auxww | grep -v grep | grep -q mDNSResponder ; then +# echo "Runs: mDNSResponder" +# : +#else +# echo "Starting mDNSResponder" +# /usr/pkg/bin/mDNSResponder +#fi load_rc_config $name run_rc_command "$1" diff --git a/audio/daapd/patches/patch-aa b/audio/daapd/patches/patch-aa index 9769d67ff01..46946b16d9a 100644 --- a/audio/daapd/patches/patch-aa +++ b/audio/daapd/patches/patch-aa @@ -1,20 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2004/11/20 15:08:23 mjl Exp $ +$NetBSD: patch-aa,v 1.3 2005/01/06 14:43:09 mjl Exp $ ---- makefile.orig 2004-09-08 03:17:58.000000000 +0200 -+++ makefile 2004-11-20 15:13:35.000000000 +0100 -@@ -2,7 +2,7 @@ - - HOWL_ENABLE = 1 - ZLIB_ENABLE = 1 --MPEG4_ENABLE = 1 -+MPEG4_ENABLE = 0 - - - # no need to touch anything below this line -@@ -14,16 +14,16 @@ - DEPS = daaplib_ libhttpd_ - OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o - LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz -lpthread +--- makefile.orig 2005-01-05 00:18:48.000000000 +0100 ++++ makefile 2005-01-06 15:02:36.000000000 +0100 +@@ -16,6 +16,6 @@ + LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz -LIBPATH = -L. -L./daaplib/src -L./libhttpd/src -L/usr/local/lib -INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I/usr/local/include -DEPLOY = /usr/local @@ -24,22 +13,16 @@ $NetBSD: patch-aa,v 1.2 2004/11/20 15:08:23 mjl Exp $ +DEPLOY = ${PREFIX} +CFLAGS += -Wall -Wno-multichar - # HOWL +@@ -23,5 +23,5 @@ ifeq ($(HOWL_ENABLE),1) - HOWLDIRS := $(sort $(wildcard /usr/local/include/howl*) ) -+ HOWLDIRS := $(sort $(wildcard ${PREFIX}/include/howl*) ) ++ HOWLDIRS := $(sort $(wildcard ${PREFIX}/include/howl*) ) ifeq ($(words $(HOWLDIRS) ), 0) -$(error howl not found in /usr/local/include. Install howl or disable it in the makefile) +$(error howl not found in ${PREFIX}/include. Install howl or disable it in the makefile) endif - HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) ) - INCPATH := $(INCPATH) -I$(HOWLRECENT) -@@ -74,8 +74,6 @@ - rm $(OBJS) $(TARGET) - +@@ -82,4 +82,2 @@ install: $(DEPS) $(TARGET) - cd libhttpd && $(MAKE) install - cd daaplib/src && $(MAKE) install cp $(TARGET) $(DEPLOY)/bin - chmod a+rx $(DEPLOY)/bin/$(TARGET) - cp $(TARGET).8 $(DEPLOY)/man/man8 |