ports/66600: [PATCH] audio/xmms-faad2: [update to 2.0 release]

[Michael Johnson]

The following reply was made to PR ports/66600; it has been noted by GNATS.

From: Michael Johnson <ahze at ahze.net>
To: FreeBSD-gnats-submit at FreeBSD.org
Cc: michael johnson <ahze at ahze.net>, dyeske at yahoo.com
Subject: Re: ports/66600: [PATCH] audio/xmms-faad2: [update to 2.0 release]
Date: Thu, 13 May 2004 09:04:55 -0400

 Please DO NOT commit the patch I sent previously. it builds and  
 installs okay but does NOT work. Please use this one instead =)
 
 ===> Updating from CVS
 M Makefile
 M files/patch-plugins_xmms_src_Makefile.am
 M files/patch-plugins_xmmsmp4_src_Makefile.am
 ===> Generating patch
 ===> Viewing diff with more
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/audio/xmms-faad/Makefile,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile
 --- Makefile	25 Mar 2004 04:31:54 -0000	1.10
 +++ Makefile	13 May 2004 12:58:44 -0000
 @@ -7,12 +7,11 @@
 
   PORTNAME=	faad2
   PORTVERSION=	2.0
 -PORTREVISION=	0
 +PORTEPOCH=	1
   CATEGORIES=	audio
   MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
   MASTER_SITE_SUBDIR=	faac
   PKGNAMEPREFIX=	xmms-
 -DISTNAME=	${PORTNAME}-${PORTVERSION}-rc3
 
   MAINTAINER=	dyeske at yahoo.com
   COMMENT=	XMMS plugin for faad
 @@ -34,14 +33,14 @@
   USE_LIBTOOL_VER=13
   USE_REINPLACE=	yes
 
 -CONFIGURE_ARGS=	--program-transform-name='' --with-mp4v2
 +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 +CONFIGURE_ARGS=	--with-xmms --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.so \
 -		lib/xmms/Input/libmp4.so
 +PLIST_FILES=	lib/xmms/Input/libmp4.so
 
   pre-patch: build-depends
 
 @@ -50,24 +49,20 @@
   # pre-configure will not work since *AUTO* tools happen in-between
   	@cd ${WRKSRC}; ${ACLOCAL} -I ${ACLOCAL_DIR} -I .; \
   		${SETENV} ${SCRIPTS_ENV} ${LIBTOOLIZE} --automake
 +	@${REINPLACE_CMD} -e 's|$$lt_target|$$host|' \
 +		${WRKSRC}/aclocal.m4
   # 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}
 +	@cd ${WRKSRC}/libfaad && ${MAKE}
 +	@cd ${WRKSRC}/common/mp4v2 && ${MAKE}
 +	@cd ${WRKSRC}/plugins/xmms/src && ${MAKE}
 
   do-install:
 -	@cd ${WRKSRC}/plugins/xmms && ${MAKE} install
 -	@cd ${WRKSRC}/plugins/xmmsmp4 && ${MAKE} install
 +	@cd ${WRKSRC}/plugins/xmms/src && ${MAKE} install
 
   .include <bsd.port.mk>
 Index: files/patch-plugins_xmms_src_Makefile.am
 ===================================================================
 RCS file:  
 /home/ncvs/ports/audio/xmms-faad/files/patch- 
 plugins_xmms_src_Makefile.am,v
 retrieving revision 1.1
 diff -u -r1.1 patch-plugins_xmms_src_Makefile.am
 --- files/patch-plugins_xmms_src_Makefile.am	15 Mar 2004 08:07:12  
 -0000	1.1
 +++ files/patch-plugins_xmms_src_Makefile.am	13 May 2004 07:05:09 -0000
 @@ -1,18 +1 @@
 ---- 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
 
 Index: files/patch-plugins_xmmsmp4_src_Makefile.am
 ===================================================================
 RCS file:  
 /home/ncvs/ports/audio/xmms-faad/files/patch- 
 plugins_xmmsmp4_src_Makefile.am,v
 retrieving revision 1.1
 diff -u -r1.1 patch-plugins_xmmsmp4_src_Makefile.am
 --- files/patch-plugins_xmmsmp4_src_Makefile.am	15 Mar 2004 08:07:12  
 -0000	1.1
 +++ files/patch-plugins_xmmsmp4_src_Makefile.am	13 May 2004 07:05:13  
 -0000
 @@ -1,15 +1 @@
 ---- 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
 ===> Done