From 4528d35cc971db4e9d54466d222970651c87c3ab Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Fri, 14 Mar 2008 14:38:46 +0000
Subject: [PATCH] update to 1.8.5 changes: bugfixes and code cleanup

---
 games/plib/Makefile         |  4 ++--
 games/plib/distinfo         | 11 +++++------
 games/plib/patches/patch-aa | 10 ++++------
 games/plib/patches/patch-af | 22 ----------------------
 4 files changed, 11 insertions(+), 36 deletions(-)
 delete mode 100644 games/plib/patches/patch-af

diff --git a/games/plib/Makefile b/games/plib/Makefile
index bbdce8f0465f..8810da1226e5 100644
--- a/games/plib/Makefile
+++ b/games/plib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2007/07/12 19:48:40 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/14 14:38:46 drochner Exp $
 #
 
-DISTNAME=	plib-1.8.4
+DISTNAME=	plib-1.8.5
 CATEGORIES=	games x11
 MASTER_SITES=	http://plib.sourceforge.net/dist/
 
diff --git a/games/plib/distinfo b/games/plib/distinfo
index 2cd7c44d3245..fe086ecb8c46 100644
--- a/games/plib/distinfo
+++ b/games/plib/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.9 2007/09/16 09:25:03 joerg Exp $
+$NetBSD: distinfo,v 1.10 2008/03/14 14:38:46 drochner Exp $
 
-SHA1 (plib-1.8.4.tar.gz) = 16d3faab36fdde85c5bf620046b56c65dfad6769
-RMD160 (plib-1.8.4.tar.gz) = a0b6f2fdd4035cb2a6b83616726563d779efb87f
-Size (plib-1.8.4.tar.gz) = 793758 bytes
-SHA1 (patch-aa) = 87f53811b33d3dbf7ea4cd12fcc0dd594847eeb2
+SHA1 (plib-1.8.5.tar.gz) = c2cf7e3e1e58f7b63dae4bb21e4fa82c3e4d4cfc
+RMD160 (plib-1.8.5.tar.gz) = 55019bf3758ec2542804d8e3994f4bed5a188e60
+Size (plib-1.8.5.tar.gz) = 779133 bytes
+SHA1 (patch-aa) = 35cd38d57f15144d659a19458a2b1c00983fb4b2
 SHA1 (patch-ab) = 3976dcf78e8ba44d55d08e67ddf3fa7f23def91e
 SHA1 (patch-ad) = 1ec59b079a662bfc9b5ea5fa03686292ac05659f
 SHA1 (patch-ae) = ae69e86642c53ef32619d6411809f80ab973b208
-SHA1 (patch-af) = 2eac06fa7462711c018c2b5876b218ef56b46dbb
diff --git a/games/plib/patches/patch-aa b/games/plib/patches/patch-aa
index 247df52b85f7..5aa747d91541 100644
--- a/games/plib/patches/patch-aa
+++ b/games/plib/patches/patch-aa
@@ -1,18 +1,16 @@
-$NetBSD: patch-aa,v 1.6 2007/09/16 09:25:03 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2008/03/14 14:38:46 drochner Exp $
 
---- src/sl/slPortability.h.orig	2007-09-16 08:50:46.000000000 +0000
+--- src/sl/slPortability.h.orig	2008-03-11 03:06:24.000000000 +0100
 +++ src/sl/slPortability.h
-@@ -59,8 +59,8 @@
+@@ -59,7 +59,7 @@
  #  if defined(UL_LINUX)
  #    include <linux/soundcard.h>
  #    include <sys/ioctl.h>
 -#  elif defined(__FreeBSD__)
--#    include <machine/soundcard.h>
 +#  elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#    include <sys/soundcard.h>
+ #    include <sys/soundcard.h>
  #  else
      /*
-       Tom thinks this file may be <sys/soundcard.h> under some
 @@ -75,7 +75,7 @@
  #endif
  
diff --git a/games/plib/patches/patch-af b/games/plib/patches/patch-af
deleted file mode 100644
index 218a26170a71..000000000000
--- a/games/plib/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.3 2007/07/12 19:48:43 drochner Exp $
-
---- src/ssgAux/ssgaSky.h.orig	2007-03-22 23:41:19.000000000 +0100
-+++ src/ssgAux/ssgaSky.h
-@@ -104,7 +104,7 @@ public:
-   ssgaCelestialBodyList ( int init = 3 )
- 	  : ssgSimpleList ( sizeof(ssgaCelestialBody*), init ) { }
- 
--  ssgaCelestialBodyList::~ssgaCelestialBodyList () { removeAll(); }
-+  ~ssgaCelestialBodyList () { removeAll(); }
- 
-   int getNum (void) { return total ; }
- 
-@@ -192,7 +192,7 @@ public:
-   ssgaCloudLayerList ( int init = 3 )
- 	  : ssgSimpleList ( sizeof(ssgaCloudLayer*), init ) { }
- 
--  ssgaCloudLayerList::~ssgaCloudLayerList () { removeAll(); }
-+  ~ssgaCloudLayerList () { removeAll(); }
- 
-   int getNum (void) { return total ; }
-