Index: head/audio/funktrackergold/Makefile
===================================================================
--- head/audio/funktrackergold/Makefile	(revision 195603)
+++ head/audio/funktrackergold/Makefile	(revision 195604)
@@ -1,37 +1,33 @@
 # New ports collection makefile for:    funktrackergold
 # Date created:                 Apr 1, 2001
 # Whom:                         Mark Pulford <mark@kyne.com.au>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	funktrackergold
 PORTVERSION=	1.5.2
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/players
 DISTNAME=	funktrackergold-1.5-2
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A curses MOD/FNK music tracker
 
 WRKSRC=		${WRKDIR}/funkgold
 MAKE_ARGS=	EXTRA_CFLAGS="${PTHREAD_CFLAGS}" \
 		EXTRA_LDFLAGS="${PTHREAD_LIBS}"
 
 .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)
 	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/${PORTNAME}/README
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/audio/funktrackergold/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/audio/funktrackergold/files/patch-dsp_mixxer.c
===================================================================
--- head/audio/funktrackergold/files/patch-dsp_mixxer.c	(nonexistent)
+++ head/audio/funktrackergold/files/patch-dsp_mixxer.c	(revision 195604)
@@ -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 +

Property changes on: head/audio/funktrackergold/files/patch-dsp_mixxer.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/audio/funktrackergold/files/patch-headers
===================================================================
--- head/audio/funktrackergold/files/patch-headers	(revision 195603)
+++ head/audio/funktrackergold/files/patch-headers	(revision 195604)
@@ -1,73 +1,53 @@
---- ../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 @@
  ***************************************************************************/
  #include <curses.h>
  #include <unistd.h>
 -#include <malloc.h>
 +#include <stdlib.h>
  #include <string.h>
  #include <signal.h>
  #include <sys/time.h>
 --- ../funkgold-orig/funkgold_dir.c	Wed Dec  2 22:01:23 1998
 +++ funkgold_dir.c	Sun Apr  1 18:05:59 2001
 @@ -18,7 +18,6 @@
  #include <unistd.h>
  #include <dirent.h>
  #include <sys/stat.h>
 -#include <malloc.h>
  #include <string.h>
  #include <stdlib.h>
  #include "funktracker_defs.h"
 --- ../funkgold-orig/funkgold_misc.c	Sun Jun 21 15:56:46 1998
 +++ funkgold_misc.c	Sun Apr  1 17:53:30 2001
 @@ -17,7 +17,6 @@
  #include <stdlib.h>
  #include <string.h>
  #include <sys/time.h>
 -#include <malloc.h>
  #include "funktracker_defs.h"
  #include "dsp_mixxer.h"
  #include "funktracker.h"
 --- ../funkgold-orig/funkgold_sm.c	Sun Jun 21 15:57:07 1998
 +++ funkgold_sm.c	Sun Apr  1 17:53:44 2001
 @@ -16,7 +16,7 @@
  ***************************************************************************/
  #include <curses.h>
  #include <unistd.h>
 -#include <malloc.h>
 +#include <stdlib.h>
  #include "funktracker_defs.h"
  #include "dsp_mixxer.h"
  #include "funktracker.h"
 --- ../funkgold-orig/funkload.c	Sun Jun 21 15:57:21 1998
 +++ funkload.c	Sun Apr  1 17:53:51 2001
 @@ -15,7 +15,7 @@
  ***************************************************************************/
  #include <stdio.h>
  #include <string.h>
 -#include <malloc.h>
 +#include <stdlib.h>
  #include "funktracker_defs.h"
  #include "dsp_mixxer.h"
  #include "funktracker.h"

Property changes on: head/audio/funktrackergold/files/patch-headers
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property