Sun Oct 20 18:20:00 2013 UTC ()
Fix rpath option and hard-coded /usr/pkg references.


(joerg)
diff -r1.10 -r1.11 pkgsrc/audio/mad123/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/mad123/patches/patch-ac
cvs diff -r1.10 -r1.11 pkgsrc/audio/mad123/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/mad123/distinfo 2012/07/01 03:25:51 1.10
+++ pkgsrc/audio/mad123/distinfo 2013/10/20 18:20:00 1.11
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.10 2012/07/01 03:25:51 sbd Exp $ 1$NetBSD: distinfo,v 1.11 2013/10/20 18:20:00 joerg Exp $
2 2
3SHA1 (mad123-0.8.5.tar.gz) = 97c5d6185a54e2262d52a687ff3a3714ff260af8 3SHA1 (mad123-0.8.5.tar.gz) = 97c5d6185a54e2262d52a687ff3a3714ff260af8
4RMD160 (mad123-0.8.5.tar.gz) = bd2bf0b79a3c9d3513583daccdfc182a2d17cc41 4RMD160 (mad123-0.8.5.tar.gz) = bd2bf0b79a3c9d3513583daccdfc182a2d17cc41
5Size (mad123-0.8.5.tar.gz) = 24836 bytes 5Size (mad123-0.8.5.tar.gz) = 24836 bytes
6SHA1 (patch-aa) = c2b6eb6eb4b23151c31ae7031150baae403aefad 6SHA1 (patch-aa) = c2b6eb6eb4b23151c31ae7031150baae403aefad
7SHA1 (patch-ab) = 55d046e95e740520b9a74cdc764eb37a59cbf049 7SHA1 (patch-ab) = 55d046e95e740520b9a74cdc764eb37a59cbf049
8SHA1 (patch-ac) = 7c150b2f15cbc00876c8619b80ee29c73b0b71df 8SHA1 (patch-ac) = 23bdaecce33684a32e7e0ada01df2ac23bc58722
9SHA1 (patch-audio__dev.h) = 699760f797aa4b90a5672b42b24e08443fe0ae69 9SHA1 (patch-audio__dev.h) = 699760f797aa4b90a5672b42b24e08443fe0ae69
10SHA1 (patch-mp3__stream.c) = bfd36ec13ab8f78e65007692195ed12275ffc0d8 10SHA1 (patch-mp3__stream.c) = bfd36ec13ab8f78e65007692195ed12275ffc0d8
cvs diff -r1.1 -r1.2 pkgsrc/audio/mad123/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/mad123/patches/patch-ac 2005/11/11 18:58:18 1.1
+++ pkgsrc/audio/mad123/patches/patch-ac 2013/10/20 18:20:00 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.1 2005/11/11 18:58:18 joerg Exp $ 1$NetBSD: patch-ac,v 1.2 2013/10/20 18:20:00 joerg Exp $
2 2
3--- Makefile.orig 2004-10-21 13:03:25.000000000 +0000 3--- Makefile.orig 2004-10-21 13:03:25.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -19,7 +19,6 @@ 5@@ -19,7 +19,6 @@
6  6
7 PROG= mad123 7 PROG= mad123
8 SRCS= mad123.c mp3_stream.c audio_dev.c 8 SRCS= mad123.c mp3_stream.c audio_dev.c
9-SRCS+= audio_dev_sun.c audio_dev_pcm.c 9-SRCS+= audio_dev_sun.c audio_dev_pcm.c
10  10
11 BINDIR?=/usr/local/bin 11 BINDIR?=/usr/local/bin
12  12
13@@ -29,6 +28,8 @@ USE_CURL?=yes 13@@ -29,6 +28,8 @@ USE_CURL?=yes
14 USE_TAGLIB?=yes 14 USE_TAGLIB?=yes
@@ -28,13 +28,24 @@ $NetBSD: patch-ac,v 1.1 2005/11/11 18:58 @@ -28,13 +28,24 @@ $NetBSD: patch-ac,v 1.1 2005/11/11 18:58
28+.else 28+.else
29+CPPFLAGS+= -DNOSUN 29+CPPFLAGS+= -DNOSUN
30+.endif 30+.endif
31+ 31+
32+.if ${USE_OSS} != "no" 32+.if ${USE_OSS} != "no"
33+SRCS+= audio_dev_pcm.c 33+SRCS+= audio_dev_pcm.c
34+.else 34+.else
35+CPPFLAGS+= -DNOOSS 35+CPPFLAGS+= -DNOOSS
36+.endif 36+.endif
37+ 37+
38 .if ${USE_ARTS} != "no" 38 .if ${USE_ARTS} != "no"
39 ARTSLIB= -lartsc 39 ARTSLIB= -lartsc
40 SRCS+= audio_dev_arts.c 40 SRCS+= audio_dev_arts.c
 41@@ -57,8 +70,8 @@ SRCS+= audio_dev_arts.c
 42 CPPFLAGS+= -DNOARTS
 43 .endif
 44
 45-CPPFLAGS+= -I/usr/pkg/include
 46-LDFLAGS+= -L/usr/pkg/lib -R/usr/pkg/lib
 47+CPPFLAGS+= -I${PREFIX}/include
 48+LDFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 49 LDADD+= -lmad ${CURLLIB} ${TAGLIB} ${ID3LIB} ${ARTSLIB} ${EXTRALIBS}
 50
 51 USETOOLS=no