Update to 1.0.20:

1.0.20:
Changes: ocp.ini did not include support for .YM files as expected.
Two other minor tweaks were done.

1.0.19:
Changes: Multiple crash bugs were fixed. Support for YM files via
STYMulator was added. 24-bit SDL/X11 output should now work (which
is needed if ran inside QEMU). PTM and Adplug files should now load
and play correctly on big-endian systems. Several other minor tweaks
were made.

5 files changed, 14 insertions, 25 deletions

diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile
index 6020d452b08..f083d90ce66 100644
--- a/audio/ocp/Makefile
+++ b/audio/ocp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/01/16 17:10:31 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/05 14:45:01 wiz Exp $
 
-DISTNAME=		ocp-0.1.18
+DISTNAME=		ocp-0.1.20
 CATEGORIES=		audio
 MASTER_SITES=		http://stian.cubic.org/ocp/
 EXTRACT_SUFX=		.tar.lzma
@@ -8,6 +8,7 @@ EXTRACT_SUFX=		.tar.lzma
 MAINTAINER=		shattered@users.sourceforge.net
 HOMEPAGE=		http://stian.cubic.org/project-ocp.php
 COMMENT=		Open Cubic Player
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/audio/ocp/PLIST b/audio/ocp/PLIST
index 58185a57666..87a7fa3345e 100644
--- a/audio/ocp/PLIST
+++ b/audio/ocp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/01/16 17:10:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/06/05 14:45:01 wiz Exp $
 bin/ocp
 bin/${PKGNAME}
 bin/ocp-curses
@@ -21,6 +21,7 @@ lib/${PKGNAME}/autoload/30-fstypes.so
 lib/${PKGNAME}/autoload/30-mcpbase.so
 lib/${PKGNAME}/autoload/30-plrbase.so
 lib/${PKGNAME}/autoload/30-smpbase.so
+lib/${PKGNAME}/autoload/30-ymtype.so
 lib/${PKGNAME}/autoload/35-cpiface.so
 lib/${PKGNAME}/autoload/40-cphlpif.so
 lib/${PKGNAME}/devpdisk.so
@@ -50,6 +51,7 @@ lib/${PKGNAME}/playmp2.so
 lib/${PKGNAME}/playogg.so
 lib/${PKGNAME}/playwav.so
 lib/${PKGNAME}/playxm.so
+lib/${PKGNAME}/playym.so
 share/doc/${PKGNAME}/AUTHORS
 share/doc/${PKGNAME}/BUGS
 share/doc/${PKGNAME}/COPYING
diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo
index b9491505140..783e3b218fb 100644
--- a/audio/ocp/distinfo
+++ b/audio/ocp/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.2 2010/01/16 17:10:31 wiz Exp $
+$NetBSD: distinfo,v 1.3 2010/06/05 14:45:01 wiz Exp $
 
-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 (ocp-0.1.20.tar.lzma) = 41ebe131f7088100d2d62bd64afd60d6f2dc76a7
+RMD160 (ocp-0.1.20.tar.lzma) = 0124c34cdc075fa91f371af78d0d5b7be2c62715
+Size (ocp-0.1.20.tar.lzma) = 614792 bytes
+SHA1 (patch-ab) = d33aad7cfa41330c5cb026a7d3e92545f741f429
 SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5bed79094fff57130da6
 SHA1 (patch-ad) = 1a3e3aa02eeae905faebac7fc7fc27eb93fa0e46
 SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65
diff --git a/audio/ocp/patches/patch-aa b/audio/ocp/patches/patch-aa
deleted file mode 100644
index 74202828012..00000000000
--- a/audio/ocp/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/01/16 17:10:31 wiz Exp $
-
---- configure.orig	2009-12-25 23:32:29.000000000 +0000
-+++ configure
-@@ -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_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 314c4429148..a90dadde9ab 100644
--- a/audio/ocp/patches/patch-ab
+++ b/audio/ocp/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2010/01/16 17:10:31 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2010/06/05 14:45:01 wiz Exp $
 
---- Makefile.in.orig	2009-12-25 23:32:29.000000000 +0000
+--- Makefile.in.orig	2010-05-17 09:55:17.000000000 +0000
 +++ Makefile.in
 @@ -60,7 +60,6 @@ endif
  ifeq ($(HAVE_X11),1)
@@ -9,4 +9,4 @@ $NetBSD: patch-ab,v 1.2 2010/01/16 17:10:31 wiz Exp $
 -	$(CP) ultrafix.sh "$(DESTDIR)$(BINDIR)/ultrafix.sh"
  	mkdir -p "$(DESTDIR)$(ULTRADIR)"
  	$(MAKE) -C doc DESTDIR="$(DESTDIR)" install TOPDIR="../$(TOPDIR)"
- ifeq ($(HAVE_X11),1)
+