diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-06-03 15:08:38 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-06-03 15:08:38 +0000 |
| commit | ed66a44c6dc3fd255024b799721b7df30b9e573c (patch) | |
| tree | 1a0ccf1552a4deb1cd0cf92ebe10285d2918e251 /x11-toolkits/plib | |
| parent | - Update to 0.9.6 and unbreak (diff) | |
5.x's <usbhid.h> lacks __BEGIN_DECLS / __END_DECLS, so we need to wrap
it in extern "C" { }.
Notes
Notes:
svn path=/head/; revision=110777
Diffstat (limited to 'x11-toolkits/plib')
| -rw-r--r-- | x11-toolkits/plib/Makefile | 1 | ||||
| -rw-r--r-- | x11-toolkits/plib/files/patch-src::js::jsBSD.cxx | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile index 050405694e18..c0675431dbd0 100644 --- a/x11-toolkits/plib/Makefile +++ b/x11-toolkits/plib/Makefile @@ -7,6 +7,7 @@ PORTNAME= plib PORTVERSION= 1.8.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://plib.sourceforge.net/dist/ diff --git a/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx b/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx index 527687d00227..4109a6071094 100644 --- a/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx +++ b/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx @@ -1,5 +1,5 @@ ---- ./src/js/jsBSD.cxx.orig Sat Mar 20 01:21:53 2004 -+++ ./src/js/jsBSD.cxx Sun May 2 16:53:28 2004 +--- src/js/jsBSD.cxx.orig Sat Mar 20 01:21:53 2004 ++++ src/js/jsBSD.cxx Thu Jun 3 17:06:30 2004 @@ -44,7 +44,11 @@ #endif @@ -13,19 +13,17 @@ #ifdef HAVE_USB_JS #if defined(__NetBSD__) #ifdef HAVE_USBHID_H -@@ -53,9 +57,14 @@ - #include <usb.h> +@@ -54,7 +58,12 @@ #endif #elif defined(__FreeBSD__) -+# if __FreeBSD_version < 500000 extern "C" { -#include <libusbhid.h> ++# if __FreeBSD_version < 500000 +# include <libusbhid.h> - } +# else +# define HAVE_USBHID_H 1 +# include <usbhid.h> +# endif + } #endif #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> |