Commits

Jim Razmus II committed eaacdfd

cvs up

Comments (0)

Files changed (152)

audio/CVS/Entries

 D/shntool////
 D/musepack////
 D/opencore-amr////
-/Makefile/1.282/Wed Jul 11 11:02:45 2012//
 D/opus////
 D/opus-tools////
+/Makefile/1.283/Thu Aug  9 11:03:59 2012//
+D/deadbeef////
-# $OpenBSD: Makefile,v 1.282 2012/07/10 12:14:46 naddy Exp $
+# $OpenBSD: Makefile,v 1.283 2012/08/08 18:12:35 shadchin Exp $
 # $FreeBSD: Makefile,v 1.40 1997/11/16 22:49:20 fenner Exp $
 
      SUBDIR =
      SUBDIR += cmus
      SUBDIR += cplay
      SUBDIR += daapd
+     SUBDIR += deadbeef
      SUBDIR += disc-cover
      SUBDIR += dumb
      SUBDIR += easytag

audio/deadbeef/CVS/Entries

+/Makefile/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/distinfo/1.1.1.1/Wed Aug  8 18:06:48 2012//
+D/files////
+D/patches////
+D/pkg////

audio/deadbeef/CVS/Repository

+ports/audio/deadbeef

audio/deadbeef/CVS/Root

+/home/jtr2/openbsd/mirror

audio/deadbeef/Makefile

+# $OpenBSD: Makefile,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+
+SHARED_ONLY =		Yes
+
+COMMENT =		DeaDBeeF is an audio player
+DISTNAME =		deadbeef-0.5.5
+CATEGORIES =		audio
+
+HOMEPAGE =		http://deadbeef.sourceforge.net/
+
+# GPLv2 & LGPLv2.1
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+WANTLIB += FLAC GL ICE Imlib2 SM X11 Xcomposite Xcursor Xdamage
+WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 avcodec
+WANTLIB += avformat avutil bz2 c cairo cddb cdio crypto curl dbus-1
+WANTLIB += expat faad ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsm gthread-2.0
+WANTLIB += gtk-x11-2.0 idn m mad mms mp3lame mpcdec ogg orc-0.4
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += png pthread pthread-stubs schroedinger-1.0 sndfile
+WANTLIB += sndio speex ssl theoradec theoraenc vorbis vorbisenc
+WANTLIB += vorbisfile vpx wavpack x264 xcb xcb-render xcb-shm
+WANTLIB += xvidcore z zip
+
+MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=deadbeef/}
+EXTRACT_SUFX =		.tar.bz2
+
+MODULES =		devel/gettext \
+			textproc/intltool
+
+BUILD_DEPENDS =		${MODGNU_AUTOCONF_DEPENDS} \
+			${MODGNU_AUTOMAKE_DEPENDS}
+
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+BUILD_DEPENDS +=	devel/yasm
+.endif
+
+RUN_DEPENDS =		devel/desktop-file-utils \
+			x11/hicolor-icon-theme
+
+LIB_DEPENDS =		archivers/libzip \
+			audio/faad \
+			audio/flac \
+			audio/libcdio \
+			audio/libmad \
+			audio/libogg \
+			audio/libsamplerate \
+			audio/libsndfile \
+			audio/libvorbis \
+			audio/musepack \
+			audio/wavpack \
+			graphics/ffmpeg \
+			graphics/imlib2 \
+			multimedia/libmms \
+			net/curl \
+			x11/dbus \
+			x11/gtk+2
+
+USE_GMAKE =		Yes
+USE_LIBTOOL =		gnu
+LIBTOOL_FLAGS =		--tag=disable-static
+
+NO_REGRESS =		Yes
+
+AUTOCONF_VERSION =	2.69
+AUTOMAKE_VERSION =	1.11
+
+CONFIGURE_STYLE =	gnu
+CONFIGURE_ARGS +=	--disable-adplug \
+			--disable-alsa \
+			--disable-gme \
+			--disable-oss \
+			--disable-pulse \
+			--disable-sid \
+			--disable-wildmidi \
+			--disable-supereq \
+			--disable-src \
+			--disable-mono2stereo
+CONFIGURE_ENV +=	CPPFLAGS='-I${LOCALBASE}/lib/libzip/include -I${X11BASE}/include' \
+			LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
+
+post-patch:
+	@mkdir -p ${WRKSRC}/m4 # XXX need for autoreconf
+	@mkdir -p ${WRKSRC}/plugins/sndio
+	@cp ${FILESDIR}/{Makefile.am,sndio.c} ${WRKSRC}/plugins/sndio
+
+pre-configure:
+	@cd ${WRKSRC}; env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf
+
+post-install:
+	@for x in ${PREFIX}/lib/deadbeef/*.so.*; do \
+		mv $$x ${PREFIX}/lib/deadbeef/`basename $$x .0.0`; \
+	done
+
+.include <bsd.port.mk>

audio/deadbeef/distinfo

+SHA256 (deadbeef-0.5.5.tar.bz2) = 2dASdvB+kBVdo3+yV8dEr0rMtNoX2gSM5WBMsRdHULc=
+SIZE (deadbeef-0.5.5.tar.bz2) = 3219511

audio/deadbeef/files/CVS/Entries

+/Makefile.am/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/sndio.c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+D

audio/deadbeef/files/CVS/Repository

+ports/audio/deadbeef/files

audio/deadbeef/files/CVS/Root

+/home/jtr2/openbsd/mirror

audio/deadbeef/files/Makefile.am

+sndiodir = $(libdir)/$(PACKAGE)
+pkglib_LTLIBRARIES = sndio.la
+sndio_la_SOURCES = sndio.c
+sndio_la_LDFLAGS = -module
+sndio_la_LIBADD = $(LDADD) -lsndio
+AM_CFLAGS = $(CFLAGS) -std=c99

audio/deadbeef/files/sndio.c

+/*
+ * sndio - Output plugin using OpenBSD sndio API
+ * Copyright (c) 2012 Alexandr Shadchin <shadchin@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <sndio.h>
+#include "../../deadbeef.h"
+
+static DB_output_t plugin;
+DB_functions_t *deadbeef;
+
+static int state = OUTPUT_STATE_STOPPED;
+static int sndio_terminate;
+static intptr_t sndio_tid;
+static uintptr_t sndio_mutex;
+
+static struct sio_hdl *hdl;
+static size_t bufsz;
+static char *buf = NULL;
+static float min_db;
+static float vol_db;
+
+static int sndio_init(void);
+static int sndio_free(void);
+static int sndio_setformat(ddb_waveformat_t *);
+static int sndio_play(void);
+static int sndio_stop(void);
+static int sndio_pause(void);
+static int sndio_unpause(void);
+static void sndio_thread(void *context);
+static int sndio_callback(char *stream, int len);
+
+static void
+vol_cb(void *unused, unsigned int newvol)
+{
+	float newvol_db;
+
+	newvol_db = min_db * (1 - (float)newvol / SIO_MAXVOL);
+	if (newvol_db == vol_db)
+		return;
+	vol_db = newvol_db;
+	deadbeef->volume_set_db(vol_db);
+}
+
+static void
+pause_do(void)
+{
+	if (!hdl)
+		return;
+
+	deadbeef->mutex_lock(sndio_mutex);
+	sio_stop(hdl);
+	sio_start(hdl);
+	deadbeef->mutex_unlock(sndio_mutex);
+}
+
+static int
+sndio_init(void)
+{
+	struct sio_par par, askpar;
+	int buffer_ms = deadbeef->conf_get_int("sndio.buffer", 250);
+	const char *device = deadbeef->conf_get_str_fast("sndio.device", SIO_DEVANY);
+
+	if (plugin.fmt.is_float) {
+		fprintf(stderr, "sndio: float format is not supported\n");
+		goto error;
+	}
+
+	hdl = sio_open(device, SIO_PLAY, 0);
+	if (!hdl) {
+		fprintf(stderr, "sndio: failed to open audio device\n");
+		goto error;
+	}
+
+	sio_initpar(&par);
+	par.pchan = plugin.fmt.channels;
+	par.rate = plugin.fmt.samplerate;
+	par.bits = plugin.fmt.bps;
+	par.bps = SIO_BPS(plugin.fmt.bps);
+	par.sig = 1;
+	par.le = SIO_LE_NATIVE;
+	par.appbufsz = par.rate * buffer_ms / 1000;
+
+	/* fprintf(stderr, "sndio: %dbit %s %dch %dHz %dbps\n", par.bits, plugin.fmt.is_float ? "float" : "int", par.pchan, par.rate, par.bps); */
+
+	askpar = par;
+	if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
+		fprintf(stderr, "sndio: failed to set parameters\n");
+		goto error;
+	}
+
+	if ((par.bps > 1 && par.le != askpar.le) ||
+	    (par.bits < par.bps * 8 && !par.msb) ||
+	    par.bps != askpar.bps ||
+	    par.sig != askpar.sig ||
+	    par.pchan != askpar.pchan ||
+	    par.rate != askpar.rate) {
+		fprintf(stderr, "sndio: parameters not supported\n");
+		goto error;
+	}
+
+	bufsz = par.bps * par.pchan * par.round;
+	buf = malloc(bufsz);
+	if (!buf) {
+		fprintf(stderr, "sndio: failed malloc buf\n");
+		goto error;
+	}
+
+	min_db = deadbeef->volume_get_min_db();
+	sio_onvol(hdl, vol_cb, NULL);
+	if (!sio_start(hdl)) {
+		fprintf(stderr, "sndio: failed to start audio device\n");
+		goto error;
+	}
+
+	sndio_tid = deadbeef->thread_start(sndio_thread, NULL);
+
+	return 0;
+
+error:
+	sndio_free();
+
+	return -1;
+}
+
+static int
+sndio_free(void)
+{
+	if (sndio_tid) {
+		sndio_terminate = 1;
+		deadbeef->thread_join(sndio_tid);
+		sndio_tid = 0;
+	}
+	if (hdl) {
+		sio_close(hdl);
+		hdl = NULL;
+	}
+	if (buf) {
+		free(buf);
+		buf = NULL;
+	}
+
+	state = OUTPUT_STATE_STOPPED;
+	sndio_terminate = 0;
+
+	return 0;
+}
+
+static int
+sndio_setformat(ddb_waveformat_t *fmt)
+{
+	if (!memcmp(&plugin.fmt, fmt, sizeof(ddb_waveformat_t)))
+		return 0;
+
+	memcpy(&plugin.fmt, fmt, sizeof(ddb_waveformat_t));
+
+	if (sndio_tid)
+		sndio_free();
+
+	return 0;
+}
+
+static int
+sndio_play(void)
+{
+	if (!sndio_tid && sndio_init() < 0)
+		return -1;
+
+	state = OUTPUT_STATE_PLAYING;
+
+	return 0;
+}
+
+static int
+sndio_stop(void)
+{
+	if (state != OUTPUT_STATE_STOPPED) {
+		state = OUTPUT_STATE_STOPPED;
+		pause_do();
+	}
+	deadbeef->streamer_reset(1);
+
+	return 0;
+}
+
+static int
+sndio_pause(void)
+{
+	if (state == OUTPUT_STATE_STOPPED)
+		return -1;
+	else if (state != OUTPUT_STATE_PAUSED) {
+		state = OUTPUT_STATE_PAUSED;
+		pause_do();
+	}
+
+	return 0;
+}
+
+static int
+sndio_unpause(void)
+{
+	state = OUTPUT_STATE_PLAYING;
+
+	return 0;
+}
+
+static void
+sndio_thread(void *context)
+{
+	float newvol_db;
+	size_t size;
+
+	while (!sndio_terminate) {
+		if (state != OUTPUT_STATE_PLAYING) {
+			usleep(10000);
+			continue;
+		}
+
+		deadbeef->mutex_lock(sndio_mutex);
+		newvol_db = deadbeef->volume_get_db();
+		if (newvol_db != vol_db) {
+			vol_db = newvol_db;
+			sio_setvol(hdl, (1 - vol_db / min_db) * SIO_MAXVOL);
+		}
+		size = sndio_callback(buf, bufsz);
+		memset(buf + size, 0, bufsz - size);
+		size = sio_write(hdl, buf, bufsz);
+		deadbeef->mutex_unlock(sndio_mutex);
+		if (size != bufsz) {
+			fprintf(stderr, "sndio: failed to write buffer\n");
+			sndio_free();
+		}
+	}
+}
+
+static int
+sndio_callback(char *stream, int len)
+{
+	return deadbeef->streamer_read(stream, len);
+}
+
+static int
+sndio_get_state(void)
+{
+	return state;
+}
+
+static int
+sndio_configchanged(void)
+{
+	deadbeef->conf_lock();
+	deadbeef->sendmessage(DB_EV_REINIT_SOUND, 0, 0, 0);
+	deadbeef->conf_unlock();
+
+	return 0;
+}
+
+static int
+sndio_plugin_message(uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2)
+{
+	switch (id) {
+	case DB_EV_CONFIGCHANGED:
+		sndio_configchanged();
+		break;
+	}
+
+	return 0;
+}
+
+static int
+sndio_plugin_start(void)
+{
+	sndio_mutex = deadbeef->mutex_create();
+
+	return 0;
+}
+
+static int
+sndio_plugin_stop(void)
+{
+	if (sndio_mutex) {
+		deadbeef->mutex_free(sndio_mutex);
+		sndio_mutex = 0;
+	}
+
+	return 0;
+}
+
+DB_plugin_t *
+sndio_load(DB_functions_t *api)
+{
+	deadbeef = api;
+
+	return DB_PLUGIN(&plugin);
+}
+
+static const char settings_dlg[] =
+    "property \"Device\" entry sndio.device " SIO_DEVANY ";\n"
+    "property \"Buffer size (ms)\" entry sndio.buffer 250;\n";
+
+/* define plugin interface */
+static DB_output_t plugin = {
+	DB_PLUGIN_SET_API_VERSION
+	.plugin.version_major = 1,
+	.plugin.version_minor = 0,
+	.plugin.type = DB_PLUGIN_OUTPUT,
+	.plugin.id = "sndio",
+	.plugin.name = "sndio output plugin",
+	.plugin.descr = "plays sound through sndio library",
+	.plugin.copyright =
+	    "Copyright (c) 2012 Alexandr Shadchin <shadchin@openbsd.org>\n"
+	    "\n"
+	    "Permission to use, copy, modify, and distribute this software for any\n"
+	    "purpose with or without fee is hereby granted, provided that the above\n"
+	    "copyright notice and this permission notice appear in all copies.\n"
+	    "\n"
+	    "THE SOFTWARE IS PROVIDED 'AS IS' AND THE AUTHOR DISCLAIMS ALL WARRANTIES\n"
+	    "WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF\n"
+	    "MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR\n"
+	    "ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\n"
+	    "WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\n"
+	    "ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF\n"
+	    "OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n",
+	.plugin.website = "http://www.openbsd.org/",
+	.plugin.start = sndio_plugin_start,
+	.plugin.stop = sndio_plugin_stop,
+	.plugin.configdialog = settings_dlg,
+	.plugin.message = sndio_plugin_message,
+	.init = sndio_init,
+	.free = sndio_free,
+	.setformat = sndio_setformat,
+	.play = sndio_play,
+	.stop = sndio_stop,
+	.pause = sndio_pause,
+	.unpause = sndio_unpause,
+	.state = sndio_get_state,
+	.has_volume = 1,
+	.fmt.samplerate = 48000,
+	.fmt.channels = 2,
+	.fmt.bps = 16,
+	.fmt.is_float = 0,
+	.fmt.channelmask = DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT
+};

audio/deadbeef/patches/CVS/Entries

+/patch-Makefile_am/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-conf_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-configure_ac/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-junklib_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-playlist_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_cdda_cdda_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_converter_converter_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_ffmpeg_ffmpeg_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_gtkui_prefwin_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_mms_Makefile_am/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_musepack_Makefile_am/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_musepack_musepack_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_supereq_Makefile_am/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-plugins_wavpack_wavpack_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-utf8_c/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/patch-yasmwrapper_sh/1.1.1.1/Wed Aug  8 18:06:48 2012//
+D

audio/deadbeef/patches/CVS/Repository

+ports/audio/deadbeef/patches

audio/deadbeef/patches/CVS/Root

+/home/jtr2/openbsd/mirror

audio/deadbeef/patches/patch-Makefile_am

+$OpenBSD: patch-Makefile_am,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- Makefile.am.orig	Wed May 16 22:58:44 2012
++++ Makefile.am	Mon Jun 11 15:09:00 2012
+@@ -43,7 +43,8 @@ deadbeef_SOURCES =\
+ sdkdir = $(pkgincludedir)
+ sdk_HEADERS = deadbeef.h
+ 
+-deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) $(ICONV_LIB) $(DL_LIBS) -lm -lpthread 
++deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) $(INTLLIBS) $(ICONV_LIB) $(DL_LIBS) -lm
++deadbeef_LDFLAGS = -pthread
+ 
+ AM_CFLAGS = $(DEPS_CFLAGS) -std=c99
+ AM_CPPFLAGS = $(DEPS_CFLAGS)

audio/deadbeef/patches/patch-conf_c

+$OpenBSD: patch-conf_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+
+Fix "pthread_mutex_destroy on mutex with waiters!"
+
+--- conf.c.orig	Thu May 31 03:15:48 2012
++++ conf.c	Tue Jun  5 21:57:26 2012
+@@ -65,6 +65,7 @@ conf_free (void) {
+     }
+     conf_items = NULL;
+     changed = 0;
++    mutex_unlock (mutex);
+     mutex_free (mutex);
+     mutex = 0;
+ }

audio/deadbeef/patches/patch-configure_ac

+$OpenBSD: patch-configure_ac,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- configure.ac.orig	Tue Jun  5 00:10:17 2012
++++ configure.ac	Tue Jun  5 22:05:24 2012
+@@ -110,6 +110,7 @@ AC_ARG_ENABLE(shn,      [AS_HELP_STRING([--enable-shn 
+ AC_ARG_ENABLE(psf,      [AS_HELP_STRING([--enable-psf      ], [build AOSDK-based PSF(,QSF,SSF,DSF) plugin (default: auto)])], [enable_psf=$enableval], [enable_psf=yes])
+ AC_ARG_ENABLE(mono2stereo,      [AS_HELP_STRING([--enable-mono2stereo      ], [build mono2stereo DSP plugin (default: auto)])], [enable_mono2stereo=$enableval], [enable_mono2stereo=yes])
+ AC_ARG_ENABLE(shellexecui, [AS_HELP_STRING([--enable-shellexecui      ], [build shellexec GTK UI plugin (default: auto)])], [enable_shellexecui=$enableval], [enable_shellexecui=yes])
++AC_ARG_ENABLE(sndio,    [AS_HELP_STRING([--enable-sndio   ], [enable sndio output plugin (default: enabled)])], [enable_sndio=$enableval], [enable_sndio=yes])
+ 
+ if test "x$enable_staticlink" != "xno" ; then
+     AC_DEFINE_UNQUOTED([STATICLINK], [1], [Define if building static version])
+@@ -264,11 +265,11 @@ if test "x$enable_staticlink" != "xno" ; then
+     VORBIS_LIBS="../../$LIB/lib/libogg.a ../../$LIB/lib/libvorbis.a ../../$LIB/lib/libvorbisenc.a ../../$LIB/lib/libvorbisfile.a"
+     AC_SUBST(VORBIS_LIBS)
+ else
+-    AC_CHECK_LIB([vorbis], [main], [HAVE_VORBIS=yes])
+-    AC_CHECK_LIB([vorbisfile], [main], [HAVE_VORBISFILE=yes])
++    AC_CHECK_LIB([vorbis], [main], [HAVE_VORBIS=yes], [], [-logg -lm])
++    AC_CHECK_LIB([vorbisfile], [main], [HAVE_VORBISFILE=yes], [], [-lvorbis -logg -lm])
+     if test "x$HAVE_VORBIS" = "xyes" && test "x$HAVE_VORBISFILE" = "xyes" ; then
+         HAVE_VORBISPLUGIN=yes
+-        VORBIS_LIBS="-lvorbis -lvorbisfile"
++        VORBIS_LIBS="-lvorbis -lvorbisfile -logg -lm"
+         AC_SUBST(VORBIS_LIBS)
+     fi
+ fi
+@@ -281,10 +282,10 @@ if test "x$enable_staticlink" != "xno" ; then
+     FLAC_LIBS="../../$LIB/lib/libFLAC.a ../../$LIB/lib/libogg.a"
+     AC_SUBST(FLAC_LIBS)
+ else
+-    AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes])
++    AC_CHECK_LIB([FLAC], [main], [HAVE_FLAC=yes], [], [-logg -lm])
+     if test "x$HAVE_FLAC" = "xyes" ; then
+         HAVE_FLACPLUGIN=yes
+-        FLAC_LIBS="-lFLAC"
++        FLAC_LIBS="-lFLAC -logg -lm"
+         AC_SUBST(FLAC_LIBS)
+     fi
+ fi
+@@ -588,8 +589,12 @@ if test "x$enable_mono2stereo" != "xno" ; then
+     HAVE_MONO2STEREO=yes
+ fi
+ 
+-PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui"
++if test "x$enable_sndio" != "xno" ; then
++    HAVE_SNDIO=yes
++fi
+ 
++PLUGINS_DIRS="plugins/lastfm plugins/mpgmad plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/shellexecui plugins/sndio"
++
+ AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
+ AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLACPLUGIN" = "xyes")
+ AM_CONDITIONAL(HAVE_WAVPACK, test "x$HAVE_WAVPACKPLUGIN" = "xyes")
+@@ -640,6 +645,7 @@ AM_CONDITIONAL(HAVE_MONO2STEREO, test "x$HAVE_MONO2STE
+ AM_CONDITIONAL(HAVE_SHELLEXECUI, test "x$HAVE_SHELLEXECUI" = "xyes")
+ AM_CONDITIONAL(HAVE_SM, test "x$HAVE_SM" = "xyes")
+ AM_CONDITIONAL(HAVE_ICE, test "x$HAVE_ICE" = "xyes")
++AM_CONDITIONAL(HAVE_SNDIO, test "x$HAVE_SNDIO" = "xyes")
+ 
+ AC_SUBST(PLUGINS_DIRS)
+ 
+@@ -705,6 +711,7 @@ PRINT_PLUGIN_INFO([dumb],[DUMB module plugin, for MOD,
+ PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn],[test "x$HAVE_SHN" = "xyes"])
+ PRINT_PLUGIN_INFO([mono2stereo],[mono2stereo DSP plugin],[test "x$HAVE_MONO2STEREO" = "xyes"])
+ PRINT_PLUGIN_INFO([shellexecui],[GTK user interface for configuring shellexec plugin],[test "x$HAVE_SHELLEXECUI" = "xyes"])
++PRINT_PLUGIN_INFO([sndio],[sndio output plugin],[test "x$HAVE_SNDIO" = "xyes"])
+ 
+ echo
+ 
+@@ -751,6 +758,7 @@ plugins/ao/Makefile
+ plugins/shn/Makefile
+ plugins/mono2stereo/Makefile
+ plugins/shellexecui/Makefile
++plugins/sndio/Makefile
+ intl/Makefile
+ po/Makefile.in
+ deadbeef.desktop

audio/deadbeef/patches/patch-junklib_c

+$OpenBSD: patch-junklib_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- junklib.c.orig	Sat May 14 16:45:26 2011
++++ junklib.c	Mon May 16 19:22:06 2011
+@@ -23,7 +23,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #if HAVE_ICONV
+-  #define LIBICONV_PLUG
+   #include <iconv.h>
+ #elif HAVE_ICU
+   #warning icu

audio/deadbeef/patches/patch-playlist_c

+$OpenBSD: patch-playlist_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- playlist.c.orig	Wed May 23 02:34:47 2012
++++ playlist.c	Tue Jun  5 21:57:26 2012
+@@ -53,6 +53,10 @@
+ #include "volume.h"
+ #include "pltmeta.h"
+ 
++#if defined(__GNUC__) && defined(__STRICT_ANSI__)
++#define alloca(size)	__builtin_alloca(size)
++#endif
++
+ #define DISABLE_LOCKING 0
+ #define DEBUG_LOCKING 0
+ #define DETECT_PL_LOCK_RC 0

audio/deadbeef/patches/patch-plugins_c

+$OpenBSD: patch-plugins_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins.c.orig	Mon Jun  4 02:56:09 2012
++++ plugins.c	Tue Jun  5 21:57:26 2012
+@@ -1091,7 +1091,7 @@ plug_select_output (void) {
+     return 0;
+ #else
+     char outplugname[100];
+-    conf_get_str ("output_plugin", "ALSA output plugin", outplugname, sizeof (outplugname));
++    conf_get_str ("output_plugin", "sndio output plugin", outplugname, sizeof (outplugname));
+     for (int i = 0; g_output_plugins[i]; i++) {
+         DB_output_t *p = g_output_plugins[i];
+         if (!strcmp (p->plugin.name, outplugname)) {
+@@ -1133,7 +1133,7 @@ plug_reinit_sound (void) {
+ 
+     if (plug_select_output () < 0) {
+         char outplugname[100];
+-        conf_get_str ("output_plugin", "ALSA output plugin", outplugname, sizeof (outplugname));
++        conf_get_str ("output_plugin", "sndio output plugin", outplugname, sizeof (outplugname));
+         trace ("failed to select output plugin %s\nreverted to %s\n", outplugname, prev->plugin.name);
+         output_plugin = prev;
+     }

audio/deadbeef/patches/patch-plugins_cdda_cdda_c

+$OpenBSD: patch-plugins_cdda_cdda_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins/cdda/cdda.c.orig	Thu May 31 03:16:28 2012
++++ plugins/cdda/cdda.c	Tue Jun  5 21:57:26 2012
+@@ -52,6 +52,10 @@
+ #define SAMPLESIZE 4 //bytes
+ #define BUFSIZE (CDIO_CD_FRAMESIZE_RAW * 2)
+ 
++#if defined(__GNUC__) && defined(__STRICT_ANSI__)
++#define alloca(size)	__builtin_alloca(size)
++#endif
++
+ static DB_decoder_t plugin;
+ static DB_functions_t *deadbeef;
+ 

audio/deadbeef/patches/patch-plugins_converter_converter_c

+$OpenBSD: patch-plugins_converter_converter_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins/converter/converter.c.orig	Sat Jun  9 01:10:44 2012
++++ plugins/converter/converter.c	Sat Jun  9 01:11:06 2012
+@@ -35,6 +35,10 @@
+ #include "converter.h"
+ #include "../../deadbeef.h"
+ 
++#if defined(__GNUC__) && defined(__STRICT_ANSI__)
++#define alloca(size)   __builtin_alloca(size)
++#endif
++
+ #ifndef strdupa
+ # define strdupa(s)							      \
+     ({									      \

audio/deadbeef/patches/patch-plugins_ffmpeg_ffmpeg_c

+$OpenBSD: patch-plugins_ffmpeg_ffmpeg_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins/ffmpeg/ffmpeg.c.orig	Tue May  8 02:49:13 2012
++++ plugins/ffmpeg/ffmpeg.c	Tue May 15 23:44:47 2012
+@@ -51,6 +51,10 @@
+ 
+ #endif
+ 
++#if defined(__GNUC__) && defined(__STRICT_ANSI__)
++#define alloca(size)	__builtin_alloca(size)
++#endif
++
+ //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
+ #define trace(fmt,...)
+ 

audio/deadbeef/patches/patch-plugins_gtkui_prefwin_c

+$OpenBSD: patch-plugins_gtkui_prefwin_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins/gtkui/prefwin.c.orig	Sat May 19 14:56:40 2012
++++ plugins/gtkui/prefwin.c	Tue Jun  5 21:57:27 2012
+@@ -501,7 +501,7 @@ on_preferences_activate                (GtkMenuItem   
+     // output plugin selection
+     combobox = GTK_COMBO_BOX (lookup_widget (w, "pref_output_plugin"));
+ 
+-    const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "ALSA output plugin");
++    const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "sndio output plugin");
+     DB_output_t **out_plugs = deadbeef->plug_get_output_list ();
+     for (int i = 0; out_plugs[i]; i++) {
+         gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), out_plugs[i]->plugin.name);
+@@ -714,7 +714,7 @@ on_pref_output_plugin_changed          (GtkComboBox   
+     DB_output_t *new = NULL;
+ 
+     deadbeef->conf_lock ();
+-    const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "ALSA output plugin");
++    const char *outplugname = deadbeef->conf_get_str_fast ("output_plugin", "sndio output plugin");
+     for (int i = 0; out_plugs[i]; i++) {
+         if (!strcmp (out_plugs[i]->plugin.name, outplugname)) {
+             prev = out_plugs[i];

audio/deadbeef/patches/patch-plugins_mms_Makefile_am

+$OpenBSD: patch-plugins_mms_Makefile_am,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins/mms/Makefile.am.orig	Fri Mar  4 01:06:16 2011
++++ plugins/mms/Makefile.am	Sat Jun  9 00:51:44 2012
+@@ -1,22 +1,10 @@
+ if HAVE_MMS
+ mmsdir = $(libdir)/$(PACKAGE)
+ pkglib_LTLIBRARIES = mms.la
+-mms_la_SOURCES = mmsplug.c\
+-	libmms/mms.c\
+-	libmms/mmsh.c\
+-	libmms/mmsx.c\
+-	libmms/uri.c\
+-	libmms/asfheader.h\
+-	libmms/bswap.h\
+-	libmms/mms-common.h\
+-	libmms/mms.h\
+-	libmms/mmsh.h\
+-	libmms/mmsio.h\
+-	libmms/mmsx.h\
+-	libmms/uri.h
++mms_la_SOURCES = mmsplug.c
+ 
+ mms_la_LDFLAGS = -module
+ 
+-mms_la_LIBADD = $(LDADD) $(LIBMMS_LIBS)
++mms_la_LIBADD = $(LDADD) $(LIBMMS_LIBS) -lmms
+ AM_CFLAGS = $(CFLAGS) -std=c99
+ endif

audio/deadbeef/patches/patch-plugins_musepack_Makefile_am

+$OpenBSD: patch-plugins_musepack_Makefile_am,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins/musepack/Makefile.am.orig	Sun Oct 23 21:16:11 2011
++++ plugins/musepack/Makefile.am	Fri Jun  8 22:14:44 2012
+@@ -2,30 +2,10 @@ if HAVE_MUSEPACK
+ 
+ pkglib_LTLIBRARIES = musepack.la
+ 
+-musepack_la_SOURCES = musepack.c\
+-huffman.c\
+-mpc_bits_reader.c\
+-mpc_decoder.c\
+-mpc_demux.c\
+-mpc_reader.c\
+-requant.c\
+-streaminfo.c\
+-synth_filter.c\
+-crc32.c\
+-decoder.h\
+-huffman.h\
+-internal.h\
+-mpc_bits_reader.h\
+-mpc/mpcdec.h\
+-mpcdec_math.h\
+-mpc/reader.h\
+-requant.h\
+-mpc/streaminfo.h\
+-mpc/mpc_types.h\
+-mpc/minimax.h
++musepack_la_SOURCES = musepack.c
+ 
+ musepack_la_LDFLAGS = -module
+-musepack_la_LIBADD = $(LDADD) -lm
++musepack_la_LIBADD = $(LDADD) -lm -lmpcdec
+ 
+ AM_CFLAGS = $(CFLAGS) -fPIC -std=c99
+ 

audio/deadbeef/patches/patch-plugins_musepack_musepack_c

+$OpenBSD: patch-plugins_musepack_musepack_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins/musepack/musepack.c.orig	Fri Jun  8 21:59:04 2012
++++ plugins/musepack/musepack.c	Fri Jun  8 21:59:18 2012
+@@ -21,7 +21,7 @@
+ #include <limits.h>
+ #include <unistd.h>
+ #include <math.h>
+-#include "mpc/mpcdec.h"
++#include <mpc/mpcdec.h>
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
+ #endif

audio/deadbeef/patches/patch-plugins_supereq_Makefile_am

+$OpenBSD: patch-plugins_supereq_Makefile_am,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins/supereq/Makefile.am.orig	Sun May 29 18:21:42 2011
++++ plugins/supereq/Makefile.am	Sun May 29 18:21:58 2011
+@@ -45,9 +45,9 @@ supereq_la_SOURCES = supereq.c Equ.cpp Equ.h Fftsg_fl.
+ #AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables -I nsfft-1.00/dft -I nsfft-1.00/simd -msse -DENABLE_SSE_FLOAT -DUSE_SHIBATCH
+ 
+ AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_OOURA
+-AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables -DUSE_OOURA
++AM_CPPFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables -DUSE_OOURA
+ 
+-supereq_la_LDFLAGS = -module -nostdlib -lsupc++
++supereq_la_LDFLAGS = -module -lsupc++
+ 
+ supereq_la_LIBADD = $(LDADD)
+ endif

audio/deadbeef/patches/patch-plugins_wavpack_wavpack_c

+$OpenBSD: patch-plugins_wavpack_wavpack_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- plugins/wavpack/wavpack.c.orig	Sat Mar 24 16:09:38 2012
++++ plugins/wavpack/wavpack.c	Tue May 15 23:44:23 2012
+@@ -38,6 +38,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH D
+ #include <math.h>
+ #include "../../deadbeef.h"
+ 
++#if defined(__GNUC__) && defined(__STRICT_ANSI__)
++#define alloca(size)	__builtin_alloca(size)
++#endif
++
+ #define min(x,y) ((x)<(y)?(x):(y))
+ #define max(x,y) ((x)>(y)?(x):(y))
+ 

audio/deadbeef/patches/patch-utf8_c

+$OpenBSD: patch-utf8_c,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- utf8.c.orig	Thu May  3 02:10:22 2012
++++ utf8.c	Tue May 15 23:44:11 2012
+@@ -34,6 +34,10 @@
+ #include "utf8.h"
+ #include "u8_lc_map.h"
+ 
++#if defined(__GNUC__) && defined(__STRICT_ANSI__)
++#define alloca(size)	__builtin_alloca(size)
++#endif
++
+ static const uint32_t offsetsFromUTF8[6] = {
+     0x00000000UL, 0x00003080UL, 0x000E2080UL,
+     0x03C82080UL, 0xFA082080UL, 0x82082080UL

audio/deadbeef/patches/patch-yasmwrapper_sh

+$OpenBSD: patch-yasmwrapper_sh,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+--- yasmwrapper.sh.orig	Wed May  2 01:00:37 2012
++++ yasmwrapper.sh	Wed May  2 01:00:43 2012
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ ARGS=""
+ for i in $@ ; do
+     #if [ "$i" != "-fPIC" ] && [ "$i" != "-DPIC" ]; then

audio/deadbeef/pkg/CVS/Entries

+/DESCR/1.1.1.1/Wed Aug  8 18:06:48 2012//
+/PLIST/1.1.1.1/Wed Aug  8 18:06:48 2012//
+D

audio/deadbeef/pkg/CVS/Repository

+ports/audio/deadbeef/pkg

audio/deadbeef/pkg/CVS/Root

+/home/jtr2/openbsd/mirror

audio/deadbeef/pkg/DESCR

+DeaDBeeF (as in 0xDEADBEEF) is an audio player for GNU/Linux, BSD,
+OpenSolaris and probably other UNIX-like systems.
+
+Some features (more can be found on the homepage):
+
+* mp3, ogg vorbis, flac, ape, wv, wav, cd audio (and many more)
+* ID3v1, ID3v2.2, ID3v2.3, ID3v2.4, APEv2, xing/info tags support
+* no GNOME or KDE dependencies
+* minimize to tray, with scrollwheel volume control
+* drag and drop, both inside the playlist, and from other applications
+* control playback from command line
+* global hotkeys
+* multiple playlists
+* album artwork display
+* 18-band graphical equalizer
+* metadata editor
+* user-customizable groups in playlists
+* user-customizable columns with flexible title formatting
+* radio and podcast support for ogg vorbis, mp3 and aac streams
+* gapless playback
+* plugin support; bundled with lots of plugins, such as global
+  hotkeys and last.fm scrobbler; sdk is included

audio/deadbeef/pkg/PLIST

+@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/08 18:06:48 shadchin Exp $
+@bin bin/deadbeef
+include/deadbeef/
+include/deadbeef/deadbeef.h
+include/deadbeef/gtkui_api.h
+lib/deadbeef/
+lib/deadbeef/aac.la
+lib/deadbeef/aac.so
+lib/deadbeef/artwork.la
+lib/deadbeef/artwork.so
+lib/deadbeef/cdda.la
+lib/deadbeef/cdda.so
+lib/deadbeef/converter.la
+lib/deadbeef/converter.so
+lib/deadbeef/converter_gtk2.la
+lib/deadbeef/converter_gtk2.so
+lib/deadbeef/convpresets/
+lib/deadbeef/convpresets/AAC_(Nero_FAAC).txt
+lib/deadbeef/convpresets/FLAC_(compression_level_5).txt
+lib/deadbeef/convpresets/MP3_CBR_320_Kbps_(Lame).txt
+lib/deadbeef/convpresets/MP3_VBR_192Kbps_(Lame).txt
+lib/deadbeef/convpresets/MS_RIFF_WAV.txt
+lib/deadbeef/convpresets/MusePack.txt
+lib/deadbeef/convpresets/Ogg_Vorbis_(-q_5).txt
+lib/deadbeef/convpresets/TTA.txt
+lib/deadbeef/convpresets/WavPack.txt
+lib/deadbeef/dca.la
+lib/deadbeef/dca.so
+lib/deadbeef/ddb_ao.la
+lib/deadbeef/ddb_ao.so
+lib/deadbeef/ddb_dumb.la
+lib/deadbeef/ddb_dumb.so
+lib/deadbeef/ddb_gui_GTK2.la
+lib/deadbeef/ddb_gui_GTK2.so
+lib/deadbeef/ddb_shn.la
+lib/deadbeef/ddb_shn.so
+lib/deadbeef/ffap.la
+lib/deadbeef/ffap.so
+lib/deadbeef/ffmpeg.la
+lib/deadbeef/ffmpeg.so
+lib/deadbeef/flac.la
+lib/deadbeef/flac.so
+lib/deadbeef/hotkeys.la
+lib/deadbeef/hotkeys.so
+lib/deadbeef/lastfm.la
+lib/deadbeef/lastfm.so
+lib/deadbeef/m3u.la
+lib/deadbeef/m3u.so
+lib/deadbeef/mms.la
+lib/deadbeef/mms.so
+lib/deadbeef/mpgmad.la
+lib/deadbeef/mpgmad.so
+lib/deadbeef/musepack.la
+lib/deadbeef/musepack.so
+lib/deadbeef/notify.la
+lib/deadbeef/notify.so
+lib/deadbeef/nullout.la
+lib/deadbeef/nullout.so
+lib/deadbeef/shellexec.la
+lib/deadbeef/shellexec.so
+lib/deadbeef/shellexecui_gtk2.la
+lib/deadbeef/shellexecui_gtk2.so
+lib/deadbeef/sndfile.la
+lib/deadbeef/sndfile.so
+lib/deadbeef/sndio.la
+lib/deadbeef/sndio.so
+lib/deadbeef/tta.la
+lib/deadbeef/tta.so
+lib/deadbeef/vfs_curl.la
+lib/deadbeef/vfs_curl.so
+lib/deadbeef/vfs_zip.la
+lib/deadbeef/vfs_zip.so
+lib/deadbeef/vorbis.la
+lib/deadbeef/vorbis.so
+lib/deadbeef/vtx.la
+lib/deadbeef/vtx.so
+lib/deadbeef/wavpack.la
+lib/deadbeef/wavpack.so
+share/applications/deadbeef.desktop
+share/deadbeef/
+share/deadbeef/pixmaps/
+share/deadbeef/pixmaps/buffering_16.png
+share/deadbeef/pixmaps/noartwork.png
+share/deadbeef/pixmaps/pause_16.png
+share/deadbeef/pixmaps/play_16.png
+share/doc/deadbeef/
+share/doc/deadbeef/COPYING.GPLv2
+share/doc/deadbeef/COPYING.LGPLv2.1
+share/doc/deadbeef/ChangeLog
+share/doc/deadbeef/README
+share/doc/deadbeef/about.txt
+share/doc/deadbeef/help.pt_BR.txt
+share/doc/deadbeef/help.ru.txt
+share/doc/deadbeef/help.txt
+share/doc/deadbeef/translators.txt
+share/icons/hicolor/128x128/apps/deadbeef.png
+share/icons/hicolor/16x16/apps/deadbeef.png
+share/icons/hicolor/192x192/apps/deadbeef.png
+share/icons/hicolor/22x22/apps/deadbeef.png
+share/icons/hicolor/24x24/apps/deadbeef.png
+share/icons/hicolor/256x256/apps/deadbeef.png
+share/icons/hicolor/32x32/apps/deadbeef.png
+share/icons/hicolor/36x36/apps/deadbeef.png
+share/icons/hicolor/48x48/apps/deadbeef.png
+share/icons/hicolor/64x64/apps/deadbeef.png
+share/icons/hicolor/72x72/apps/deadbeef.png
+share/icons/hicolor/96x96/apps/deadbeef.png
+share/icons/hicolor/scalable/apps/deadbeef.svg
+share/locale/be/LC_MESSAGES/deadbeef.mo
+share/locale/bg/LC_MESSAGES/deadbeef.mo
+share/locale/bn/LC_MESSAGES/deadbeef.mo
+share/locale/ca/LC_MESSAGES/deadbeef.mo
+share/locale/cs/LC_MESSAGES/deadbeef.mo
+share/locale/da/LC_MESSAGES/deadbeef.mo
+share/locale/de/LC_MESSAGES/deadbeef.mo
+share/locale/el/LC_MESSAGES/deadbeef.mo
+share/locale/en_GB/LC_MESSAGES/deadbeef.mo
+share/locale/eo/LC_MESSAGES/deadbeef.mo
+share/locale/es/LC_MESSAGES/deadbeef.mo
+share/locale/et/LC_MESSAGES/deadbeef.mo
+share/locale/fa/LC_MESSAGES/deadbeef.mo
+share/locale/fi/LC_MESSAGES/deadbeef.mo
+share/locale/fr/LC_MESSAGES/deadbeef.mo
+share/locale/gl/LC_MESSAGES/deadbeef.mo
+share/locale/he/LC_MESSAGES/deadbeef.mo
+share/locale/hr/LC_MESSAGES/deadbeef.mo
+share/locale/hu/LC_MESSAGES/deadbeef.mo
+share/locale/id/LC_MESSAGES/deadbeef.mo
+share/locale/it/LC_MESSAGES/deadbeef.mo
+share/locale/ja/LC_MESSAGES/deadbeef.mo
+share/locale/kk/LC_MESSAGES/deadbeef.mo
+share/locale/km/LC_MESSAGES/deadbeef.mo
+share/locale/lg/
+share/locale/lg/LC_MESSAGES/
+share/locale/lg/LC_MESSAGES/deadbeef.mo
+share/locale/lt/LC_MESSAGES/deadbeef.mo
+share/locale/nb/LC_MESSAGES/deadbeef.mo
+share/locale/nl/LC_MESSAGES/deadbeef.mo
+share/locale/pl/LC_MESSAGES/deadbeef.mo
+share/locale/pt/LC_MESSAGES/deadbeef.mo
+share/locale/pt_BR/LC_MESSAGES/deadbeef.mo
+share/locale/ro/LC_MESSAGES/deadbeef.mo
+share/locale/ru/LC_MESSAGES/deadbeef.mo
+share/locale/si/LC_MESSAGES/deadbeef.mo
+share/locale/sk/LC_MESSAGES/deadbeef.mo
+share/locale/sl/LC_MESSAGES/deadbeef.mo
+share/locale/sr/LC_MESSAGES/deadbeef.mo
+share/locale/sr@latin/LC_MESSAGES/deadbeef.mo
+share/locale/sv/LC_MESSAGES/deadbeef.mo
+share/locale/te/LC_MESSAGES/deadbeef.mo
+share/locale/tr/LC_MESSAGES/deadbeef.mo
+share/locale/ug/LC_MESSAGES/deadbeef.mo
+share/locale/uk/LC_MESSAGES/deadbeef.mo
+share/locale/vi/LC_MESSAGES/deadbeef.mo
+share/locale/zh_CN/LC_MESSAGES/deadbeef.mo
+share/locale/zh_TW/LC_MESSAGES/deadbeef.mo
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
+@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true

audio/ncmpcpp/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.11/Tue Apr  3 11:01:47 2012//
-/distinfo/1.4/Tue Apr  3 11:01:47 2012//
+/Makefile/1.12/Thu Aug  9 11:04:30 2012//
+/distinfo/1.5/Thu Aug  9 11:04:30 2012//

audio/ncmpcpp/Makefile

-# $OpenBSD: Makefile,v 1.11 2012/04/02 14:09:36 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.12 2012/08/08 12:32:10 dcoppa Exp $
 
 COMMENT =		ncurses mpd client inspired by ncmpc
 
 DISTNAME =		ncmpcpp-0.5.10
+REVISION =		0
 
 EXTRACT_SUFX =		.tar.bz2
 

audio/ncmpcpp/distinfo

-MD5 (ncmpcpp-0.5.10.tar.bz2) = KY7WYyW8/jWON+GGx+pIYQ==
-RMD160 (ncmpcpp-0.5.10.tar.bz2) = 2nlGSa42UJo4XPBKBlr2uXFWHb4=
-SHA1 (ncmpcpp-0.5.10.tar.bz2) = XjRzPn+68oYvBP34r4GVzoYKkBQ=
 SHA256 (ncmpcpp-0.5.10.tar.bz2) = /21TdqLZyrpvW7eOaK93zvvbLwTNJW9zjjn4rJp5pKg=
 SIZE (ncmpcpp-0.5.10.tar.bz2) = 381162

audio/ncmpcpp/patches/CVS/Entries

 /patch-configure/1.3/Mon Mar 19 11:01:43 2012//
 /patch-doc_Makefile_in/1.2/Mon Mar 19 11:01:43 2012//
 /patch-src_clock_cpp/1.3/Mon Mar 19 11:01:43 2012//
+/patch-src_help_cpp/1.1/Wed Aug  8 12:32:10 2012//
+/patch-src_ncmpcpp_cpp/1.4/Wed Aug  8 12:32:10 2012//
+/patch-src_settings_cpp/1.3/Wed Aug  8 12:32:10 2012//
+/patch-src_settings_h/1.1/Wed Aug  8 12:32:10 2012//
 D

audio/ncmpcpp/patches/patch-src_help_cpp

+$OpenBSD: patch-src_help_cpp,v 1.1 2012/08/08 12:32:10 dcoppa Exp $
+
+Fix typo
+(upstream git commit a22e875473bb796eb1e905ca4d40b39c90133637)
+
+--- src/help.cpp.orig	Wed Aug  8 13:43:54 2012
++++ src/help.cpp	Wed Aug  8 13:44:20 2012
+@@ -297,7 +297,7 @@ void Help::GetKeybindings()
+ 	*w << DisplayKeys(Key.SwitchTagTypeList)	<< "Tag type list switcher (left column)\n";
+ 	
+ 	
+-	*w << "\n\n   " << fmtBold << "Keys - Playlist Editor\n -----------------------------------------\n" << fmtBoldEnd;
++	*w << "\n\n   " << fmtBold << "Keys - Playlist editor\n -----------------------------------------\n" << fmtBoldEnd;
+ 	*w << DisplayKeys(Key.PrevColumn)		<< "Previous column\n";
+ 	*w << DisplayKeys(Key.NextColumn)		<< "Next column\n";
+ 	*w << DisplayKeys(Key.Enter)			<< "Add item to playlist and play\n";

audio/ncmpcpp/patches/patch-src_ncmpcpp_cpp

+$OpenBSD: patch-src_ncmpcpp_cpp,v 1.4 2012/08/08 12:32:10 dcoppa Exp $
+
+Fix columns generation without configuration file (the text of the
+playlist disappeared in columns display mode when there is no config
+file)
+(upstream git commit 6126def6c5b339c7f43d99c47501dde21d4943b3)
+
+--- src/ncmpcpp.cpp.orig	Sun Apr  1 18:49:09 2012
++++ src/ncmpcpp.cpp	Wed Aug  8 13:41:05 2012
+@@ -249,6 +249,8 @@ int main(int argc, char **argv)
+ 	Config.Read();
+ 	Key.Read();
+ 	
++	Config.GenerateColumns();
++	
+ 	if (getenv("MPD_HOST"))
+ 		Mpd.SetHostname(getenv("MPD_HOST"));
+ 	if (getenv("MPD_PORT"))

audio/ncmpcpp/patches/patch-src_settings_cpp

+$OpenBSD: patch-src_settings_cpp,v 1.3 2012/08/08 12:32:10 dcoppa Exp $
+
+Fix columns generation without configuration file (the text of the
+playlist disappeared in columns display mode when there is no config
+file)
+(upstream git commit 6126def6c5b339c7f43d99c47501dde21d4943b3)
+
+--- src/settings.cpp.orig	Sun Apr  1 18:49:09 2012
++++ src/settings.cpp	Wed Aug  8 13:41:05 2012
+@@ -1330,7 +1330,11 @@ void NcmpcppConfig::Read()
+ 		}
+ 	}
+ 	f.close();
+-	
++}
++
++void NcmpcppConfig::GenerateColumns()
++{
++	columns.clear();
+ 	std::string width;
+ 	while (!(width = GetLineValue(song_list_columns_format, '(', ')', 1)).empty())
+ 	{

audio/ncmpcpp/patches/patch-src_settings_h

+$OpenBSD: patch-src_settings_h,v 1.1 2012/08/08 12:32:10 dcoppa Exp $
+
+Fix columns generation without configuration file (the text of the
+playlist disappeared in columns display mode when there is no config
+file)
+(upstream git commit 6126def6c5b339c7f43d99c47501dde21d4943b3)
+
+--- src/settings.h.orig	Sun Apr  1 18:49:09 2012
++++ src/settings.h	Wed Aug  8 13:41:05 2012
+@@ -149,6 +149,7 @@ struct NcmpcppConfig
+ 	
+ 	void SetDefaults();
+ 	void Read();
++	void GenerateColumns();
+ 	
+ 	std::string ncmpcpp_directory;
+ 	std::string lyrics_directory;

audio/taglib/CVS/Entries

 D/patches////
 D/pkg////
-/distinfo/1.9/Wed May  2 11:02:06 2012//
-/Makefile/1.22/Sat Jun 30 11:02:14 2012//
+/Makefile/1.23/Thu Aug  9 11:04:45 2012//
+/distinfo/1.10/Thu Aug  9 11:04:45 2012//

audio/taglib/Makefile

-# $OpenBSD: Makefile,v 1.22 2012/06/29 14:35:07 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.23 2012/08/08 11:37:03 dcoppa Exp $
 
 COMMENT=	managing meta-data of audio formats
 DISTNAME=	taglib-1.7.2
+REVISION=	0
 CATEGORIES=	audio devel
 
-MASTER_SITES=	https://github.com/downloads/taglib/taglib/ \
-		http://developer.kde.org/~wheeler/files/src/
+MASTER_SITES=	https://github.com/downloads/taglib/taglib/
+
 SHARED_LIBS +=	tag                  9.0      # .1.7.1
 SHARED_LIBS +=	tag_c                2.0      # .0.0.0
 
-HOMEPAGE= 	http://developer.kde.org/~wheeler/taglib.html
+HOMEPAGE= 	http://taglib.github.com/
 
 # LGPLv2.1 / MPLv1.1
 PERMIT_DISTFILES_CDROM=	Yes

audio/taglib/distinfo

-MD5 (taglib-1.7.2.tar.gz) = sKnnl9ODP7kzx8MXbePXIA==
-RMD160 (taglib-1.7.2.tar.gz) = E+41dG1GzMcp4YIvkFY0Oo5bBbQ=
-SHA1 (taglib-1.7.2.tar.gz) = 5lc4TM8yhNstq6MtzOznRTQoYBI=
 SHA256 (taglib-1.7.2.tar.gz) = OPflKDtZQCGyhCamEznP+/LVA7RQM4sC9lH6sbC0KJk=
 SIZE (taglib-1.7.2.tar.gz) = 535427

databases/redis/CVS/Entries

 D/patches////
 D/pkg////
-/Makefile/1.31/Sat Jun 23 11:02:23 2012//
-/distinfo/1.26/Sat Jun 23 11:02:23 2012//
+/Makefile/1.32/Thu Aug  9 11:06:07 2012//
+/distinfo/1.27/Thu Aug  9 11:06:07 2012//

databases/redis/Makefile

-# $OpenBSD: Makefile,v 1.31 2012/06/22 13:29:17 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.32 2012/08/08 11:24:05 dcoppa Exp $
 
 COMMENT =		persistent key-value database
-DISTNAME =		redis-2.4.15
+DISTNAME =		redis-2.4.16
 CATEGORIES =		databases
 HOMEPAGE =		http://redis.io/
 

databases/redis/distinfo

-MD5 (redis-2.4.15.tar.gz) = 7ycxUhUcP5BdKEy9u9sjTA==
-RMD160 (redis-2.4.15.tar.gz) = 7Daa/gKvtp9JGWz5fOd/8fPjRhM=
-SHA1 (redis-2.4.15.tar.gz) = njiNLAcLFRNtoSd/TSHxx4hpSxI=
-SHA256 (redis-2.4.15.tar.gz) = LlRnB5qhMNnpaN17NUEZQPAS0yK/aNKHx69vTUDjk8Q=
-SIZE (redis-2.4.15.tar.gz) = 653949
+SHA256 (redis-2.4.16.tar.gz) = 01zInXOqH/Ba9fE4CkQRyCiXmztEb1yvi1cgIls44Vs=
+SIZE (redis-2.4.16.tar.gz) = 649908

databases/redis/patches/CVS/Entries

 /patch-redis_conf/1.2/Wed Feb 29 12:01:48 2012//
 /patch-src_config_h/1.2/Wed Feb 29 12:01:48 2012//
 /patch-src_Makefile/1.10/Thu May 31 11:02:05 2012//
-/patch-src_redis_c/1.11/Wed Jun 27 11:02:41 2012//
+/patch-src_redis_c/1.12/Thu Aug  9 11:06:07 2012//
 D

databases/redis/patches/patch-src_redis_c

-$OpenBSD: patch-src_redis_c,v 1.11 2012/06/26 13:17:32 jasper Exp $
---- src/redis.c.orig	Wed May 23 11:32:58 2012
-+++ src/redis.c	Mon May 28 09:16:01 2012
+$OpenBSD: patch-src_redis_c,v 1.12 2012/08/08 11:24:05 dcoppa Exp $
+--- src/redis.c.orig	Wed Aug  1 11:59:08 2012
++++ src/redis.c	Wed Aug  8 13:10:58 2012
 @@ -33,7 +33,9 @@
  
  #ifdef HAVE_BACKTRACE
  #endif /* HAVE_BACKTRACE */
  
  #include <time.h>
-@@ -1808,7 +1811,9 @@ int main(int argc, char **argv) {
+@@ -1809,7 +1811,9 @@ int main(int argc, char **argv) {
  
  #ifdef HAVE_BACKTRACE
  static void *getMcontextEip(ucontext_t *uc) {
      return (void*) uc->uc_mcontext.mc_eip;
  #elif defined(__dietlibc__)
      return (void*) uc->uc_mcontext.eip;
-@@ -1837,14 +1842,6 @@ static void *getMcontextEip(ucontext_t *uc) {
+@@ -1838,14 +1842,6 @@ static void *getMcontextEip(ucontext_t *uc) {
  #endif
  }
  
  static void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
      void *trace[100];
      char **messages = NULL;
-@@ -1920,7 +1917,7 @@ static void sigsegvHandler(int sig, siginfo_t *info, v
+@@ -1921,7 +1917,7 @@ static void sigsegvHandler(int sig, siginfo_t *info, v
  "=== REDIS BUG REPORT END. Make sure to include from START to END. ===\n\n"
  "       Please report the crash opening an issue on github:\n\n"
  "           http://github.com/antirez/redis/issues\n\n"
  );
      /* free(messages); Don't call free() with possibly corrupted memory. */
      if (server.daemonize) unlink(server.pidfile);
-@@ -1936,6 +1933,14 @@ static void sigsegvHandler(int sig, siginfo_t *info, v
+@@ -1937,6 +1933,14 @@ static void sigsegvHandler(int sig, siginfo_t *info, v
      kill(getpid(),sig);
  }
  #endif /* HAVE_BACKTRACE */

devel/CVS/Entries

 D/p5-Proc-PID-File////
 D/ocaml-net////
 D/ocaml-mlgmp////
-/Makefile/1.1058/Wed Jul 18 11:03:14 2012//
 D/node-gir////
 D/py-gevent////
 D/py-greenlet////
+/Makefile/1.1059/Thu Aug  9 11:06:15 2012//
+D/nagelfar////
-# $OpenBSD: Makefile,v 1.1058 2012/07/17 19:34:09 landry Exp $
+# $OpenBSD: Makefile,v 1.1059 2012/08/09 04:55:39 stu Exp $
 # $FreeBSD: Makefile,v 1.85 1997/11/20 05:22:14 asami Exp $
 
      SUBDIR =
      SUBDIR += msp430
      SUBDIR += mspdebug
      SUBDIR += mysql++
+     SUBDIR += nagelfar
      SUBDIR += naken430asm
      SUBDIR += nant
      SUBDIR += nasm

devel/nagelfar/CVS/Entries

+/Makefile/1.1.1.1/Thu Aug  9 04:53:10 2012//
+/distinfo/1.1.1.1/Thu Aug  9 04:53:10 2012//
+D/patches////
+D/pkg////

devel/nagelfar/CVS/Repository

+ports/devel/nagelfar

devel/nagelfar/CVS/Root

+/home/jtr2/openbsd/mirror

devel/nagelfar/Makefile

+# $OpenBSD: Makefile,v 1.1.1.1 2012/08/09 04:53:10 stu Exp $
+
+COMMENT =	syntax analysis tool for Tcl
+
+DISTNAME =	nagelfar1112
+PKGNAME =	nagelfar-1.1.12
+CATEGORIES =	devel
+HOMEPAGE =	http://nagelfar.berlios.de/
+MAINTAINER =	Stuart Cassoff <stwo@users.sourceforge.net>
+
+# GPLv2 (Nagelfar)
+# BSD (textSearch)
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+MASTER_SITES =	${MASTER_SITE_BERLIOS:=nagelfar/}
+MODULES =	x11/tk
+RUN_DEPENDS =	${MODTK_RUN_DEPENDS}
+NO_BUILD =	Yes
+NO_REGRESS =	Yes
+PKG_ARCH =	*
+
+NF_LIB_DIR =	${PREFIX}/libdata/nagelfar
+NF_DOC_DIR =	${PREFIX}/share/doc/nagelfar
+TS_SRC_DIR =	${WRKSRC}/lib/textsearch
+TS_DOC_DIR =	${PREFIX}/share/doc/textsearch
+TS_EXA_DIR =	${PREFIX}/share/examples/textsearch
+MOD_DIR =	${DESTDIR}${MODTCL_MODDIR}/${MODTCL_VERSION}
+
+do-configure:
+	@${MODTCL_TCLSH_ADJ} ${WRKSRC}/nagelfar.tcl
+	@${SUBST_CMD} ${WRKSRC}/nagelfar.tcl
+	@${MODTCL_TCLSH_ADJ} ${TS_SRC_DIR}/examples/demo.tcl
+	@${SUBST_CMD} ${TS_SRC_DIR}/examples/demo.tcl
+
+do-install:
+	${INSTALL_DATA_DIR} ${NF_LIB_DIR} ${NF_DOC_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/nagelfar.tcl ${PREFIX}/bin/nagelfar
+	${INSTALL_DATA} ${WRKSRC}/syntax*.tcl ${NF_LIB_DIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${NF_DOC_DIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${NF_DOC_DIR}
+	${INSTALL_DATA_DIR} ${TS_DOC_DIR} ${TS_EXA_DIR} ${MOD_DIR}
+	${INSTALL_DATA} ${TS_SRC_DIR}/tcl/textsearch.tcl ${MOD_DIR}/textSearch-0.3.tm
+	${INSTALL_DATA} ${TS_SRC_DIR}/doc/readme.txt ${TS_DOC_DIR}
+	${INSTALL_SCRIPT} ${TS_SRC_DIR}/examples/demo.tcl ${TS_EXA_DIR}
+
+.include <bsd.port.mk>

devel/nagelfar/distinfo

+MD5 (nagelfar1112.tar.gz) = gIU/JyAVbSUbBv4c1fIgvg==
+RMD160 (nagelfar1112.tar.gz) = uzE0IiTJ38WjLsRQcKMnMm1y8A0=
+SHA1 (nagelfar1112.tar.gz) = Ti0VHUobWPB8CDhoZdnxGF6hO68=
+SHA256 (nagelfar1112.tar.gz) = 3wB+yE7bzjlqZo9ej6eas8WGuTJ9oSpZRy8JAuZJ1Fs=
+SIZE (nagelfar1112.tar.gz) = 98004

devel/nagelfar/patches/CVS/Entries

+/patch-lib_textsearch_examples_demo_tcl/1.1.1.1/Thu Aug  9 04:53:10 2012//
+/patch-nagelfar_tcl/1.1.1.1/Thu Aug  9 04:53:10 2012//
+D

devel/nagelfar/patches/CVS/Repository

+ports/devel/nagelfar/patches

devel/nagelfar/patches/CVS/Root

+/home/jtr2/openbsd/mirror

devel/nagelfar/patches/patch-lib_textsearch_examples_demo_tcl

+$OpenBSD: patch-lib_textsearch_examples_demo_tcl,v 1.1.1.1 2012/08/09 04:53:10 stu Exp $
+--- lib/textsearch/examples/demo.tcl.orig	Sat Sep 22 13:59:17 2007
++++ lib/textsearch/examples/demo.tcl	Sun Nov 27 22:22:04 2011
+@@ -47,10 +47,7 @@ menu .m.f
+ menu .m.s
+ textSearch::searchMenu .m.s
+ 
+-foreach dir {. tcl ../tcl} {
+-    if {![catch {set ch [open [file join $dir textsearch.tcl] r]}]} {
++    if {![catch {set ch [open ${PREFIX}/share/doc/textsearch/readme.txt r]}]} {
+         $w insert end [read $ch]
+         close $ch
+-        break
+     }
+-}

devel/nagelfar/patches/patch-nagelfar_tcl

+$OpenBSD: patch-nagelfar_tcl,v 1.1.1.1 2012/08/09 04:53:10 stu Exp $
+--- nagelfar.tcl.orig	Sun Nov 27 20:09:25 2011
++++ nagelfar.tcl	Sun Nov 27 20:10:54 2011
+@@ -46,15 +46,15 @@ while {[file type $tmplink] == "link"} {
+ unset tmplink
+ 
+ # This makes it possible to customize where files are installed
+-set dbDir      $thisDir
+-set docDir     $thisDir/doc
++set dbDir	${PREFIX}/libdata/nagelfar
++set docDir	${PREFIX}/share/doc/nagelfar
+ set libDir     $thisDir/lib
+  
+ # Search where the script is to be able to place e.g. ctext there.
+ if {[info exists ::starkit::topdir]} {
+     lappend auto_path [file dirname [file normalize $::starkit::topdir]]
+ } else {
+-    lappend auto_path $libDir
++    #lappend auto_path $libDir
+ }
+ #----------------------------------------------------------------------
+ #  Nagelfar, a syntax checker for Tcl.

devel/nagelfar/pkg/CVS/Entries

+/DESCR/1.1.1.1/Thu Aug  9 04:53:10 2012//
+/PLIST/1.1.1.1/Thu Aug  9 04:53:10 2012//
+D

devel/nagelfar/pkg/CVS/Repository

+ports/devel/nagelfar/pkg

devel/nagelfar/pkg/CVS/Root

+/home/jtr2/openbsd/mirror

devel/nagelfar/pkg/DESCR

+A Tcl application to read a Tcl program and provide static syntax
+analysis - information regarding Tcl syntax errors like missing braces,
+incomplete commands, etc. and code coverage analysis. Extensible, using
+a customizable exposed syntax database.
+
+Comes with the "textSearch" Tcl extension which provides procedures
+to add search and incremental search functions to Tk text widgets.

devel/nagelfar/pkg/PLIST

+@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/09 04:53:10 stu Exp $
+bin/nagelfar
+lib/tcl/modules/${MODTK_VERSION}/textSearch-0.3.tm
+libdata/nagelfar/
+libdata/nagelfar/syntaxbuild.tcl
+libdata/nagelfar/syntaxdb.tcl
+libdata/nagelfar/syntaxdb84.tcl
+libdata/nagelfar/syntaxdb86.tcl
+share/doc/nagelfar/
+share/doc/nagelfar/COPYING
+share/doc/nagelfar/README.txt
+share/doc/nagelfar/call-by-name.txt
+share/doc/nagelfar/codecoverage.txt
+share/doc/nagelfar/inlinecomments.txt
+share/doc/nagelfar/messages.txt
+share/doc/nagelfar/syntaxdatabases.txt
+share/doc/nagelfar/syntaxtokens.txt
+share/doc/textsearch/
+share/doc/textsearch/readme.txt
+share/examples/textsearch/
+share/examples/textsearch/demo.tcl

emulators/qemu/CVS/Entries

 D/files////
 D/patches////
 D/pkg////
-/distinfo/1.20/Sat Jun 16 11:03:23 2012//
-/Makefile/1.87/Mon Jul  9 11:04:25 2012//
+/Makefile/1.88/Thu Aug  9 11:10:05 2012//
+/distinfo/1.21/Thu Aug  9 11:10:05 2012//

emulators/qemu/Makefile

-# $OpenBSD: Makefile,v 1.87 2012/07/08 14:30:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.88 2012/08/08 10:44:44 sthen Exp $
 
 ONLY_FOR_ARCHS=	amd64 arm hppa i386 mips64 mips64el powerpc sparc sparc64
 BROKEN-hppa=	compiler bug with gcc 4.2
 
 COMMENT=	multi system emulator
 
-DISTNAME=	qemu-1.1.0-1
-PKGNAME=	qemu-1.1.0
-REVISION=	0
+DISTNAME=	qemu-1.1.1-1
+PKGNAME=	qemu-1.1.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 EXTRACT_SUFX=	.tar.bz2
 
-WRKDIST=	${WRKDIR}/qemu-1.1.0
+WRKDIST=	${WRKDIR}/qemu-1.1.1
 
 HOMEPAGE=	http://www.qemu.org/
 

emulators/qemu/distinfo

-MD5 (qemu-1.1.0-1.tar.bz2) = 9chcIpt4C8OSaIRbbzZfwQ==
-RMD160 (qemu-1.1.0-1.tar.bz2) = hcjCYLZwBW30qCoGuSVb6H8Xe2g=
-SHA1 (qemu-1.1.0-1.tar.bz2) = hgB2WDHBN6gzhU8arAMT8lCJogA=
-SHA256 (qemu-1.1.0-1.tar.bz2) = HlZvjLwz5ft9XzZMD9HN3p6SHmRyI7XXrn5flVRLJY0=
-SIZE (qemu-1.1.0-1.tar.bz2) = 9630116
+SHA256 (qemu-1.1.1-1.tar.bz2) = b7r/H6darhoGlHz3yxAcNSc3EsVhuH746uySqjlzSsg=
+SIZE (qemu-1.1.1-1.tar.bz2) = 9635574

emulators/qemu/patches/CVS/Entries

 /patch-cache-utils_c/1.4/Mon Jan  2 23:39:37 2012//
-/patch-configure/1.23/Sat Jun 16 11:03:23 2012//
+/patch-configure/1.24/Thu Aug  9 11:10:05 2012//
 D

emulators/qemu/patches/patch-configure

-$OpenBSD: patch-configure,v 1.23 2012/06/15 11:53:28 ajacoutot Exp $
---- configure.orig	Wed May 30 20:54:30 2012
-+++ configure	Thu May 31 22:41:49 2012
-@@ -2850,10 +2850,6 @@ fi
+$OpenBSD: patch-configure,v 1.24 2012/08/08 10:44:44 sthen Exp $
+--- configure.orig	Tue Jul 17 14:11:14 2012
++++ configure	Wed Jul 18 11:40:41 2012
+@@ -2854,10 +2854,6 @@ fi
  # End of CC checks
  # After here, no more $cc or $ld runs
  

emulators/qemu/pkg/CVS/Entries

 /DESCR/1.3/Mon Jan  2 23:39:38 2012//
 /MESSAGE/1.8/Mon Dec 12 10:56:56 2011//
-/PLIST/1.21/Sat Jun 16 11:03:23 2012//
 /README/1.9/Mon Jul  9 11:04:25 2012//
+/PLIST/1.22/Thu Aug  9 11:10:05 2012//
 D

emulators/qemu/pkg/PLIST

-@comment $OpenBSD: PLIST,v 1.21 2012/06/15 11:53:28 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.22 2012/08/08 10:44:44 sthen Exp $
 @conflict kqemu-*
 @conflict qemu-*
 @pkgpath emulators/kqemu
 share/doc/qemu/
 share/doc/qemu/qemu-doc.html
 share/doc/qemu/qemu-tech.html
+share/doc/qemu/qmp-commands.txt
 share/examples/qemu/
 share/examples/qemu/qemu-ifdown
 @mode 755

multimedia/get_iplayer/CVS/Entries

 D/files////
 D/patches////
 D/pkg////
-/Makefile/1.60/Fri Jun 29 11:05:11 2012//
 /distinfo/1.42/Fri Jun 29 11:05:11 2012//
+/Makefile/1.61/Thu Aug  9 11:14:55 2012//

multimedia/get_iplayer/Makefile

-# $OpenBSD: Makefile,v 1.60 2012/06/28 15:40:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.61 2012/08/08 23:17:28 sthen Exp $
 
 COMMENT =		download/stream programmes from BBC iPlayer
 
 DISTNAME =		get_iplayer-2.82
+REVISION =		0
 CATEGORIES =		multimedia
 
 # http://git.infradead.org/get_iplayer.git

multimedia/get_iplayer/patches/CVS/Entries

-/patch-get_iplayer/1.49/Fri Jun 29 11:05:11 2012//
+/patch-get_iplayer/1.50/Thu Aug  9 11:14:55 2012//
 D

multimedia/get_iplayer/patches/patch-get_iplayer

-$OpenBSD: patch-get_iplayer,v 1.49 2012/06/28 15:40:25 sthen Exp $
---- get_iplayer.orig	Sat Jun  2 17:37:17 2012
-+++ get_iplayer	Thu Jun 28 16:08:52 2012
-@@ -311,6 +311,7 @@ $opt->{verbose} = 1 if $opt_pre->{verbose};
+$OpenBSD: patch-get_iplayer,v 1.50 2012/08/08 23:17:28 sthen Exp $
+--- get_iplayer.orig	Thu Aug  9 00:12:51 2012
++++ get_iplayer	Thu Aug  9 00:12:46 2012
+@@ -130,8 +130,8 @@ my $opt_format = {
+ 	pidrecursive	=> [ 1, "pidrecursive|pid-recursive!", 'Recording', '--pid-recursive', "When used with --pid record all the embedded pids if the pid is a series or brand pid."],
+ 	proxy		=> [ 0, "proxy|p=s", 'Recording', '--proxy, -p <url>', "Web proxy URL e.g. 'http://USERNAME:PASSWORD\@SERVER:PORT' or 'http://SERVER:PORT'"],
+ 	raw		=> [ 0, "raw!", 'Recording', '--raw', "Don't transcode or change the recording/stream in any way (i.e. radio/realaudio, rtmp/flv)"],
+-	start		=> [ 1, "start=s", 'Recording', '--start <secs>', "Recording/streaming start offset (rtmp and realaudio only)"],
+-	stop		=> [ 1, "stop=s", 'Recording', '--stop <secs>', "Recording/streaming stop offset (can be used to limit live rtmp recording length) rtmp and realaudio only"],
++	start		=> [ 1, "start=s", 'Recording', '--start <secs|hh:mm:ss>', "Recording/streaming start offset (rtmp and realaudio only)"],
++	stop		=> [ 1, "stop=s", 'Recording', '--stop <secs|hh:mm:ss>', "Recording/streaming stop offset (can be used to limit live rtmp recording length) rtmp and realaudio only"],
+ 	suboffset	=> [ 1, "suboffset=n", 'Recording', '--suboffset <offset>', "Offset the subtitle timestamps by the specified number of milliseconds"],
+ 	subtitles	=> [ 2, "subtitles|subs!", 'Recording', '--subtitles', "Download subtitles into srt/SubRip format if available and supported"],
+ 	subsonly	=> [ 1, "subtitlesonly|subsonly|subtitles-only|subs-only!", 'Recording', '--subtitles-only', "Only download the subtitles, not the programme"],
+@@ -245,6 +245,7 @@ my $opt_format = {
+ 	mplayer		=> [ 1, "mplayer=s", 'External Program', '--mplayer <path>', "Location of mplayer binary"],
+ 
+ 	# Tagging
++	noartwork => [ 1, "noartwork|no-artwork!", 'Tagging', '--no-artwork', "Do not embed thumbnail image in output file.  All other metadata values will be written."],
+ 	notag => [ 1, "notag|no-tag!", 'Tagging', '--no-tag', "Do not tag downloaded programmes"],
+ 	tag_cnid => [ 1, "tagcnid|tag-cnid!", 'Tagging', '--tag-cnid', "AtomicParsley supports --cnID argument to add catalog ID used for combining HD and SD versions in iTunes"],
+ 	tag_fulltitle => [ 1, "tagfulltitle|tag-fulltitle!", 'Tagging', '--tag-fulltitle', "Use complete title (including series) instead of shorter episode title"],
+@@ -311,6 +312,7 @@ $opt->{verbose} = 1 if $opt_pre->{verbose};
  $opt->{quiet} = 1 if $opt_pre->{quiet};
  $opt->{pvr} = 1 if $opt_pre->{pvr};
  $opt->{stdout} = 1 if $opt_pre->{stdout} || $opt_pre->{stream};
  
  # show version and exit
  if ( $opt_pre->{showver} ) {
-@@ -347,7 +348,7 @@ mkpath $profile_dir if ! -d $profile_dir;
+@@ -347,7 +349,7 @@ mkpath $profile_dir if ! -d $profile_dir;
  
  
  # get list of additional user plugins and load plugin
  my $plugin_dir_user = "$profile_dir/plugins";
  for my $plugin_dir ( ( $plugin_dir_user, $plugin_dir_system ) ) {
  	if ( opendir( DIR, $plugin_dir ) ) {
-@@ -749,7 +750,7 @@ sub init_search {
+@@ -534,6 +536,13 @@ if ( $opt->{webrequest} ) {
+ 	delete $opt_cmdline->{webrequest};
+ }
+ 
++# process --start and --stop if necessary
++foreach ('start', 'stop') {
++	if ($opt->{$_} && $opt->{$_} =~ /(\d\d):(\d\d)(:(\d\d))?/) {