5 files changed, 54 insertions, 29 deletions

diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index 1eac0e7e20cd..bc5dda89eff5 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	plib
-PORTVERSION=	1.7.0
-PORTREVISION=	2
+PORTVERSION=	1.8.3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://plib.sourceforge.net/dist/
 
-MAINTAINER=	des@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A portable library for joystick/sound/OpenGL GUI/3D math
 
 USE_X_PREFIX=	yes
-USE_MESA=	yes
+USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}" \
diff --git a/x11-toolkits/plib/distinfo b/x11-toolkits/plib/distinfo
index 4bca516e2de2..c8b39db64710 100644
--- a/x11-toolkits/plib/distinfo
+++ b/x11-toolkits/plib/distinfo
@@ -1,2 +1,2 @@
-MD5 (plib-1.7.0.tar.gz) = 30881640e37bf650e203e10a23f879c7
-SIZE (plib-1.7.0.tar.gz) = 523907
+MD5 (plib-1.8.3.tar.gz) = de10b19dfcee5da7115ee2a69656f34c
+SIZE (plib-1.8.3.tar.gz) = 742380
diff --git a/x11-toolkits/plib/files/patch-src::js::js.h b/x11-toolkits/plib/files/patch-src::js::js.h
deleted file mode 100644
index c8d27db87f5f..000000000000
--- a/x11-toolkits/plib/files/patch-src::js::js.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/js/js.h.orig	Mon Sep  2 15:05:43 2002
-+++ src/js/js.h	Thu Nov 28 21:43:15 2002
-@@ -63,7 +63,7 @@
- #  include <fcntl.h>
- 
- #  if defined(__FreeBSD__) || defined(__NetBSD__)
--#    include <machine/joystick.h>
-+#    include <sys/joystick.h>
- #    define JS_DATA_TYPE joystick
- #    define JS_RETURN (sizeof(struct JS_DATA_TYPE))
- #  elif defined(__linux__)
-@@ -132,9 +132,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/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx b/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx
new file mode 100644
index 000000000000..527687d00227
--- /dev/null
+++ b/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx
@@ -0,0 +1,31 @@
+--- ./src/js/jsBSD.cxx.orig	Sat Mar 20 01:21:53 2004
++++ ./src/js/jsBSD.cxx	Sun May  2 16:53:28 2004
+@@ -44,7 +44,11 @@
+ #endif
+ 
+ #include <sys/ioctl.h>
+-#include <machine/joystick.h>		// For analog joysticks
++#if defined(__FreeBSD__)
++# include <sys/joystick.h>
++#else
++# include <machine/joystick.h>		// For analog joysticks
++#endif
+ #ifdef HAVE_USB_JS
+ #if defined(__NetBSD__)
+ #ifdef HAVE_USBHID_H
+@@ -53,9 +57,14 @@
+ #include <usb.h>
+ #endif
+ #elif defined(__FreeBSD__)
++#  if __FreeBSD_version < 500000
+ extern "C" {
+-#include <libusbhid.h>
++#    include <libusbhid.h>
+ }
++#  else
++#    define HAVE_USBHID_H 1
++#    include <usbhid.h>
++#  endif
+ #endif
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
diff --git a/x11-toolkits/plib/pkg-plist b/x11-toolkits/plib/pkg-plist
index 8c76357f03fe..c89488c2024c 100644
--- a/x11-toolkits/plib/pkg-plist
+++ b/x11-toolkits/plib/pkg-plist
@@ -1,12 +1,23 @@
 include/plib/fnt.h
 include/plib/js.h
+include/plib/net.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/pcx.h
+include/plib/psl.h
 include/plib/pu.h
+include/plib/puAux.h
+include/plib/puAuxLocal.h
+include/plib/puFLTK.h
+include/plib/puGLUT.h
+include/plib/puNative.h
+include/plib/puPW.h
+include/plib/puSDL.h
+include/plib/pw.h
 include/plib/sg.h
 include/plib/sl.h
 include/plib/slPortability.h
@@ -15,10 +26,14 @@ include/plib/ssg.h
 include/plib/ssgAux.h
 include/plib/ssgKeyFlier.h
 include/plib/ssgMSFSPalette.h
+include/plib/ssgaBillboards.h
 include/plib/ssgaFire.h
 include/plib/ssgaLensFlare.h
 include/plib/ssgaParticleSystem.h
+include/plib/ssgaScreenDump.h
 include/plib/ssgaShapes.h
+include/plib/ssgaSky.h
+include/plib/ssgaSphere.h
 include/plib/ssgaWaveSystem.h
 include/plib/ssgconf.h
 include/plib/ul.h
@@ -26,7 +41,10 @@ include/plib/ulRTTI.h
 lib/libplibfnt.a
 lib/libplibjs.a
 lib/libplibnet.a
+lib/libplibpsl.a
 lib/libplibpu.a
+lib/libplibpuaux.a
+lib/libplibpw.a
 lib/libplibsg.a
 lib/libplibsl.a
 lib/libplibsm.a