diff options
| author | schmonz <schmonz@pkgsrc.org> | 2005-01-08 06:44:41 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2005-01-08 06:44:41 +0000 |
| commit | fa84583330d15a6f728528b27817a41a800c77f9 (patch) | |
| tree | 53465b4f0e52f0945fad92d882a5c88ca5191f95 /audio/daapd/patches | |
| parent | a2c0ed43c31a44993a0f89c9fd5f907298bef5ed (diff) | |
| download | pkgsrc-fa84583330d15a6f728528b27817a41a800c77f9.tar.gz | |
pkgsrc changes:
* Remove unnecessary patches to strip /usr/local from -L and -I paths.
* Makefile style nits.
* Specify dependency on howl's mDNSResponder in the rc.d script.
Ride the version and PKGREVISION from mjl's commit an hour ago.
Diffstat (limited to 'audio/daapd/patches')
| -rw-r--r-- | audio/daapd/patches/patch-aa | 27 | ||||
| -rw-r--r-- | audio/daapd/patches/patch-ac | 12 |
2 files changed, 20 insertions, 19 deletions
diff --git a/audio/daapd/patches/patch-aa b/audio/daapd/patches/patch-aa index 6a14106d2e8..91282e2f449 100644 --- a/audio/daapd/patches/patch-aa +++ b/audio/daapd/patches/patch-aa @@ -1,22 +1,29 @@ --- makefile.orig 2004-09-08 03:17:58.000000000 +0200 +++ makefile 2005-01-08 06:12:42.000000000 +0100 -@@ -4,3 +4,3 @@ +--- makefile.orig 2004-09-07 21:17:58.000000000 -0400 ++++ makefile +@@ -2,7 +2,7 @@ + + HOWL_ENABLE = 1 ZLIB_ENABLE = 1 -MPEG4_ENABLE = 1 +MPEG4_ENABLE = 0 -@@ -16,6 +16,6 @@ + + # no need to touch anything below this line +@@ -14,16 +14,16 @@ TARGET = daapd + DEPS = daaplib_ libhttpd_ + OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o 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 ++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 -DEPLOY = /usr/local -CFLAGS = -Wall -Wno-multichar -+LIBPATH = -L. ${LDFLAGS} -L./daaplib/src -L./libhttpd/src -+INCPATH = -I. -I./daaplib/include -I./libhttpd/src +DEPLOY = ${PREFIX} +CFLAGS += -Wall -Wno-multichar -@@ -23,5 +23,5 @@ + # HOWL ifeq ($(HOWL_ENABLE),1) - HOWLDIRS := $(sort $(wildcard /usr/local/include/howl*) ) + HOWLDIRS := $(sort $(wildcard ${PREFIX}/include/howl*) ) @@ -24,8 +31,14 @@ -$(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 -@@ -76,4 +76,2 @@ + HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) ) + INCPATH := $(INCPATH) -I$(HOWLRECENT) +@@ -74,8 +74,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 604b44d8722..00000000000 --- a/audio/daapd/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/06/05 19:07:51 nathanw Exp $ - ---- libhttpd/Site.mm.in.orig 2004-06-04 14:51:42.000000000 -0400 -+++ libhttpd/Site.mm.in 2004-06-04 14:52:05.000000000 -0400 -@@ -37,5 +37,5 @@ - # Any other CFlags required - EXTRA_CFLAGS= - --CFLAGS= -g -I$(TOP)/ -I/usr/local/include $(EXTRA_CFLAGS) -D$(OS_TYPE) --LDLIBS= -L/usr/local/lib -L$(TOP)/lib @LIBS@ $(EXTRA_LIBS) -+CFLAGS= -g -I$(TOP)/ $(EXTRA_CFLAGS) -D$(OS_TYPE) -+LDLIBS= -L$(TOP)/lib @LIBS@ $(EXTRA_LIBS) |