summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/plib/Makefile7
-rw-r--r--games/plib/PLIST38
-rw-r--r--games/plib/buildlink2.mk27
-rw-r--r--games/plib/distinfo9
-rw-r--r--games/plib/patches/patch-aa16
-rw-r--r--games/plib/patches/patch-ab28
-rw-r--r--games/plib/patches/patch-ac13
7 files changed, 121 insertions, 17 deletions
diff --git a/games/plib/Makefile b/games/plib/Makefile
index cd4d0edd257..1dbd6457a56 100644
--- a/games/plib/Makefile
+++ b/games/plib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 16:49:59 martti Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/22 12:27:28 xtraeme Exp $
#
-DISTNAME= plib-1.2.0
-PKGREVISION= 1
+DISTNAME= plib-1.6.0
CATEGORIES= games x11
MASTER_SITES= http://plib.sourceforge.net/dist/
@@ -16,4 +15,6 @@ GNU_CONFIGURE= YES
CPPFLAGS+= -Dunix=1
.include "../../graphics/Mesa/buildlink2.mk"
+
+.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/plib/PLIST b/games/plib/PLIST
index 8d67e762afd..f8037200815 100644
--- a/games/plib/PLIST
+++ b/games/plib/PLIST
@@ -1,21 +1,37 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:54:57 zuntum Exp $
-include/plib/ul.h
+@comment $NetBSD: PLIST,v 1.2 2003/09/22 12:27:28 xtraeme Exp $
+include/plib/fnt.h
include/plib/js.h
+include/plib/netBuffer.h
+include/plib/netChannel.h
+include/plib/netChat.h
+include/plib/netMessage.h
+include/plib/netMonitor.h
+include/plib/netSocket.h
+include/plib/pu.h
+include/plib/sg.h
include/plib/sl.h
include/plib/slPortability.h
include/plib/sm.h
-include/plib/slMODPrivate.h
-include/plib/slMODfile.h
-include/plib/pu.h
-include/plib/sg.h
include/plib/ssg.h
+include/plib/ssgAux.h
include/plib/ssgKeyFlier.h
-include/plib/fnt.h
-include/plib/fntLocal.h
-lib/libplibsl.a
-lib/libplibsm.a
+include/plib/ssgMSFSPalette.h
+include/plib/ssgaFire.h
+include/plib/ssgaLensFlare.h
+include/plib/ssgaParticleSystem.h
+include/plib/ssgaShapes.h
+include/plib/ssgaWaveSystem.h
+include/plib/ssgconf.h
+include/plib/ul.h
+include/plib/ulRTTI.h
+lib/libplibfnt.a
+lib/libplibjs.a
+lib/libplibnet.a
lib/libplibpu.a
lib/libplibsg.a
+lib/libplibsl.a
+lib/libplibsm.a
lib/libplibssg.a
-lib/libplibfnt.a
+lib/libplibssgaux.a
+lib/libplibul.a
@dirrm include/plib
diff --git a/games/plib/buildlink2.mk b/games/plib/buildlink2.mk
new file mode 100644
index 00000000000..07c3a994643
--- /dev/null
+++ b/games/plib/buildlink2.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/09/22 12:27:28 xtraeme Exp $
+#
+# This Makefile fragment is included by packages that use plib.
+#
+# This file was created automatically using createbuildlink 2.6.
+#
+
+.if !defined(PLIB_BUILDLINK2_MK)
+PLIB_BUILDLINK2_MK= # defined
+
+BUILDLINK_PACKAGES+= plib
+BUILDLINK_DEPENDS.plib?= plib>=1.6.0
+BUILDLINK_PKGSRCDIR.plib?= ../../games/plib
+
+EVAL_PREFIX+= BUILDLINK_PREFIX.plib=plib
+BUILDLINK_PREFIX.plib_DEFAULT= ${LOCALBASE}
+BUILDLINK_FILES.plib+= include/plib/*.h
+BUILDLINK_FILES.plib+= lib/libplib*
+BUILDLINK_DEPMETHOD.plib= build
+
+.include "../../graphics/Mesa/buildlink2.mk"
+
+BUILDLINK_TARGETS+= plib-buildlink
+
+plib-buildlink: _BUILDLINK_USE
+
+.endif # PLIB_BUILDLINK2_MK
diff --git a/games/plib/distinfo b/games/plib/distinfo
index 9649fe9e816..27fcb681dc3 100644
--- a/games/plib/distinfo
+++ b/games/plib/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:34 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/09/22 12:27:28 xtraeme Exp $
-SHA1 (plib-1.2.0.tar.gz) = 7e94d9f6729aa3bc585772e9274b2ccb518608f7
-Size (plib-1.2.0.tar.gz) = 260989 bytes
+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
diff --git a/games/plib/patches/patch-aa b/games/plib/patches/patch-aa
new file mode 100644
index 00000000000..d1aa9f79cd8
--- /dev/null
+++ b/games/plib/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.3 2003/09/22 12:27:29 xtraeme Exp $
+
+--- src/sl/slPortability.h.orig Mon Sep 22 06:08:29 2003
++++ src/sl/slPortability.h Mon Sep 22 06:09:02 2003
+@@ -78,7 +78,11 @@
+ # if defined(__linux__)
+ # include <linux/soundcard.h>
+ # elif defined(__FreeBSD__)
++# if __FreeBSD_version >= 500000
++# include <sys/soundcard.h>
++# else
+ # include <machine/soundcard.h>
++# endif
+ # else
+ /*
+ Tom thinks this file may be <sys/soundcard.h> under some
diff --git a/games/plib/patches/patch-ab b/games/plib/patches/patch-ab
new file mode 100644
index 00000000000..d30c3bcea2c
--- /dev/null
+++ b/games/plib/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.4 2003/09/22 12:27:29 xtraeme Exp $
+
+--- src/js/js.h.orig Mon Sep 22 06:05:53 2003
++++ src/js/js.h Mon Sep 22 06:06:47 2003
+@@ -63,7 +63,11 @@
+ # include <fcntl.h>
+
+ # if defined(__FreeBSD__) || defined(__NetBSD__)
++# if __FreeBSD_version >= 500000
++# include <sys/joystick.h>
++# else
+ # include <machine/joystick.h>
++# endif
+ # define JS_DATA_TYPE joystick
+ # define JS_RETURN (sizeof(struct JS_DATA_TYPE))
+ # elif defined(__linux__)
+@@ -132,9 +136,9 @@
+
+
+
+-/*#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ int id ;
+-#endif*/
++#endif
+ #ifdef WIN32
+ JOYINFOEX js ;
+ UINT js_id ;
diff --git a/games/plib/patches/patch-ac b/games/plib/patches/patch-ac
new file mode 100644
index 00000000000..96b26a7244f
--- /dev/null
+++ b/games/plib/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2003/09/22 12:27:29 xtraeme Exp $
+
+--- src/net/netSocket.cxx.orig Mon Sep 22 06:03:03 2003
++++ src/net/netSocket.cxx Mon Sep 22 06:03:29 2003
+@@ -25,7 +25,7 @@
+
+ #if defined(__CYGWIN__) || !defined (WIN32)
+
+-#if defined(__APPLE__)
++#if defined(__APPLE__) || defined (__FreeBSD__)
+ # include <netinet/in.h>
+ #endif
+