3 files changed, 71 insertions, 14 deletions

diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index e775c860b135..bc5829ddfae6 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	faad2
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	2.0
+PORTREVISION=	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 +22,52 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		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>
diff --git a/audio/xmms-faad/files/patch-plugins_xmms_src_Makefile.am b/audio/xmms-faad/files/patch-plugins_xmms_src_Makefile.am
new file mode 100644
index 000000000000..54ce5ef9f59b
--- /dev/null
+++ b/audio/xmms-faad/files/patch-plugins_xmms_src_Makefile.am
@@ -0,0 +1,18 @@
+--- plugins/xmms/src/Makefile.am.orig	Thu Nov  6 06:04:13 2003
++++ plugins/xmms/src/Makefile.am	Sun Mar 14 23:57:12 2004
+@@ -1,13 +1,11 @@
+ libdir = `xmms-config --input-plugin-dir`
+ lib_LTLIBRARIES = libaac.la
+ 
+-libaac_la_CFLAGS = `xmms-config --cflags` `$GTK_CONFIG --cflags` -Wall \
++libaac_la_CFLAGS = `xmms-config --cflags` `${GTK_CONFIG} --cflags` ${CFLAGS} \
+ 	-I$(top_builddir)/include 
+ 	
+-libaac_la_LIBADD = $(top_builddir)/libfaad/libfaad.la
+-
+ libaac_la_LDFLAGS = -module -avoid-version `xmms-config --libs` \
+-	`$GTK_CONFIG --libs` -lpthread -lz -lid3 -lstdc++
++	`${GTK_CONFIG} --libs` -lfaad -lz -lid3 -lstdc++
+ libaac_la_SOURCES = libaac.c id3.cpp dialog_gtk1.c aac_utils.c \
+ 	aac_utils.h
+ 
diff --git a/audio/xmms-faad/files/patch-plugins_xmmsmp4_src_Makefile.am b/audio/xmms-faad/files/patch-plugins_xmmsmp4_src_Makefile.am
new file mode 100644
index 000000000000..130e50965614
--- /dev/null
+++ b/audio/xmms-faad/files/patch-plugins_xmmsmp4_src_Makefile.am
@@ -0,0 +1,15 @@
+--- plugins/xmmsmp4/src/Makefile.am.orig	Thu Nov  6 06:04:14 2003
++++ plugins/xmmsmp4/src/Makefile.am	Sun Mar 14 23:57:41 2004
+@@ -3,10 +3,8 @@
+ lib_LTLIBRARIES = libmp4.la
+ libmp4_la_CFLAGS = -I$(top_builddir)/common/mp4v2 \
+ 	-I$(top_builddir)/include \
+-	`xmms-config --cflags` -DHAVE_GLIB_H=1
++	`xmms-config --cflags` ${CFLAGS} -DHAVE_GLIB_H=1
+ 
+-libmp4_la_LDFLAGS = -module -avoid-version `xmms-config --libs` -lpthread -lstdc++ 
+-
+-libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la $(top_builddir)/common/mp4v2/libmp4v2.la
++libmp4_la_LDFLAGS = -module -avoid-version `xmms-config --libs` -lfaad -lstdc++
+ 
+ libmp4_la_SOURCES = libmp4.c libmp4_utils.c libmp4_utils.h