ports/137148: [patch] audio/xmp: update to 2.7.1

[Anonymous]

>Number:         137148
>Category:       ports
>Synopsis:       [patch] audio/xmp: update to 2.7.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 26 08:20:05 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Anonymous
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD luffy 8.0-BETA2 FreeBSD 8.0-BETA2 #0 r195859M: Sat Jul 25 00:01:07 UTC 2009     root at luffy:/usr/obj/usr/src/sys/PHOENIX  amd64

$ make showconfig (all OFF)
===> The following configuration options are available for xmp-2.7.1:
     XMMS=off "Build XMMS plugin"
     ESOUND=off "EsounD support"
===> Use 'make config' to modify these settings
>Description:
>How-To-Repeat:
>Fix:
--- xmp-2.7.1.diff begins here ---
Index: audio/xmp/Makefile
===================================================================
RCS file: /home/csup/ports/audio/xmp/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- audio/xmp/Makefile	18 May 2008 12:16:40 -0000	1.38
+++ audio/xmp/Makefile	26 Jul 2009 08:12:18 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmp
-PORTVERSION=	2.5.1
+PORTVERSION=	2.7.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -42,11 +42,11 @@ CONFIGURE_ARGS+=	--disable-esd
 LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 CONFIGURE_ARGS+=	--enable-xmms-plugin
 .else
-CONFIGURE_ARGS+=	--disable-xmms
+CONFIGURE_ARGS+=	--disable-xmms-plugin
 .endif
 
 post-patch:
-.for f in docs/xmp.1 etc/xmp.conf etc/xmp-modules.conf
+.for f in docs/xmp.1 etc/xmp.conf etc/modules.conf
 	@${REINPLACE_CMD} -e "s|/etc/xmp|${PREFIX}/etc/xmp|g" ${WRKSRC}/${f}
 .endfor
 	@${REINPLACE_CMD} -E -e 's|(^DDIRS.*)etc|\1|' ${WRKSRC}/Makefile
@@ -54,6 +54,6 @@ post-patch:
 post-install:
 	@${MKDIR} ${PREFIX}/etc/xmp
 	@${INSTALL_DATA} ${WRKSRC}/etc/xmp.conf ${PREFIX}/etc/xmp/xmp.conf.default
-	@${INSTALL_DATA} ${WRKSRC}/etc/xmp-modules.conf ${PREFIX}/etc/xmp/xmp-modules.conf.default
+	@${INSTALL_DATA} ${WRKSRC}/etc/modules.conf ${PREFIX}/etc/xmp/modules.conf.default
 
 .include <bsd.port.post.mk>
Index: audio/xmp/distinfo
===================================================================
RCS file: /home/csup/ports/audio/xmp/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- audio/xmp/distinfo	16 Apr 2008 21:21:25 -0000	1.9
+++ audio/xmp/distinfo	26 Jul 2009 08:12:09 -0000
@@ -1,3 +1,3 @@
-MD5 (xmp-2.5.1.tar.gz) = 79040d5ae0efaf7ea116c5fe05d99b75
-SHA256 (xmp-2.5.1.tar.gz) = af9dedfc6f312c1f68fb73f286be26b67755877c6b53803b9dea9f3d189b992f
-SIZE (xmp-2.5.1.tar.gz) = 772595
+MD5 (xmp-2.7.1.tar.gz) = bbed5ba3dc9bd8ff38133b31fd5b8846
+SHA256 (xmp-2.7.1.tar.gz) = 84b1bfc00e254fe1eb1e6a2932c27b2695f6d401fbe4e244b740289e9101c805
+SIZE (xmp-2.7.1.tar.gz) = 794986
Index: audio/xmp/pkg-plist
===================================================================
RCS file: /home/csup/ports/audio/xmp/pkg-plist,v
retrieving revision 1.4
diff -u -p -r1.4 pkg-plist
--- audio/xmp/pkg-plist	19 Apr 2008 00:03:30 -0000	1.4
+++ audio/xmp/pkg-plist	26 Jul 2009 08:12:09 -0000
@@ -1,5 +1,5 @@
 bin/xmp
 etc/xmp/xmp.conf.default
-etc/xmp/xmp-modules.conf.default
+etc/xmp/modules.conf.default
 @dirrmtry etc/xmp
 @rmtry lib/xmms/Input/xmp-xmms.so
Index: audio/xmp/files/patch-src-drivers-oss_seq.c
===================================================================
RCS file: /home/csup/ports/audio/xmp/files/patch-src-drivers-oss_seq.c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src-drivers-oss_seq.c
--- audio/xmp/files/patch-src-drivers-oss_seq.c	16 Apr 2008 21:21:25 -0000	1.1
+++ audio/xmp/files/patch-src-drivers-oss_seq.c	26 Jul 2009 08:12:09 -0000
@@ -1,26 +1,26 @@
 --- src/drivers/oss_seq.c.orig	2008-04-16 20:48:53.000000000 +0200
 +++ src/drivers/oss_seq.c	2008-04-16 20:49:05.000000000 +0200
-@@ -141,7 +141,6 @@
+@@ -138,7 +138,6 @@ static int numvoices(int num)
  #endif
- 	if (num > SEQ_NUM_VOICES)
- 	    return SEQ_NUM_VOICES;
--	GUS_NUMVOICES (dev, num);
- 	break;
-     }
+ 		if (num > SEQ_NUM_VOICES)
+ 			return SEQ_NUM_VOICES;
+-		GUS_NUMVOICES(dev, num);
+ 		break;
+ 	}
  
-@@ -151,7 +150,6 @@
+@@ -147,7 +146,6 @@ static int numvoices(int num)
  
  static void voicepos(int ch, int pos)
  {
--    GUS_VOICE_POS (dev, ch, pos);
+-	GUS_VOICE_POS(dev, ch, pos);
  }
  
- 
-@@ -204,7 +202,6 @@
+ static void echoback(int msg)
+@@ -194,7 +192,6 @@ static void seteffect(struct xmp_context
  
  static void setpan(struct xmp_context *ctx, int ch, int pan)
  {
--    GUS_VOICEBALA(dev, ch, (pan + 0x80) >> 4)
+-	GUS_VOICEBALA(dev, ch, (pan + 0x80) >> 4)
  }
  
- 
+ static void setbend(int ch, int bend)
--- xmp-2.7.1.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: