Update audio/flac-xmms to 1.0.3. This uses the XMMX plugin distributed

with the flac-1.0.3 sources.  There is no provided list of changes.

4 files changed, 59 insertions, 31 deletions

diff --git a/audio/flac-xmms/Makefile b/audio/flac-xmms/Makefile
index 22c4ffb5f73..2dd0498878f 100644
--- a/audio/flac-xmms/Makefile
+++ b/audio/flac-xmms/Makefile
@@ -1,23 +1,33 @@
-# $NetBSD: Makefile,v 1.4 2002/04/27 10:12:40 rh Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/06 06:45:07 jlam Exp $
 #
 
-DISTNAME=		flac-1.0.2-src
-PKGNAME=		flac-xmms-1.0.2
-WRKSRC=			${WRKDIR}/flac-1.0.2/src/plugin_xmms/
-CATEGORIES=		audio archivers
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flac/}
+DISTNAME=	flac-1.0.3
+PKGNAME=	flac-xmms-1.0.3
+CATEGORIES=	audio archivers
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac/}
 
-MAINTAINER=		collver@linuxfreemail.com
-HOMEPAGE=		http://flac.sourceforge.net
-COMMENT=		FLAC xmms plugin
+MAINTAINER=	collver@linuxfreemail.com
+HOMEPAGE=	http://flac.sourceforge.net/
+COMMENT=	FLAC XMMS plugin
 
-MAKEFILE=		Makefile.lite
+USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+XMMS_WRKSRC=	${WRKSRC}/src/plugin_xmms
+
+do-build:
+	@cd ${XMMS_WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../../obj/lib/libxmms-flac.so \
-		${PREFIX}/lib/xmms/Input
+	@cd ${XMMS_WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET}
+
+.include "../../audio/flac/buildlink2.mk"
+.include "../../audio/xmms/buildlink2.mk"
 
-.include "../../audio/flac/buildlink.mk"
-.include "../../audio/xmms/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/flac-xmms/PLIST b/audio/flac-xmms/PLIST
index 6ed7597e02e..d5644cdeb35 100644
--- a/audio/flac-xmms/PLIST
+++ b/audio/flac-xmms/PLIST
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:16:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/06 06:45:08 jlam Exp $
+lib/xmms/Input/libxmms-flac.a
+lib/xmms/Input/libxmms-flac.la
 lib/xmms/Input/libxmms-flac.so
diff --git a/audio/flac-xmms/distinfo b/audio/flac-xmms/distinfo
index f0fa6a993c9..fd4e5373f95 100644
--- a/audio/flac-xmms/distinfo
+++ b/audio/flac-xmms/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/04/27 10:12:40 rh Exp $
+$NetBSD: distinfo,v 1.4 2002/09/06 06:45:08 jlam Exp $
 
-SHA1 (flac-1.0.2-src.tar.gz) = b712611a2902a5a165a1ef205a7b3ebe9695b560
-Size (flac-1.0.2-src.tar.gz) = 458799 bytes
-SHA1 (patch-aa) = 8c166a5aebec7ddbadc9a1196b231e21e6673d51
+SHA1 (flac-1.0.3.tar.gz) = 72106148c43f938df441d227f4b6198cfcadfdb8
+Size (flac-1.0.3.tar.gz) = 591337 bytes
+SHA1 (patch-aa) = e023e9dc3ca0899adc6522d6b2cc2e43b4342423
diff --git a/audio/flac-xmms/patches/patch-aa b/audio/flac-xmms/patches/patch-aa
index 15cd06635a2..f0227721ba5 100644
--- a/audio/flac-xmms/patches/patch-aa
+++ b/audio/flac-xmms/patches/patch-aa
@@ -1,15 +1,31 @@
-$NetBSD: patch-aa,v 1.1 2001/08/13 20:07:17 nra Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/06 06:45:09 jlam Exp $
 
---- Makefile.lite.orig	Thu Jun  7 17:00:48 2001
-+++ Makefile.lite
-@@ -20,8 +20,8 @@
- #
+--- src/plugin_xmms/Makefile.in.orig	Wed Jul  3 14:01:59 2002
++++ src/plugin_xmms/Makefile.in
+@@ -102,7 +102,7 @@ FLaC__USIZE32 = @FLaC__USIZE32@
+ FLaC__USIZE64 = @FLaC__USIZE64@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ # Don't build a static library
+-LIBTOOL = $(top_builddir)/libtool-disable-static
++LIBTOOL = $(top_builddir)/libtool
+ LN_S = @LN_S@
+ NASM = @NASM@
+ OBJDUMP = @OBJDUMP@
+@@ -134,7 +134,7 @@ xmmsinputplugindir = @XMMS_INPUT_PLUGIN_
  
- LIB_NAME  = libxmms-flac
--INCLUDES  = $(shell xmms-config --cflags) -I./include -I../../include
--LIBS = ../../obj/lib/libFLAC.a
-+INCLUDES  = $(shell xmms-config --cflags) -I./include -I${BUILDLINK}/include
-+LIBS = ${LOCALBASE}/lib/libFLAC.a
+ xmmsinputplugin_LTLIBRARIES = libxmms-flac.la
+ libxmms_flac_la_SOURCES = plugin.c
+-libxmms_flac_la_LIBADD = $(top_builddir)/src/libFLAC/libFLAC.la @XMMS_LIBS@
++libxmms_flac_la_LIBADD = $(libdir)/libFLAC.la @XMMS_LIBS@
+ #libxmms_flac_la_LIBADD = -L$(top_builddir)/src/libFLAC/.libs -lFLAC @XMMS_LIBS@
+ libxmms_flac_la_LDFLAGS = -module -avoid-version
+ subdir = src/plugin_xmms
+@@ -142,7 +142,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(xmmsinputplugin_LTLIBRARIES)
+ 
+-libxmms_flac_la_DEPENDENCIES = $(top_builddir)/src/libFLAC/libFLAC.la
++libxmms_flac_la_DEPENDENCIES =
+ am_libxmms_flac_la_OBJECTS = plugin.lo
+ libxmms_flac_la_OBJECTS = $(am_libxmms_flac_la_OBJECTS)
  
- OBJS = \
- 	plugin.o