Rename Speex to speex.

8 files changed, 2 insertions, 123 deletions

diff --git a/audio/Makefile b/audio/Makefile
index da75a8d7d85..f7706d98e84 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.166 2003/03/17 15:57:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.167 2003/03/24 09:00:45 wiz Exp $
 #
 
 COMMENT=	Audio tools
 
 SUBDIR+=	SDL-mixer
-SUBDIR+=	Speex
 SUBDIR+=	abcde
 SUBDIR+=	amp
 SUBDIR+=	arts
@@ -140,6 +139,7 @@ SUBDIR+=	shorten
 SUBDIR+=	sidplay
 SUBDIR+=	snd
 SUBDIR+=	sox
+SUBDIR+=	speex
 SUBDIR+=	spiralloops
 SUBDIR+=	spiralsynth
 SUBDIR+=	splay
diff --git a/audio/Speex-mixedcase/DESCR b/audio/Speex-mixedcase/DESCR
deleted file mode 100644
index 8b557db62ae..00000000000
--- a/audio/Speex-mixedcase/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The Speex project aims to build an open-source, patent-free voice
-codec.  Unlike other codecs like MP3 and Ogg Vorbis, Speex is
-specially designed for compressing voice at low bitrates in the
-8-32 kbps/channel range.  Possible applications include Voice over
-IP (VoIP), internet audio streaming, archiving of speech data (e.g.
-voice mail), and audio books.  In some sense, it is meant to be
-complementary to the Ogg Vorbis codec.
diff --git a/audio/Speex-mixedcase/Makefile b/audio/Speex-mixedcase/Makefile
deleted file mode 100644
index 87b5a05d568..00000000000
--- a/audio/Speex-mixedcase/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/03/04 15:18:35 wiz Exp $
-#
-
-DISTNAME=	speex-1.0rc3
-PKGNAME=	Speex-0.99.5
-CATEGORIES=	audio
-MASTER_SITES=	http://www.speex.org/download/
-
-MAINTAINER=	wiz@netbsd.org
-HOMEPAGE=	http://www.speex.org/
-COMMENT=	open-source, patent-free voice codec
-
-USE_BUILDLINK2=		YES
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-GNU_CONFIGURE=		YES
-
-CONFIGURE_ARGS+=	--with-ogg-dir="${BUILDLINK_PREFIX.libogg}"
-
-.include "../../audio/libogg/buildlink2.mk"
-.include "../../mk/ossaudio.buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/Speex-mixedcase/PLIST b/audio/Speex-mixedcase/PLIST
deleted file mode 100644
index 3071ea243eb..00000000000
--- a/audio/Speex-mixedcase/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/03 18:54:42 wiz Exp $
-bin/speexdec
-bin/speexenc
-include/speex.h
-include/speex_bits.h
-include/speex_callbacks.h
-include/speex_header.h
-include/speex_stereo.h
-lib/libspeex-0.99.so
-lib/libspeex.a
-lib/libspeex.la
-lib/libspeex.so
-man/man1/speexdec.1
-man/man1/speexenc.1
-share/doc/speex/manual.pdf
-@dirrm share/doc/speex
diff --git a/audio/Speex-mixedcase/buildlink2.mk b/audio/Speex-mixedcase/buildlink2.mk
deleted file mode 100644
index c2a8efece71..00000000000
--- a/audio/Speex-mixedcase/buildlink2.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/12/20 13:29:18 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use Speex.
-#
-# This file was created automatically using createbuildlink 2.2.
-#
-
-.if !defined(SPEEX_BUILDLINK2_MK)
-SPEEX_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			Speex
-BUILDLINK_DEPENDS.Speex?=		Speex>=0.99.3
-BUILDLINK_PKGSRCDIR.Speex?=		../../audio/Speex
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.Speex=Speex
-BUILDLINK_PREFIX.Speex_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.Speex+=	include/speex.h
-BUILDLINK_FILES.Speex+=	include/speex_bits.h
-BUILDLINK_FILES.Speex+=	include/speex_callbacks.h
-BUILDLINK_FILES.Speex+=	include/speex_header.h
-BUILDLINK_FILES.Speex+=	include/speex_stereo.h
-BUILDLINK_FILES.Speex+=	lib/libspeex-0.99.*
-BUILDLINK_FILES.Speex+=	lib/libspeex.*
-
-.include "../../audio/libogg/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	Speex-buildlink
-
-Speex-buildlink: _BUILDLINK_USE
-
-.endif	# SPEEX_BUILDLINK2_MK
diff --git a/audio/Speex-mixedcase/distinfo b/audio/Speex-mixedcase/distinfo
deleted file mode 100644
index 7915fbcd763..00000000000
--- a/audio/Speex-mixedcase/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2003/03/04 15:18:36 wiz Exp $
-
-SHA1 (speex-1.0rc3.tar.gz) = 1e4ffd8d7a5c7fb57f85f3cc63219626e46265d5
-Size (speex-1.0rc3.tar.gz) = 481195 bytes
-SHA1 (patch-aa) = 8171488be56f0dd34ff28315fef219e2e4eaee5b
-SHA1 (patch-ab) = 63c5bc6d4941cfb05e915de919b336b03de280b0
diff --git a/audio/Speex-mixedcase/patches/patch-aa b/audio/Speex-mixedcase/patches/patch-aa
deleted file mode 100644
index 2c6a8e80ac6..00000000000
--- a/audio/Speex-mixedcase/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/03/04 15:18:36 wiz Exp $
-
---- doc/Makefile.in.orig	Mon Mar  3 08:13:28 2003
-+++ doc/Makefile.in
-@@ -83,7 +83,7 @@ STRIP = @STRIP@
- VERSION = @VERSION@
- src = @src@
- 
--docdir = $(prefix)/share/doc
-+docdir = $(prefix)/share/doc/speex
- 
- doc_DATA = manual.pdf
- 
diff --git a/audio/Speex-mixedcase/patches/patch-ab b/audio/Speex-mixedcase/patches/patch-ab
deleted file mode 100644
index 718b6a432c9..00000000000
--- a/audio/Speex-mixedcase/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/03/04 15:18:36 wiz Exp $
-
---- src/Makefile.in.orig	Mon Mar  3 08:13:28 2003
-+++ src/Makefile.in
-@@ -89,7 +89,7 @@ src = @src@
- 
- INCLUDES = -I$(top_srcdir)/libspeex $(OGG_INCLUDES)
- 
--mandir = $(prefix)/share/man
-+mandir = $(prefix)/man
- man_MANS = speexenc.1 speexdec.1
- 
- EXTRA_DIST = $(man_MANS) getopt_win.h getopt.c getopt1.c wave_out.c wave_out.h
-@@ -100,10 +100,10 @@ noinst_HEADERS = wav_io.h
- bin_PROGRAMS = speexenc speexdec
- 
- speexenc_SOURCES = speexenc.c wav_io.c
--speexenc_LDADD = $(top_srcdir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
-+speexenc_LDADD = $(top_srcdir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) ${LIBOSSAUDIO}
- 
- speexdec_SOURCES = speexdec.c wav_io.c
--speexdec_LDADD = $(top_srcdir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS)
-+speexdec_LDADD = $(top_srcdir)/libspeex/libspeex.la $(OGG_LDFLAGS) $(OGG_LIBS) ${LIBOSSAUDIO}
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
- bin_PROGRAMS =  speexenc$(EXEEXT) speexdec$(EXEEXT)