10 files changed, 36 insertions, 74 deletions

diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index 14271df56216..6f6949b4ec3c 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	daapd
-PORTVERSION=	0.2.3d
-PORTREVISION=	1
+PORTVERSION=	0.2.4b
 CATEGORIES=	audio
 MASTER_SITES=	http://www.deleet.de/projekte/daap/daapd/
 EXTRACT_SUFX=	.tgz
@@ -15,14 +14,15 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Server for Digital Audio Access Protocol
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libid3tag.a:${PORTSDIR}/audio/mad \
-		${LOCALBASE}/lib/libdaaplib.a:${PORTSDIR}/audio/daaplib \
-		${LOCALBASE}/lib/libhttpd-persistent.a:${PORTSDIR}/www/libhttpd-persistent
+BUILD_DEPENDS=	daaplib>=0.1.1a_2:${PORTSDIR}/audio/daaplib \
+		libhttpd-persistent>=1.3h_1:${PORTSDIR}/www/libhttpd-persistent
+RUN_DEPENDS=	${BUILD_DEPENDS}
+LIB_DEPENDS=	id3tag:${PORTSDIR}/audio/libid3tag
 
+USE_GCC=	3.4+
 USE_GMAKE=	yes
 MAKEFILE=	makefile
-ALL_TARGET=	daapd
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	daapd
 
 MAN8=		daapd.8
 
@@ -70,9 +70,6 @@ pre-install:
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/daapd-example.conf ${PREFIX}/etc/daapd.conf.sample
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/daapd.sh > ${WRKDIR}/daapd.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/daapd.sh ${PREFIX}/etc/rc.d/daapd.sh
-	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-deinstall > ${PKGDEINSTALL}
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-message > ${PKGMESSAGE}
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo
index 90729d0690d9..bd14f016bc75 100644
--- a/audio/daapd/distinfo
+++ b/audio/daapd/distinfo
@@ -1,3 +1,3 @@
-MD5 (daapd-0.2.3d.tgz) = 9cdf2e94b93001610f9f211866d94901
-SHA256 (daapd-0.2.3d.tgz) = 93ce36bea146d7497df0521b93430dc1bdeb922fee8a48ad020224323b512a17
-SIZE (daapd-0.2.3d.tgz) = 202317
+MD5 (daapd-0.2.4b.tgz) = 3a83294a9eb88b27bae7f5dd06394c49
+SHA256 (daapd-0.2.4b.tgz) = 80e552ae393dc230e4e18b0d906657a0a0166e14bf9150ac43ca54a02e1d4e4c
+SIZE (daapd-0.2.4b.tgz) = 205476
diff --git a/audio/daapd/files/daapd.sh b/audio/daapd/files/daapd.in
index 26b5f3b58f6b..26b5f3b58f6b 100644
--- a/audio/daapd/files/daapd.sh
+++ b/audio/daapd/files/daapd.in
diff --git a/audio/daapd/files/patch-README b/audio/daapd/files/patch-README
index 61f7919ac433..d5c7b2cdc34a 100644
--- a/audio/daapd/files/patch-README
+++ b/audio/daapd/files/patch-README
@@ -1,8 +1,8 @@
---- README.orig	Sat Jun 26 22:25:40 2004
-+++ README	Sat Jun 26 22:26:03 2004
+--- ./README.orig	Sun Mar  5 14:39:37 2006
++++ ./README	Thu Jul 20 14:04:13 2006
 @@ -65,7 +65,7 @@
  
- daapd [-dhqrv] [-c config-file] [-C cache-file] [-n name] [-p port] [-t vbr-limit] [file/directory]...
+ daapd [-dhqvz] [-c config-file] [-C cache-file] [-n name] [-p port] [-t vbr-limit] [file/directory]...
  
 -When called without command line arguments, daapd looks for a configuration file called /etc/daapd.conf. Failing that, it runs with the following default options:
 +When called without command line arguments, daapd looks for a configuration file called %%PREFIX%%/etc/daapd.conf. Failing that, it runs with the following default options:
diff --git a/audio/daapd/files/patch-daapd-example.conf b/audio/daapd/files/patch-daapd-example.conf
index 902353774936..5298d4dcd7a9 100644
--- a/audio/daapd/files/patch-daapd-example.conf
+++ b/audio/daapd/files/patch-daapd-example.conf
@@ -1,5 +1,5 @@
---- daapd-example.conf.orig	Sun Jun 13 22:57:18 2004
-+++ daapd-example.conf	Sun Jun 13 22:58:55 2004
+--- ./daapd-example.conf.orig	Sun Mar  5 14:39:37 2006
++++ ./daapd-example.conf	Thu Jul 20 14:04:13 2006
 @@ -1,8 +1,8 @@
  Port		3689
  ServerName 	daapd server
@@ -12,4 +12,4 @@
 +Root		/path/to/my/music
 +Cache		/var/db/daapd.cache
  Timescan	2
- Rescan		0
+ RescanInterval	60
diff --git a/audio/daapd/files/patch-daapd.8 b/audio/daapd/files/patch-daapd.8
index d90acb5dcf08..008324f28026 100644
--- a/audio/daapd/files/patch-daapd.8
+++ b/audio/daapd/files/patch-daapd.8
@@ -1,6 +1,6 @@
---- daapd.8.orig	Sat Jun 26 22:30:28 2004
-+++ daapd.8	Sat Jun 26 22:30:41 2004
-@@ -48,7 +48,7 @@
+--- ./daapd.8.orig	Sun Mar  5 14:39:37 2006
++++ ./daapd.8	Thu Jul 20 14:04:13 2006
+@@ -53,7 +53,7 @@
  .It Fl c Ar config-file
  Read configuration options from
  .Ar config-file .
diff --git a/audio/daapd/files/patch-daapd.cc b/audio/daapd/files/patch-daapd.cc
deleted file mode 100644
index 9fd6bda4ef04..000000000000
--- a/audio/daapd/files/patch-daapd.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- daapd.cc.orig	Tue Jun 15 22:54:30 2004
-+++ daapd.cc	Tue Jun 29 20:37:49 2004
-@@ -787,7 +787,7 @@
- 		}
- 	}
- 	
--	conf = fopen( "/etc/daapd.conf", "r" );
-+	conf = fopen( "/usr/local/etc/daapd.conf", "r" );
- 	if( conf != NULL ) {
- 		return( parseConfig( conf, initParams ) );
- 	}
-@@ -1041,6 +1041,10 @@
- 		perror ( "Couldn't create HTTP server" );	
- 		exit(1);
- 	}
-+
-+	// unbuffer stdout if redirected
-+	if (!isatty(fileno(stdout)))
-+		setvbuf(stdout, NULL, _IONBF, 0);
- 
- 	httpdSetAccessLog( server, stdout );
- 	httpdSetErrorLog( server, stderr ); 
diff --git a/audio/daapd/files/patch-db.cc b/audio/daapd/files/patch-db.cc
deleted file mode 100644
index 0d8f4620500a..000000000000
--- a/audio/daapd/files/patch-db.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- db.cc.orig	Wed Sep  1 23:42:10 2004
-+++ db.cc	Wed Sep  1 23:42:58 2004
-@@ -36,7 +36,7 @@
- #ifdef __APPLE__
- 	#include <malloc/malloc.h>
- #else
--	#include <malloc.h>
-+	#include <stdlib.h>
- #endif
- 
- #ifdef MPEG4_ENABLE
diff --git a/audio/daapd/files/patch-makefile b/audio/daapd/files/patch-makefile
index c14b657cf2de..1601d47f2e46 100644
--- a/audio/daapd/files/patch-makefile
+++ b/audio/daapd/files/patch-makefile
@@ -1,33 +1,32 @@
---- makefile.orig	Sat Aug 21 15:24:06 2004
-+++ makefile	Wed Sep  1 23:14:25 2004
-@@ -1,8 +1,6 @@
+--- ./makefile.orig	Sun Mar  5 14:39:37 2006
++++ ./makefile	Thu Jul 20 14:04:28 2006
+@@ -1,21 +1,18 @@
  # configure daapd here
  
 -HOWL_ENABLE = 1
  ZLIB_ENABLE = 1
--MPEG4_ENABLE = 1
+-MPEG4_ENABLE = 0
  
  
  # no need to touch anything below this line
-@@ -11,13 +9,12 @@
- CC = g++
+ # -----------------------------------------
+ 
+-CC = g++
++CC = ${CXX}
  MAKE = $(MAKE_COMMAND)
  TARGET = daapd
 -DEPS = daaplib_ libhttpd_
- OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o
--LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz -lpthread 
+ OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o util.o
+ 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
-+LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz $(PTHREAD_LIBS)
-+LIBPATH = -L. -L/usr/local/lib
-+INCPATH = -I. -I/usr/local/include
- DEPLOY = /usr/local
--CFLAGS = -Wall -Wno-multichar
-+CFLAGS = -Wall -Wno-multichar $(PTHREAD_CFLAGS)
- 
- # HOWL
- ifeq ($(HOWL_ENABLE),1)
-@@ -54,28 +51,17 @@
++LIBPATH = -L. -L%%LOCALBASE%%/lib
++INCPATH = -I. -I%%LOCALBASE%%/include
+-DEPLOY = /usr/local
++DEPLOY = %%PREFIX%%
+ CFLAGS = -Wall -Wno-multichar
+ 
+@@ -60,28 +57,17 @@
  .cc.o:
  	$(CC) $(CFLAGS) $(INCPATH) -c $<
  
diff --git a/audio/daapd/pkg-plist b/audio/daapd/pkg-plist
index d3d045d65f2f..d50942ac4c09 100644
--- a/audio/daapd/pkg-plist
+++ b/audio/daapd/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 etc/daapd.conf.sample
-etc/rc.d/daapd.sh
 sbin/daapd
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%