Remove audio/moc-devel now that audio/moc contains a newer version.

7 files changed, 1 insertions, 267 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 3b1318a8009..c29010b4508 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.529 2016/02/08 01:54:33 markd Exp $
+# $NetBSD: Makefile,v 1.530 2016/02/16 08:54:42 leot Exp $
 #
 
 COMMENT=	Audio tools
@@ -299,7 +299,6 @@ SUBDIR+=	milkytracker
 SUBDIR+=	mixer.app
 SUBDIR+=	mkcdtoc
 SUBDIR+=	moc
-SUBDIR+=	moc-devel
 SUBDIR+=	moodbar
 SUBDIR+=	moss
 SUBDIR+=	mp32ogg
diff --git a/audio/moc-devel/DESCR b/audio/moc-devel/DESCR
deleted file mode 100644
index 83500f474e3..00000000000
--- a/audio/moc-devel/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-MOC (music on console) is a console audio player for LINUX/UNIX
-designed to be powerful and easy to use. Noteworthy features
-include:
-
-  * By default, files are decoded and played in a background
-    process. This allows the user to quit the interface (e.g.,
-    if one needs to close the xterm) without affecting
-    playback. It also allows attaching multiple interfaces
-    (e.g. in multiple xterms) to the same player.
-  * Playback should be smooth even under high cpu or I/O load,
-    due to the use of output buffering in a separate thread.
-  * There are no sound gaps in between files, because the next
-    file to be played is precached while playing the current
-    file.
-
-Note: To avoid conflicts with Qt's 'moc', the moc binary is
-called 'mocp'.
diff --git a/audio/moc-devel/Makefile b/audio/moc-devel/Makefile
deleted file mode 100644
index 6acbcfaba6e..00000000000
--- a/audio/moc-devel/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2015/12/29 04:54:35 dholland Exp $
-
-DISTNAME=		moc-2.5.0-beta1
-PKGREVISION=		3
-PKGNAME=		${DISTNAME:S/-beta/b/:moc%=moc-devel%}
-CATEGORIES=		audio
-MASTER_SITES=		http://ftp.daper.net/pub/soft/moc/unstable/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		peter.schuller@infidyne.com
-HOMEPAGE=		http://moc.daper.net/
-COMMENT=		Curses based console audio player
-LICENSE=		gnu-gpl-v2
-
-CONFLICTS=		moc-[0-9]*
-
-GNU_CONFIGURE=		yes
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
-#USE_TOOLS+=		autoconf automake
-
-SUBST_CLASSES+=		oss
-SUBST_STAGE.oss=	pre-configure
-SUBST_FILES.oss=	config.example options.c
-SUBST_SED.oss=		-e s,/dev/dsp,${DEVOSSAUDIO},g
-SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
-
-.include "options.mk"
-###
-### This target is [currently] for regenerating configure to add the
-### sched_get_priority_max check of librt.
-###
-#pre-configure:
-#	cd ${WRKSRC} && autoreconf -v -i
-post-extract:
-	${CP} ${FILESDIR}/getline.c ${WRKSRC}
-
-LDFLAGS.SunOS+=		-lsocket
-
-BUILDLINK_TRANSFORM+=	l:db:db4
-
-# ${PREFIX}/bin/mocp contains path to pkg-config in work/.tools/.
-# It is harmless.
-CHECK_WRKREF_SKIP=	bin/mocp
-
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/audio/moc-devel/PLIST b/audio/moc-devel/PLIST
deleted file mode 100644
index b1436fe2acc..00000000000
--- a/audio/moc-devel/PLIST
+++ /dev/null
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2013/02/10 08:39:00 ryoon Exp $
-bin/mocp
-${PLIST.flac}lib/moc/decoder_plugins/libflac_decoder.la
-lib/moc/decoder_plugins/libmp3_decoder.la
-${PLIST.vorbis}lib/moc/decoder_plugins/libvorbis_decoder.la
-${PLIST.sndfile}lib/moc/decoder_plugins/libsndfile_decoder.la
-${PLIST.speex}lib/moc/decoder_plugins/libspeex_decoder.la
-man/man1/mocp.1
-share/doc/moc/README
-share/doc/moc/README_equalizer
-share/doc/moc/THANKS
-share/doc/moc/config.example
-share/doc/moc/keymap.example
-share/moc/themes/black_theme
-share/moc/themes/darkdot_theme
-share/moc/themes/example_theme
-share/moc/themes/green_theme
-share/moc/themes/moca_theme
-share/moc/themes/nightly_theme
-share/moc/themes/red_theme
-share/moc/themes/transparent-background
-share/moc/themes/yellow_red_theme
diff --git a/audio/moc-devel/distinfo b/audio/moc-devel/distinfo
deleted file mode 100644
index 57ded25a428..00000000000
--- a/audio/moc-devel/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 01:12:41 agc Exp $
-
-SHA1 (moc-2.5.0-beta1.tar.bz2) = 4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa
-RMD160 (moc-2.5.0-beta1.tar.bz2) = ca7095f71e5fe8155eda41e98547db541d6a4cab
-SHA512 (moc-2.5.0-beta1.tar.bz2) = 16f1cf35706bbf410197651fd4398114ae2c95103773886629f0e1884900f2b865b9b6354da507a57af021a7d6599cd2e1d7e338791dc4a6f55e6c6c193800f2
-Size (moc-2.5.0-beta1.tar.bz2) = 570468 bytes
-SHA1 (patch-aa) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
-SHA1 (patch-ab) = 101bc0808cc3a4981d51720c6558ce61f66c79d7
-SHA1 (patch-ac) = 8d42e26a6e4c5483741e74a71a747dc68888b9b2
-SHA1 (patch-ad) = 0f51c3145a393e6b99ca47b3e9622c332872e0b4
-SHA1 (patch-af) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
-SHA1 (patch-ag) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
-SHA1 (patch-decoder__plugins_vorbis_vorbis.m4) = d85c04e8e8576afae224c07d7aac0aec3aebbb7f
-SHA1 (patch-playlist__file.c) = dcd6387567031c4f540b869c01765223a81a74b0
diff --git a/audio/moc-devel/files/getline.c b/audio/moc-devel/files/getline.c
deleted file mode 100644
index 9827eede347..00000000000
--- a/audio/moc-devel/files/getline.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* 	$NetBSD: getline.c,v 1.2 2008/04/29 05:46:09 martin Exp $ */
-/*	$NetBSD: getline.c,v 1.2 2008/04/29 05:46:09 martin Exp $	*/
-
-/*-
- * Copyright (c) 1997-2007 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-
-/* Read a line from the FILE stream into buf/buflen using fgets(), so up
- * to buflen-1 chars will be read and the result will be NUL terminated.
- * If the line has a trailing newline it will be removed.
- * If the line is too long, excess characters will be read until
- * newline/EOF/error.
- * If EOF/error occurs or a too-long line is encountered and errormsg
- * isn't NULL, it will be changed to a description of the problem.
- * (The EOF message has a leading \n for cosmetic purposes).
- * Returns:
- *	>=0	length of line (excluding trailing newline) if all ok
- *	-1	error occurred
- *	-2	EOF encountered
- *	-3	line was too long
- */
-int
-getline(FILE *stream, char *buf, size_t buflen, const char **errormsg)
-{
-	int	rv, ch;
-	size_t	len;
-
-	if (fgets(buf, buflen, stream) == NULL) {
-		if (feof(stream)) {	/* EOF */
-			rv = -2;
-			if (errormsg)
-				*errormsg = "\nEOF received";
-		} else  {		/* error */
-			rv = -1;
-			if (errormsg)
-				*errormsg = "Error encountered";
-		}
-		clearerr(stream);
-		return rv;
-	}
-	len = strlen(buf);
-	if (buf[len-1] == '\n') {	/* clear any trailing newline */
-		buf[--len] = '\0';
-	} else if (len == buflen-1) {	/* line too long */
-		while ((ch = getchar()) != '\n' && ch != EOF)
-			continue;
-		if (errormsg)
-			*errormsg = "Input line is too long";
-		clearerr(stream);
-		return -3;
-	}
-	if (errormsg)
-		*errormsg = NULL;
-	return len;
-}
diff --git a/audio/moc-devel/options.mk b/audio/moc-devel/options.mk
deleted file mode 100644
index 58b9318f9b7..00000000000
--- a/audio/moc-devel/options.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-# $NetBSD: options.mk,v 1.4 2008/07/31 04:02:40 bjs Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.moc
-PKG_SUPPORTED_OPTIONS=	sndfile flac vorbis speex curl samplerate jack
-PKG_SUGGESTED_OPTIONS=	sndfile flac vorbis curl
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		flac sndfile speex vorbis
-
-.if !empty(PKG_OPTIONS:Mjack)
-CONFIGURE_ARGS+=	--with-jack
-###
-### Resampling support is usually required with jack.
-###
-.  include "../../audio/jack/buildlink3.mk"
-.  if empty(PKG_OPTIONS:Msamplerate)
-PKG_OPTIONS+=		samplerate
-.  endif
-.else
-CONFIGURE_ARGS+=	--without-jack
-.endif
-
-.if !empty(PKG_OPTIONS:Msamplerate)
-CONFIGURE_ARGS+=	--with-samplerate
-.  if empty(PKG_OPTIONS:Msndfile)
-PKG_OPTIONS+=		sndfile
-.  endif
-.  include "../../audio/libsamplerate/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-samplerate
-.endif
-
-.if !empty(PKG_OPTIONS:Msndfile)
-PLIST.sndfile=		yes
-CONFIGURE_ARGS+=	--with-sndfile
-.  include "../../audio/libsndfile/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-sndfile
-.endif
-
-.if !empty(PKG_OPTIONS:Mflac)
-PLIST.flac=		yes
-CONFIGURE_ARGS+=	--with-flac
-.  include "../../audio/flac/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-flac
-.endif
-
-.if !empty(PKG_OPTIONS:Mvorbis)
-PLIST.vorbis=		yes
-CONFIGURE_ARGS+=	--with-vorbis
-.  include "../../audio/libvorbis/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-vorbis
-.endif
-
-.if !empty(PKG_OPTIONS:Mspeex)
-PLIST.speex=		yes
-CONFIGURE_ARGS+=	--with-speex
-.  include "../../audio/speex/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-speex
-.endif
-
-.if !empty(PKG_OPTIONS:Mcurl)
-CONFIGURE_ARGS+=	--with-curl
-.  include "../../www/curl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-curl
-.endif