From 58223019747a8080c8392293d81a834668498fd4 Mon Sep 17 00:00:00 2001
From: atatat <atatat@pkgsrc.org>
Date: Wed, 6 Nov 2002 19:02:55 +0000
Subject: Place a defined(__NetBSD__) near a defined(__OpenBSD__) so that the
 avifile-devel pkg (among other things) can build again.

---
 devel/SDL/Makefile         |  4 ++--
 devel/SDL/distinfo         |  3 ++-
 devel/SDL/patches/patch-ab | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 devel/SDL/patches/patch-ab

(limited to 'devel/SDL')

diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index a19abd09b66..4860593bf69 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2002/11/05 19:25:07 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2002/11/06 19:02:55 atatat Exp $
 #
 
 DISTNAME=	SDL-1.2.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel games
 MASTER_SITES=	http://www.libsdl.org/release/
 
diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo
index 1c377a3aac3..16a76042bc9 100644
--- a/devel/SDL/distinfo
+++ b/devel/SDL/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.16 2002/10/31 22:19:49 jlam Exp $
+$NetBSD: distinfo,v 1.17 2002/11/06 19:02:56 atatat Exp $
 
 SHA1 (SDL-1.2.5.tar.gz) = c1bdc68d390d421158778f68f3498f5b9d63a9e4
 Size (SDL-1.2.5.tar.gz) = 1854550 bytes
 SHA1 (patch-aa) = 02438ad6409081a9fbcb542fcc414277f2aa61f7
+SHA1 (patch-ab) = 7effcc7f7f1856372692c147521888843810fed5
 SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
 SHA1 (patch-ag) = 989c3464686a3158c538034ad7ea012a4e4b4b9e
 SHA1 (patch-aj) = 2f4dd90c85bc822c049820b5f027c984d015555b
diff --git a/devel/SDL/patches/patch-ab b/devel/SDL/patches/patch-ab
new file mode 100644
index 00000000000..38e0cee969f
--- /dev/null
+++ b/devel/SDL/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.3 2002/11/06 19:02:56 atatat Exp $
+
+We are similar enough to OpenBSD to use this, especially since it
+makes the graphics/avifile-devel pkg build again.
+
+--- include/SDL_syswm.h.orig	Sun Aug 25 02:21:49 2002
++++ include/SDL_syswm.h	Mon Nov  4 13:00:07 2002
+@@ -49,7 +49,7 @@
+ #else
+ 
+ /* This is the structure for custom window manager events */
+-#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
++#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)) && \
+     (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX))
+  /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
+ #include <X11/Xlib.h>
-- 
cgit v1.2.3