Index: branches/2017Q2/x11-drivers/xf86-input-wacom/Makefile
===================================================================
--- branches/2017Q2/x11-drivers/xf86-input-wacom/Makefile	(revision 444619)
+++ branches/2017Q2/x11-drivers/xf86-input-wacom/Makefile	(revision 444620)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-input-wacom
-PORTVERSION=	0.34.2
+PORTVERSION=	0.35.0
 CATEGORIES=	x11-drivers
 MASTER_SITES=	SF/linuxwacom/${PORTNAME}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	X.Org Wacom tablet driver
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	v4l_compat>=1.0.20110603:multimedia/v4l_compat
 RUN_DEPENDS=	webcamd>=3.1.0.1:multimedia/webcamd
 
 USES=		pathfix
 USE_XORG=	x11 xext xinerama xrandr
 XORG_CAT=	driver
 LDFLAGS+=	-Wl,--as-needed # Xext
 USE_RC_SUBR=	wacom
 SUB_FILES=	pkg-message
 CONFIGURE_ENV=	UDEV_CFLAGS=" " UDEV_LIBS=" "
 CONFIGURE_ARGS=	--without-systemd-unit-dir \
 		--without-udev-rules-dir \
 		--without-doxygen
 
 OPTIONS_DEFINE=	DEBUG TEST
 
 DEBUG_CONFIGURE_ENABLE=debug
 
 TEST_CONFIGURE_ENABLE=unit-tests
 TEST_ALL_TARGET=check
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's/dir=.*xorg-server/& \
 			--define-variable prefix="$$prefix"/' \
 		${WRKSRC}/configure
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
 	${INSTALL_DATA} ${FILESDIR}/wacom.conf.sample \
 		${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
 
 .include <bsd.port.mk>
Index: branches/2017Q2/x11-drivers/xf86-input-wacom/distinfo
===================================================================
--- branches/2017Q2/x11-drivers/xf86-input-wacom/distinfo	(revision 444619)
+++ branches/2017Q2/x11-drivers/xf86-input-wacom/distinfo	(revision 444620)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489012292
-SHA256 (xorg/driver/xf86-input-wacom-0.34.2.tar.bz2) = 2ad1b9db141104370aef4966aae419dde915caea316e1df2c6ac063545706b1c
-SIZE (xorg/driver/xf86-input-wacom-0.34.2.tar.bz2) = 632058
+TIMESTAMP = 1498669939
+SHA256 (xorg/driver/xf86-input-wacom-0.35.0.tar.bz2) = 55f60a71e81ef5544885652069a4f52b5cbaceabba53a28ac1397ec0ac26447d
+SIZE (xorg/driver/xf86-input-wacom-0.35.0.tar.bz2) = 601314
Index: branches/2017Q2/x11-drivers/xf86-input-wacom/files/patch-src-xf86Wacom.c
===================================================================
--- branches/2017Q2/x11-drivers/xf86-input-wacom/files/patch-src-xf86Wacom.c	(revision 444619)
+++ branches/2017Q2/x11-drivers/xf86-input-wacom/files/patch-src-xf86Wacom.c	(revision 444620)
@@ -1,30 +1,20 @@
 --- src/xf86Wacom.c.orig	2017-02-24 04:04:55 UTC
 +++ src/xf86Wacom.c
 @@ -667,6 +667,17 @@ void wcmReadPacket(InputInfoPtr pInfo)
  
  	if (len <= 0)
  	{
 +		/* BSD specific code. */
 +		/* Hotplug code does not send remove dev notify because
 +		 * opened cuse dev cant be removed. */
 +		if (priv->isParent && errno == EINVAL) {
 +			WacomDevicePtr other;
 +			for (other = common->wcmDevices; other; other = other->next) {
 +				xf86Msg(X_INFO, "%s: removing automatically added device.\n",
 +					other->pInfo->name);
 +				DeleteInputDeviceRequest(other->pInfo->dev);
 +			}
 +		} else
  		/* for all other errors, hope that the hotplugging code will
  		 * remove the device */
  		if (errno != EAGAIN && errno != EINTR)
-@@ -823,9 +834,7 @@ static void wcmUnlinkTouchAndPen(InputIn
- static int wcmDevProc(DeviceIntPtr pWcm, int what)
- {
- 	InputInfoPtr pInfo = (InputInfoPtr)pWcm->public.devicePrivate;
--#ifdef DEBUG
- 	WacomDevicePtr priv = (WacomDevicePtr)pInfo->private;
--#endif
- 	Status rc = !Success;
- 
- 	DBG(2, priv, "BEGIN dev=%p priv=%p "
Index: branches/2017Q2
===================================================================
--- branches/2017Q2	(revision 444619)
+++ branches/2017Q2	(revision 444620)

Property changes on: branches/2017Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r444604