Update daapd to 0.2.3d

- Fixed a stupid bug in the howl callback. If you had problems with
  daapd showing up in iTunes (i.e. with the mDNS Responder), try this
  update.
- The howl API has changed as of howl 0.9.6.
- Added support for Xing/LAME headers. This speeds up parsing of MP3 files
  and in effect the complete initial scan of the filesystem.
- Fixed a few memory leaks.
- Fixed an issue in the makefile.
- Added auto-updates.
- Clients waiting for updates are automatically notified of changes in the
  database.
- daapd scans the filesystem periodically now. This happens in a
  separate thread.
- Transmissions are compressed with gzip now. This can be turned off with -z

5 files changed, 59 insertions, 40 deletions

diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index 4a8bfe72ef6..69918e61ca0 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/20 15:08:23 mjl Exp $
 
-DISTNAME=		daapd-0.2.2b
-PKGREVISION=	1
+DISTNAME=		daapd-0.2.3d
+# PKGREVISION=	1
 CATEGORIES=		audio
 MASTER_SITES=		${HOMEPAGE}
 EXTRACT_SUFX=		.tgz
@@ -12,9 +12,22 @@ COMMENT=		Server for DAA protocol (iTunes)
 
 USE_LANGUAGES=		c c++
 USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		YES
 USE_GNU_TOOLS+=		make
 MAKEFILE=		makefile
 
+RCD_SCRIPTS=		daapd
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+
+# PKG_SYSCONFSUBDIR=	${PKGBASE}
+
+CONF_FILES=    ${EGDIR}/daapd.conf ${PKG_SYSCONFDIR}/daapd.conf
+
+post-install:
+	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/daapd-example.conf ${EGDIR}/daapd.conf
+
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../net/howl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo
index 5893d6224f0..e7ed73f174c 100644
--- a/audio/daapd/distinfo
+++ b/audio/daapd/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/06/05 19:07:51 nathanw Exp $
+$NetBSD: distinfo,v 1.2 2004/11/20 15:08:23 mjl Exp $
 
-SHA1 (daapd-0.2.2b.tgz) = d1644a5baaa0d89b4e550fbc4e3d0b4590bc9690
-Size (daapd-0.2.2b.tgz) = 198250 bytes
-SHA1 (patch-aa) = 1ae5e6ed769ce4ed4e3ac3b33d081440d86e6ecd
-SHA1 (patch-ab) = c18447494745366099b5bfe666d45a9c528500a2
+SHA1 (daapd-0.2.3d.tgz) = 3ca12f0cb608a0be2d8351dbc341aa7d2a4f08f8
+Size (daapd-0.2.3d.tgz) = 202317 bytes
+SHA1 (patch-aa) = 2378e996076279750f4373ce75c53f7f796ff2e3
 SHA1 (patch-ac) = a3e203dcf6e7686795f8348fef5cc2272abdfc48
diff --git a/audio/daapd/files/daapd.sh b/audio/daapd/files/daapd.sh
new file mode 100644
index 00000000000..217fa200f43
--- /dev/null
+++ b/audio/daapd/files/daapd.sh
@@ -0,0 +1,21 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: daapd.sh,v 1.1 2004/11/20 15:08:23 mjl Exp $
+#
+
+# PROVIDE: daapd
+# REQUIRE: DAEMON LOGIN
+
+. /etc/rc.subr
+
+name="daapd"
+help_name=$name
+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@"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/audio/daapd/patches/patch-aa b/audio/daapd/patches/patch-aa
index 02dcf6d15d9..9769d67ff01 100644
--- a/audio/daapd/patches/patch-aa
+++ b/audio/daapd/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/06/05 19:07:51 nathanw Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/20 15:08:23 mjl Exp $
 
---- makefile.orig	2004-04-17 07:14:45.000000000 -0400
-+++ makefile	2004-06-04 15:34:59.000000000 -0400
-@@ -1,7 +1,7 @@
- # configure daapd here
+--- 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
-@@ -13,16 +13,14 @@
+@@ -14,16 +14,16 @@
  DEPS = daaplib_ libhttpd_
  OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o
- LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz 
--LIBPATH = -L. -L/usr/local/lib -L./daaplib/src -L./libhttpd/src
--INCPATH = -I. -I/usr/local/include -I./daaplib/include -I./libhttpd/src
+ LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz -lpthread 
+-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
 -CFLAGS = -Wall -Wno-multichar
 +LIBPATH = -L. ${LDFLAGS} -L./daaplib/src -L./libhttpd/src
@@ -26,14 +26,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/06/05 19:07:51 nathanw Exp $
  
  # HOWL
  ifeq ($(HOWL_ENABLE),1)
--	HOWLDIRS := $(sort $(wildcard /usr/local/include/howl-*) )
--	HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) )
--	INCPATH := $(INCPATH) -I$(HOWLRECENT)
-+	INCPATH := $(INCPATH) -I${PREFIX}/include/howl
- 	LIBS := $(LIBS) -lpthread -lhowl
- 	CFLAGS := $(CFLAGS) -DHOWL_ENABLE
- 	ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __APPLE__),)
-@@ -70,8 +68,6 @@
+-	HOWLDIRS := $(sort $(wildcard /usr/local/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)
  
  install: $(DEPS) $(TARGET)
diff --git a/audio/daapd/patches/patch-ab b/audio/daapd/patches/patch-ab
deleted file mode 100644
index a1cf245bea9..00000000000
--- a/audio/daapd/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/06/05 19:07:51 nathanw Exp $
-
---- daaplib/src/makefile.orig	2004-04-13 19:35:14.000000000 -0400
-+++ daaplib/src/makefile	2004-06-04 13:58:11.000000000 -0400
-@@ -8,8 +8,8 @@
- 

- LIBS = 

- LIBPATH = 

--LIBDEPLOY = /usr/local/lib

--INCDEPLOY = /usr/local/include

-+LIBDEPLOY = ${PREFIX}/lib

-+INCDEPLOY = ${PREFIX}/include

- INCPATH = ../include

- CFLAGS = -Wall -Wno-multichar

-