From a98001220d50a462c67f287673fc7b721fd1a7a7 Mon Sep 17 00:00:00 2001 From: tonio Date: Sun, 1 Oct 2006 12:23:39 +0000 Subject: Fix build under Darwin by explicitly linking against libiconv Bump PKGREVISION --- audio/id3v2/Makefile | 5 +++-- audio/id3v2/distinfo | 3 ++- audio/id3v2/patches/patch-aa | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 audio/id3v2/patches/patch-aa (limited to 'audio') diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile index 6ce344566ee..46c66568a8d 100644 --- a/audio/id3v2/Makefile +++ b/audio/id3v2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2006/03/04 21:28:56 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/10/01 12:23:39 tonio Exp $ DISTNAME= id3v2-0.1.11 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=id3v2/} @@ -22,5 +22,6 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/id3v2 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/id3v2/README +.include "../../converters/libiconv/buildlink3.mk" .include "../../audio/id3lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/id3v2/distinfo b/audio/id3v2/distinfo index d0fa6f30e69..00a5a01b60e 100644 --- a/audio/id3v2/distinfo +++ b/audio/id3v2/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2005/02/23 20:39:47 agc Exp $ +$NetBSD: distinfo,v 1.8 2006/10/01 12:23:39 tonio Exp $ SHA1 (id3v2-0.1.11.tar.gz) = ca825d851ca0c6a5783af107dc6baa7aa93f0bad RMD160 (id3v2-0.1.11.tar.gz) = 433900ec5ccc072e5daeaf3fc25902d87bc95a01 Size (id3v2-0.1.11.tar.gz) = 52427 bytes +SHA1 (patch-aa) = 24369db9115ea921e5ebaa4befa66a71ebb4da19 diff --git a/audio/id3v2/patches/patch-aa b/audio/id3v2/patches/patch-aa new file mode 100644 index 00000000000..643bddf0d03 --- /dev/null +++ b/audio/id3v2/patches/patch-aa @@ -0,0 +1,19 @@ +$NetBSD: patch-aa,v 1.5 2006/10/01 12:23:39 tonio Exp $ + +--- Makefile.orig 2004-05-04 20:33:53.000000000 +0200 ++++ Makefile +@@ -2,12 +2,12 @@ all: id3v2 + + VERSION=0.1.11 + +-PREFIX= /usr/local ++PREFIX?= /usr/local + CXXFLAGS+= -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME + LDFLAGS+= -L${PREFIX}/lib/ + + id3v2: convert.o list.o id3v2.o genre.o +- c++ ${LDFLAGS} -pedantic -Wall -lz -lid3 -g -o $@ $^ ++ c++ ${LDFLAGS} -pedantic -Wall -lz -lid3 -liconv -g -o $@ $^ + + create_map: create_map.o + c++ -Wall -g -o $@ $^ -- cgit v1.2.3