From nobody@FreeBSD.org  Mon Oct 18 21:08:53 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 50AA316A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Oct 2004 21:08:53 +0000 (GMT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2497943D1D
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Oct 2004 21:08:53 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.11/8.12.11) with ESMTP id i9IL8qFH008225
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 18 Oct 2004 21:08:52 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.11/8.12.11/Submit) id i9IL8qiO008224;
	Mon, 18 Oct 2004 21:08:52 GMT
	(envelope-from nobody)
Message-Id: <200410182108.i9IL8qiO008224@www.freebsd.org>
Date: Mon, 18 Oct 2004 21:08:52 GMT
From: Tim Hawkins <timh@contentspace.demon.co.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: ports/audo/daapd fails to build on 6-current
X-Send-Pr-Version: www-2.3

>Number:         72849
>Category:       ports
>Synopsis:       ports/audo/daapd fails to build on 6-current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lth
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 18 21:10:31 GMT 2004
>Closed-Date:    Sun Nov 21 19:35:33 GMT 2004
>Last-Modified:  Sun Nov 21 19:35:33 GMT 2004
>Originator:     Tim Hawkins
>Release:        6-Current
>Organization:
Yahoo Europe
>Environment:
FreeBSD godzuki.contentspace.priv 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Thu Aug 19 23:39:07 BST 2004     root@godzuki.contentspace.priv:/usr/obj/usr/src/sys/GENERIC-current-locali386
      
>Description:
$ sudo make install clean
===>  Vulnerability check disabled, database not found
===>  Found saved configuration for daapd-0.2.2c_1
===>  Extracting for daapd-0.2.2c_1
>How-To-Repeat:
      
>Fix:
      
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lth 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Oct 20 04:09:19 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72849 

From: Michael Handler <handler@lair.grendel.net>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/72849: ports/audio/daapd fails to build on 6-current
Date: Fri, 5 Nov 2004 15:48:38 -0500 (EST)

 This is because the Howl API changed after 0.9.5; the daapd package
 needs to be updated to 0.2.3d, which uses the new Howl API. Here's a patch
 that I've tested and been using for a few weeks now.
 
 diff -ur /usr/ports/audio/daapd/Makefile ./Makefile
 --- /usr/ports/audio/daapd/Makefile	Tue Jul 27 16:04:09 2004
 +++ ./Makefile	Fri Oct 15 16:50:05 2004
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	daapd
 -PORTVERSION=	0.2.2c
 -PORTREVISION=	1
 +PORTVERSION=	0.2.3d
  CATEGORIES=	audio
  MASTER_SITES=	http://www.deleet.de/projekte/daap/daapd/
  EXTRACT_SUFX=	.tgz
 diff -ur /usr/ports/audio/daapd/distinfo ./distinfo
 --- /usr/ports/audio/daapd/distinfo	Tue Jun 29 20:17:37 2004
 +++ ./distinfo	Fri Oct 15 16:52:45 2004
 @@ -1,2 +1,2 @@
 -MD5 (daapd-0.2.2c.tgz) = 63ff586d479f3b7ea477789f3ca3dd42
 -SIZE (daapd-0.2.2c.tgz) = 199236
 +MD5 (daapd-0.2.3d.tgz) = 9cdf2e94b93001610f9f211866d94901
 +SIZE (daapd-0.2.3d.tgz) = 202317
 Only in ./files: patch-db.cc
 diff -ur /usr/ports/audio/daapd/files/patch-makefile ./files/patch-makefile
 --- /usr/ports/audio/daapd/files/patch-makefile	Tue Jun 29 20:17:37 2004
 +++ ./files/patch-makefile	Fri Oct 15 17:08:03 2004
 @@ -1,27 +1,30 @@
 ---- makefile.orig	Mon Jun 21 16:07:51 2004
 -+++ makefile	Mon Jun 21 16:14:40 2004
 -@@ -1,7 +1,5 @@
 +--- makefile	Tue Sep  7 21:17:58 2004
 ++++ /tmp/makefile	Fri Oct 15 17:07:17 2004
 +@@ -1,8 +1,6 @@
   # configure daapd here
   
  -HOWL_ENABLE = 1
 --MPEG4_ENABLE = 0
 + ZLIB_ENABLE = 1
 +-MPEG4_ENABLE = 1
   
   
   # no need to touch anything below this line
 -@@ -10,24 +8,23 @@
 +@@ -11,17 +9,16 @@
   CC = g++
   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 
 +-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
 ++LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz $(PTHREAD_LIBS)
  +LIBPATH = -L. -L%%LOCALBASE%%/lib
  +INCPATH = -I. -I%%LOCALBASE%%/include
  +DEPLOY = %%PREFIX%%
 - CFLAGS = -Wall -Wno-multichar
 ++CFLAGS = $(PTHREAD_CFLAGS) -Wall -Wno-multichar
   
   # HOWL
   ifeq ($(HOWL_ENABLE),1)
 @@ -30,16 +33,7 @@
   ifeq ($(words $(HOWLDIRS) ), 0)
   $(error howl not found in /usr/local/include. Install howl or disable it in the makefile)
   endif
 - 	HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) )
 - 	INCPATH := $(INCPATH) -I$(HOWLRECENT)
 --	LIBS := $(LIBS) -lpthread -lhowl
 --	CFLAGS := $(CFLAGS) -DHOWL_ENABLE
 -+	LIBS := $(LIBS) $(PTHREAD_LIBS) -lhowl
 -+	CFLAGS := $(CFLAGS) $(PTHREAD_CFLAGS) -DHOWL_ENABLE
 - 	ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __APPLE__),)
 - 		LIBS := $(LIBS) -framework CoreFoundation
 - 	endif
 -@@ -53,28 +50,17 @@
 +@@ -54,28 +51,17 @@
   .cc.o:
   	$(CC) $(CFLAGS) $(INCPATH) -c $<
   
State-Changed-From-To: open->closed 
State-Changed-By: lth 
State-Changed-When: Sun Nov 21 19:35:11 GMT 2004 
State-Changed-Why:  
Committed with changes, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72849 
>Unformatted:
 >> Checksum OK for daapd-0.2.2c.tgz.
 ===>  Patching for daapd-0.2.2c_1
 ===>  Applying FreeBSD patches for daapd-0.2.2c_1
 ===>   daapd-0.2.2c_1 depends on file: /usr/local/lib/libid3tag.a - found
 ===>   daapd-0.2.2c_1 depends on file: /usr/local/lib/libdaaplib.a - found
 ===>   daapd-0.2.2c_1 depends on file: /usr/local/lib/libhttpd-persistent.a - found
 ===>   daapd-0.2.2c_1 depends on executable: gmake - found
 ===>   daapd-0.2.2c_1 depends on shared library: howl - found
 ===>  Configuring for daapd-0.2.2c_1
 ===>  Building for daapd-0.2.2c_1
 g++ -Wall -Wno-multichar  -DHOWL_ENABLE -I. -I/usr/local/include -I/usr/local/include/howl-0.9.6 -c daapd.cc
 In file included from types.h:36,
                  from daapd.cc:24:
 /usr/local/include/daap/tagoutput.h:128:7: warning: no newline at end of file
 In file included from daapd.cc:39:
 /usr/local/include/daap/registry.h:91:7: warning: no newline at end of file
 daapd.cc:931: error: `sw_discovery_publish_handler' was not declared in this scope
 daapd.cc:932: error: expected primary-expression before "discovery"
 daapd.cc:933: error: expected primary-expression before "status"
 daapd.cc:934: error: expected primary-expression before "id"
 daapd.cc:935: error: expected primary-expression before "extra"
 daapd.cc:936: error: initializer expression list treated as compound expression
 daapd.cc:936: error: expected `,' or `;' before '{' token
 daapd.cc: In function `_sw_discovery* setupServiceDiscovery(const char*, int, bool)':
 daapd.cc:958: error: `sw_rendezvous_publish_id' undeclared (first use this function)
 daapd.cc:958: error: (Each undeclared identifier is reported only once for each function it appears in.)
 daapd.cc:958: error: expected `;' before "id"
 daapd.cc:968: error: `id' undeclared (first use this function)
 gmake: *** [daapd.o] Error 1
 *** Error code 2
 
 Stop in /usr/ports/audio/daapd.
 $                                                    
