From 40158b04b7cb19766098984586d22133598be465 Mon Sep 17 00:00:00 2001
From: rh <rh>
Date: Fri, 28 Jan 2000 07:18:37 +0000
Subject: Make cdparanoia compile under NetBSD-1.4.x (pointed out by Eric
 Mumpower on the cdparanoia mailing list).

---
 audio/cdparanoia/files/patch-sum  |  6 +++---
 audio/cdparanoia/patches/patch-ad | 16 +++++++++++-----
 audio/cdparanoia/patches/patch-cc | 14 ++++++++++----
 3 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'audio/cdparanoia')

diff --git a/audio/cdparanoia/files/patch-sum b/audio/cdparanoia/files/patch-sum
index 21692a8279f..03b6ff94b6e 100644
--- a/audio/cdparanoia/files/patch-sum
+++ b/audio/cdparanoia/files/patch-sum
@@ -1,14 +1,14 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-sum,v 1.2 2000/01/28 07:18:37 rh Exp $
 
 MD5 (patch-aa) = 598f4761b68407f819fa9b8c67ba627c
 MD5 (patch-ab) = c3ef67eeb817732c2f29c11dd7048ba4
 MD5 (patch-ac) = 3bcd421fb561a7b5abdf217f7b264f90
-MD5 (patch-ad) = 6ae48f279ad64674500eb41983221d61
+MD5 (patch-ad) = 7af44261fb32ba66253c5f7f8bf8f5bf
 MD5 (patch-ae) = 8ade64b6451e4aa2814640655f777904
 MD5 (patch-ba) = 316c91a58bd361d96d86910ace6ba66a
 MD5 (patch-ca) = b5e83a7b1dfd50a0e0e969f563220ea1
 MD5 (patch-cb) = 60d5539a6bdd1ec81bb1cd4bb9f6dbbd
-MD5 (patch-cc) = c0832f9360f73d77988a1cf48e6b3457
+MD5 (patch-cc) = 795d7c9f4971ad7804229f757ab4479e
 MD5 (patch-cd) = ab3d1eaaa4706c77a0e4795f20759c8c
 MD5 (patch-ce) = 6f15e3f28c38a0058428c5f5981029ad
 MD5 (patch-cf) = 021d133eafbefb81ffdcbe06f6805842
diff --git a/audio/cdparanoia/patches/patch-ad b/audio/cdparanoia/patches/patch-ad
index 89b7dab1010..1bcdc333844 100644
--- a/audio/cdparanoia/patches/patch-ad
+++ b/audio/cdparanoia/patches/patch-ad
@@ -1,19 +1,25 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-ad,v 1.2 2000/01/28 07:18:38 rh Exp $
 
---- utils.h.orig	Sat Oct  9 04:18:21 1999
-+++ utils.h	Sun Jan 16 19:05:14 2000
-@@ -1,5 +1,10 @@
+--- utils.h.orig	Fri Oct  8 21:18:21 1999
++++ utils.h	Fri Jan 28 08:04:15 2000
+@@ -1,5 +1,16 @@
  #include <stdlib.h>
 +#ifdef __linux__
  #include <endian.h>
 +#endif
 +#ifdef __NetBSD__
++#include <sys/param.h>
++#if __NetBSD_Version__ >= 104010000
 +#include <sys/endian.h>
++#else
++#include <machine/endian.h>
++#include <machine/bswap.h>
++#endif
 +#endif
  #include <stdio.h>
  #include <errno.h>
  #include <string.h>
-@@ -19,15 +24,23 @@
+@@ -19,15 +30,23 @@
  }
  
  static inline size32 swap32(size32 x){
diff --git a/audio/cdparanoia/patches/patch-cc b/audio/cdparanoia/patches/patch-cc
index 26418fc7ddb..4e2e5f2119a 100644
--- a/audio/cdparanoia/patches/patch-cc
+++ b/audio/cdparanoia/patches/patch-cc
@@ -1,13 +1,19 @@
-$NetBSD: patch-cc,v 1.1.1.1 2000/01/19 08:03:00 itohy Exp $
+$NetBSD: patch-cc,v 1.2 2000/01/28 07:18:38 rh Exp $
 
---- interface/utils.h.orig	Mon Aug 16 07:13:44 1999
-+++ interface/utils.h	Sat Jan 15 19:51:10 2000
-@@ -1,4 +1,10 @@
+--- interface/utils.h.orig	Mon Aug 16 00:13:44 1999
++++ interface/utils.h	Fri Jan 28 08:04:27 2000
+@@ -1,4 +1,16 @@
 +#ifdef __linux__
  #include <endian.h>
 +#endif
 +#ifdef __NetBSD__
++#include <sys/param.h>
++#if __NetBSD_Version__ >= 104010000
 +#include <sys/endian.h>
++#else
++#include <machine/endian.h>
++#include <machine/bswap.h>
++#endif
 +#include <err.h>	/* XXX */
 +#endif
  #include <stdio.h>
-- 
cgit v1.2.3