Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Nov 2019 20:54:03 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r518726 - in head/sysutils/btsixad: . files
Message-ID:  <201911302054.xAUKs3EP078337@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Sat Nov 30 20:54:03 2019
New Revision: 518726
URL: https://svnweb.freebsd.org/changeset/ports/518726

Log:
  sysutils/btsixad: switch from CUSE4BSD to cuse, which is its in-tree successor.
  
  Suggested by:	jbeich

Added:
  head/sysutils/btsixad/files/patch-btsixad_Makefile   (contents, props changed)
  head/sysutils/btsixad/files/patch-btsixad_btsixad.8   (contents, props changed)
  head/sysutils/btsixad/files/patch-btsixad_rc.sh.in   (contents, props changed)
  head/sysutils/btsixad/files/patch-btsixad_vuhid.c   (contents, props changed)
Modified:
  head/sysutils/btsixad/Makefile
  head/sysutils/btsixad/files/patch-test_Makefile

Modified: head/sysutils/btsixad/Makefile
==============================================================================
--- head/sysutils/btsixad/Makefile	Sat Nov 30 20:37:02 2019	(r518725)
+++ head/sysutils/btsixad/Makefile	Sat Nov 30 20:54:03 2019	(r518726)
@@ -2,6 +2,7 @@
 
 PORTNAME=	btsixad
 PORTVERSION=	0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://althenia.net/files/
 
@@ -9,8 +10,6 @@ MAINTAINER=	aaz@q-fu.com
 COMMENT=	Driver for Sixaxis gamepad connected over Bluetooth
 
 LICENSE=	BSD2CLAUSE
-
-LIB_DEPENDS=	libcuse4bsd.so:multimedia/cuse4bsd-kmod
 
 USES=		uidfix
 

Added: head/sysutils/btsixad/files/patch-btsixad_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/btsixad/files/patch-btsixad_Makefile	Sat Nov 30 20:54:03 2019	(r518726)
@@ -0,0 +1,11 @@
+--- btsixad/Makefile.orig	2014-07-27 15:28:06 UTC
++++ btsixad/Makefile
+@@ -5,7 +5,7 @@ MAN=btsixad.8
+ CFLAGS+= -pthread -I${LOCALBASE}/include
+ CFLAGS+= -Wno-parentheses
+ LDFLAGS+= -pthread -L${LOCALBASE}/lib
+-LDADD+= -lbluetooth -lsdp -lcuse4bsd
++LDADD+= -lbluetooth -lsdp -lcuse
+ 
+ SCRIPTS=rc.sh
+ SCRIPTSNAME_rc.sh=btsixad

Added: head/sysutils/btsixad/files/patch-btsixad_btsixad.8
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/btsixad/files/patch-btsixad_btsixad.8	Sat Nov 30 20:54:03 2019	(r518726)
@@ -0,0 +1,11 @@
+--- btsixad/btsixad.8.orig	2014-07-27 15:28:06 UTC
++++ btsixad/btsixad.8
+@@ -138,7 +138,7 @@ keyboard or mouse events.
+ .Xr bthidd 8 ,
+ .Xr usbhidaction 1 ,
+ .Xr uhid 4 ,
+-.Xr cuse4bsd 3
++.Xr cuse 3
+ .
+ .Sh AUTHORS
+ .An -nosplit

Added: head/sysutils/btsixad/files/patch-btsixad_rc.sh.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/btsixad/files/patch-btsixad_rc.sh.in	Sat Nov 30 20:54:03 2019	(r518726)
@@ -0,0 +1,11 @@
+--- btsixad/rc.sh.in.orig	2014-07-27 15:28:06 UTC
++++ btsixad/rc.sh.in
+@@ -15,7 +15,7 @@ extra_commands="attach detach pair"
+ attach_cmd=do_attach
+ detach_cmd=do_detach
+ pair_cmd=do_pair
+-required_modules=cuse4bsd~'\bcuse4bsd\b' # kldstat -m cuse4bsd doesn't work
++required_modules=cuse~'\bcuse\b' # kldstat -m cuse doesn't work
+ 
+ load_rc_config $name
+ 

Added: head/sysutils/btsixad/files/patch-btsixad_vuhid.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/btsixad/files/patch-btsixad_vuhid.c	Sat Nov 30 20:54:03 2019	(r518726)
@@ -0,0 +1,24 @@
+--- btsixad/vuhid.c.orig	2014-07-27 15:28:06 UTC
++++ btsixad/vuhid.c
+@@ -14,7 +14,7 @@
+ #include <unistd.h>
+ #include <dev/usb/usb_ioctl.h>
+ 
+-#include <cuse4bsd.h>
++#include <cuse.h>
+ 
+ #ifndef CUSE_ID_BTSIXAD
+ #define CUSE_ID_BTSIXAD(what) CUSE_MAKE_ID('6', 'A', what, 0)
+@@ -188,10 +188,10 @@ vuhid_init()
+         const char* error;
+         switch (r) {
+         case CUSE_ERR_NOT_LOADED:
+-            error = "kldload cuse4bsd";
++            error = "kldload cuse";
+             break;
+         case CUSE_ERR_INVALID:
+-            error = "cuse4bsd not accessible";
++            error = "cuse not accessible";
+             break;
+         default:
+             error = "cuse_init() failed";

Modified: head/sysutils/btsixad/files/patch-test_Makefile
==============================================================================
--- head/sysutils/btsixad/files/patch-test_Makefile	Sat Nov 30 20:37:02 2019	(r518725)
+++ head/sysutils/btsixad/files/patch-test_Makefile	Sat Nov 30 20:54:03 2019	(r518726)
@@ -1,4 +1,4 @@
---- test/Makefile.orig
+--- test/Makefile.orig	2014-07-27 15:28:06 UTC
 +++ test/Makefile
 @@ -1,6 +1,6 @@
  PROG=test



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911302054.xAUKs3EP078337>