Turn audio/vorbis into a meta-port for the new Vorbis sub-ports.

Submitted by:   maintainer (changed by me to eliminate warning
about missing distinfo, to allow package-building, to eliminate
unnecessary pkg-plist file, and to retain most of pkg-descr)

3 files changed, 28 insertions, 46 deletions

diff --git a/audio/vorbis/Makefile b/audio/vorbis/Makefile
index 69e1392..5c5dc34 100644
--- a/audio/vorbis/Makefile
+++ b/audio/vorbis/Makefile
@@ -6,47 +6,33 @@
 #
 
 PORTNAME=	vorbis
-PORTVERSION=	20000821
+PORTVERSION=	20001018
 CATEGORIES=	audio
-MASTER_SITES=	http://home.student.utwente.nl/t.vanklaveren/distfiles/
+MASTER_SITES=	# empty
+DISTFILES=	# none
+EXTRACT_ONLY=	# empty
 
 MAINTAINER=	t.vanklaveren@student.utwente.nl
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
-		xmms.1:${PORTSDIR}/audio/xmms
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-# Vorbis doesn't depend on X, but it's needed for the XMMS plugin :-(
-USE_X_PREFIX=	yes
-USE_GTK=	yes
-USE_AUTOCONF=	yes
-
-MAN1=	ogg123.1 vorbize.1 oggenc.1
-
-post-build:
-	cd ${WRKSRC}/vorbis-tools/libao && ${SETENV} ${MAKE_ENV} ${MAKE}
-	cd ${WRKSRC}/vorbis-tools && ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
-	cd ${WRKSRC}/xmms && ${SETENV} ${MAKE_ENV} ${MAKE} target
-
-do-install:
-# Install all vorbis libraries and headers by hand. There is no target for it.
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libvorbis.a ${PREFIX}/lib/
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/vorbisfile.a ${PREFIX}/lib/
-# Install all vorbis-tools by hand. The Makefile sucks and is beyond hope.
-	${INSTALL_PROGRAM} ${WRKSRC}/vorbis-tools/vorbize ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/vorbis-tools/mp3tovorbis ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/vorbis-tools/ogg123 ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/vorbis-tools/vorbiscomment ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/vorbis-tools/oggenc ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/vorbis-tools/ogg123.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/vorbis-tools/vorbize.1 ${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/vorbis-tools/oggenc.1 ${PREFIX}/man/man1/
-	${INSTALL_PROGRAM} ${WRKSRC}/xmms/libvorbis.so ${PREFIX}/lib/xmms/Input/
-# And finally, the header files
-	${MKDIR} ${PREFIX}/include/vorbis
-	${MKDIR} ${PREFIX}/include/vorbis/book
-	${INSTALL_DATA} ${WRKSRC}/include/vorbis/*.h ${PREFIX}/include/vorbis/
-	${INSTALL_DATA} ${WRKSRC}/include/vorbis/book/*.vqh ${PREFIX}/include/vorbis/book/
+LIB_DEPENDS=	ao.0:${PORTSDIR}/audio/libao \
+		ogg.0:${PORTSDIR}/audio/libogg \
+		vorbis.0:${PORTSDIR}/audio/libvorbis
+RUN_DEPENDS=	${X11BASE}/lib/xmms/Input/libvorbis.so:${PORTSDIR}/audio/vorbis-xmms \
+		ogg123:${PORTSDIR}/audio/vorbis-tools
+
+MD5_FILE=	Makefile	# dummy
+NO_BUILD=	yes
+PLIST=		${WRKDIR}/pkg-plist
+SUBPORTS=	libao libogg libvorbis vorbis-tools vorbis-xmms
+
+pre-install:
+		${ECHO} "@comment intentionally left empty" > ${PLIST}
+
+do-install:	# empty
+
+do-package:
+.for i in ${SUBPORTS}
+	cd ${PORTSDIR}/audio/${i} && ${MAKE} package
+.endfor
 
 .include <bsd.port.mk>
diff --git a/audio/vorbis/pkg-comment b/audio/vorbis/pkg-comment
index a92422a..35b4560 100644
--- a/audio/vorbis/pkg-comment
+++ b/audio/vorbis/pkg-comment
@@ -1 +1 @@
-MP3-comparable audio compression codec and tools
+Meta-port for all vorbis-related ports
diff --git a/audio/vorbis/pkg-descr b/audio/vorbis/pkg-descr
index 5829373..8ecff17 100644
--- a/audio/vorbis/pkg-descr
+++ b/audio/vorbis/pkg-descr
@@ -1,17 +1,13 @@
-Vorbis is a general purpose audio and music encoding format
+Vorbis is a general-purpose audio and music encoding format
 contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
-MPEG audio layer 3. Unlike the MPEG sponsored formats (and other
+MPEG audio layer 3.  Unlike the MPEG sponsored formats (and other
 proprietary formats such as RealAudio G2 and Windows' flavor of the
 month), the Vorbis CODEC specification belongs to the public domain.
 All the technical details are published and documented, and any
 software entity may make full use of the format without royalty or
 patent concerns.
 
-This package contains libvorbis, an LGPLed software implementation of
-the Vorbis specification by the Xiphophorus company
-(http://www.xiph.org/), vorbisfile, an LGPLed convenience library
-built on Vorbis designed to simplify common uses and a number of GPL
-example programs, utilities and player plugins.
+This is a meta-port for all the vorbis-related ports.
 
 WWW: http://www.vorbis.com