Fix build with GCC 4.x:

- Use "-ffriend-injection" to get "daaplib" to build again.
- Use proper return values in iterators in "libhttpd-persistent".

4 files changed, 140 insertions, 2 deletions

diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index 135ce54c247..9ecc2d58679 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/05/31 10:54:42 tonio Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/03 02:18:15 tron Exp $
 
 DISTNAME=		daapd-0.2.4b
 PKGREVISION=		1
@@ -42,6 +42,18 @@ SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	daapd.8 daapd.cc
 SUBST_SED.paths=	-e 's,/etc/,${PKG_SYSCONFDIR}/,g'
 
+.include "../../mk/compiler.mk"
+
+.if !empty(CC_VERSION:Mgcc-4.1.*)
+CFLAGS+=		-ffriend-injection
+.endif
+
+post-extract:
+	for FILE in `${FIND} ${WRKSRC}/daaplib -type f -print`; do	\
+	  ${TR} -d \\r <$${FILE} >$${FILE}.new;				\
+	  ${MV} $${FILE}.new $${FILE};					\
+	done
+
 post-install:
 	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo
index b1e98247c3f..1def4da231d 100644
--- a/audio/daapd/distinfo
+++ b/audio/daapd/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.14 2006/04/23 18:25:27 tonio Exp $
+$NetBSD: distinfo,v 1.15 2006/07/03 02:18:15 tron Exp $
 
 SHA1 (daapd-0.2.4b.tgz) = 0903303f155c19ae12cdc78be05799508156a16b
 RMD160 (daapd-0.2.4b.tgz) = 899b37b3872623ef918f7faa4eb8bad2dfc5b369
 Size (daapd-0.2.4b.tgz) = 205476 bytes
 SHA1 (patch-aa) = c10564ede45fa92b18926da68a7a9a2d9547627d
+SHA1 (patch-ab) = 4b6e743a4de3f476ad73c13ecc19397d418e2731
+SHA1 (patch-ac) = 0a4e3dfb010bbf2cc01843987c970548cb4c646f
diff --git a/audio/daapd/patches/patch-ab b/audio/daapd/patches/patch-ab
new file mode 100644
index 00000000000..696463a5181
--- /dev/null
+++ b/audio/daapd/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2006/07/03 02:18:15 tron Exp $
+
+--- daaplib/src/makefile.orig	2006-03-05 13:39:36.000000000 +0000
++++ daaplib/src/makefile	2006-07-03 02:37:56.000000000 +0100
+@@ -11,7 +11,7 @@
+ LIBDEPLOY = /usr/local/lib
+ INCDEPLOY = /usr/local/include
+ INCPATH = ../include
+-CFLAGS = -Wall -Wno-multichar
++CFLAGS += -Wall -Wno-multichar
+ 
+ .cpp.o:
+ 	$(CC) $(CFLAGS) -I$(INCPATH) -c $<
diff --git a/audio/daapd/patches/patch-ac b/audio/daapd/patches/patch-ac
new file mode 100644
index 00000000000..7cff9e08aae
--- /dev/null
+++ b/audio/daapd/patches/patch-ac
@@ -0,0 +1,111 @@
+$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;
+ 		}