audio: Remove daapd, successor forked-daapd

16 files changed, 1 insertions, 490 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 67378ed6adb..5c6a6908232 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.616 2020/11/02 14:00:47 nia Exp $
+# $NetBSD: Makefile,v 1.617 2020/11/02 14:04:41 nia Exp $
 #
 
 COMMENT=	Audio tools
@@ -62,7 +62,6 @@ SUBDIR+=	csound5
 SUBDIR+=	csound5-manual
 SUBDIR+=	csound6
 SUBDIR+=	csound6-manual
-SUBDIR+=	daapd
 SUBDIR+=	dap
 SUBDIR+=	darkice
 SUBDIR+=	deforaos-mixer
diff --git a/audio/daapd/DESCR b/audio/daapd/DESCR
deleted file mode 100644
index 1e01c36ec50..00000000000
--- a/audio/daapd/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Server for DAAP, the digital audio access protocol
-Copyright deleet 2003, Alexander Oberdorster
-
-daapd scans a directory for mp3 files and makes them available via the Apple
-proprietary protocol DAAP. DAAP clients can browse the directory and retrieve
-individual files, either by streaming or by downloading them.
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
deleted file mode 100644
index e1fee326711..00000000000
--- a/audio/daapd/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2020/11/02 10:34:48 nia Exp $
-
-DISTNAME=		daapd-0.2.4b
-PKGREVISION=		1
-CATEGORIES=		audio
-MASTER_SITES=		${HOMEPAGE}
-EXTRACT_SUFX=		.tgz
-
-MAINTAINER=		nathanw@NetBSD.org
-HOMEPAGE=		http://www.deleet.de/projekte/daap/daapd/
-COMMENT=		Server for DAA protocol (iTunes)
-LICENSE=		gnu-gpl-v2
-
-MAKE_JOBS_SAFE=		no
-
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-MAKE_FILE=		makefile
-
-RCD_SCRIPTS=		daapd
-EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-
-CONF_FILES=		${EGDIR}/daapd.conf ${PKG_SYSCONFDIR}/daapd.conf
-
-MAKE_ENV+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	daapd.8 daapd.cc
-SUBST_SED.paths=	-e 's,/etc/,${PKG_SYSCONFDIR}/,g'
-
-INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man8 ${EGDIR}
-
-post-extract:
-	for FILE in `${FIND} ${WRKSRC}/daaplib -type f -print`; do	\
-	  ${TR} -d \\r <$${FILE} >$${FILE}.new;				\
-	  ${MV} $${FILE}.new $${FILE};					\
-	done
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/daapd ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/daapd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA} ${WRKSRC}/daapd-example.conf ${DESTDIR}${EGDIR}/daapd.conf
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../net/howl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/daapd/PLIST b/audio/daapd/PLIST
deleted file mode 100644
index f23d4c8999d..00000000000
--- a/audio/daapd/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:04:57 jperkin Exp $
-bin/daapd
-man/man8/daapd.8
-share/examples/daapd/daapd.conf
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo
deleted file mode 100644
index 3bd42305d6a..00000000000
--- a/audio/daapd/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.26 2020/03/26 21:51:24 joerg Exp $
-
-SHA1 (daapd-0.2.4b.tgz) = 0903303f155c19ae12cdc78be05799508156a16b
-RMD160 (daapd-0.2.4b.tgz) = 899b37b3872623ef918f7faa4eb8bad2dfc5b369
-SHA512 (daapd-0.2.4b.tgz) = dfead46eb71122906b6e9165ae79a4bfcadbb18b5969b619bb9a7e1f7795b01d0a36c1efc9dae5d5d97eeb000cdddc2c128a408f55be3916b397e026357da8e6
-Size (daapd-0.2.4b.tgz) = 205476 bytes
-SHA1 (patch-aa) = c10564ede45fa92b18926da68a7a9a2d9547627d
-SHA1 (patch-ac) = 0a4e3dfb010bbf2cc01843987c970548cb4c646f
-SHA1 (patch-ad) = 4b132fc143d3b29ff2235eacb5c2eaa438cd816c
-SHA1 (patch-ae) = 3433d7e944999e10690ccdda1d49d3c711671446
-SHA1 (patch-af) = 84086c0ee508c07e3cec07a723e07270be667c56
-SHA1 (patch-ag) = cf0dc389fb2a031883f52c348d8303dd36b33818
-SHA1 (patch-daapd.cc) = 9107fc35ca6eb8a9841f986342781769bc29a9d2
-SHA1 (patch-libhttpd_configure) = 91a7a942a078bda76582cbdf0cc1d3ae8b7029cb
-SHA1 (patch-types.h) = b609e6e47c2dc14bb3013d75f44c6bedeae8aff5
-SHA1 (patch-util.cc) = 18f0158016f56d9253459b2efe6ed528bac750c0
diff --git a/audio/daapd/files/daapd.sh b/audio/daapd/files/daapd.sh
deleted file mode 100644
index 9850ed35e53..00000000000
--- a/audio/daapd/files/daapd.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: daapd.sh,v 1.5 2006/01/01 18:34:13 tron Exp $
-#
-
-# PROVIDE: daapd
-# REQUIRE: DAEMON LOGIN howl
-
-. /etc/rc.subr
-
-name="daapd"
-rcvar=$name
-command="@PREFIX@/bin/${name}"
-required_files="@PKG_SYSCONFDIR@/daapd.conf"
-command_args="</dev/null >/dev/null 2>&1 &"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/audio/daapd/patches/patch-aa b/audio/daapd/patches/patch-aa
deleted file mode 100644
index 46de10fa4fa..00000000000
--- a/audio/daapd/patches/patch-aa
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2006/04/23 18:25:27 tonio Exp $
-
---- makefile.orig	2006-03-05 14:39:37.000000000 +0100
-+++ makefile
-@@ -2,28 +2,28 @@
- 
- HOWL_ENABLE = 1
- ZLIB_ENABLE = 1
--MPEG4_ENABLE = 0
-+MPEG4_ENABLE = $(WITH_FAAD)
- 
- 
- # no need to touch anything below this line
- # -----------------------------------------
- 
--CC = g++
-+CC = $(CXX)
- MAKE = $(MAKE_COMMAND)
- TARGET = daapd
- DEPS = daaplib_ libhttpd_
- 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
--DEPLOY = /usr/local
--CFLAGS = -Wall -Wno-multichar
-+LIBPATH = -L. -L./daaplib/src -L./libhttpd/src  -L$(PREFIX)/lib $(LDFLAGS)
-+INCPATH = -I. -I./daaplib/include -I./libhttpd/src  -I$(PREFIX)/include
-+DEPLOY = $(PREFIX)
-+CFLAGS += -Wall -Wno-multichar
- 
- # HOWL
- ifeq ($(HOWL_ENABLE),1)
--	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)
-@@ -46,11 +46,7 @@ ifneq ($(shell $(CC) -E -dM - < /dev/nul
- 	LIBS := $(LIBS) -lsocket -lnsl
- endif
- 
--ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __FreeBSD__),)
--	LIBS := $(LIBS) -pthread
--else
--	LIBS := $(LIBS) -lpthread
--endif
-+LIBS+=	${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- 
- ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __sgi__),)
- 	LIBS := $(LIBS) /usr/lib/snprintf.o
-@@ -80,8 +76,6 @@ clean:
- 	rm $(OBJS) $(TARGET)
- 
- 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
diff --git a/audio/daapd/patches/patch-ac b/audio/daapd/patches/patch-ac
deleted file mode 100644
index 7cff9e08aae..00000000000
--- a/audio/daapd/patches/patch-ac
+++ /dev/null
@@ -1,111 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/07/03 02:18:15 tron Exp $
-
---- libhttpd/src/select.h.orig	2006-03-05 14:00:38.000000000 +0000
-+++ libhttpd/src/select.h	2006-07-03 03:10:45.000000000 +0100
-@@ -81,7 +81,7 @@
- 			c++;
- 		}
- 	
--		return 0;
-+		return c;
- 	}
- 
- 
-@@ -154,7 +154,7 @@
- 	
- 	void erase( const int fDesc ) {
- 		ClientIterator c;
--		if ((c = locateFDesc(fDesc)) != 0) {
-+		if ((c = locateFDesc(fDesc)) != clientList.end()) {
- 			clientList.erase(c);
- 			close(fDesc);
- 		}
-@@ -162,14 +162,14 @@
- 
- 	void finish( const int fDesc ) {
- 		ClientIterator c;
--		if ((c = locateFDesc(fDesc)) != 0) {
-+		if ((c = locateFDesc(fDesc)) != clientList.end()) {
- 			c->finished = true;
- 		}
- 	}
- 
- 	void address( const int fDesc, char address[HTTP_IP_ADDR_LEN] ) {
- 		ClientIterator c;
--		if ((c = locateFDesc(fDesc)) != 0) {
-+		if ((c = locateFDesc(fDesc)) != clientList.end()) {
- 			strncpy(address, c->address, HTTP_IP_ADDR_LEN);
- 		}
- 	}
-@@ -180,7 +180,7 @@
- 
- 	int readBuf(const int fDesc, char *destBuf, const uint len) {
- 		ClientIterator c;
--		if ((c = locateFDesc(fDesc)) == 0) {
-+		if ((c = locateFDesc(fDesc)) == clientList.end()) {
- 			// printf("unknown client id %d\n", fDesc);
- 			return 0;
- 		}
-@@ -192,7 +192,7 @@
- 		
- 	int readLine(const int fDesc, char *destBuf, const uint len) {
- 		ClientIterator c;
--		if ((c = locateFDesc(fDesc)) == 0) {
-+		if ((c = locateFDesc(fDesc)) == clientList.end()) {
- 			// printf("unknown client id %d\n", fDesc);
- 			return 0;
- 		}
-@@ -217,7 +217,7 @@
- 	int handleWrite(int socket) {
- 		int bytesWritten;
- 		ClientIterator c;
--		if ((c = locateFDesc(socket)) == 0) {
-+		if ((c = locateFDesc(socket)) == clientList.end()) {
- 			// printf("unknown client id %d\n", socket);
- 			return 2;
- 		}
-@@ -260,7 +260,7 @@
- 			return 1;
- 		} else {
- 			ClientIterator c;
--			if ((c = locateFDesc(fDesc)) == 0) {
-+			if ((c = locateFDesc(fDesc)) == clientList.end()) {
- 				// printf("unknown client id %d\n", fDesc);
- 				return 2;
- 			}
-@@ -304,7 +304,7 @@
- 	
- 	void doWrite(const int fDesc, const char* string, const uint len) {
- 		ClientIterator c;
--		if ((c = locateFDesc(fDesc)) == 0) {
-+		if ((c = locateFDesc(fDesc)) == clientList.end()) {
- 			//printf("unknown client id %d\n", fDesc);
- 			return;
- 		}
-@@ -318,7 +318,7 @@
- 
- 	void doWrite(const int fDesc, const char* string) {
- 		ClientIterator c;
--		if ((c = locateFDesc(fDesc)) == 0) {
-+		if ((c = locateFDesc(fDesc)) == clientList.end()) {
- 			//printf("unknown client id %d\n", fDesc);
- 			return;
- 		}
-@@ -351,7 +351,7 @@
- 
- 	void queueFile(const int socket, const int pendingFile ) {
- 		ClientIterator c;
--		if ((c = locateFDesc(socket)) == 0) {
-+		if ((c = locateFDesc(socket)) == clientList.end()) {
- 			// printf("unknown client id %d\n", socket);
- 			return;
- 		}
-@@ -360,7 +360,7 @@
- 
- 	void subscribe(const int fDesc) {
- 		ClientIterator c;
--		if ((c = locateFDesc(fDesc)) == 0) {
-+		if ((c = locateFDesc(fDesc)) == clientList.end()) {
- 			//printf("unknown client id %d\n", fDesc);
- 			return;
- 		}
diff --git a/audio/daapd/patches/patch-ad b/audio/daapd/patches/patch-ad
deleted file mode 100644
index aa83999d6d0..00000000000
--- a/audio/daapd/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2011/11/26 17:09:32 joerg Exp $
-
---- daaplib/include/daap/tagoutput.h.orig	2011-11-26 15:54:46.000000000 +0000
-+++ daaplib/include/daap/tagoutput.h
-@@ -25,6 +25,7 @@
- 	
- 	#include <daap/basic.h>
- 	#include <string>
-+	#include <string.h>
- 	#include <vector>
- 	#include <assert.h>
- 
-@@ -98,9 +99,7 @@
- 			return( func( *this ));
- 		}
- 			
--		friend inline TagOutput& end( TagOutput& x ) {
--			return( x.closeTag());
--		}
-+		friend inline TagOutput& end( TagOutput& x );
- 		
- 	protected:
- 		typedef std::vector<u8>  DataInt8;
-@@ -125,4 +124,8 @@
- 		TagOutput( const TagOutput& );
- 		TagOutput& operator = ( const TagOutput& );
- 	};
-+
-+	inline TagOutput& end( TagOutput& x ) {
-+		return( x.closeTag());
-+	}
- #endif
diff --git a/audio/daapd/patches/patch-ae b/audio/daapd/patches/patch-ae
deleted file mode 100644
index 075f2543308..00000000000
--- a/audio/daapd/patches/patch-ae
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/07/03 13:58:31 tron Exp $
-
---- daaplib/include/daap/taginput.h.orig	2006-07-03 14:32:01.000000000 +0100
-+++ daaplib/include/daap/taginput.h	2006-07-03 14:36:37.000000000 +0100
-@@ -71,9 +71,7 @@
- 			return( func( *this ));
- 		}
- 			
--		friend inline TagInput& end( TagInput& x ) {
--			return( x.closeTag() );
--		}
-+		friend inline TagInput& end( TagInput& x );
- 
- 
- 		//////
-@@ -95,15 +93,9 @@
- 			return( *this );
- 		}
- 
--		friend inline TagInput& skipTag( TagInput& x ) {
--			x.skipTag();
--			return( x );
--		}
-+		friend inline TagInput& skipTag( TagInput& x );
- 
--		friend inline TagInput& skipRestOfTag( TagInput& x ) {
--			x.skipRestOfTag();
--			return( x );
--		}
-+		friend inline TagInput& skipRestOfTag( TagInput& x );
- 
- 	protected:
- 		typedef std::vector<u32> StackInt32;
-@@ -131,4 +123,20 @@
- 		TagInput( const TagInput& );
- 		TagInput& operator = ( const TagInput& );
- 	};
-+
-+	inline TagInput& end( TagInput& x ) {
-+		return( x.closeTag() );
-+	}
-+
-+
-+	inline TagInput& skipTag( TagInput& x ) {
-+		x.skipTag();
-+		return( x );
-+	}
-+
-+	inline TagInput& skipRestOfTag( TagInput& x ) {
-+		x.skipRestOfTag();
-+		return( x );
-+	}
-+
- #endif
diff --git a/audio/daapd/patches/patch-af b/audio/daapd/patches/patch-af
deleted file mode 100644
index 9e32748ae17..00000000000
--- a/audio/daapd/patches/patch-af
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-af,v 1.2 2020/03/26 21:51:24 joerg Exp $
-
---- db.cc.orig	2006-03-05 13:39:37.000000000 +0000
-+++ db.cc
-@@ -180,14 +180,14 @@ void Database::addMp3( std::string& path
- 	
- 		if( getId3TextFrame( tag, "TRCK", s ) == 0 ) {
- 			song->tracknumber = strtol( s.c_str(), NULL, 10 );
--			char *sp;
-+			const char *sp;
- 			if( ( sp = strchr( s.c_str(), '/' ) ) != 0 ) 
- 				song->trackcount = strtol( sp+1, NULL, 10 );
- 		}
- 					
- 		if( getId3TextFrame( tag, "TPOS", s ) == 0 ) {
- 			song->discnumber = strtol( s.c_str(), NULL, 10 );
--			char *sp;
-+			const char *sp;
- 			if( ( sp = strchr( s.c_str(), '/' ) ) != 0 ) 
- 				song->disccount = strtol( sp+1, NULL, 10 );
- 		}
-@@ -325,7 +325,7 @@ void Database::addM4a( std::string& path
- 			MP4TrackId trackId = MP4FindTrackId(mp4file, 0);
- 			u32 timeScale = MP4GetTrackTimeScale(mp4file, trackId);
- 			MP4Duration trackDuration = MP4GetTrackDuration(mp4file, trackId);
--			double msDuration = UINT64_TO_DOUBLE(MP4ConvertFromTrackDuration(mp4file, trackId, trackDuration, MP4_MSECS_TIME_SCALE));
-+			double msDuration = (double)MP4ConvertFromTrackDuration(mp4file, trackId, trackDuration, MP4_MSECS_TIME_SCALE);
- 			u32 avgBitRate = MP4GetTrackBitRate(mp4file, trackId);
- 			song->time = (u32) (msDuration);
- 			song->bitrate = (u16) ((avgBitRate + 500) / 1000);
-@@ -413,7 +413,7 @@ int Database::getTypeFromExtension( std:
- 	// we just trust the user that files with extension
- 	// .mp3 are really mp3 files etc.
- 	// metadata in the filesystem would be cool :(
--	char *pointPos;
-+	const char *pointPos;
- 	if( ( pointPos = strrchr( fileName.c_str(), '.' ) ) != 0 ) {
- 		if( strlen( pointPos ) >= 5 ) {
- 			if( strncasecmp( pointPos, ".aiff", 5 ) == 0 ) {
diff --git a/audio/daapd/patches/patch-ag b/audio/daapd/patches/patch-ag
deleted file mode 100644
index 39e03734963..00000000000
--- a/audio/daapd/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2011/11/20 17:46:34 marino Exp $
-
---- daaplib/include/daap/basic.h.orig	2011-11-20 17:12:14.236503000 +0000
-+++ daaplib/include/daap/basic.h
-@@ -53,7 +53,7 @@
- 		typedef int32_t  s32;
- 		typedef int16_t  s16;
- 		typedef int8_t   s8;
--	#elif
-+	#else
- 		#error "uh - no idea what the int types could be!"
- 	#endif
- 
diff --git a/audio/daapd/patches/patch-daapd.cc b/audio/daapd/patches/patch-daapd.cc
deleted file mode 100644
index 8d50084b151..00000000000
--- a/audio/daapd/patches/patch-daapd.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-daapd.cc,v 1.1 2012/02/15 21:20:24 hans Exp $
-
---- daapd.cc.orig	2012-01-17 00:33:56.007883523 +0100
-+++ daapd.cc	2012-01-17 00:37:49.469248794 +0100
-@@ -29,6 +29,7 @@
- #include <cstring>
- #include <cassert>
- 
-+#include <limits.h>
- #include <unistd.h>
- #include <errno.h>
- #include <sys/time.h>
diff --git a/audio/daapd/patches/patch-libhttpd_configure b/audio/daapd/patches/patch-libhttpd_configure
deleted file mode 100644
index b17e828da6e..00000000000
--- a/audio/daapd/patches/patch-libhttpd_configure
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-libhttpd_configure,v 1.1 2011/09/12 05:01:15 dholland Exp $
-
-Since the package makefiles configure and build this library with a
-C++ compiler (even though AFAICT it's C code) the configure script had
-better use a valid C++ test program to see if the compiler works.
-
---- libhttpd/configure~	2006-03-05 13:39:37.000000000 +0000
-+++ libhttpd/configure
-@@ -662,7 +662,7 @@ cat > conftest.$ac_ext << EOF
- #line 663 "configure"
- #include "confdefs.h"
- 
--main(){return(0);}
-+int main(){return(0);}
- EOF
- if { (eval echo configure:668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
diff --git a/audio/daapd/patches/patch-types.h b/audio/daapd/patches/patch-types.h
deleted file mode 100644
index b3b9b4d745a..00000000000
--- a/audio/daapd/patches/patch-types.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-types.h,v 1.2 2014/08/19 13:30:39 joerg Exp $
-
---- types.h.orig	2014-08-19 12:33:06.000000000 +0000
-+++ types.h
-@@ -52,7 +52,7 @@
- 	__STL_BEGIN_NAMESPACE
- 		template<> struct hash<std::string> {
- 			size_t operator()(std::string __s) const { 
--				return __stl_hash_string( (const char*) __s.c_str() ); 
-+				return hash<const char *>()(__s.c_str()); 
- 			}
- 		};
- 	__STL_END_NAMESPACE
-@@ -60,7 +60,7 @@
- 	namespace __gnu_cxx {
- 		template<> struct hash<std::string> {
- 			size_t operator()(std::string __s) const { 
--				return __stl_hash_string( (const char*) __s.c_str() ); 
-+				return hash<const char *>()(__s.c_str()); 
- 			}
- 		};
- 	}
-@@ -69,7 +69,7 @@
- 	__STL_BEGIN_NAMESPACE
- 		template<> struct hash<std::string> {
- 			size_t operator()(std::string __s) const { 
--				return __stl_hash_string( (const char*) __s.c_str() ); 
-+				return hash<const char *>()(__s.c_str()); 
- 			}
- 		};
- 	__STL_END_NAMESPACE
-@@ -109,7 +109,7 @@ struct InitParams {
- 	}
- 
- 	~InitParams() {
--		free(dirs);
-+		delete dirs;
- 	}
- };
- 
diff --git a/audio/daapd/patches/patch-util.cc b/audio/daapd/patches/patch-util.cc
deleted file mode 100644
index 412000821dd..00000000000
--- a/audio/daapd/patches/patch-util.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-util.cc,v 1.1 2012/02/15 21:20:24 hans Exp $
-
---- util.cc.orig	2006-03-05 14:39:37.000000000 +0100
-+++ util.cc	2012-01-17 00:39:15.102002150 +0100
-@@ -27,6 +27,7 @@
- #include <string>
- #include <vector>
- 
-+#include <limits.h>
- #include <sys/param.h>
- #include <cstdlib>
-