Update to 0.1.18:

2009-06-29: devpcoreaudio didn't compile on darwin

2009-07-19: dev/smpman.c: x86_64 crashed when expanding loops

2009-07-20: configure.ac: missing AC_DEFINE, made compiling on ubuntu flash a lot of warnings due to we not knowing about some header files

2009-07-20: platit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Out-of-range_note_delays

2009-07-20: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Pattern_loop

2009-07-20: playit/itptrack.c: track-visualizer didn't show SBx commands (now appears like plx - pattern loop)

2009-07-20: *: use sysconf(_SC_PAGESIZE) if available, before trying to use PAGESIZE, and defaulting to 4096

2009-07-21: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Tremor_effect

2009-07-21: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Ping-pong_loop_and_sample_number

2009-07-22: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Retrigger

2009-07-22: stuff/*x11*: Borrowed some code from mplayer (don't attemt to use SHM on network connected X11 servers)

2009-07-23: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Pattern_row_delay

2009-07-23: stuff/poutput-x11.c: Added XSync() after resize-windows, else XGetImage sometimes fails, since local structure isn't ajour with server fast enough (window resize on remote X11 would sometime exit ocp with X11 error)

2009-07-23: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Random_waveform

2009-07-25: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Pan_swing_and_set_panning_effect

2009-07-26: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Zero_value_for_note_cut_and_note_delay

2009-07-26: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Portamento_with_no_note

2009-07-28: playit/itplay.c: http://eval.sovietrussia.org/wiki/Player_abuse_tests#Portamento_and_pitch_slide

2009-07-29: playgmi/*: Added buffer overrun protection to the MIDI file parser

2009-07-30: playit/itload.c: use Impulse Tracker 2.15 sample decompression, only when needed

2009-08-07: *: Remove the need for keep=1 on certain drivers. The drivers can tell themselfs if they need it.

2009-08-07: devp/devpcoreaudio.c: Major updates

2009-09-24: stuff/*: Added support for SDL video

2009-09-24: dev*/dev*oss.c: Only warn if GET_VERSION fails (some BSDs fails on this)

2009-09-24: ocp-*: Make even faster method for forcing SDL, etc video drivers

2009-09-25: Compiling SDL support without X11 gave a missing symbol

2009-11-18: configure.ac: AC_MSG_ERROR was used wrong some places

2009-12-25: *: medialib didn't handle archived files very well. This is now fixed, however, a rescan is needed in order to make them work (database didn't store archive data)

2009-12-26: playit/itload.c: Don't fail on loading samples with length set to zero, skip them instead

2009-12-26: VERSION 0.1.18

6 files changed, 30 insertions, 28 deletions

diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index a95d238792c..6020d452b08 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/08/16 15:52:10 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/16 17:10:31 wiz Exp $
 
-DISTNAME=		ocp-0.1.17
+DISTNAME=		ocp-0.1.18
 CATEGORIES=		audio
 MASTER_SITES=		http://stian.cubic.org/ocp/
 EXTRACT_SUFX=		.tar.lzma
diff --git a/audio/ocp/PLIST b/audio/ocp/PLIST
index d8c2eb2816e..58185a57666 100644
--- a/audio/ocp/PLIST
+++ b/audio/ocp/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/08/16 15:52:10 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/01/16 17:10:31 wiz Exp $
 bin/ocp
 bin/${PKGNAME}
+bin/ocp-curses
 info/ocp.info.gz
 lib/${PKGNAME}/autoload/10-compat.so
 lib/${PKGNAME}/autoload/10-devi.so
diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo
index dca1db65b6d..b9491505140 100644
--- a/audio/ocp/distinfo
+++ b/audio/ocp/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/08/16 15:52:10 wiz Exp $
+$NetBSD: distinfo,v 1.2 2010/01/16 17:10:31 wiz Exp $
 
-SHA1 (ocp-0.1.17.tar.lzma) = e501070a1331ecf1a5deed0c2b8235783376ec3d
-RMD160 (ocp-0.1.17.tar.lzma) = b247baf8859c1e3274488100c4af6928c36510ad
-Size (ocp-0.1.17.tar.lzma) = 562501 bytes
-SHA1 (patch-aa) = 5d098b551214eb5d557fee6218666237021a3b2c
-SHA1 (patch-ab) = 0514496cade761375371adc561257a1019a5fa1d
+SHA1 (ocp-0.1.18.tar.lzma) = b7806636042e66a7778d25777031d3634e6542a3
+RMD160 (ocp-0.1.18.tar.lzma) = 441911f98e1c0e8db584c357edf6f6506b12b798
+Size (ocp-0.1.18.tar.lzma) = 571471 bytes
+SHA1 (patch-aa) = c505ce46f28c85f4007cbe46fb728d1bb21366de
+SHA1 (patch-ab) = 09c1dc692b73571ba2e503b712c71b409041619d
 SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5bed79094fff57130da6
 SHA1 (patch-ad) = 1a3e3aa02eeae905faebac7fc7fc27eb93fa0e46
-SHA1 (patch-ae) = f68302eaedcb9841952f9b1670c5b0534f8fa63a
+SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65
 SHA1 (patch-af) = d379ded1f683c8299293436a3f9f7c0d32b06ec4
diff --git a/audio/ocp/patches/patch-aa b/audio/ocp/patches/patch-aa
index e139d635f94..74202828012 100644
--- a/audio/ocp/patches/patch-aa
+++ b/audio/ocp/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/08/16 15:52:11 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/16 17:10:31 wiz Exp $
 
---- configure.orig	2009-06-27 10:15:43.000000000 +0000
+--- configure.orig	2009-12-25 23:32:29.000000000 +0000
 +++ configure
-@@ -7340,7 +7340,7 @@ test "x$exec_prefix" = xNONE && exec_pre
- { $as_echo "$as_me:$LINENO: checking gcc version" >&5
+@@ -6006,7 +6006,7 @@ test "x$exec_prefix" = xNONE && exec_pre
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
  $as_echo_n "checking gcc version... " >&6; }
  cc_version=`( $CC -dumpversion ) 2>&1`
 -if test "$?" -gt 0 || test x$cc_version == x; then
 +if test "$?" -gt 0 || test x$cc_version = x; then
- 	{ { $as_echo "$as_me:$LINENO: error: not found" >&5
- $as_echo "$as_me: error: not found" >&2;}
-    { (exit 1); exit 1; }; }
+ 	as_fn_error "not found" "$LINENO" 5
+ else
+ 	case $cc_version in
diff --git a/audio/ocp/patches/patch-ab b/audio/ocp/patches/patch-ab
index 3a7fd7eb426..314c4429148 100644
--- a/audio/ocp/patches/patch-ab
+++ b/audio/ocp/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/08/16 15:52:11 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2010/01/16 17:10:31 wiz Exp $
 
---- Makefile.in.orig	2009-06-27 10:15:43.000000000 +0000
+--- Makefile.in.orig	2009-12-25 23:32:29.000000000 +0000
 +++ Makefile.in
-@@ -50,7 +50,6 @@ endif
- 	mkdir -p "$(DESTDIR)$(BINDIR)"
- 	$(CP) ocp "$(DESTDIR)$(BINDIR)/ocp$(DIR_SUFFIX)"
- 	if ! test -z $(DIR_SUFFIX); then ln -sf "ocp$(DIR_SUFFIX)" "$(DESTDIR)$(BINDIR)/ocp"; fi
+@@ -60,7 +60,6 @@ endif
+ ifeq ($(HAVE_X11),1)
+ 	$(CP) ocp-x11 "$(DESTDIR)$(BINDIR)/ocp-x11"
+ endif
 -	$(CP) ultrafix.sh "$(DESTDIR)$(BINDIR)/ultrafix.sh"
  	mkdir -p "$(DESTDIR)$(ULTRADIR)"
  	$(MAKE) -C doc DESTDIR="$(DESTDIR)" install TOPDIR="../$(TOPDIR)"
diff --git a/audio/ocp/patches/patch-ae b/audio/ocp/patches/patch-ae
index 52e9dbbe575..8be17bee666 100644
--- a/audio/ocp/patches/patch-ae
+++ b/audio/ocp/patches/patch-ae
@@ -1,13 +1,14 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/08/16 15:52:11 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2010/01/16 17:10:31 wiz Exp $
 
---- stuff/Makefile.orig	2009-06-27 10:15:43.000000000 +0000
+--- stuff/Makefile.orig	2009-12-25 23:32:29.000000000 +0000
 +++ stuff/Makefile
-@@ -29,7 +29,7 @@ framelock$(LIB_SUFFIX): $(framelock_so)
+@@ -34,7 +34,8 @@ framelock$(LIB_SUFFIX): $(framelock_so)
  	$(CC) $(SHARED_FLAGS) -o $@ $^
  
  poutput$(LIB_SUFFIX): $(poutput_so)
--	$(CC) $(SHARED_FLAGS) $(LINUX_LIBS) -o $@ $^ -lncurses $(X11_LIBS)
-+	$(CC) $(SHARED_FLAGS) $(LDFLAGS) $(LINUX_LIBS) -o $@ $^ -lncurses $(X11_LIBS)
+-	$(CC) $(SHARED_FLAGS) $(LINUX_LIBS) -o $@ $^ -lncurses $(poutput_so_libs)
++	$(CC) $(SHARED_FLAGS) $(LDFLAGS) $(LINUX_LIBS) -o $@ $^ -lncurses $(poutput_so_libs)
++
  
  hardware$(LIB_SUFFIX): $(hardware_so)
  	$(CC) $(SHARED_FLAGS) -o $@ $^