- Use internal libmp4v2 (doesn't build if external libmp4v2 is available)

- Better LIB_DEPENDS
- Fix WANTLIB
- Bump PKGNAME

audio/faad/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2004/12/13 05:40:55 jcs Exp $
+# $OpenBSD: Makefile,v 1.16 2005/01/05 11:40:04 alek Exp $
 
 COMMENT=	"MPEG2 and MPEG-4 AAC decoder"
 COMMENT-xmms=	"XMMS input plugin for AAC files"
 DISTNAME=	faad2-2.0
-PKGNAME=	faad-2.0p0
-PKGNAME-xmms=	faad-xmms-2.0p0
+PKGNAME=	faad-2.0p1
+PKGNAME-xmms=	faad-xmms-2.0p1
 CATEGORIES=    	audio
 MASTER_SITES=	http://users.codefusionis.com/~jolan/
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=	"Patents"
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	"Patents"
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c m stdc++
+WANTLIB=		m stdc++
 
 BUILD_DEPENDS+=	${MODGNU_AUTOCONF_DEPENDS}
 USE_GMAKE=	Yes
@@ -42,8 +42,11 @@ SUBPACKAGE?=
 .if defined(PACKAGING)
 . if ${SUBPACKAGE} == "-xmms"
 LIB_DEPENDS=	xmms.3::audio/xmms \
-		faad::audio/faad
+		faad.0,mp4v2.0::audio/faad
 RUN_DEPENDS=	::audio/xmms
+WANTLIB+=	X11 Xext Xi pthread iconv intl glib gmodule gtk gdk
+. else
+WANTLIB+=	c
 . endif
 .else
 . if ${MULTI_PACKAGES:M-xmms}
@@ -51,7 +54,6 @@ LIB_DEPENDS=	xmms.3::audio/xmms
 BUILD_DEPENDS=	xmms-config::audio/xmms \
 		::audio/id3lib
 CONFIGURE_ARGS+= --with-xmms
-WANTLIB+=	X11 Xext Xi pthread
 . endif
 .endif
 

audio/faad/patches/patch-configure_in

@@ -0,0 +1,15 @@
+$OpenBSD: patch-configure_in,v 1.3 2005/01/05 11:40:04 alek Exp $
+--- configure.in.orig	Fri Feb  6 17:04:39 2004
++++ configure.in	Wed Jan  5 12:38:10 2005
+@@ -67,10 +67,7 @@ MY_CHECK_TYPEDEF_FROM_INCLUDE([fpos_t fo
+         [HAVE_FPOS_T_POS])
+ 
+ 
+-external_mp4v2=yes
+-AC_CHECK_LIB(mp4v2, MP4Create, , external_mp4v2=no, -lstdc++)
+-AC_CHECK_LIB(mp4v2, MP4MetadataDelete, , external_mp4v2=no, -lstdc++)
+-AC_CHECK_HEADER(mp4.h, , external_mp4v2=no)
++external_mp4v2=no
+ 
+ AM_CONDITIONAL(WITH_MP4V2, false)
+