Attachment #114985 for bug #156736

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

Lines 6-12 Link Here

(-)Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= pianobar	8	PORTNAME= pianobar
9	PORTVERSION= 2011.01.24	9	PORTVERSION= 2011.04.27
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://6xq.net/media/00/16/	11	MASTER_SITES= http://6xq.net/media/00/16/
12		12

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (pianobar-2011.01.24.tar.bz2) = d81c93c1d6facf6c35fa42b3569df6442f275686f872220b26bfff4d1f3fe19e	1	SHA256 (pianobar-2011.04.27.tar.bz2) = e4b1354974af36d32dc34b3329bd09f3e0437127539024cf7add61facbb621dc
2	SIZE (pianobar-2011.01.24.tar.bz2) = 57710	2	SIZE (pianobar-2011.04.27.tar.bz2) = 61317




--- Makefile.orig	2011-04-27 14:11:06.000000000 -0500
+++ Makefile	2011-04-30 09:03:16.000000000 -0500
@@ -4,11 +4,10 @@
 PREFIX:=/usr/local
 BINDIR:=${PREFIX}/bin
 LIBDIR:=${PREFIX}/lib
 INCDIR:=${PREFIX}/include
-MANDIR:=${PREFIX}/share/man
-CFLAGS:=-std=c99 -O2 -DNDEBUG
+MANDIR:=${PREFIX}/man
 DYNLINK:=0
-CFLAGS:=-O2 -DNDEBUG
+CFLAGS:=-Wall -std=c99 -O2 -DNDEBUG -pedantic -I/usr/local/include -L/usr/local/lib -lao
 LDFLAGS:=
-CC:=c99
 
 PIANOBAR_DIR=src
 PIANOBAR_SRC=\
@@ -59,8 +59,8 @@
 LIBEZXML_RELOBJ=${LIBEZXML_SRC:.c=.lo}
 LIBEZXML_INCLUDE=${LIBEZXML_DIR}
 
-LIBAO_INCLUDE=/usr/include
-LIBAO_LIB=-lao
+LIBAO_INCLUDE=/usr/local/include
+LIBAO_LIB=-L/usr/local/lib -lao
 
 LIBM_LIB=-lm
 
@@ -68,8 +68,8 @@
 	LIBFAAD_CFLAGS=
 	LIBFAAD_LDFLAGS=
 else
-	LIBFAAD_INCLUDE:=/usr/include
-	LIBFAAD_LIB:=-lfaad
+	LIBFAAD_INCLUDE:=/usr/local/include
+	LIBFAAD_LIB:=-L/usr/local/lib -lfaad
 	LIBFAAD_CFLAGS=-I ${LIBFAAD_INCLUDE} -DENABLE_FAAD
 	LIBFAAD_LDFLAGS=${LIBFAAD_LIB}
 endif
@@ -78,8 +78,8 @@
 	LIBMAD_CFLAGS=
 	LIBMAD_LDFLAGS=
 else
-	LIBMAD_INCLUDE:=/usr/include
-	LIBMAD_LIB:=-lmad
+	LIBMAD_INCLUDE:=/usr/local/include
+	LIBMAD_LIB:=-L/usr/local/lib -lmad
 	LIBMAD_CFLAGS=-I ${LIBMAD_INCLUDE} -DENABLE_MAD
 	LIBMAD_LDFLAGS=${LIBMAD_LIB}
 endif

Return to bug 156736

Lines 1-46 Link Here

(-)files/patch-Makefile (-39 / +9 lines)
1	--- Makefile.orig 2011-01-24 04:00:25.000000000 -0800	1	--- Makefile.orig 2011-04-27 14:11:06.000000000 -0500
2	+++ Makefile 2011-04-07 14:26:46.000000000 -0700	2	+++ Makefile 2011-04-30 09:03:16.000000000 -0500
3	@@ -3,8 +3,8 @@	3	@@ -4,11 +4,10 @@
4	PREFIX:=/usr/local
5	BINDIR:=${PREFIX}/bin	4	BINDIR:=${PREFIX}/bin
6	LIBDIR:=${PREFIX}/lib	5	LIBDIR:=${PREFIX}/lib
		6	INCDIR:=${PREFIX}/include
7	-MANDIR:=${PREFIX}/share/man	7	-MANDIR:=${PREFIX}/share/man
8	-CFLAGS:=-std=c99 -O2 -DNDEBUG
9	+MANDIR:=${PREFIX}/man	8	+MANDIR:=${PREFIX}/man
10	+CFLAGS:=-Wall -std=c99 -O2 -DNDEBUG -pedantic -I/usr/local/include	9	DYNLINK:=0
		10	-CFLAGS:=-O2 -DNDEBUG
		11	+CFLAGS:=-Wall -std=c99 -O2 -DNDEBUG -pedantic -I/usr/local/include -L/usr/local/lib -lao
		12	LDFLAGS:=
		13	-CC:=c99
11		14
12	PIANOBAR_DIR=src	15	PIANOBAR_DIR=src
13	PIANOBAR_SRC=\	16	PIANOBAR_SRC=\
14	@@ -59,8 +59,8 @@
15	LIBEZXML_RELOBJ=${LIBEZXML_SRC:.c=.lo}
16	LIBEZXML_INCLUDE=${LIBEZXML_DIR}
17
18	-LIBAO_INCLUDE=/usr/include
19	-LIBAO_LIB=-lao
20	+LIBAO_INCLUDE=/usr/local/include
21	+LIBAO_LIB=-L/usr/local/lib -lao
22
23	LIBM_LIB=-lm
24
25	@@ -68,8 +68,8 @@
26	LIBFAAD_CFLAGS=
27	LIBFAAD_LDFLAGS=
28	else
29	- LIBFAAD_INCLUDE:=/usr/include
30	- LIBFAAD_LIB:=-lfaad
31	+ LIBFAAD_INCLUDE:=/usr/local/include
32	+ LIBFAAD_LIB:=-L/usr/local/lib -lfaad
33	LIBFAAD_CFLAGS=-I ${LIBFAAD_INCLUDE} -DENABLE_FAAD
34	LIBFAAD_LDFLAGS=${LIBFAAD_LIB}
35	endif
36	@@ -78,8 +78,8 @@
37	LIBMAD_CFLAGS=
38	LIBMAD_LDFLAGS=
39	else
40	- LIBMAD_INCLUDE:=/usr/include
41	- LIBMAD_LIB:=-lmad
42	+ LIBMAD_INCLUDE:=/usr/local/include
43	+ LIBMAD_LIB:=-L/usr/local/lib -lmad
44	LIBMAD_CFLAGS=-I ${LIBMAD_INCLUDE} -DENABLE_MAD
45	LIBMAD_LDFLAGS=${LIBMAD_LIB}
46	endif