 @@ -1,12 +1,4 @@
-This is the Extended Module Player, an open source module player for UNIX
+The Extended Module Player, or xmp, is a portable command-line module
-distributed under the terms of the GNU GPL. xmp currently runs on several
+player. Xmp plays many mainstream and obscure module formats including
-platforms, including ALSA, OSS (for Linux on i386 and Alpha and FreeBSD),
+Protracker (MOD), Scream Tracker 3 (S3M), Fast Tracker II (XM), and
-BSD, SunOS, Solaris, S/Linux and HP-UX.  On PC class machines with GUS or
+Impulse Tracker (IT).
 AWE cards xmp takes advantage of the  OSS sequencer to play modules  with
 virtually no system load. Using software mixing, xmp plays at rates up to
 kHz in mono or stereo, 8 or 16 bits, signed or unsigned, little or big
 endian samples with 32 bit linear interpolation.
 The current version of xmp supports many Amiga and PC module formats
 (including packed, Powerpacked and SQSHed modules) -- currently 47 known
 formats.

 @@ -1,26 +1,38 @@
-# $NetBSD: Makefile,v 1.53 2019/09/18 14:17:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2019/11/21 23:59:06 nia Exp $
-DISTNAME=	xmp-4.0.10
+DISTNAME=	xmp-4.1.0
 PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmp/}
 MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://xmp.sourceforge.net/
 COMMENT=	Player for many different Amiga and PC module formats
 LICENSE=	gnu-gpl-v2
 USE_TOOLS+=	gmake pkg-config
 GNU_CONFIGURE=	yes
 EGDIR=		${PREFIX}/share/examples/xmp
 CONF_FILES=	${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/xmp/modules.conf
 CONF_FILES+=	${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp/xmp.conf
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${EGDIR}
 INSTALL_MAKE_FLAGS+=	INSTALL=${INSTALL:Q}
-.include "options.mk"
+.include "../../mk/bsd.prefs.mk"
 .include "../../mk/oss.buildlink3.mk"
 # NetBSD and Solaris have their own drivers.
 .if ${OPSYS} != "NetBSD" && \
     ${OPSYS} != "Solaris" && \
     ${OSS_TYPE} != "none"
 LIBS+=		${LIBOSSAUDIO}
 CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 CPPFLAGS+=	-DDEVOSSSOUND="\"${DEVOSSSOUND}\""
 .else
 CONFIGURE_ARGS+=	--disable-oss
 .endif
 .include "options.mk"
 .include "../../audio/libxmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 01:12:56 agc Exp $
+$NetBSD: distinfo,v 1.19 2019/11/21 23:59:06 nia Exp $
-SHA1 (xmp-4.0.10.tar.gz) = e6a39a5158a9e36d437b233d68a8dc7756a971e1
+SHA1 (xmp-4.1.0.tar.gz) = 4550bd5daa505f577a9cd9470da202fcc4b57ebc
-RMD160 (xmp-4.0.10.tar.gz) = 1dfd7f50c0bf8fa7cfd72c127d9d66dc151cced2
+RMD160 (xmp-4.1.0.tar.gz) = 61d875610bf2e90d1d91fb01e2a960b714036413
-SHA512 (xmp-4.0.10.tar.gz) = 14e85cb0a35edb7f1584e1b8485b502b8ac8b1ce8d6360f9d3d5cbb488379e25a6a19587c9bacd598cac13ca7ab8e07380cfbb7fb41fe54897fa3ef598de0da6
+SHA512 (xmp-4.1.0.tar.gz) = 9d9791b729f902afc8c728609e82c06fc6576d915b83a01957b1ca585d726f00196f9059df1d86c3e75db7b275416b3d550aea32b140daafaf20b0170ae2dc32
-Size (xmp-4.0.10.tar.gz) = 203088 bytes
+Size (xmp-4.1.0.tar.gz) = 210435 bytes
 SHA1 (patch-etc_Makefile) = 5816b82a6253a627b39ff2ca262bfb5675ca97e3
-SHA1 (patch-src_drivers_netbsd.c) = 6bbb1a40b7bb95ecdad6fe5f76be2a51a8940906
+SHA1 (patch-src_drivers_netbsd.c) = ff8c97165380ea2323957135554fda53253b00d5
 SHA1 (patch-src_options.c) = f372d1336e795b77c7ce38230bf69dd363da02c2
 SHA1 (patch-src_sound_oss.c) = 251a09075ade185e33938be67776e7740473a6a5

 @@ -1,54 +1,20 @@
-# $NetBSD: options.mk,v 1.5 2017/09/27 13:47:30 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2019/11/21 23:59:06 nia Exp $
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xmp
+PKG_OPTIONS_VAR=		PKG_OPTIONS.xmp
-# XXX configure.ac is broken, you cannot disable oss and alsa at the moment.
+PKG_SUPPORTED_OPTIONS=		alsa pulseaudio
-PKG_SUPPORTED_OPTIONS=	alsa esound nas oss pulseaudio
+PKG_SUGGESTED_OPTIONS.Linux=	alsa
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS=	alsa
 .elif ${OPSYS} == "Interix"
 # No native support for this OS, so use esound for audio output
 PKG_SUGGESTED_OPTIONS=	esound
 # On Darwin, xmp uses CoreAudio
 .elif ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=	pulseaudio
 .endif
 .include "../../mk/bsd.options.mk"
 # Alsa support
 .if !empty(PKG_OPTIONS:Malsa)
 .  include "../../audio/alsa-lib/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=--disable-alsa
+CONFIGURE_ARGS+=	--disable-alsa
 .endif
 # Esd support
 .if !empty(PKG_OPTIONS:Mesound)
 CONFIGURE_ARGS+=--enable-esd
 .  include "../../audio/esound/buildlink3.mk"
 .endif
 # Nas support
 .if !empty(PKG_OPTIONS:Mnas)
 CONFIGURE_ARGS+=--enable-nas
 .  include "../../audio/nas/buildlink3.mk"
 .endif
 # Oss support
 .if !empty(PKG_OPTIONS:Moss)
 .  include "../../mk/oss.buildlink3.mk"
 LIBS+=		${LIBOSSAUDIO}
 CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 CPPFLAGS+=	-DDEVOSSSOUND="\"${DEVOSSSOUND}\""
 .else
 CONFIGURE_ARGS+=--disable-oss
 .endif
 # Pulseaudio support
 .if !empty(PKG_OPTIONS:Mpulseaudio)
-CONFIGURE_ARGS+=--enable-pulseaudio
+CONFIGURE_ARGS+=	--enable-pulseaudio
 .  include "../../audio/pulseaudio/buildlink3.mk"
 .endif

 @@ -1,13 +1,22 @@
-$NetBSD: patch-src_drivers_netbsd.c,v 1.3 2014/02/27 03:40:10 rxg Exp $
+$NetBSD: patch-src_drivers_netbsd.c,v 1.4 2019/11/21 23:59:06 nia Exp $
---- src/sound_netbsd.c.orig	2013-04-06 13:38:02.000000000 +0000
+--- src/sound_netbsd.c.orig	2016-07-16 11:29:44.213738881 +0000
 +++ src/sound_netbsd.c
-@@ -99,7 +101,7 @@ static void play(void *b, int i)
+@@ -36,7 +36,7 @@ static int init(struct options *options)
  	chkparm1("buffer", bsize = strtoul(token, NULL, 0));
  	parm_end();
 -	if ((audio_fd = open("/dev/sound", O_WRONLY)) == -1)
 +	if ((audio_fd = open("/dev/audio", O_WRONLY)) == -1)
  		return -1;
  	/* try to open audioctldevice */
@@ -101,7 +101,7 @@ static void play(void *b, int i)
  	while (i) {
  		if ((j = write(audio_fd, b, i)) > 0) {
  			i -= j;
 -			(char *)b += j;
 +			b = (char *)b + j;
  		} else
  			break;
+ 	}