From c969db5b7ffd64cac9ef0c0b0ee00abb889da3d4 Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 1 Jan 2006 18:32:01 +0000 Subject: Update "daapd" package to version 0.2.4a. Changes since version 0.2.3d: - static playlists - daapd parses paths with backslashes correctly now - bugfixes --- audio/daapd/Makefile | 22 ++++++++++------------ audio/daapd/distinfo | 10 +++++----- audio/daapd/files/daapd.sh | 4 ++-- audio/daapd/patches/patch-aa | 41 +++++++++++++++++++++++------------------ 4 files changed, 40 insertions(+), 37 deletions(-) (limited to 'audio') diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile index 49e99a79981..4d1d15b173b 100644 --- a/audio/daapd/Makefile +++ b/audio/daapd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:30 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2006/01/01 18:32:01 tron Exp $ -DISTNAME= daapd-0.2.3d -PKGREVISION= 3 +DISTNAME= daapd-0.2.4a CATEGORIES= audio MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tgz @@ -19,16 +18,15 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/daapd.conf ${PKG_SYSCONFDIR}/daapd.conf -PKG_OPTIONS_VAR=PKG_OPTIONS.daapd -PKG_SUPPORTED_OPTIONS=faad -.include "../../mk/bsd.options.mk" +MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} -.if !empty(PKG_OPTIONS:Mfaad) -.include "../../audio/faad2/buildlink3.mk" -MAKE_ENV+= WITH_FAAD=1 -.else -MAKE_ENV+= WITH_FAAD=0 -.endif +FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} + +SUBST_CLASSES+= paths +SUBST_MESSAGE.paths= "Fixing hardcoded paths." +SUBST_STAGE.paths= post-patch +SUBST_FILES.paths= daapd.8 daapd.cc +SUBST_SED.paths= -e 's,/etc/,${PKG_SYSCONFDIR}/,g' post-install: ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR} diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo index 05764d41c4c..0d4a088e018 100644 --- a/audio/daapd/distinfo +++ b/audio/daapd/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2005/10/11 12:20:57 tonio Exp $ +$NetBSD: distinfo,v 1.10 2006/01/01 18:32:01 tron Exp $ -SHA1 (daapd-0.2.3d.tgz) = 3ca12f0cb608a0be2d8351dbc341aa7d2a4f08f8 -RMD160 (daapd-0.2.3d.tgz) = 3093b678d4f74fa371cb7cccee860b3f3d1f5bcd -Size (daapd-0.2.3d.tgz) = 202317 bytes -SHA1 (patch-aa) = a6b576702f33ebd5c4313f2f76ed41738b270027 +SHA1 (daapd-0.2.4a.tgz) = 175130c8b709fcac124857fe5a9eacdfbe00153c +RMD160 (daapd-0.2.4a.tgz) = ca3bf641693779af359cfe1c1b91c7b06cfaaa10 +Size (daapd-0.2.4a.tgz) = 205231 bytes +SHA1 (patch-aa) = eb8bc48668206d79b32b43ac5aafc43a19c217a8 diff --git a/audio/daapd/files/daapd.sh b/audio/daapd/files/daapd.sh index e43d8862cdb..dbfc335464e 100644 --- a/audio/daapd/files/daapd.sh +++ b/audio/daapd/files/daapd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: daapd.sh,v 1.3 2005/01/08 06:44:41 schmonz Exp $ +# $NetBSD: daapd.sh,v 1.4 2006/01/01 18:32:01 tron Exp $ # # PROVIDE: daapd @@ -12,7 +12,7 @@ name="daapd" rcvar=$name command="@PREFIX@/bin/${name}" required_files="@PKG_SYSCONFDIR@/daapd.conf" -command_args="-c $required_files 2>&1 > /dev/null &" +command_args="&1 > /dev/null &" load_rc_config $name run_rc_command "$1" diff --git a/audio/daapd/patches/patch-aa b/audio/daapd/patches/patch-aa index 991ac43a231..0526153b1fa 100644 --- a/audio/daapd/patches/patch-aa +++ b/audio/daapd/patches/patch-aa @@ -1,41 +1,46 @@ -$NetBSD: patch-aa,v 1.8 2005/10/11 12:20:57 tonio Exp $ +$NetBSD: patch-aa,v 1.9 2006/01/01 18:32:01 tron Exp $ ---- makefile.orig 2004-09-08 03:17:58.000000000 +0200 -+++ makefile -@@ -2,7 +2,7 @@ +--- makefile.orig 2005-01-04 23:18:48.000000000 +0000 ++++ makefile 2006-01-01 18:17:40.000000000 +0000 +@@ -1,6 +1,6 @@ + # configure daapd here - HOWL_ENABLE = 1 +-HOWL_ENABLE = 0 ++HOWL_ENABLE = 1 ZLIB_ENABLE = 1 --MPEG4_ENABLE = 1 -+MPEG4_ENABLE = $(WITH_FAAD) - + MPEG4_ENABLE = 0 +@@ -8,22 +8,22 @@ # no need to touch anything below this line -@@ -13,17 +13,17 @@ MAKE = $(MAKE_COMMAND) + # ----------------------------------------- + +-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 -+LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -+LIBPATH = -L. ${LDFLAGS} -L./daaplib/src -L./libhttpd/src -L/usr/local/lib - INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I/usr/local/include +-INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I/usr/local/include -DEPLOY = /usr/local -CFLAGS = -Wall -Wno-multichar -+DEPLOY = ${PREFIX} ++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*) ) ++ 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) ++$(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) -@@ -74,8 +74,6 @@ clean: +@@ -80,8 +80,6 @@ rm $(OBJS) $(TARGET) install: $(DEPS) $(TARGET) -- cgit v1.2.3