Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/funktrackergold/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	27 May 2007 02:39:02 -0000	1.9
+++ Makefile	14 Jul 2007 19:57:03 -0000
@@ -23,10 +23,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/funkgold ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
Index: files/patch-dsp_mixxer.c
===================================================================
RCS file: files/patch-dsp_mixxer.c
diff -N files/patch-dsp_mixxer.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-dsp_mixxer.c	14 Jul 2007 19:56:55 -0000
@@ -0,0 +1,50 @@
+--- dsp_mixxer.c.orig	Mon Jun 22 12:39:39 1998
++++ dsp_mixxer.c	Sat Jul 14 21:55:28 2007
+@@ -15,15 +15,11 @@
+ ***************************************************************************/
+ #include <stdio.h>
+ #include <math.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+-#ifdef Linux
+- #include <sys/soundcard.h>
+-#elif FreeBSD
+- #include <machine/soundcard.h>
+-#endif
++#include <sys/soundcard.h>
+ #include "funktracker_defs.h"
+ #include "funktracker.h"
+ #include "funkload.h"
+@@ -301,12 +297,12 @@
+ 
+   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
+   {
+-    if(chmix[chan_no].funkctrl & 0x2)
++    if(chmix[chan_no].funkctrl & 0x2) {
+ #pragma pack(1)
+       sam = *((sDB *)chmix[chan_no].sample_addr +
+             (unsigned long)chmix[chan_no].sample_ptr);
+ #pragma pack()
+-    else
++    } else
+       sam = 0;
+ 
+ #ifdef DIGITAL_ECHOING
+@@ -363,12 +359,12 @@
+   shift_t = 8 + shift_table[funk_info.no_active_channels];
+   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
+   {
+-    if(chmix[chan_no].funkctrl & 0x2)
++    if(chmix[chan_no].funkctrl & 0x2) {
+ #pragma pack(1)
+       sam = *((sDW *)chmix[chan_no].sample_addr +
+             (unsigned long)chmix[chan_no].sample_ptr);
+ #pragma pack()
+-    else
++    } else
+       sam = 0;
+ #ifdef DIGITAL_ECHOING
+     sam_reverb = *(chmix[chan_no].echo_buffer +
Index: files/patch-headers
===================================================================
RCS file: /home/pcvs/ports/audio/funktrackergold/files/patch-headers,v
retrieving revision 1.1
diff -u -r1.1 patch-headers
--- files/patch-headers	7 Apr 2001 06:10:56 -0000	1.1
+++ files/patch-headers	14 Jul 2007 19:56:40 -0000
@@ -1,23 +1,3 @@
---- ../funkgold-orig/dsp_mixxer.c	Mon Jun 22 20:09:39 1998
-+++ dsp_mixxer.c	Sun Apr  1 17:51:50 2001
-@@ -15,15 +15,11 @@
- ***************************************************************************/
- #include <stdio.h>
- #include <math.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
--#ifdef Linux
-- #include <sys/soundcard.h>
--#elif FreeBSD
-- #include <machine/soundcard.h>
--#endif
-+#include <sys/soundcard.h>
- #include "funktracker_defs.h"
- #include "funktracker.h"
- #include "funkload.h"
 --- ../funkgold-orig/funkgold.c	Sun Jun 21 22:10:54 1998
 +++ funkgold.c	Sun Apr  1 17:53:18 2001
 @@ -23,7 +23,7 @@