NetBSD doesn't use __unix__ nor unix, so use __NetBSD__ and so on in

slPortability.h to include <sys/param.h> which is needed to get
defined(BSD) in sl.h. While I'm here switch to use buildlink3.

Bump PKGREVISION to 1.

4 files changed, 42 insertions, 6 deletions

diff --git a/games/plib/Makefile b/games/plib/Makefile
index 1dbd6457a56..e78d96fab1e 100644
--- a/games/plib/Makefile
+++ b/games/plib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/09/22 12:27:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/03/19 02:25:28 xtraeme Exp $
 #
 
 DISTNAME=	plib-1.6.0
+PKGREVISION=	1
 CATEGORIES=	games x11
 MASTER_SITES=	http://plib.sourceforge.net/dist/
 
@@ -9,12 +10,11 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://plib.sourceforge.net/
 COMMENT=	Libraries for writing portable games/realtime interactive apps
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	-Dunix=1
 
-.include "../../graphics/Mesa/buildlink2.mk"
-
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/plib/buildlink3.mk b/games/plib/buildlink3.mk
new file mode 100644
index 00000000000..29fd7f0c417
--- /dev/null
+++ b/games/plib/buildlink3.mk
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/19 02:25:28 xtraeme Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+PLIB_BUILDLINK3_MK:=	${PLIB_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	plib
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nplib}
+BUILDLINK_PACKAGES+=	plib
+
+.if !empty(PLIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.plib+=	plib>=1.6.0
+BUILDLINK_PKGSRCDIR.plib?=	../../games/plib
+BUILDLINK_DEPMETHOD.plib?=	build
+.endif	# PLIB_BUILDLINK3_MK
+
+.include "../../graphics/Mesa/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/games/plib/distinfo b/games/plib/distinfo
index 27fcb681dc3..6c01e33ff6c 100644
--- a/games/plib/distinfo
+++ b/games/plib/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/09/22 12:27:28 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2004/03/19 02:25:28 xtraeme Exp $
 
 SHA1 (plib-1.6.0.tar.gz) = f2c0c8ba909e7df12850fafba9bb57152cb96976
 Size (plib-1.6.0.tar.gz) = 523897 bytes
 SHA1 (patch-aa) = 3c3adf01bd2107b1b91cac98410081a3f25f7b47
 SHA1 (patch-ab) = a4f82828a88e6d6605c3627e73f769ae8e0fcade
 SHA1 (patch-ac) = 167ddbc8de4448d94644cce8ac28d77aa70a2704
+SHA1 (patch-ad) = cf59cd9968b52ca42fc9d6ee6cdb9c59b9ebb018
diff --git a/games/plib/patches/patch-ad b/games/plib/patches/patch-ad
new file mode 100644
index 00000000000..0be169ec53c
--- /dev/null
+++ b/games/plib/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.3 2004/03/19 02:25:28 xtraeme Exp $
+
+--- src/sl/slPortability.h.orig	2004-03-19 03:18:23.000000000 +0100
++++ src/sl/slPortability.h	2004-03-19 03:19:02.000000000 +0100
+@@ -35,7 +35,8 @@
+ 
+ /* the next lines are to define BSD */
+ /* see http://www.freebsd.org/handbook/porting.html for why we do this */
+-#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) \ 
++    && !defined(USG)
+ #include <sys/param.h>
+ #endif
+