6 files changed, 15 insertions, 105 deletions

diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index d9a078aafab6..5695c49feaf0 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -1,51 +1,25 @@
-# New ports collection makefile for:  mad
-# Date created:        18 November 2000
-# Whom:                Jason R. Mastaler <jason@mastaler.com>
+# New ports collection makefile for:	mad
+# Date created:		18 November 2000
+# Whom:			Jason R. Mastaler <jason@mastaler.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mad
-PORTVERSION=	0.14.2b
-PORTREVISION=	3
+PORTVERSION=	0.15.0b
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.mars.org/pub/mpeg/
-MASTER_SITE_SUBDIR=	mad
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
 
-MAINTAINER=	jason@mastaler.com
-COMMENT=	High-quality MPEG audio decoder
+MAINTAINER=	asa@gascom.ru
+COMMENT=	The "meta-port" for the MAD sound playback system
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
+RUN_DEPENDS=	madplay:${PORTSDIR}/audio/madplay
+LIB_DEPENDS=	id3tag.2:${PORTSDIR}/audio/libid3tag
 
-WANT_GNOME=	yes
+NO_BUILD=	yes
 
-USE_AUTOCONF=	yes
-USE_LIBTOOL=	yes
-USE_REINPLACE=	yes
-INSTALLS_SHLIB=	yes
-LIBTOOLFILES=	configure libmad/configure libid3tag/configure
-CONFIGURE_ARGS=	--enable-shared \
-		--disable-debugging \
-		--enable-sso \
-		--enable-accuracy
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+do-install:	# empty
 
-MAN1=		abxtest.1 madplay.1
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
-PKGNAMESUFFIX=	-esound
-.else
-CONFIGURE_ARGS+=	--without-esd
-.endif
-
-post-patch:
-# fix weird @INSTALL@ behavior caused by USE_AUTOCONF
-	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} -n 10 \
-		${REINPLACE_CMD} -E -e 's|^(INSTALL[[:space:]]*=).*$$|\1 ${INSTALL_DATA}|'
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/mad/distinfo b/audio/mad/distinfo
deleted file mode 100644
index d7c3119be27d..000000000000
--- a/audio/mad/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (mad-0.14.2b.tar.gz) = eb3bfbe634ba9d5b4928aa11e0f6819d
diff --git a/audio/mad/files/patch-Makefile.in b/audio/mad/files/patch-Makefile.in
deleted file mode 100644
index 50d0c1d3c87b..000000000000
--- a/audio/mad/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Thu Apr 12 04:44:41 2001
-+++ Makefile.in	Sun Aug 19 13:03:39 2001
-@@ -94,7 +94,7 @@
- 
- SUBDIRS = intl po libmad winamp
- 
--bin_PROGRAMS = madplay
-+bin_PROGRAMS = madplay madtime
- bin_SCRIPTS = abxtest
- EXTRA_PROGRAMS = madtime minimad madmix mad123
- 
diff --git a/audio/mad/files/patch-aa b/audio/mad/files/patch-aa
deleted file mode 100644
index 6649b102efbf..000000000000
--- a/audio/mad/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.orig	Fri Feb  9 18:31:26 2001
-+++ configure	Thu Feb 15 19:31:10 2001
-@@ -3820,5 +3820,5 @@
- 	    ;;
- 	-O*|-f*)
--	    optimize="$1"
-+	    optimize="$optimize $1"
- 	    shift
- 	    ;;
-@@ -5653,8 +5653,4 @@
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
- 
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
diff --git a/audio/mad/files/patch-ac b/audio/mad/files/patch-ac
deleted file mode 100644
index a0aea947a9aa..000000000000
--- a/audio/mad/files/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
---- libmad/configure.orig	Fri Feb  9 18:31:43 2001
-+++ libmad/configure	Thu Feb 15 19:17:51 2001
-@@ -1841,5 +1841,5 @@
- 	    ;;
- 	-O2)
--	    optimize="-O"
-+	    optimize="-O2"
- 	    shift
- 	    ;;
diff --git a/audio/mad/pkg-plist b/audio/mad/pkg-plist
index ff40965d5e29..93a9d89ea0f5 100644
--- a/audio/mad/pkg-plist
+++ b/audio/mad/pkg-plist
@@ -1,26 +1 @@
-bin/abxtest
-bin/madplay
-bin/madtime
-include/id3tag.h
-include/mad.h
-lib/libmad.a
-lib/libmad.so
-lib/libmad.so.1
-lib/libid3tag.a
-lib/libid3tag.so
-lib/libid3tag.so.1
-share/locale/en/LC_MESSAGES/mad.mo
-share/locale/es/LC_MESSAGES/mad.mo
-share/locale/fr/LC_MESSAGES/mad.mo
-share/locale/hr/LC_MESSAGES/mad.mo
-share/locale/no/LC_MESSAGES/mad.mo
-@exec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/no 2>/dev/null || true
-@exec rmdir %D/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/hr 2>/dev/null || true
-@exec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/fr 2>/dev/null || true
-@exec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/es 2>/dev/null || true
-@exec rmdir %D/share/locale/en/LC_MESSAGES 2>/dev/null || true
-@exec rmdir %D/share/locale/en 2>/dev/null || true
+@comment Metaports do not have files :)