mad is now a meta-package that contains libmad, libid3tag, and madplay, as the mad distribution has been split up to these three

5 files changed, 30 insertions, 84 deletions

diff --git a/audio/mad/DESCR b/audio/mad/DESCR
index 923313d6893..b28a8a384fd 100644
--- a/audio/mad/DESCR
+++ b/audio/mad/DESCR
@@ -1,11 +1,11 @@
-MAD is a high-quality MPEG audio decoder. It currently supports MPEG 1 as
-well as the MPEG 2 extension to Lower Sampling Frequencies. All three
-audio layers (Layer I, Layer II, and Layer III aka MP3) are fully
-implemented.
+MAD (libmad) is a high-quality MPEG audio decoder. It currently
+supports MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies,
+as well as the so-called MPEG 2.5 format. All three audio layers
+(Layer I, Layer II, and Layer III a.k.a. MP3) are fully implemented.
 
-MAD does not yet support MPEG 2 multichannel audio (although it should be
-backward compatible with such streams), nor does it support the so-called
-MPEG 2.5 format.
+MAD does not yet support MPEG-2 multichannel audio (although it
+should be backward compatible with such streams) nor does it
+currently support AAC.
 
 MAD has the following special features:
 
@@ -13,3 +13,9 @@ MAD has the following special features:
   - 100% fixed-point (integer) computation
   - completely new implementation based on the ISO/IEC standards
   - distributed under the terms of the GNU General Public License (GPL)
+
+Because MAD provides full 24-bit PCM output, applications using
+MAD are able to produce high quality audio. Even when the output
+device supports only 16-bit PCM, applications can use the extra
+resolution to increase the audible dynamic range through the use
+of dithering or noise shaping.
diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index 5ea6391bb06..e1fc634d05f 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -1,34 +1,25 @@
-# $NetBSD: Makefile,v 1.11 2003/07/10 08:50:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/10 09:05:43 adam Exp $
 #
 
-DISTNAME=	mad-0.14.2b
-PKGREVISION=	1
-CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mad/} \
-		ftp://ftp.mars.org/pub/mpeg/
+DISTNAME=	mad-0.15.0b
+CATEGORIES=	audio meta-pkgs
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
 MAINTAINER=	simonb@netbsd.org
 HOMEPAGE=	http://sourceforge.net/projects/mad/
-COMMENT=	High-quality MPEG audio decoder
+COMMENT=	Meta-package for MAD (MPEG Audio Decoder)
 
-BUILD_USES_MSGFMT=	YES
+DEPENDS+=	libmad>=0.15.0:../../audio/libmad
+DEPENDS+=	libid3tag>=0.15.0:../../audio/libid3tag
+DEPENDS+=	madplay>=0.15.0:../../audio/madplay
 
-CONFLICTS=	madplay-[0-9]* libid3tag-[0-9]* libmad-[0-9]*
+USE_BUILDLINK2=	YES
+EXTRACT_ONLY=	# empty
+NO_CHECKSUM=	YES
+NO_CONFIGURE=	YES
+NO_BUILD=	YES
 
-USE_BUILDLINK2=		YES
-USE_PKGLOCALEDIR=	YES
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../audio/esound/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-
-.if defined(USE_OSS)
-.  include "../../mk/ossaudio.buildlink2.mk"
-.endif
+do-install:	# empty
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mad/PLIST b/audio/mad/PLIST
index 978badedff0..27708bdf80c 100644
--- a/audio/mad/PLIST
+++ b/audio/mad/PLIST
@@ -1,22 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:21:53 jlam Exp $
-bin/abxtest
-bin/madplay
-include/id3tag.h
-include/mad.h
-lib/libid3tag.a
-lib/libid3tag.la
-lib/libid3tag.so
-lib/libid3tag.so.1
-lib/libid3tag.so.1.0
-lib/libmad.so
-lib/libmad.so.1
-lib/libmad.so.1.0
-lib/libmad.a
-lib/libmad.la
-man/man1/abxtest.1
-man/man1/madplay.1
-${PKGLOCALEDIR}/locale/en/LC_MESSAGES/mad.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mad.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mad.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/mad.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/mad.mo
+@comment $NetBSD: PLIST,v 1.5 2003/07/10 09:06:02 adam Exp $
+@comment this plist intentionally left empty
diff --git a/audio/mad/buildlink2.mk b/audio/mad/buildlink2.mk
deleted file mode 100644
index 5a59ad34e5f..00000000000
--- a/audio/mad/buildlink2.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:21:54 jlam Exp $
-
-.if !defined(MAD_BUILDLINK2_MK)
-MAD_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		mad
-BUILDLINK_DEPENDS.mad?=		mad>=0.14.2b
-BUILDLINK_PKGSRCDIR.mad?=	../../audio/mad
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.mad=mad
-BUILDLINK_PREFIX.mad_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.mad=		include/id3tag.h
-BUILDLINK_FILES.mad+=		include/mad.h
-BUILDLINK_FILES.mad+=		lib/libid3tag.*
-BUILDLINK_FILES.mad+=		lib/libmad.*
-
-#.include "../../audio/libaudiofile/buildlink2.mk"
-.include "../../audio/esound/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-
-BUILDLINK_TARGETS+=		mad-buildlink
-
-mad-buildlink: _BUILDLINK_USE
-
-.endif	# MAD_BUILDLINK2_MK
diff --git a/audio/mad/distinfo b/audio/mad/distinfo
deleted file mode 100644
index 2817f95424e..00000000000
--- a/audio/mad/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2003/06/02 12:38:45 is Exp $
-
-SHA1 (mad-0.14.2b.tar.gz) = 07303e2a512a9956d63fef3451ae7823e5f03b68
-Size (mad-0.14.2b.tar.gz) = 721345 bytes
-SHA1 (patch-ac) = 8d70ebc8823a876ee72fb89e14fbc4cfcd755c45
-SHA1 (patch-ad) = dff1f070265e8fd1c7c05cb52f95353eb4c2db68