From 4c15138757a85d4aeb9062d572ab62bc45c7fe2f Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 20 Oct 2013 18:20:00 +0000 Subject: Fix rpath option and hard-coded /usr/pkg references. --- audio/mad123/distinfo | 4 ++-- audio/mad123/patches/patch-ac | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'audio/mad123') diff --git a/audio/mad123/distinfo b/audio/mad123/distinfo index 142c27c2cf4..181c19899c7 100644 --- a/audio/mad123/distinfo +++ b/audio/mad123/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2012/07/01 03:25:51 sbd Exp $ +$NetBSD: distinfo,v 1.11 2013/10/20 18:20:00 joerg Exp $ SHA1 (mad123-0.8.5.tar.gz) = 97c5d6185a54e2262d52a687ff3a3714ff260af8 RMD160 (mad123-0.8.5.tar.gz) = bd2bf0b79a3c9d3513583daccdfc182a2d17cc41 Size (mad123-0.8.5.tar.gz) = 24836 bytes SHA1 (patch-aa) = c2b6eb6eb4b23151c31ae7031150baae403aefad SHA1 (patch-ab) = 55d046e95e740520b9a74cdc764eb37a59cbf049 -SHA1 (patch-ac) = 7c150b2f15cbc00876c8619b80ee29c73b0b71df +SHA1 (patch-ac) = 23bdaecce33684a32e7e0ada01df2ac23bc58722 SHA1 (patch-audio__dev.h) = 699760f797aa4b90a5672b42b24e08443fe0ae69 SHA1 (patch-mp3__stream.c) = bfd36ec13ab8f78e65007692195ed12275ffc0d8 diff --git a/audio/mad123/patches/patch-ac b/audio/mad123/patches/patch-ac index 296c3a4701d..758edd1adb0 100644 --- a/audio/mad123/patches/patch-ac +++ b/audio/mad123/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2005/11/11 18:58:18 joerg Exp $ +$NetBSD: patch-ac,v 1.2 2013/10/20 18:20:00 joerg Exp $ --- Makefile.orig 2004-10-21 13:03:25.000000000 +0000 +++ Makefile @@ -38,3 +38,14 @@ $NetBSD: patch-ac,v 1.1 2005/11/11 18:58:18 joerg Exp $ .if ${USE_ARTS} != "no" ARTSLIB= -lartsc SRCS+= audio_dev_arts.c +@@ -57,8 +70,8 @@ SRCS+= audio_dev_arts.c + CPPFLAGS+= -DNOARTS + .endif + +-CPPFLAGS+= -I/usr/pkg/include +-LDFLAGS+= -L/usr/pkg/lib -R/usr/pkg/lib ++CPPFLAGS+= -I${PREFIX}/include ++LDFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib + LDADD+= -lmad ${CURLLIB} ${TAGLIB} ${ID3LIB} ${ARTSLIB} ${EXTRALIBS} + + USETOOLS=no -- cgit v1.2.3