From ae36cf117558c9802df71203d18937fd9c753b70 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 2 Apr 2003 02:46:39 +0000
Subject: Fix building on -current.  Kludge around the ffs issue and use time_t
 where a time_t is ment, not a long.

---
 audio/rio/Makefile       |  4 ----
 audio/rio/files/patch-ab |  4 +++-
 audio/rio/files/patch-ad | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 audio/rio/files/patch-ad

(limited to 'audio/rio')

diff --git a/audio/rio/Makefile b/audio/rio/Makefile
index df767e16eec1..bd3fa51cc6bb 100644
--- a/audio/rio/Makefile
+++ b/audio/rio/Makefile
@@ -23,10 +23,6 @@ BINMODE=	4755
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500035
-BROKEN=		"Does not compile on 5.0"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rio ${PREFIX}/bin
 
diff --git a/audio/rio/files/patch-ab b/audio/rio/files/patch-ab
index b4515d6791f6..9947818f6127 100644
--- a/audio/rio/files/patch-ab
+++ b/audio/rio/files/patch-ab
@@ -2,7 +2,7 @@
 --- rio.cpp	Fri Feb 18 11:02:11 2000
 ***************
 *** 53,58 ****
---- 53,76 ----
+--- 53,78 ----
   	#define		CLOCK_SECOND			1000
   	#define		DELETEARRAY				delete[]
   
@@ -11,7 +11,9 @@
 + 	// (anybody know if this stuff applies more generally to other BSDs?)
 + 	#include	<fcntl.h>
 + 	#include	<unistd.h>
++	#define		ffs _ffs_hack
 + 	#include	<machine/cpufunc.h>
++	#undef		ffs
 + 	#if defined(__alpha__)
 + 		#include <sys/types.h>
 + 		extern "C" {
diff --git a/audio/rio/files/patch-ad b/audio/rio/files/patch-ad
new file mode 100644
index 000000000000..dc64fda1172d
--- /dev/null
+++ b/audio/rio/files/patch-ad
@@ -0,0 +1,20 @@
+--- app.cpp.orig	Tue Apr  1 19:32:47 2003
++++ app.cpp	Fri Jun 11 10:26:46 1999
+@@ -46,7 +46,7 @@
+ #elif defined(__FreeBSD__)
+ 	// FreeBSD g++
+ 	#include	<unistd.h>
+-	#include	<sys/syslimits.h>
++	#include	<limits.h>
+ 	#define		SIZE_MAXPATH			PATH_MAX
+ 	#define		DELETEARRAY				delete[]
+ 
+@@ -97,7 +97,7 @@
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ // return pointer to static string containing datetime
+-static char* TimeStr( long lValue )
++static char* TimeStr( time_t lValue )
+ {
+ 	static char szBuf[ 64 ];
+ 	struct tm* psDateTime;
-- 
cgit v1.2.3