Attachment #42428 for bug #66172

View | Details | Raw Unified | Return to bug 66172
Collapse All | Expand All




#

PORTNAME=	plib
PORTVERSION=	1.8.3
PORTREVISION=	2
CATEGORIES=	x11-toolkits
MASTER_SITES=	http://plib.sourceforge.net/dist/


COMMENT=	A portable library for joystick/sound/OpenGL GUI/3D math

USE_X_PREFIX=	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}" \

Lines 1-2 Link Here

(-)x11-toolkits/plib/distinfo (-2 / +2 lines)
1	MD5 (plib-1.7.0.tar.gz) = 30881640e37bf650e203e10a23f879c7	1	MD5 (plib-1.8.3.tar.gz) = de10b19dfcee5da7115ee2a69656f34c
2	SIZE (plib-1.7.0.tar.gz) = 523907	2	SIZE (plib-1.8.3.tar.gz) = 742380




--- 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    ;




--- ./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>

Lines 1-12 Link Here

(-)x11-toolkits/plib/pkg-plist (+18 lines)
1	include/plib/fnt.h	1	include/plib/fnt.h
2	include/plib/js.h	2	include/plib/js.h
		3	include/plib/net.h
3	include/plib/netBuffer.h	4	include/plib/netBuffer.h
4	include/plib/netChannel.h	5	include/plib/netChannel.h
5	include/plib/netChat.h	6	include/plib/netChat.h
6	include/plib/netMessage.h	7	include/plib/netMessage.h
7	include/plib/netMonitor.h	8	include/plib/netMonitor.h
8	include/plib/netSocket.h	9	include/plib/netSocket.h
		10	include/plib/pcx.h
		11	include/plib/psl.h
9	include/plib/pu.h	12	include/plib/pu.h
		13	include/plib/puAux.h
		14	include/plib/puAuxLocal.h
		15	include/plib/puFLTK.h
		16	include/plib/puGLUT.h
		17	include/plib/puNative.h
		18	include/plib/puPW.h
		19	include/plib/puSDL.h
		20	include/plib/pw.h
10	include/plib/sg.h	21	include/plib/sg.h
11	include/plib/sl.h	22	include/plib/sl.h
12	include/plib/slPortability.h	23	include/plib/slPortability.h
Lines 15-24 Link Here
15	include/plib/ssgAux.h	26	include/plib/ssgAux.h
16	include/plib/ssgKeyFlier.h	27	include/plib/ssgKeyFlier.h
17	include/plib/ssgMSFSPalette.h	28	include/plib/ssgMSFSPalette.h
		29	include/plib/ssgaBillboards.h
18	include/plib/ssgaFire.h	30	include/plib/ssgaFire.h
19	include/plib/ssgaLensFlare.h	31	include/plib/ssgaLensFlare.h
20	include/plib/ssgaParticleSystem.h	32	include/plib/ssgaParticleSystem.h
		33	include/plib/ssgaScreenDump.h
21	include/plib/ssgaShapes.h	34	include/plib/ssgaShapes.h
		35	include/plib/ssgaSky.h
		36	include/plib/ssgaSphere.h
22	include/plib/ssgaWaveSystem.h	37	include/plib/ssgaWaveSystem.h
23	include/plib/ssgconf.h	38	include/plib/ssgconf.h
24	include/plib/ul.h	39	include/plib/ul.h
Lines 26-32 Link Here
26	lib/libplibfnt.a	41	lib/libplibfnt.a
27	lib/libplibjs.a	42	lib/libplibjs.a
28	lib/libplibnet.a	43	lib/libplibnet.a
		44	lib/libplibpsl.a
29	lib/libplibpu.a	45	lib/libplibpu.a
		46	lib/libplibpuaux.a
		47	lib/libplibpw.a
30	lib/libplibsg.a	48	lib/libplibsg.a
31	lib/libplibsl.a	49	lib/libplibsl.a
32	lib/libplibsm.a	50	lib/libplibsm.a

Return to bug 66172

Lines 6-13 Link Here

(-)x11-toolkits/plib/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= plib	8	PORTNAME= plib
9	PORTVERSION= 1.7.0	9	PORTVERSION= 1.8.3
10	PORTREVISION= 2
11	CATEGORIES= x11-toolkits	10	CATEGORIES= x11-toolkits
12	MASTER_SITES= http://plib.sourceforge.net/dist/	11	MASTER_SITES= http://plib.sourceforge.net/dist/
13		12
Lines 15-23 Link Here
15	COMMENT= A portable library for joystick/sound/OpenGL GUI/3D math	14	COMMENT= A portable library for joystick/sound/OpenGL GUI/3D math
16		15
17	USE_X_PREFIX= yes	16	USE_X_PREFIX= yes
18	USE_MESA= yes	17	USE_GL= yes
19	USE_GMAKE= yes	18	USE_GMAKE= yes
20	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
		20	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
21	CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" \	21	CONFIGURE_ENV= CC="${CC}" CFLAGS="${CFLAGS}" \
22	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \	22	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
23	CPPFLAGS="${PTHREAD_CFLAGS}" \	23	CPPFLAGS="${PTHREAD_CFLAGS}" \

Lines 1-23 Link Here

(-)x11-toolkits/plib/files/patch-src::js::js.h (-23 lines)
1	--- src/js/js.h.orig Mon Sep 2 15:05:43 2002
2	+++ src/js/js.h Thu Nov 28 21:43:15 2002
3	@@ -63,7 +63,7 @@
4	# include <fcntl.h>
5
6	# if defined(__FreeBSD__) \|\| defined(__NetBSD__)
7	-# include <machine/joystick.h>
8	+# include <sys/joystick.h>
9	# define JS_DATA_TYPE joystick
10	# define JS_RETURN (sizeof(struct JS_DATA_TYPE))
11	# elif defined(__linux__)
12	@@ -132,9 +132,9 @@
13
14
15
16	-/*#if defined(__FreeBSD__) \|\| defined(__NetBSD__)
17	+#if defined(__FreeBSD__) \|\| defined(__NetBSD__)
18	int id ;
19	-#endif*/
20	+#endif
21	#ifdef WIN32
22	JOYINFOEX js ;
23	UINT js_id ;

Line 0 Link Here

(-)x11-toolkits/plib/files/patch-src::js::jsBSD.cxx (+31 lines)
	1	--- ./src/js/jsBSD.cxx.orig Sat Mar 20 01:21:53 2004
	2	+++ ./src/js/jsBSD.cxx Sun May 2 16:53:28 2004
	3	@@ -44,7 +44,11 @@
	4	#endif
	5
	6	#include <sys/ioctl.h>
	7	-#include <machine/joystick.h> // For analog joysticks
	8	+#if defined(__FreeBSD__)
	9	+# include <sys/joystick.h>
	10	+#else
	11	+# include <machine/joystick.h> // For analog joysticks
	12	+#endif
	13	#ifdef HAVE_USB_JS
	14	#if defined(__NetBSD__)
	15	#ifdef HAVE_USBHID_H
	16	@@ -53,9 +57,14 @@
	17	#include <usb.h>
	18	#endif
	19	#elif defined(__FreeBSD__)
	20	+# if __FreeBSD_version < 500000
	21	extern "C" {
	22	-#include <libusbhid.h>
	23	+# include <libusbhid.h>
	24	}
	25	+# else
	26	+# define HAVE_USBHID_H 1
	27	+# include <usbhid.h>
	28	+# endif
	29	#endif
	30	#include <dev/usb/usb.h>
	31	#include <dev/usb/usbhid.h>