Add comments to patches. Re-enable modplug (hi joerg) per default.

Bump PKGREVISION.

6 files changed, 17 insertions, 11 deletions

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 910262bbbe5..fcb55352928 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2014/04/20 02:27:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.49 2014/04/21 09:49:49 wiz Exp $
 
 DISTNAME=		cmus-v2.5.0
 PKGNAME=		${DISTNAME:S/-v/-/}
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cmus/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo
index 9b6e341240d..c0d255d7c44 100644
--- a/audio/cmus/distinfo
+++ b/audio/cmus/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.17 2014/04/19 14:48:12 joerg Exp $
+$NetBSD: distinfo,v 1.18 2014/04/21 09:49:49 wiz Exp $
 
 SHA1 (cmus-v2.5.0.tar.bz2) = 244975a5ff642567acb047f6bd518e4a3271c25b
 RMD160 (cmus-v2.5.0.tar.bz2) = ee7b285cbafd6449d853d669e25cb4997254cece
 Size (cmus-v2.5.0.tar.bz2) = 224675 bytes
-SHA1 (patch-mixer__sun.c) = ffab27aa6c24715d78757015f4dcb2a53f2920b0
-SHA1 (patch-modplug.c) = 3382111d8d953e1f8928d690149da8d15d15532f
-SHA1 (patch-sun.c) = b3abbd3446b695c8d0aec9d9132328e92511b475
+SHA1 (patch-mixer__sun.c) = 4a7599fc200157cbd1169125d03ce1e29b26b643
+SHA1 (patch-modplug.c) = b08ea6c1c3501de9b3b2614df9f6450c0b508895
+SHA1 (patch-sun.c) = 1155871f5fcc714e3c26f21ecbd94604fee28a7f
diff --git a/audio/cmus/options.mk b/audio/cmus/options.mk
index e76d09faf85..e74a71b5072 100644
--- a/audio/cmus/options.mk
+++ b/audio/cmus/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.11 2014/04/18 14:12:51 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2014/04/21 09:49:49 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.cmus
 PKG_SUPPORTED_OPTIONS=		flac mad vorbis arts libao musepack faad wavpack pulseaudio
 PKG_SUPPORTED_OPTIONS+=		wide-curses ffmpeg
 PKG_OPTIONS_OPTIONAL_GROUPS=	mod
 PKG_OPTIONS_GROUP.mod=		modplug mikmod
-PKG_SUGGESTED_OPTIONS=		flac mad libao vorbis
+PKG_SUGGESTED_OPTIONS=		flac libao mad modplug vorbis
 PKG_OPTIONS_LEGACY_OPTS=	ao:libao
 PKG_OPTIONS_LEGACY_OPTS=	mpcdec:musepack
 
diff --git a/audio/cmus/patches/patch-mixer__sun.c b/audio/cmus/patches/patch-mixer__sun.c
index 6fcb3e8d2fc..bbfe5081810 100644
--- a/audio/cmus/patches/patch-mixer__sun.c
+++ b/audio/cmus/patches/patch-mixer__sun.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-mixer__sun.c,v 1.1 2012/02/15 20:15:42 hans Exp $
+$NetBSD: patch-mixer__sun.c,v 1.2 2014/04/21 09:49:49 wiz Exp $
+
+Fix build on SunOS.
 
 --- mixer_sun.c.orig	2011-11-30 09:57:20.000000000 +0100
 +++ mixer_sun.c	2012-02-15 21:12:05.691072986 +0100
diff --git a/audio/cmus/patches/patch-modplug.c b/audio/cmus/patches/patch-modplug.c
index 4226f7f3f07..dd841d2d3a0 100644
--- a/audio/cmus/patches/patch-modplug.c
+++ b/audio/cmus/patches/patch-modplug.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-modplug.c,v 1.1 2014/04/19 14:48:12 joerg Exp $
+$NetBSD: patch-modplug.c,v 1.2 2014/04/21 09:49:49 wiz Exp $
+
+Adapt for header path change.
 
 --- modplug.c.orig	2014-04-19 13:01:44.000000000 +0000
 +++ modplug.c
diff --git a/audio/cmus/patches/patch-sun.c b/audio/cmus/patches/patch-sun.c
index 7323c0068a3..1e838ca0ed7 100644
--- a/audio/cmus/patches/patch-sun.c
+++ b/audio/cmus/patches/patch-sun.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-sun.c,v 1.1 2012/02/15 20:15:42 hans Exp $
+$NetBSD: patch-sun.c,v 1.2 2014/04/21 09:49:49 wiz Exp $
+
+Fix build on SunOS.
 
 --- sun.c.orig	2011-11-30 09:57:20.000000000 +0100
 +++ sun.c	2012-02-15 21:12:09.658462551 +0100