Complete move of flac-xmms to xmms-flac.

Sort entries in category Makefile while here.

6 files changed, 3 insertions, 62 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 1ddd98d5780..5e322526a51 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.177 2003/07/13 08:40:28 mrg Exp $
+# $NetBSD: Makefile,v 1.178 2003/07/19 09:01:35 wiz Exp $
 #
 
 COMMENT=	Audio tools
@@ -56,7 +56,6 @@ SUBDIR+=	festvox-us1
 SUBDIR+=	festvox-us2
 SUBDIR+=	festvox-us3
 SUBDIR+=	flac
-SUBDIR+=	flac-xmms
 SUBDIR+=	freezetag
 SUBDIR+=	gdcd
 SUBDIR+=	gkrellm-volume
@@ -182,13 +181,14 @@ SUBDIR+=	xmix
 SUBDIR+=	xmmix
 SUBDIR+=	xmms
 SUBDIR+=	xmms-bezier
-SUBDIR+=	xmms-bump-scope
 SUBDIR+=	xmms-blursk
+SUBDIR+=	xmms-bump-scope
 SUBDIR+=	xmms-crossfade
 SUBDIR+=	xmms-dflowers
 SUBDIR+=	xmms-dscope
 SUBDIR+=	xmms-dspectogram
 SUBDIR+=	xmms-dspectral
+SUBDIR+=	xmms-flac
 SUBDIR+=	xmms-fmradio
 SUBDIR+=	xmms-funtimedancer
 SUBDIR+=	xmms-gdancer
diff --git a/audio/flac-xmms/DESCR b/audio/flac-xmms/DESCR
deleted file mode 100644
index 724f7a1bc42..00000000000
--- a/audio/flac-xmms/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-XMMS plugin for FLAC compressed audio.
diff --git a/audio/flac-xmms/Makefile b/audio/flac-xmms/Makefile
deleted file mode 100644
index aa379316ae4..00000000000
--- a/audio/flac-xmms/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2003/07/19 08:54:26 wiz Exp $
-#
-
-DISTNAME=	flac-1.1.0
-PKGNAME=	flac-xmms-1.1.0
-PKGREVISION=	2
-CATEGORIES=	audio archivers
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac/}
-
-MAINTAINER=	collver1@comcast.net
-HOMEPAGE=	http://flac.sourceforge.net/
-COMMENT=	FLAC XMMS plugin
-
-USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
-
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool-disable-static
-
-XMMS_WRKSRC=	${WRKSRC}/src/plugin_xmms
-
-#do-build:
-#	@cd ${XMMS_WRKSRC}/../plugin_common && ${SETENV} ${MAKE_ENV} \
-#		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
-#	@cd ${XMMS_WRKSRC} && ${SETENV} ${MAKE_ENV} \
-#		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET}
-
-do-install:
-	@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 "../../mk/bsd.pkg.mk"
diff --git a/audio/flac-xmms/PLIST b/audio/flac-xmms/PLIST
deleted file mode 100644
index cf84bdd6c8b..00000000000
--- a/audio/flac-xmms/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/02/14 23:56:29 wiz Exp $
-lib/xmms/Input/libxmms-flac.la
-lib/xmms/Input/libxmms-flac.so
diff --git a/audio/flac-xmms/distinfo b/audio/flac-xmms/distinfo
deleted file mode 100644
index 880fa1a945e..00000000000
--- a/audio/flac-xmms/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2003/02/14 23:56:29 wiz Exp $
-
-SHA1 (flac-1.1.0.tar.gz) = 80334c1ebc693fb92e01f5a55ed332fbe9809592
-Size (flac-1.1.0.tar.gz) = 1201861 bytes
-SHA1 (patch-aa) = d042e72b8e12631004b2403b40c5b004fc71ea8b
diff --git a/audio/flac-xmms/patches/patch-aa b/audio/flac-xmms/patches/patch-aa
deleted file mode 100644
index 14d2ecfc44b..00000000000
--- a/audio/flac-xmms/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/02/14 23:56:30 wiz Exp $
-
---- src/libFLAC/ia32/Makefile.in.orig	Sat Feb 15 00:49:15 2003
-+++ src/libFLAC/ia32/Makefile.in
-@@ -352,7 +352,7 @@ uninstall-am: uninstall-info-am
- 
- 
- .nasm.lo:
--	$(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
-+	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: