- Update to 0.2.3d

PR:		72849
Submitted by:	Michael Handler <handler@lair.grendel.net>

3 files changed, 19 insertions, 31 deletions

diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index 35c9a2deeefc..c8251ea0ee79 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -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
@@ -39,6 +38,7 @@ CACHE=		/var/db/daapd.cache
 FILES_SUB=	USER=${DAAPD_USER} GROUP=${DAAPD_GROUP} \
 		PREFIX=${PREFIX} LOGDIR=${LOGDIR} DOCSDIR=${DOCSDIR} \
 		LOCALBASE=${LOCALBASE} CACHE=${CACHE} RC_SUBR=${RC_SUBR}
+MAKE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 
 OPTIONS+=	HOWL "Use howl for Zeroconf/Rendezvous" on
 OPTIONS+=	MPEG4IP "Use mpeg4ip for AAC metadata" on
@@ -47,7 +47,7 @@ OPTIONS+=	MPEG4IP "Use mpeg4ip for AAC metadata" on
 
 .ifdef(WITH_HOWL)
 LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
-MAKE_ENV+=	HOWL_ENABLE=1 PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
+MAKE_ENV+=	HOWL_ENABLE=1
 .endif
 
 .ifdef(WITH_MPEG4IP)
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo
index c7c6a7b64df3..df7e865c6fd7 100644
--- a/audio/daapd/distinfo
+++ b/audio/daapd/distinfo
@@ -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
diff --git a/audio/daapd/files/patch-makefile b/audio/daapd/files/patch-makefile
index 39d05cdd4c4d..c14b657cf2de 100644
--- a/audio/daapd/files/patch-makefile
+++ b/audio/daapd/files/patch-makefile
@@ -1,45 +1,33 @@
---- makefile.orig	Mon Jun 21 16:07:51 2004
-+++ makefile	Mon Jun 21 16:14:40 2004
-@@ -1,7 +1,5 @@
+--- makefile.orig	Sat Aug 21 15:24:06 2004
++++ makefile	Wed Sep  1 23:14:25 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,13 +9,12 @@
  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
-+LIBPATH = -L. -L%%LOCALBASE%%/lib
-+INCPATH = -I. -I%%LOCALBASE%%/include
-+DEPLOY = %%PREFIX%%
- CFLAGS = -Wall -Wno-multichar
++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)
--	HOWLDIRS := $(sort $(wildcard /usr/local/include/howl*) )
-+	HOWLDIRS := $(sort $(wildcard %%LOCALBASE%%/include/howl*) )
- 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 $<