- Update to 2.3.1

Approved by:	maintainer

11 files changed, 9 insertions, 171 deletions

diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index 14180d76524a..e85c684653a6 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	moc
-PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.3.1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.daper.net/pub/soft/moc/stable/
 
diff --git a/audio/moc/distinfo b/audio/moc/distinfo
index 1f81259b3d3e..0576eff43e88 100644
--- a/audio/moc/distinfo
+++ b/audio/moc/distinfo
@@ -1,2 +1,2 @@
-MD5 (moc-2.3.0.tar.bz2) = 3d5d152c28f6e40162058fc1566c8109
-SIZE (moc-2.3.0.tar.bz2) = 402954
+MD5 (moc-2.3.1.tar.bz2) = f6c9d56a80eb8000cfe51997b27eb6ed
+SIZE (moc-2.3.1.tar.bz2) = 403800
diff --git a/audio/moc/files/patch-audio__conversion.c b/audio/moc/files/patch-audio__conversion.c
index 8d4484c56182..608f49b91c9a 100644
--- a/audio/moc/files/patch-audio__conversion.c
+++ b/audio/moc/files/patch-audio__conversion.c
@@ -1,20 +1,9 @@
---- audio_conversion.c.orig	Wed Jun 15 18:56:46 2005
-+++ audio_conversion.c	Fri Jul 29 01:19:15 2005
-@@ -27,7 +27,8 @@
- #define __USE_ISOC99    1
- 
- #include <assert.h>
--#include <stdint.h>
-+#include <inttypes.h>
-+#include <limits.h>
- #include <stdlib.h>
- #include <math.h>
- #include <string.h>
-@@ -43,6 +44,32 @@
- #include "main.h"
+--- audio_conversion.c.orig	Fri Jul 29 10:46:36 2005
++++ audio_conversion.c	Fri Sep  9 12:50:22 2005
+@@ -52,6 +52,32 @@
  #include "log.h"
  #include "options.h"
-+
+ 
 +/* FreeBSD 4.x lacks these */
 +
 +#ifndef INT8_MIN
@@ -40,6 +29,7 @@
 +#ifndef INT32_MAX
 +#define INT32_MAX	INT_MAX
 +#endif
- 
++
  /* Byte order conversion */
  /* TODO: use functions from byteswap.h if available */
+ #define SWAP_INT16(l) ((int16_t) \
diff --git a/audio/moc/files/patch-decoder__plugins_flac_flac.c b/audio/moc/files/patch-decoder__plugins_flac_flac.c
deleted file mode 100644
index 7fa26bf521ab..000000000000
--- a/audio/moc/files/patch-decoder__plugins_flac_flac.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- decoder_plugins/flac/flac.c.orig	Fri Jul 29 01:31:54 2005
-+++ decoder_plugins/flac/flac.c	Fri Jul 29 01:32:11 2005
-@@ -422,11 +422,12 @@
- static int flac_seek (void *void_data, int sec)
- {
- 	struct flac_data *data = (struct flac_data *)void_data;
-+	FLAC__uint64 target_sample;
- 
- 	if (sec < 0 || (unsigned)sec > data->length)
- 		return -1;
- 
--	FLAC__uint64 target_sample = (FLAC__uint64)((sec/(double)data->length)
-+	target_sample = (FLAC__uint64)((sec/(double)data->length)
- 			* (double)data->total_samples);
- 	
- 	if (FLAC__seekable_stream_decoder_seek_absolute(data->decoder,
diff --git a/audio/moc/files/patch-decoder__plugins_mp3_mp3.c b/audio/moc/files/patch-decoder__plugins_mp3_mp3.c
deleted file mode 100644
index e4c715608bcc..000000000000
--- a/audio/moc/files/patch-decoder__plugins_mp3_mp3.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- decoder_plugins/mp3/mp3.c.orig	Wed Jun 15 18:56:45 2005
-+++ decoder_plugins/mp3/mp3.c	Fri Jul 29 14:28:05 2005
-@@ -353,10 +353,13 @@
- 	
- 	debug ("Processing file %s", file);
- 
--	if (!(data = mp3_open_internal(file, 0)))
--		time = -1;
--	else
-+	data = mp3_open_internal (file, 0);
-+	
-+	if (data->ok)
- 		time = data->duration;
-+	else
-+		time = -1;
-+	
- 	mp3_close (data);
- 
- 	return time;
diff --git a/audio/moc/files/patch-decoder__plugins_speex_speex.c b/audio/moc/files/patch-decoder__plugins_speex_speex.c
deleted file mode 100644
index 8420e7caa0b4..000000000000
--- a/audio/moc/files/patch-decoder__plugins_speex_speex.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- decoder_plugins/speex/speex.c.orig	Fri Jul 29 01:34:35 2005
-+++ decoder_plugins/speex/speex.c	Fri Jul 29 01:34:45 2005
-@@ -17,7 +17,7 @@
- #endif
- 
- #include <string.h>
--#include <stdint.h>
-+#include <inttypes.h>
- #include <assert.h>
- #include <speex/speex.h>
- #include <speex/speex_header.h>
diff --git a/audio/moc/files/patch-io__curl.c b/audio/moc/files/patch-io__curl.c
deleted file mode 100644
index 0a34e79613c7..000000000000
--- a/audio/moc/files/patch-io__curl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- io_curl.c.orig	Fri Jul 29 01:21:58 2005
-+++ io_curl.c	Fri Jul 29 01:22:25 2005
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- #include <errno.h>
- #include <assert.h>
--#include <stdint.h>
-+#include <inttypes.h>
- 
- #define DEBUG
- 
diff --git a/audio/moc/files/patch-io_open.c b/audio/moc/files/patch-io_open.c
deleted file mode 100644
index 6ebf67000af3..000000000000
--- a/audio/moc/files/patch-io_open.c
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: io.c
-===================================================================
---- io.c	(revision 1506)
-+++ io.c	(revision 1507)
-@@ -300,16 +300,6 @@
- 		if (s->source == IO_SOURCE_FD)
- 			close (s->fd);
- 
--		if (pthread_mutex_destroy(&s->buf_mutex))
--			logit ("Destroying buf_mutex failed: %s",
--					strerror(errno));
--		if (pthread_mutex_destroy(&s->io_mutex))
--			logit ("Destroying io_mutex failed: %s",
--					strerror(errno));
--		if (pthread_mutex_destroy(&s->metadata.mutex))
--			logit ("Destroying metadata mutex failed: %s",
--					strerror(errno));
--
- 		if (s->buffered) {
- 			fifo_buf_destroy (&s->buf);
- 			if (pthread_cond_destroy(&s->buf_free_cond))
-@@ -326,6 +316,13 @@
- 			free (s->metadata.url);
- 	}
- 
-+	if (pthread_mutex_destroy(&s->buf_mutex))
-+		logit ("Destroying buf_mutex failed: %s", strerror(errno));
-+	if (pthread_mutex_destroy(&s->io_mutex))
-+		logit ("Destroying io_mutex failed: %s", strerror(errno));
-+	if (pthread_mutex_destroy(&s->metadata.mutex))
-+		logit ("Destroying metadata mutex failed: %s", strerror(errno));
-+
- 	if (s->strerror)
- 		free (s->strerror);
- 	free (s);
-@@ -493,6 +490,10 @@
- #endif
- 	io_open_file (s, file);
- 
-+	pthread_mutex_init (&s->buf_mutex, NULL);
-+	pthread_mutex_init (&s->io_mutex, NULL);
-+	pthread_mutex_init (&s->metadata.mutex, NULL);
-+
- 	if (!s->opened)
- 		return s;
- 				
-@@ -503,10 +504,6 @@
- 	s->pos = 0;
- 	memset (&s->metadata, 0, sizeof(s->metadata));
- 
--	pthread_mutex_init (&s->buf_mutex, NULL);
--	pthread_mutex_init (&s->io_mutex, NULL);
--	pthread_mutex_init (&s->metadata.mutex, NULL);
--
- 	if (buffered) {
- 		fifo_buf_init (&s->buf, options_get_int("InputBuffer") * 1024);
- 		s->prebuffer = options_get_int("Prebuffering") * 1024;
diff --git a/audio/moc/files/patch-player.c b/audio/moc/files/patch-player.c
deleted file mode 100644
index a43621a1bb76..000000000000
--- a/audio/moc/files/patch-player.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: player.c
-===================================================================
---- player.c	(revision 1478)
-+++ player.c	(working copy)
-@@ -615,7 +615,9 @@
- 		}
- 
- 		already_decoded_time = precache.decoded_time;
--		bitrate_list = precache.bitrate_list;
-+		bitrate_list_init (&bitrate_list);
-+		bitrate_list.head = precache.bitrate_list.head;
-+		bitrate_list.tail = precache.bitrate_list.tail;
- 
- 		/* don't free list elements when reseting precache */
- 		precache.bitrate_list.head = NULL;
diff --git a/audio/moc/files/patch-server.c b/audio/moc/files/patch-server.c
deleted file mode 100644
index c97f8ee942f7..000000000000
--- a/audio/moc/files/patch-server.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- server.c.orig	Fri Jul 29 01:02:48 2005
-+++ server.c	Fri Jul 29 01:02:54 2005
-@@ -212,8 +212,8 @@
- 
- static void del_client (struct client *cli)
- {
--	cli->socket = -1;
- 	struct event *e;
-+	cli->socket = -1;
- 
- 	/* Free the event queue - we can't just use event_queue_free(), because
- 	 * it can't free() the event's data. */
diff --git a/audio/moc/files/patch-themes-yellow_red_theme b/audio/moc/files/patch-themes-yellow_red_theme
deleted file mode 100644
index 9224e1bffe14..000000000000
--- a/audio/moc/files/patch-themes-yellow_red_theme
+++ /dev/null
@@ -1,10 +0,0 @@
---- themes/yellow_red_theme.orig	Wed Jun 15 18:56:44 2005
-+++ themes/yellow_red_theme	Fri Jul 29 10:29:23 2005
-@@ -1,7 +1,6 @@
- # Yellow/Red theme - mostly Yellow. By Morten Grunnet Buhl
- # Doesn't work on terminals when underline is not supported (like Linux console)
- 
--border			= red		default
- background		= red		default
- frame			= red		default
- window_title		= yellow	default underline,dim