Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms-faad/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	14 Mar 2004 03:44:48 -0000	1.8
+++ Makefile	15 Mar 2004 05:02:16 -0000
@@ -2,16 +2,16 @@
 # Date created:			23 Feb, 2002
 # Whom:				David Yeske <dyeske@yahoo.com>
 #
-# $FreeBSD: ports/audio/xmms-faad/Makefile,v 1.8 2004/03/14 03:44:48 kris Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	faad2
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	2.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	faac
 PKGNAMEPREFIX=	xmms-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rc3
 
 MAINTAINER=	dyeske@yahoo.com
 COMMENT=	XMMS plugin for faad
@@ -21,29 +21,52 @@
 		xmms.4:${PORTSDIR}/multimedia/xmms \
 		faad.0:${PORTSDIR}/audio/faad
 
-BROKEN=		"Does not work with faad 2.0"
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_AUTOMAKE_VER=	15
+USE_AUTOHEADER=	yes
+AUTOMAKE_ARGS=	--add-missing
 
 USE_X_PREFIX=	yes
+USE_GNOME=	gtk12
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
-ALL_TARGET=
 
-WRKSRC=		${WRKDIR}/${PORTNAME}/plugins/xmms
+CONFIGURE_ARGS=	--program-transform-name='' --with-mp4v2
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 
 DESCR=		${PORTSDIR}/audio/faad/pkg-descr
 MD5_FILE=	${PORTSDIR}/audio/faad/distinfo
-PLIST_FILES=	lib/xmms/Input/libaac-XMMS.so
+PLIST_FILES=	lib/xmms/Input/libaac.so \
+		lib/xmms/Input/libmp4.so
+
+pre-patch: build-depends
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|gcc|${CC} ${CFLAGS} -fPIC|; \
-		s|-I/usr/include/glib-1.2/||; \
-		s|-lfaad2|-lfaad -lstdc++|; \
-		s|-I/usr/lib/glib/include|-L${LOCALBASE}/lib|; \
-		s|-I/usr/include/gtk-1.2/|\`xmms-config --cflags\`|' \
-		${WRKSRC}/Makefile
+# make sure everything is prepared prior to configure stage
+# pre-configure will not work since *AUTO* tools happen in-between
+	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \
+		${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
+# CFLAGS safeness
+	@${FIND} ${WRKSRC} -type f -name Makefile.am | \
+		${XARGS} -n 5 -x \
+			${REINPLACE_CMD} -e \
+				's|-O2|${CFLAGS}|'
+
+post-configure:
+# sync the multiple libtool copies
+	@${CP} ${WRKSRC}/libtool ${WRKSRC}/common/mp4v2/
+	@${CP} ${WRKSRC}/libtool ${WRKSRC}/plugins/xmms/
+	@${CP} ${WRKSRC}/libtool ${WRKSRC}/plugins/xmmsmp4/
+
+do-build:
+	@cd ${WRKSRC}/plugins/xmms && ${MAKE}
+	@cd ${WRKSRC}/plugins/xmmsmp4 && ${MAKE}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/libaac-XMMS.so ${PREFIX}/lib/xmms/Input/
+	@cd ${WRKSRC}/plugins/xmms && ${MAKE} install
+	@cd ${WRKSRC}/plugins/xmmsmp4 && ${MAKE} install
 
 .include <bsd.port.mk>