7 files changed, 546 insertions, 0 deletions

diff --git a/audio/xmms-nsf/Makefile b/audio/xmms-nsf/Makefile
new file mode 100644
index 000000000000..8d02f84efc85
--- /dev/null
+++ b/audio/xmms-nsf/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	xmms-nsf
+# Date created:				18 Aug 2005
+# Whom:					Emanuel Haupt <ehaupt@critical.ch>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xmms-nsf
+PORTVERSION=	0.0.3
+CATEGORIES=	audio
+MASTER_SITES=	http://optronic.sourceforge.net/files/ \
+		http://critical.ch/distfiles/
+
+MAINTAINER=	ehaupt@critical.ch
+COMMENT=	XMMS input-plugin for playing Nintendo(TM) NSF audio files
+
+BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
+
+USE_LIBTOOL_VER=13
+USE_REINPLACE=	yes
+USE_X_PREFIX=	yes
+
+ONLY_FOR_ARCHS=	i386 amd64
+
+CFLAGS+=	-fPIC
+
+PLIST_FILES=	lib/xmms/Input/libnsf.so lib/xmms/Input/libnsf.la
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|' \
+		${WRKSRC}/src/nes/nestypes.h
+
+post-install:
+	@${SED} -e 's|%%VERSION%%|${PORTVERSION}|' ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/audio/xmms-nsf/distinfo b/audio/xmms-nsf/distinfo
new file mode 100644
index 000000000000..aa3acb87c361
--- /dev/null
+++ b/audio/xmms-nsf/distinfo
@@ -0,0 +1,2 @@
+MD5 (xmms-nsf-0.0.3.tar.gz) = 45c55a17d81cd82d36d59bdb231777df
+SIZE (xmms-nsf-0.0.3.tar.gz) = 185683
diff --git a/audio/xmms-nsf/files/patch-src-nes-handler.c b/audio/xmms-nsf/files/patch-src-nes-handler.c
new file mode 100644
index 000000000000..093d68df3402
--- /dev/null
+++ b/audio/xmms-nsf/files/patch-src-nes-handler.c
@@ -0,0 +1,26 @@
+--- src/nes/handler.c.orig	Sun Jan  7 05:17:57 2001
++++ src/nes/handler.c	Thu Aug 18 16:47:01 2005
+@@ -10,9 +10,9 @@
+ static NES_READ_HANDLER  *(nprh[0x10]) = { 0, };
+ static NES_WRITE_HANDLER *(npwh[0x10]) = { 0, };
+ #define EXTREADWRITE(p) \
+-static Uint __fastcall ExtRd##p##(Uint A) \
++static Uint __fastcall ExtRd##p (Uint A) \
+ { \
+-	NES_READ_HANDLER *ph = nprh[0x##p##]; \
++	NES_READ_HANDLER *ph = nprh[0x##p ]; \
+ 	do \
+ 	{ \
+ 		if (ph->min <= A && A <= ph->max) \
+@@ -22,9 +22,9 @@
+ 	} while ((ph = ph->next) != 0); \
+ 	return 0; \
+ } \
+-static void __fastcall ExtWr##p##(Uint A, Uint V) \
++static void __fastcall ExtWr##p (Uint A, Uint V) \
+ { \
+-	NES_WRITE_HANDLER *ph = npwh[0x##p##]; \
++	NES_WRITE_HANDLER *ph = npwh[0x##p ]; \
+ 	do \
+ 	{ \
+ 		if (ph->min <= A && A <= ph->max) \
diff --git a/audio/xmms-nsf/files/patch-src-nes-km6502-km6502cd.h b/audio/xmms-nsf/files/patch-src-nes-km6502-km6502cd.h
new file mode 100644
index 000000000000..577908f99da3
--- /dev/null
+++ b/audio/xmms-nsf/files/patch-src-nes-km6502-km6502cd.h
@@ -0,0 +1,417 @@
+--- src/nes/km6502/km6502cd.h.orig	Sun Jan  7 05:18:05 2001
++++ src/nes/km6502/km6502cd.h	Thu Aug 18 16:47:34 2005
+@@ -361,27 +361,27 @@
+ 
+ /* --- ADC ---  */
+ #if BUILD_HUC6280
+-#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall D_Opco##i##(__CONTEXT) \
+-{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall T_Opco##i##(__CONTEXT) \
++#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall D_Opco##i (__CONTEXT) \
++{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall T_Opco##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ } \
+-static void OpcodeCall TD_Opc##i##(__CONTEXT) \
++static void OpcodeCall TD_Opc##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ }
+ #else
+-#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall D_Opco##i##(__CONTEXT) \
+-{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall D_Opco##i (__CONTEXT) \
++{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ #endif
+ DEF_ADC(61,NP,KA_INDX)	/* 61 - ADC - (Indirect,X) */
+ DEF_ADC(65,ZP,KA_ZP)	/* 65 - ADC - Zero Page */
+@@ -397,17 +397,17 @@
+ 
+ /* --- AND ---  */
+ #if BUILD_HUC6280
+-#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall T_Opco##i##(__CONTEXT) \
++#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall T_Opco##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ }
+ #else
+-#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ #endif
+ DEF_AND(21,NP,KA_INDX)	/* 21 - AND - (Indirect,X) */
+ DEF_AND(25,ZP,KA_ZP)	/* 25 - AND - Zero Page */
+@@ -422,10 +422,10 @@
+ #endif
+ 
+ /* --- ASL ---  */
+-#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_ASL(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_ASL(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_ASL(06,ZP,KA_ZP)	/* 06 - ASL - Zero Page */
+ DEF_ASL(0E,NP,KA_ABS)	/* 0E - ASL - Absolute */
+@@ -436,7 +436,7 @@
+ 
+ #if BUILD_HUC6280
+ /* --- BBRi --- */
+-#define DEF_BBR(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_BBR(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = KA_ZP(__THISP); \
+ 	Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
+@@ -451,7 +451,7 @@
+ DEF_BBR(6F,6)			/* 6F - BBR6 */
+ DEF_BBR(7F,7)			/* 7F - BBR7 */
+ /* --- BBSi --- */
+-#define DEF_BBS(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_BBS(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = KA_ZP(__THISP); \
+ 	Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
+@@ -468,8 +468,8 @@
+ #endif
+ 
+ /* --- BIT ---  */
+-#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_BIT(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_BIT(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_BIT(24,ZP,KA_ZP)	/* 24 - BIT - Zero Page */
+ DEF_BIT(2C,NP,KA_ABS)	/* 2C - BIT - Absolute */
+ #if BUILD_HUC6280 || BUILD_M65C02
+@@ -479,7 +479,7 @@
+ #endif
+ 
+ /* --- Bcc ---  */
+-#define DEF_BRA(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_BRA(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
+ 	if (a) KM_BRA(__THISP_ rel); \
+@@ -536,8 +536,8 @@
+ { __THIS__.P &= ~V_FLAG; }
+ 
+ /* --- CMP --- */
+-#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_CMP(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_CMP(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_CMP(C1,NP,KA_INDX)	/* C1 - CMP - (Indirect,X) */
+ DEF_CMP(C5,ZP,KA_ZP)	/* C5 - CMP - Zero Page */
+ DEF_CMP(C9,NP,KA_IMM)	/* C9 - CMP - Immediate */
+@@ -551,24 +551,24 @@
+ #endif
+ 
+ /* --- CPX --- */
+-#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_CPX(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_CPX(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_CPX(E0,NP,KA_IMM)	/* E0 - CPX - Immediate */
+ DEF_CPX(E4,ZP,KA_ZP)	/* E4 - CPX - Zero Page */
+ DEF_CPX(EC,NP,KA_ABS)	/* EC - CPX - Absolute */
+ 
+ /* --- CPY --- */
+-#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_CPY(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_CPY(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_CPY(C0,NP,KA_IMM)	/* C0 - CPY - Immediate */
+ DEF_CPY(C4,ZP,KA_ZP)	/* C4 - CPY - Zero Page */
+ DEF_CPY(CC,NP,KA_ABS)	/* CC - CPY - Absolute */
+ 
+ /* --- DEC ---  */
+-#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_DEC(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_DEC(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_DEC(C6,ZP,KA_ZP)	/* C6 - DEC - Zero Page */
+ DEF_DEC(CE,NP,KA_ABS)	/* CE - DEC - Absolute */
+@@ -585,17 +585,17 @@
+ 
+ /* --- EOR ---  */
+ #if BUILD_HUC6280
+-#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall T_Opco##i##(__CONTEXT) \
++#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall T_Opco##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ }
+ #else
+-#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ #endif
+ DEF_EOR(41,NP,KA_INDX)	/* 41 - EOR - (Indirect,X) */
+ DEF_EOR(45,ZP,KA_ZP)	/* 45 - EOR - Zero Page */
+@@ -610,10 +610,10 @@
+ #endif
+ 
+ /* --- INC ---  */
+-#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_INC(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_INC(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_INC(E6,ZP,KA_ZP)	/* E6 - INC - Zero Page */
+ DEF_INC(EE,NP,KA_ABS)	/* EE - INC - Absolute */
+@@ -629,12 +629,12 @@
+ { __THIS__.Y = KM_INC(__THISP_ __THIS__.Y); }
+ 
+ /* --- JMP ---  */
+-#define DEF_JMP(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_JMP(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { __THIS__.PC = KI_READWORD(__THISP_ a(__THISP)); }
+ #if BUILD_HUC6280 || BUILD_M65C02
+ #define DEF_JMPBUG(i,a) DEF_JMP(i,a)
+ #else
+-#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { __THIS__.PC = KI_READWORDBUG(__THISP_ a(__THISP)); }
+ #endif
+ DEF_JMP(4C,KA_IMM16)	/* 4C - JMP - Immediate */
+@@ -653,8 +653,8 @@
+ }
+ 
+ /* --- LDA --- */
+-#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ __THIS__.A = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ __THIS__.A = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_LDA(A1,NP,KA_INDX)	/* A1 - LDA - (Indirect,X) */
+ DEF_LDA(A5,ZP,KA_ZP)	/* A5 - LDA - Zero Page */
+ DEF_LDA(A9,NP,KA_IMM)	/* A9 - LDA - Immediate */
+@@ -668,8 +668,8 @@
+ #endif
+ 
+ /* --- LDX ---  */
+-#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ __THIS__.X = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ __THIS__.X = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_LDX(A2,NP,KA_IMM)	/* A2 - LDX - Immediate */
+ DEF_LDX(A6,ZP,KA_ZP)	/* A6 - LDX - Zero Page */
+ DEF_LDX(AE,NP,KA_ABS)	/* AE - LDX - Absolute */
+@@ -677,8 +677,8 @@
+ DEF_LDX(BE,NP,KA_ABSY_)	/* BE - LDX - Absolute,Y */
+ 
+ /* --- LDY ---  */
+-#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ __THIS__.Y = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ __THIS__.Y = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_LDY(A0,NP,KA_IMM)	/* A0 - LDY - Immediate */
+ DEF_LDY(A4,ZP,KA_ZP)	/* A4 - LDY - Zero Page */
+ DEF_LDY(AC,NP,KA_ABS)	/* AC - LDY - Absolute */
+@@ -686,10 +686,10 @@
+ DEF_LDY(BC,NP,KA_ABSX_)	/* BC - LDY - Absolute,X */
+ 
+ /* --- LSR ---  */
+-#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_LSR(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_LSR(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_LSR(46,ZP,KA_ZP)	/* 46 - LSR - Zero Page */
+ DEF_LSR(4E,NP,KA_ABS)	/* 4E - LSR - Absolute */
+@@ -705,17 +705,17 @@
+ 
+ /* --- ORA ---  */
+ #if BUILD_HUC6280
+-#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall T_Opco##i##(__CONTEXT) \
++#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall T_Opco##i (__CONTEXT) \
+ { \
+ 	Uword saveA = KMI_PRET(__THISP); \
+-	KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
++	KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
+ 	KMI_POSTT(__THISP_ saveA); \
+ }
+ #else
+-#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ #endif
+ DEF_ORA(01,NP,KA_INDX)	/* 01 - ORA - (Indirect,X) */
+ DEF_ORA(05,ZP,KA_ZP)	/* 05 - ORA - Zero Page */
+@@ -751,7 +751,7 @@
+ 
+ #if BUILD_HUC6280
+ /* --- RMBi --- */
+-#define DEF_RMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_RMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = KA_ZP(__THISP); \
+ 	K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) & (~(1 << y)))); \
+@@ -765,7 +765,7 @@
+ DEF_RMB(67,6)	/* 67 - RMB6 */
+ DEF_RMB(77,7)	/* 77 - RMB7 */
+ /* --- SMBi --- */
+-#define DEF_SMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_SMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = KA_ZP(__THISP); \
+ 	K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) | (1 << y))); \
+@@ -781,10 +781,10 @@
+ #endif
+ 
+ /* --- ROL ---  */
+-#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_ROL(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_ROL(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_ROL(26,ZP,KA_ZP)	/* 26 - ROL - Zero Page */
+ DEF_ROL(2E,NP,KA_ABS)	/* 2E - ROL - Absolute */
+@@ -794,10 +794,10 @@
+ { __THIS__.A = KM_ROL(__THISP_ __THIS__.A); }
+ 
+ /* --- ROR ---  */
+-#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_ROR(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_ROR(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_ROR(66,ZP,KA_ZP)	/* 66 - ROR - Zero Page */
+ DEF_ROR(6E,NP,KA_ABS)	/* 6E - ROR - Absolute */
+@@ -841,10 +841,10 @@
+ #endif
+ 
+ /* --- SBC ---  */
+-#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ KMI_SBC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
+-static void OpcodeCall D_Opco##i##(__CONTEXT) \
+-{ KMI_SBC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
++#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ KMI_SBC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
++static void OpcodeCall D_Opco##i (__CONTEXT) \
++{ KMI_SBC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
+ DEF_SBC(E1,NP,KA_INDX)	/* E1 - SBC - (Indirect,X) */
+ DEF_SBC(E5,ZP,KA_ZP)	/* E5 - SBC - Zero Page */
+ DEF_SBC(E9,NP,KA_IMM)	/* E9 - SBC - Immediate */
+@@ -883,8 +883,8 @@
+ #endif
+ 
+ /* --- STA --- */
+-#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.A); }
++#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.A); }
+ DEF_STA(81,NP,KA_INDX)	/* 81 - STA - (Indirect,X) */
+ DEF_STA(85,ZP,KA_ZP)	/* 85 - STA - Zero Page */
+ DEF_STA(8D,NP,KA_ABS)	/* 8D - STA - Absolute */
+@@ -897,23 +897,23 @@
+ #endif
+ 
+ /* --- STX ---  */
+-#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.X); }
++#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.X); }
+ DEF_STX(86,ZP,KA_ZP)	/* 86 - STX - Zero Page */
+ DEF_STX(8E,NP,KA_ABS)	/* 8E - STX - Absolute */
+ DEF_STX(96,ZP,KA_ZPY)	/* 96 - STX - Zero Page,Y */
+ 
+ /* --- STY ---  */
+-#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.Y); }
++#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.Y); }
+ DEF_STY(84,ZP,KA_ZP)	/* 84 - STY - Zero Page */
+ DEF_STY(8C,NP,KA_ABS)	/* 8C - STY - Absolute */
+ DEF_STY(94,ZP,KA_ZPX)	/* 94 - STY - Zero Page,X */
+ 
+ #if BUILD_HUC6280 || BUILD_M65C02
+ /* --- STZ ---  */
+-#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+-{ K_WRITE##p##(__THISP_ a(__THISP), 0); }
++#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
++{ K_WRITE##p (__THISP_ a(__THISP), 0); }
+ DEF_STZ(64,ZP,KA_ZP)	/* 64 - STZ - Zero Page */
+ DEF_STZ(9C,NP,KA_ABS)	/* 9C - STZ - Absolute */
+ DEF_STZ(74,ZP,KA_ZPX)	/* 74 - STZ - Zero Page,X */
+@@ -931,18 +931,18 @@
+ 
+ #if BUILD_HUC6280 || BUILD_M65C02
+ /* --- TRB --- */
+-#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_TRB(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_TRB(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_TRB(14,ZP,KA_ZP)	/* 14 - TRB - Zero Page */
+ DEF_TRB(1C,NP,KA_ABS)	/* 1C - TRB - Absolute */
+ /* --- TSB --- */
+-#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword adr = a(__THISP); \
+-	K_WRITE##p##(__THISP_ adr, KM_TSB(__THISP_ K_READ##p##(__THISP_ adr))); \
++	K_WRITE##p (__THISP_ adr, KM_TSB(__THISP_ K_READ##p (__THISP_ adr))); \
+ }
+ DEF_TSB(04,ZP,KA_ZP)	/* 04 - TSB - Zero Page */
+ DEF_TSB(0C,NP,KA_ABS)	/* 0C - TSB - Absolute */
+@@ -950,10 +950,10 @@
+ 
+ #if BUILD_HUC6280
+ /* --- TST --- */
+-#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
++#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+ { \
+ 	Uword imm = K_READ(__THISP_ KA_IMM(__THISP)); \
+-	KM_TST(__THISP_ imm, K_READ##p##(__THISP_ a(__THISP))); \
++	KM_TST(__THISP_ imm, K_READ##p (__THISP_ a(__THISP))); \
+ }
+ DEF_TST(83,ZP,KA_ZP)	/* 83 - TST - Zero Page */
+ DEF_TST(93,NP,KA_ABS)	/* 93 - TST - Absolute */
diff --git a/audio/xmms-nsf/files/patch-src-nes-km6502-km6502ot.h b/audio/xmms-nsf/files/patch-src-nes-km6502-km6502ot.h
new file mode 100644
index 000000000000..84a16c209e5a
--- /dev/null
+++ b/audio/xmms-nsf/files/patch-src-nes-km6502-km6502ot.h
@@ -0,0 +1,51 @@
+--- src/nes/km6502/km6502ot.h.orig	Sun Jan  7 05:18:05 2001
++++ src/nes/km6502/km6502ot.h	Thu Aug 18 16:47:59 2005
+@@ -1,35 +1,35 @@
+ #define OPxx(i)
+ #define OP__(i) \
+-	case 0x##i##: \
+-		Opcode##i##(__THISP); \
++	case 0x##i : \
++		Opcode##i (__THISP); \
+ 		break;
+ #define OP_d(i) \
+-	case 0x##i##: \
++	case 0x##i : \
+ 		if (__THIS__.P & D_FLAG) \
+-			D_Opco##i##(__THISP); \
++			D_Opco##i (__THISP); \
+ 		else \
+-			Opcode##i##(__THISP); \
++			Opcode##i (__THISP); \
+ 		break;
+ #if BUILD_HUC6280
+ #define OPtd(i) \
+-	case 0x##i##: \
++	case 0x##i : \
+ 		if (__THIS__.P & T_FLAG) \
+ 			if (__THIS__.P & D_FLAG) \
+-				TD_Opc##i##(__THISP); \
++				TD_Opc##i (__THISP); \
+ 			else \
+-				T_Opco##i##(__THISP); \
++				T_Opco##i (__THISP); \
+ 		else \
+ 			if (__THIS__.P & D_FLAG) \
+-				D_Opco##i##(__THISP); \
++				D_Opco##i (__THISP); \
+ 			else \
+-				Opcode##i##(__THISP); \
++				Opcode##i (__THISP); \
+ 		break;
+ #define OPt_(i) \
+-	case 0x##i##: \
++	case 0x##i : \
+ 		if (__THIS__.P & T_FLAG) \
+-			T_Opco##i##(__THISP); \
++			T_Opco##i (__THISP); \
+ 		else \
+-			Opcode##i##(__THISP); \
++			Opcode##i (__THISP); \
+ 		break;
+ #else
+ #define OPtd OP_d
diff --git a/audio/xmms-nsf/pkg-descr b/audio/xmms-nsf/pkg-descr
new file mode 100644
index 000000000000..2d2556c6fd07
--- /dev/null
+++ b/audio/xmms-nsf/pkg-descr
@@ -0,0 +1,7 @@
+This is an XMMS input plugin for playing Nintendo(TM) 8bit NSF audio files.
+The module has a special pannel for selecting multi track .nsf files.
+
+WWW: http://optronic.sourceforge.net/files/
+
+- ehaupt
+ehaupt@critical.ch
diff --git a/audio/xmms-nsf/pkg-message b/audio/xmms-nsf/pkg-message
new file mode 100644
index 000000000000..3cb90434e931
--- /dev/null
+++ b/audio/xmms-nsf/pkg-message
@@ -0,0 +1,6 @@
+================================================================================
+A huge .nsf file collection can be found at: http://www.2a03.org/browse.php/2A03
+
+NSF files may contain multiple tracks. You can activate a special pannel by
+selecting "NSF Player %%VERSION%% [libnsf.so]" and pressing the "About" button.
+================================================================================