8 files changed, 52 insertions, 18 deletions
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index 187660822ed..58191db5736 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2005/07/01 06:35:15 grant Exp $
+# $NetBSD: Makefile,v 1.27 2005/10/06 13:13:28 ben Exp $
 #
 
 DISTNAME=	faad2-2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
 
@@ -23,6 +23,7 @@ AUTOCONF_REQD=	2.50
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--with-mp4v2
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/faad2
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
 
diff --git a/audio/faad2/PLIST b/audio/faad2/PLIST
index c9deb334905..b453fea9740 100644
--- a/audio/faad2/PLIST
+++ b/audio/faad2/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/10/06 13:13:28 ben Exp $
 bin/faad
-include/faad.h
-include/mp4.h
-include/mp4ff.h
-include/mpeg4ip.h
-include/systems.h
+include/faad2/config.h
+include/faad2/faad.h
+include/faad2/mp4.h
+include/faad2/mp4ff.h
+include/faad2/mpeg4ip.h
+include/faad2/systems.h
 lib/libfaad.la
 lib/libmp4ff.la
 lib/libmp4v2.la
diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk
index 6324de5231e..b6df7385d60 100644
--- a/audio/faad2/buildlink3.mk
+++ b/audio/faad2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/10/06 13:13:28 ben Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FAAD2_BUILDLINK3_MK:=	${FAAD2_BUILDLINK3_MK}+
@@ -11,9 +11,9 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfaad2}
 BUILDLINK_PACKAGES+=	faad2
 
 .if !empty(FAAD2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.faad2+=	faad2>=2.0
-BUILDLINK_RECOMMENDED.faad2+=	faad2>=2.0nb1
+BUILDLINK_DEPENDS.faad2+=	faad2>=2.0nb2
 BUILDLINK_PKGSRCDIR.faad2?=	../../audio/faad2
+BUILDLINK_INCDIRS.faad2?=	include/faad2
 .endif	# FAAD2_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index af4cb6e7cf5..b74bc162378 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.7 2005/08/05 13:01:57 tonio Exp $
+$NetBSD: distinfo,v 1.8 2005/10/06 13:13:28 ben Exp $
 
 SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8
 RMD160 (faad2-2.0.tar.gz) = e1e4d7c96cbc3db2b9e67385062ccf5decb61f90
 Size (faad2-2.0.tar.gz) = 766660 bytes
-SHA1 (patch-aa) = 59215b4c221b47dbee9a713fff302fdfe700cea2
+SHA1 (patch-aa) = 60f8ee14a3da38405eeab29047670b6878114244
 SHA1 (patch-ab) = 33c8c741f3b3870d84c66b6eb8bf95d4b768f39e
-SHA1 (patch-ac) = 9c610dbaa89df5a82587f685116aac5e760fe32c
+SHA1 (patch-ac) = 6bc2c97d5c5022637d63c0194a6545d55720f82e
 SHA1 (patch-ad) = 4d57360bfd5e9c7f75d06ae274723f7aa1e11186
 SHA1 (patch-ae) = 04b09d0ace9381152b1ebc12951c530c5c3c46fc
 SHA1 (patch-af) = c6da419d2ac6b120b2e70c72f240c6f6b83ca39a
 SHA1 (patch-ag) = a2527f6ddfcf65ba6077bc6145c87bb354c740db
 SHA1 (patch-ah) = d062e23144932994c4193189efc6dfc47520f139
 SHA1 (patch-ai) = 0f09c422d764467fdb5d4bce846bc80e653d4aac
+SHA1 (patch-aj) = 06a8641803fdae5055f66255c57634b8f8619a77
+SHA1 (patch-ak) = a83c7805ec58ee124fbb0e3c2327731aeaeb9a79
diff --git a/audio/faad2/patches/patch-aa b/audio/faad2/patches/patch-aa
index 4c40c369f2b..550b3e8e51d 100644
--- a/audio/faad2/patches/patch-aa
+++ b/audio/faad2/patches/patch-aa
@@ -1,8 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2004/03/28 20:16:09 mycroft Exp $
+$NetBSD: patch-aa,v 1.3 2005/10/06 13:13:28 ben Exp $
 
 --- libfaad/Makefile.am.orig	2004-02-06 13:12:28.000000000 +0000
 +++ libfaad/Makefile.am	2004-03-27 22:27:18.000000000 +0000
-@@ -7,8 +7,9 @@
+@@ -1,5 +1,4 @@
+ lib_LTLIBRARIES = libfaad.la
+-include_HEADERS = ../include/faad.h
+ 
+ libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
+ error.c filtbank.c \
+@@ -7,8 +6,9 @@ ic_predict.c is.c lt_predict.c mdct.c mp
  pulse.c specrec.c syntax.c tns.c hcr.c huffman.c \
  rvlc.c ssr.c ssr_fb.c ssr_ipqf.c common.c \
  sbr_dct.c sbr_e_nf.c sbr_fbt.c sbr_hfadj.c sbr_hfgen.c \
diff --git a/audio/faad2/patches/patch-ac b/audio/faad2/patches/patch-ac
index a80784abbb5..e43c8cc7bda 100644
--- a/audio/faad2/patches/patch-ac
+++ b/audio/faad2/patches/patch-ac
@@ -1,10 +1,15 @@
-$NetBSD: patch-ac,v 1.2 2004/03/28 20:16:09 mycroft Exp $
+$NetBSD: patch-ac,v 1.3 2005/10/06 13:13:28 ben Exp $
 
 --- Makefile.am.orig	2004-02-06 16:04:39.000000000 +0000
 +++ Makefile.am	2004-03-27 22:36:00.000000000 +0000
-@@ -3,6 +3,6 @@
+@@ -1,8 +1,10 @@
+-SUBDIRS = libfaad common frontend plugins
++SUBDIRS = libfaad common frontend plugins include
+ 
  EXTRA_DIST = faad2.spec
  
++include_HEADERS = config.h
++
  rpm:    Makefile
 -       make dist
 -       $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
diff --git a/audio/faad2/patches/patch-aj b/audio/faad2/patches/patch-aj
new file mode 100644
index 00000000000..0275fe78c8d
--- /dev/null
+++ b/audio/faad2/patches/patch-aj
@@ -0,0 +1,6 @@
+$NetBSD: patch-aj,v 1.1 2005/10/06 13:13:28 ben Exp $
+
+--- /dev/null	2005-10-05 21:10:17.000000000 -0700
++++ include/Makefile.am	2005-10-05 21:10:37.000000000 -0700
+@@ -0,0 +1 @@
++include_HEADERS = faad.h
diff --git a/audio/faad2/patches/patch-ak b/audio/faad2/patches/patch-ak
new file mode 100644
index 00000000000..888c24c834f
--- /dev/null
+++ b/audio/faad2/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2005/10/06 13:13:28 ben Exp $
+
+--- configure.in.orig	2005-10-05 21:16:43.000000000 -0700
++++ configure.in
+@@ -114,7 +114,7 @@ if test x$WITHDRM = xyes; then
+   AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])
+ fi
+ 
+-AC_CONFIG_FILES(libfaad/Makefile frontend/Makefile common/Makefile plugins/Makefile Makefile )
++AC_CONFIG_FILES(libfaad/Makefile frontend/Makefile common/Makefile plugins/Makefile include/Makefile Makefile )
+ 
+ AC_CONFIG_FILES(plugins/mpeg4ip/Makefile)
+