Index: head/sysutils/solaar/Makefile
===================================================================
--- head/sysutils/solaar/Makefile	(revision 459841)
+++ head/sysutils/solaar/Makefile	(revision 459842)
@@ -1,49 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	solaar
-PORTVERSION=	g20170327
-PORTREVISION=	2
+# The latest release is from 2013 and there is not going to be a new
+# release for now:
+# https://github.com/pwr/Solaar/issues/288
+# https://github.com/pwr/Solaar/issues/296
+DISTVERSION=	0.9.2-221
+DISTVERSIONSUFFIX=	-g1a67b33
 CATEGORIES=	sysutils
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Device manager for the Logitech Unifying Receiver
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 # libhidapi.so is only loaded at runtime via ctypes (dlopen)
 RUN_DEPENDS=	${LOCALBASE}/lib/libhidapi.so:comms/hidapi
 
-USES=	python
-USE_PYTHON=	distutils autoplist concurrent optsuffix
-
+USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	pwr
 GH_PROJECT=	Solaar
-# The latest release is from 2013 and there is not going to be a new
-# release for now:
-# https://github.com/pwr/Solaar/issues/288
-# https://github.com/pwr/Solaar/issues/296
-GH_TAGNAME=	53ec751
+USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	GUI
 GUI_USES=	gnome
 GUI_USE=	gnome=pygobject3:run
 
 post-patch:
 	@${CP} ${FILESDIR}/hidapi.py ${WRKSRC}/lib/hidapi/udev.py
 	@${REINPLACE_CMD} -e '/pyudev/d' \
 		-e 's|python-gi|${PYTHON_PKGNAMEPREFIX}gobject3|' \
 		${WRKSRC}/lib/solaar/gtk.py
 	@${REINPLACE_CMD} 's|receiver\.path\.split.*|receiver.path)|' \
 		${WRKSRC}/lib/logitech_receiver/listener.py
 	@${REINPLACE_CMD} 's|[[:<:]]cmd[[:>:]]|action|' \
 		${WRKSRC}/lib/solaar/cli/__init__.py
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/devd-solaar.conf \
 		${STAGEDIR}${PREFIX}/etc/devd/solaar.conf.sample
 
 .include <bsd.port.mk>
Index: head/sysutils/solaar/distinfo
===================================================================
--- head/sysutils/solaar/distinfo	(revision 459841)
+++ head/sysutils/solaar/distinfo	(revision 459842)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490648037
-SHA256 (pwr-Solaar-g20170327-53ec751_GH0.tar.gz) = 0dca927e30c5436215d732a328d72f6d73b2a1878df6efa4ba054b1dbec9310f
-SIZE (pwr-Solaar-g20170327-53ec751_GH0.tar.gz) = 1189828
+TIMESTAMP = 1516754216
+SHA256 (pwr-Solaar-0.9.2-221-g1a67b33_GH0.tar.gz) = ce5f9dc83a0bb3ba2d84e1cc5c169fe4cb3d53d1ff2e269b9e4ce3382e6e2ceb
+SIZE (pwr-Solaar-0.9.2-221-g1a67b33_GH0.tar.gz) = 1192295
Index: head/sysutils/solaar/files/patch-lib_logitech__receiver_settings.py
===================================================================
--- head/sysutils/solaar/files/patch-lib_logitech__receiver_settings.py	(revision 459841)
+++ head/sysutils/solaar/files/patch-lib_logitech__receiver_settings.py	(nonexistent)
@@ -1,17 +0,0 @@
-Solaar will die with a silent error when trying to configure devices like
-e.g. the Logitech K400 that are detected as keyboards but also have
-mouse settings for an integrated touchpad.  Remove the overly cautious
-assert.
-
-https://github.com/pwr/Solaar/issues/330
-
---- lib/logitech_receiver/settings.py.orig	2017-04-17 19:26:20 UTC
-+++ lib/logitech_receiver/settings.py
-@@ -61,7 +61,6 @@ class Setting(object):
- 
- 	def __call__(self, device):
- 		assert not hasattr(self, '_value')
--		assert self.device_kind is None or self.device_kind == device.kind
- 		p = device.protocol
- 		if p == 1.0:
- 			# HID++ 1.0 devices do not support features

Property changes on: head/sysutils/solaar/files/patch-lib_logitech__receiver_settings.py
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/solaar/files/devd-solaar.conf
===================================================================
--- head/sysutils/solaar/files/devd-solaar.conf	(revision 459841)
+++ head/sysutils/solaar/files/devd-solaar.conf	(revision 459842)
@@ -1,13 +1,13 @@
 # Allows non-root users to have raw access to Logitech Unifying USB
 # Receiver devices.
 
 notify 100 {
 	match "system" "USB";
 	match "subsystem" "DEVICE";
 	match "type" "ATTACH";
 	match "vendor" "0x046d";
-	match "product" "(0xc52b|0xc532|0xc52f|0xc526|0xc52e|0xc51b|0xc531|0xc517|0xc518|0xc51a|0xc521|0xc525)";
+	match "product" "(0xc52b|0xc532|0xc52f|0xc526|0xc52e|0xc51b|0xc531|0xc517|0xc518|0xc51a|0xc521|0xc525|0xc534)";
 # Please uncomment the line below and change the group name to suit
 # your own needs.
 #	action "chgrp solaar /dev/$cdev && chmod 660 /dev/$cdev";
 };