Complete rename of SDL-mixer to SDL_mixer.

7 files changed, 2 insertions, 89 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 7cff9c6e6fb..e56f25d07e1 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.168 2003/03/26 22:49:14 wiz Exp $
+# $NetBSD: Makefile,v 1.169 2003/04/03 08:27:14 wiz Exp $
 #
 
 COMMENT=	Audio tools
 
-SUBDIR+=	SDL-mixer
+SUBDIR+=	SDL_mixer
 SUBDIR+=	SDL_sound
 SUBDIR+=	abcde
 SUBDIR+=	amp
diff --git a/audio/SDL-mixer/DESCR b/audio/SDL-mixer/DESCR
deleted file mode 100644
index 18b7f9ca7f8..00000000000
--- a/audio/SDL-mixer/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-  SDL_mixer is a sample multi-channel audio mixer library.  It supports
-any number of simultaneously playing channels of 16 bit stereo audio, plus
-a single channel of music, mixed by the popular MikMod MOD, Timidity MIDI,
-Ogg Vorbis, and SMPEG MP3 libraries.
diff --git a/audio/SDL-mixer/Makefile b/audio/SDL-mixer/Makefile
deleted file mode 100644
index 1d7f8f39a11..00000000000
--- a/audio/SDL-mixer/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/03/24 10:50:47 wiz Exp $
-#
-
-DISTNAME=		SDL_mixer-1.2.4
-PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
-CATEGORIES=		audio
-MASTER_SITES=		http://www.libsdl.org/projects/SDL_mixer/release/
-
-MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.libsdl.org/projects/SDL_mixer/
-COMMENT=		multi-channel audio mixer library
-
-GNU_CONFIGURE=		YES
-USE_X11=		YES
-USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
-USE_BUILDLINK2=		YES
-BUILDLINK_DEPENDS.SDL=	SDL>=1.2.2
-
-CPPFLAGS+=		-Dunix=1
-
-post-configure:
-	${SED} -e "s|@PREFIX@|${PREFIX}|" ${WRKSRC}/timidity/config.h \
-		> ${WRKSRC}/timidity/config.h.patched
-	${MV} ${WRKSRC}/timidity/config.h.patched ${WRKSRC}/timidity/config.h
-
-.include "../../audio/libogg/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/smpeg/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/SDL-mixer/PLIST b/audio/SDL-mixer/PLIST
deleted file mode 100644
index f07203c20a0..00000000000
--- a/audio/SDL-mixer/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/13 20:04:43 wiz Exp $
-bin/playmus
-bin/playwave
-include/SDL/SDL_mixer.h
-lib/libSDL_mixer-1.2.so
-lib/libSDL_mixer-1.2.so.2
-lib/libSDL_mixer-1.2.so.2.2
-lib/libSDL_mixer.a
-lib/libSDL_mixer.la
-lib/libSDL_mixer.so
diff --git a/audio/SDL-mixer/buildlink2.mk b/audio/SDL-mixer/buildlink2.mk
deleted file mode 100644
index 5000076ea0f..00000000000
--- a/audio/SDL-mixer/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/08/27 18:40:07 jlam Exp $
-
-.if !defined(SDL_MIXER_BUILDLINK2_MK)
-SDL_MIXER_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		SDL-mixer
-BUILDLINK_DEPENDS.SDL-mixer?=	SDL-mixer>=1.2.0
-BUILDLINK_PKGSRCDIR.SDL-mixer?=	../../audio/SDL-mixer
-
-EVAL_PREFIX+=				BUILDLINK_PREFIX.SDL-mixer=SDL-mixer
-BUILDLINK_PREFIX.SDL-mixer_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.SDL-mixer=		include/SDL_mixer/*
-BUILDLINK_FILES.SDL-mixer+=		lib/libSDL_mixer-*
-BUILDLINK_FILES.SDL-mixer+=		lib/libSDL_mixer.*
-
-.include "../../devel/SDL/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	SDL-mixer-buildlink
-
-SDL-mixer-buildlink: _BUILDLINK_USE
-
-.endif	# SDL_MIXER_BUILDLINK2_MK
diff --git a/audio/SDL-mixer/distinfo b/audio/SDL-mixer/distinfo
deleted file mode 100644
index 2f64acaf122..00000000000
--- a/audio/SDL-mixer/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2003/03/24 10:50:47 wiz Exp $
-
-SHA1 (SDL_mixer-1.2.4.tar.gz) = 96c4d173382d3eaefa3a837c388d5f50f34a7d11
-Size (SDL_mixer-1.2.4.tar.gz) = 955542 bytes
-SHA1 (patch-aa) = dc8f4f72e347caaa3c470b3757dd124850ff3059
diff --git a/audio/SDL-mixer/patches/patch-aa b/audio/SDL-mixer/patches/patch-aa
deleted file mode 100644
index a8228fe0d78..00000000000
--- a/audio/SDL-mixer/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/03/24 10:50:48 wiz Exp $
-
---- timidity/config.h.orig	Mon Mar 24 00:04:57 2003
-+++ timidity/config.h	Mon Mar 24 00:06:06 2003
-@@ -206,7 +206,7 @@
- 
- /* You could specify a complete path, e.g. "/etc/timidity.cfg", and
-    then specify the library directory in the configuration file. */
--#define CONFIG_FILE	"timidity.cfg"
-+#define CONFIG_FILE	"@PREFIX@/share/timidity/timidity.cfg"
- #ifdef __WIN32__
- #define DEFAULT_PATH	"\\TIMIDITY"
- #else