Attachment #37953 for bug #60215

View | Details | Raw Unified | Return to bug 60215
Collapse All | Expand All

Lines 6-13 Link Here

(-)Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= daapd	8	PORTNAME= daapd
9	PORTVERSION= 0.2.1c	9	PORTVERSION= 0.2.1d
10	PORTREVISION= 1
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= http://www.deleet.de/projekte/daap/daapd/	11	MASTER_SITES= http://www.deleet.de/projekte/daap/daapd/
13	EXTRACT_SUFX= .tgz	12	EXTRACT_SUFX= .tgz
Lines 17-23 Link Here
17		16
18	BUILD_DEPENDS= ${LOCALBASE}/lib/libid3tag.a:${PORTSDIR}/audio/mad \	17	BUILD_DEPENDS= ${LOCALBASE}/lib/libid3tag.a:${PORTSDIR}/audio/mad \
19	${LOCALBASE}/lib/libdaaplib.a:${PORTSDIR}/audio/daaplib \	18	${LOCALBASE}/lib/libdaaplib.a:${PORTSDIR}/audio/daaplib \
20	${LOCALBASE}/lib/libhttpd.a:${PORTSDIR}/www/libhttpd-persistent	19	${LOCALBASE}/lib/libhttpd-persistent.a:${PORTSDIR}/www/libhttpd-persistent
21		20
22	USE_GMAKE= yes	21	USE_GMAKE= yes
23	USE_REINPLACE= yes	22	USE_REINPLACE= yes

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (daapd-0.2.1c.tgz) = 6f4d9a4d6aaaaafea9d82e3f31cb055f	1	MD5 (daapd-0.2.1d.tgz) = 2f69299a099920694d7ddf78a1dcea49




--- makefile.orig	Sat Dec 13 23:25:47 2003
+++ makefile	Sat Dec 13 23:26:24 2003
@@ -2,9 +2,9 @@
 TARGET = daapd
 OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o
 LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz
-LIBPATH = -L. -L/usr/local/lib
-INCPATH = -I. -I/usr/local/include
-DEPLOY = /usr/local/bin
+LIBPATH = -L. -L%%LOCALBASE%%/lib
+INCPATH = -I. -I%%LOCALBASE%%/include
+DEPLOY = %%PREFIX%%/bin
 CFLAGS = -Wall -Wno-multichar
 
 .cc.o:

Return to bug 60215

Lines 1-15 Link Here

(-)files/patch-makefile (-5 / +5 lines)
1	--- makefile.orig Tue Oct 21 22:59:55 2003	1	--- makefile.orig Sat Dec 13 23:25:47 2003
2	+++ makefile Tue Oct 21 23:00:44 2003	2	+++ makefile Sat Dec 13 23:26:24 2003
3	@@ -2,9 +2,9 @@	3	@@ -2,9 +2,9 @@
4	TARGET = daapd	4	TARGET = daapd
5	OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o	5	OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o
6	LIBS = -ldaaplib -lhttpd -lid3tag -lz	6	LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz
7	-LIBPATH = -L. -L/usr/local/lib	7	-LIBPATH = -L. -L/usr/local/lib
8	-INCPATH = -I.	8	-INCPATH = -I. -I/usr/local/include
9	-DEPLOY = /usr/local/bin	9	-DEPLOY = /usr/local/bin
10	+LIBPATH = -L. -L%%LOCALBASE%%/lib	10	+LIBPATH = -L. -L%%LOCALBASE%%/lib
11	+INCPATH = -I. -I%%LOCALBASE%%/include	11	+INCPATH = -I. -I%%LOCALBASE%%/include
12	+DEPLOY = %%PREFIX%%/sbin	12	+DEPLOY = %%PREFIX%%/bin
13	CFLAGS = -Wall -Wno-multichar	13	CFLAGS = -Wall -Wno-multichar
14		14
15	.cc.o:	15	.cc.o: