Date: Sun, 2 May 2004 18:37:40 +0200 (CEST) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/66172: x11-toolkits/plib: upgrading tp 1.8.3. Message-ID: <20040502163740.25B597668@graf.pompo.net> Resent-Message-ID: <200405021640.i42GeJ6x008511@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 66172 >Category: ports >Synopsis: x11-toolkits/plib: upgrading tp 1.8.3. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun May 02 09:40:18 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.10-BETA i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.10-BETA FreeBSD 4.10-BETA #0: Sat Apr 10 15:25:53 CEST 2004 thierry@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386 >Description: I needed this version to test some features in TORCS... >How-To-Repeat: N/A. >Fix: Please apply the following patch. Note: remove patch-src::js::js.h and add patch-src::js::jsBSD.cxx. --- plib.diff begins here --- diff -urN x11-toolkits/plib.orig/Makefile x11-toolkits/plib/Makefile --- x11-toolkits/plib.orig/Makefile Wed Feb 4 20:21:24 2004 +++ x11-toolkits/plib/Makefile Sun May 2 16:40:33 2004 @@ -6,8 +6,7 @@ # PORTNAME= plib -PORTVERSION= 1.7.0 -PORTREVISION= 2 +PORTVERSION= 1.8.3 CATEGORIES= x11-toolkits MASTER_SITES= http://plib.sourceforge.net/dist/ @@ -15,9 +14,10 @@ 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_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" \ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ CPPFLAGS="${PTHREAD_CFLAGS}" \ diff -urN x11-toolkits/plib.orig/distinfo x11-toolkits/plib/distinfo --- x11-toolkits/plib.orig/distinfo Fri Apr 2 23:46:50 2004 +++ x11-toolkits/plib/distinfo Sun May 2 16:27:33 2004 @@ -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 -urN x11-toolkits/plib.orig/files/patch-src::js::js.h x11-toolkits/plib/files/patch-src::js::js.h --- x11-toolkits/plib.orig/files/patch-src::js::js.h Thu Nov 28 13:42:56 2002 +++ x11-toolkits/plib/files/patch-src::js::js.h Thu Jan 1 01:00:00 1970 @@ -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 -urN x11-toolkits/plib.orig/files/patch-src::js::jsBSD.cxx x11-toolkits/plib/files/patch-src::js::jsBSD.cxx --- x11-toolkits/plib.orig/files/patch-src::js::jsBSD.cxx Thu Jan 1 01:00:00 1970 +++ x11-toolkits/plib/files/patch-src::js::jsBSD.cxx Sun May 2 16:54:11 2004 @@ -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 -urN x11-toolkits/plib.orig/pkg-plist x11-toolkits/plib/pkg-plist --- x11-toolkits/plib.orig/pkg-plist Sun Sep 8 09:34:16 2002 +++ x11-toolkits/plib/pkg-plist Sun May 2 17:23:32 2004 @@ -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/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 @@ 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 --- plib.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040502163740.25B597668>