Index: head/x11/libwacom/Makefile
===================================================================
--- head/x11/libwacom/Makefile	(revision 550445)
+++ head/x11/libwacom/Makefile	(revision 550446)
@@ -1,26 +1,23 @@
 # Created by: johalun0@gmail.com
 # $FreeBSD$
 
 PORTNAME=	libwacom
-DISTVERSIONPREFIX=libwacom-
-DISTVERSION=	1.4.1
-PORTREVISION=	1
+DISTVERSION=	1.5
 CATEGORIES=	x11
+MASTER_SITES=	https://github.com/linuxwacom/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Adds tablet support to libinput
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		compiler:c++11-lang gnome meson pkgconfig
-USE_GITHUB=	yes
-GH_ACCOUNT=	linuxwacom
+USES=		compiler:c++11-lang gnome meson pkgconfig tar:bz2
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
Index: head/x11/libwacom/distinfo
===================================================================
--- head/x11/libwacom/distinfo	(revision 550445)
+++ head/x11/libwacom/distinfo	(revision 550446)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593718670
-SHA256 (linuxwacom-libwacom-libwacom-1.4.1_GH0.tar.gz) = 87c3d4282b84d27896afad0b69656aec1045593370978403ab0a66d1f02f3ff5
-SIZE (linuxwacom-libwacom-libwacom-1.4.1_GH0.tar.gz) = 118613
+TIMESTAMP = 1601323778
+SHA256 (libwacom-1.5.tar.bz2) = 6b349fb73c8edcf0288d17c49049648214924846b6a58914c2ed3477ff36d47b
+SIZE (libwacom-1.5.tar.bz2) = 515548
Index: head/x11/libwacom/pkg-plist
===================================================================
--- head/x11/libwacom/pkg-plist	(revision 550445)
+++ head/x11/libwacom/pkg-plist	(revision 550446)
@@ -1,351 +1,360 @@
 bin/libwacom-list-local-devices
 include/libwacom-1.0/libwacom/libwacom.h
 lib/libwacom.so
 lib/libwacom.so.2
 lib/libwacom.so.2.6.1
 lib/udev/hwdb.d/65-libwacom.hwdb
 lib/udev/rules.d/65-libwacom.rules
 libdata/pkgconfig/libwacom.pc
 man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/bamboo-0fg-m-p-alt.tablet
 %%DATADIR%%/bamboo-0fg-s-p-alt.tablet
 %%DATADIR%%/bamboo-0fg-s-p.tablet
 %%DATADIR%%/bamboo-16fg-m-pt.tablet
 %%DATADIR%%/bamboo-16fg-s-p.tablet
 %%DATADIR%%/bamboo-16fg-s-pt.tablet
 %%DATADIR%%/bamboo-16fg-s-t.tablet
 %%DATADIR%%/bamboo-2fg-fun-m-pt.tablet
 %%DATADIR%%/bamboo-2fg-fun-s-pt.tablet
 %%DATADIR%%/bamboo-2fg-m-p.tablet
 %%DATADIR%%/bamboo-2fg-s-p.tablet
 %%DATADIR%%/bamboo-2fg-s-pt.tablet
 %%DATADIR%%/bamboo-2fg-s-t.tablet
 %%DATADIR%%/bamboo-4fg-fun-m.tablet
 %%DATADIR%%/bamboo-4fg-fun-s.tablet
 %%DATADIR%%/bamboo-4fg-s-pt.tablet
 %%DATADIR%%/bamboo-4fg-s-t.tablet
 %%DATADIR%%/bamboo-4fg-se-m-pt.tablet
 %%DATADIR%%/bamboo-4fg-se-s-pt.tablet
 %%DATADIR%%/bamboo-one-m-p.tablet
 %%DATADIR%%/bamboo-one.tablet
 %%DATADIR%%/bamboo-pad-wireless.tablet
 %%DATADIR%%/bamboo-pad.tablet
 %%DATADIR%%/cintiq-12wx.tablet
 %%DATADIR%%/cintiq-13hd.tablet
 %%DATADIR%%/cintiq-13hdt.tablet
+%%DATADIR%%/cintiq-16-2.tablet
 %%DATADIR%%/cintiq-16.tablet
 %%DATADIR%%/cintiq-20wsx.tablet
 %%DATADIR%%/cintiq-21ux.tablet
 %%DATADIR%%/cintiq-21ux2.tablet
 %%DATADIR%%/cintiq-22.tablet
 %%DATADIR%%/cintiq-22hd.tablet
 %%DATADIR%%/cintiq-22hdt.tablet
 %%DATADIR%%/cintiq-24hd-touch.tablet
 %%DATADIR%%/cintiq-24hd.tablet
 %%DATADIR%%/cintiq-27hd.tablet
 %%DATADIR%%/cintiq-27hdt.tablet
 %%DATADIR%%/cintiq-companion-2.tablet
 %%DATADIR%%/cintiq-companion-hybrid.tablet
 %%DATADIR%%/cintiq-companion.tablet
 %%DATADIR%%/cintiq-pro-13.tablet
 %%DATADIR%%/cintiq-pro-16.tablet
 %%DATADIR%%/cintiq-pro-24-p.tablet
 %%DATADIR%%/cintiq-pro-24-pt.tablet
 %%DATADIR%%/cintiq-pro-32.tablet
 %%DATADIR%%/dell-canvas-27.tablet
 %%DATADIR%%/dtf-720.tablet
 %%DATADIR%%/dth-1152.tablet
 %%DATADIR%%/dth-2242.tablet
 %%DATADIR%%/dth-2452.tablet
 %%DATADIR%%/dti-520.tablet
 %%DATADIR%%/dtk-1651.tablet
+%%DATADIR%%/dtk-1660e-2.tablet
 %%DATADIR%%/dtk-1660e.tablet
 %%DATADIR%%/dtk-2241.tablet
 %%DATADIR%%/dtk-2451.tablet
 %%DATADIR%%/dtu-1031.tablet
 %%DATADIR%%/dtu-1031x.tablet
 %%DATADIR%%/dtu-1141.tablet
 %%DATADIR%%/dtu-1141b.tablet
 %%DATADIR%%/dtu-1631.tablet
 %%DATADIR%%/dtu-1931.tablet
 %%DATADIR%%/dtu-2231.tablet
 %%DATADIR%%/ek-remote.tablet
 %%DATADIR%%/elan-0732.tablet
 %%DATADIR%%/elan-2072.tablet
 %%DATADIR%%/elan-22e2.tablet
 %%DATADIR%%/elan-24db.tablet
+%%DATADIR%%/elan-2514-alt.tablet
 %%DATADIR%%/elan-2514.tablet
 %%DATADIR%%/elan-2537.tablet
 %%DATADIR%%/elan-2627.tablet
 %%DATADIR%%/elan-2628.tablet
 %%DATADIR%%/elan-262b.tablet
 %%DATADIR%%/elan-264c.tablet
 %%DATADIR%%/elan-29a1.tablet
 %%DATADIR%%/elan-29b6.tablet
 %%DATADIR%%/elan-5515.tablet
 %%DATADIR%%/gaomon-s56k.tablet
+%%DATADIR%%/gaomon-s620.tablet
 %%DATADIR%%/generic.tablet
 %%DATADIR%%/graphire-usb.tablet
 %%DATADIR%%/graphire-wireless-8x6.tablet
 %%DATADIR%%/graphire2-4x5.tablet
 %%DATADIR%%/graphire2-5x7.tablet
 %%DATADIR%%/graphire3-4x5.tablet
 %%DATADIR%%/graphire3-6x8.tablet
 %%DATADIR%%/graphire4-4x5.tablet
 %%DATADIR%%/graphire4-6x8.tablet
 %%DATADIR%%/huion-420.tablet
 %%DATADIR%%/huion-h420.tablet
 %%DATADIR%%/huion-h610-pro.tablet
 %%DATADIR%%/huion-new-1060-plus.tablet
 %%DATADIR%%/intuos-12x12.tablet
 %%DATADIR%%/intuos-12x18.tablet
 %%DATADIR%%/intuos-4x5.tablet
 %%DATADIR%%/intuos-6x8.tablet
 %%DATADIR%%/intuos-9x12.tablet
 %%DATADIR%%/intuos-m-p.tablet
 %%DATADIR%%/intuos-m-p2.tablet
 %%DATADIR%%/intuos-m-p3-android.tablet
 %%DATADIR%%/intuos-m-p3-wl-android.tablet
 %%DATADIR%%/intuos-m-p3-wl.tablet
 %%DATADIR%%/intuos-m-p3.tablet
 %%DATADIR%%/intuos-m-pt.tablet
 %%DATADIR%%/intuos-m-pt2.tablet
 %%DATADIR%%/intuos-pro-2-l.tablet
 %%DATADIR%%/intuos-pro-2-m.tablet
 %%DATADIR%%/intuos-pro-2-s.tablet
 %%DATADIR%%/intuos-pro-l.tablet
 %%DATADIR%%/intuos-pro-m.tablet
 %%DATADIR%%/intuos-pro-s.tablet
 %%DATADIR%%/intuos-s-p.tablet
 %%DATADIR%%/intuos-s-p2.tablet
 %%DATADIR%%/intuos-s-p3-android.tablet
 %%DATADIR%%/intuos-s-p3-wl-android.tablet
 %%DATADIR%%/intuos-s-p3-wl.tablet
 %%DATADIR%%/intuos-s-p3.tablet
 %%DATADIR%%/intuos-s-pt.tablet
 %%DATADIR%%/intuos-s-pt2.tablet
 %%DATADIR%%/intuos2-12x12.tablet
 %%DATADIR%%/intuos2-12x18.tablet
 %%DATADIR%%/intuos2-4x5.tablet
 %%DATADIR%%/intuos2-6x8.tablet
 %%DATADIR%%/intuos2-9x12.tablet
 %%DATADIR%%/intuos3-12x12.tablet
 %%DATADIR%%/intuos3-12x19.tablet
 %%DATADIR%%/intuos3-4x5.tablet
 %%DATADIR%%/intuos3-4x6.tablet
 %%DATADIR%%/intuos3-6x11.tablet
 %%DATADIR%%/intuos3-6x8.tablet
 %%DATADIR%%/intuos3-9x12.tablet
 %%DATADIR%%/intuos4-12x19.tablet
 %%DATADIR%%/intuos4-4x6.tablet
 %%DATADIR%%/intuos4-6x9-wl.tablet
 %%DATADIR%%/intuos4-6x9.tablet
 %%DATADIR%%/intuos4-8x13.tablet
 %%DATADIR%%/intuos5-m.tablet
 %%DATADIR%%/intuos5-s.tablet
 %%DATADIR%%/intuos5-touch-l.tablet
 %%DATADIR%%/intuos5-touch-m.tablet
 %%DATADIR%%/intuos5-touch-s.tablet
 %%DATADIR%%/isdv4-100.tablet
 %%DATADIR%%/isdv4-101.tablet
 %%DATADIR%%/isdv4-104.tablet
 %%DATADIR%%/isdv4-10d.tablet
 %%DATADIR%%/isdv4-10e.tablet
 %%DATADIR%%/isdv4-10f.tablet
 %%DATADIR%%/isdv4-114.tablet
 %%DATADIR%%/isdv4-116.tablet
 %%DATADIR%%/isdv4-117.tablet
 %%DATADIR%%/isdv4-124.tablet
 %%DATADIR%%/isdv4-12c.tablet
 %%DATADIR%%/isdv4-149.tablet
 %%DATADIR%%/isdv4-2d1f-001e.tablet
 %%DATADIR%%/isdv4-2d1f-002e.tablet
 %%DATADIR%%/isdv4-4004.tablet
 %%DATADIR%%/isdv4-4800.tablet
 %%DATADIR%%/isdv4-4806.tablet
 %%DATADIR%%/isdv4-4807.tablet
 %%DATADIR%%/isdv4-4809.tablet
 %%DATADIR%%/isdv4-4814.tablet
 %%DATADIR%%/isdv4-481a.tablet
 %%DATADIR%%/isdv4-4822.tablet
 %%DATADIR%%/isdv4-4824.tablet
 %%DATADIR%%/isdv4-4831.tablet
+%%DATADIR%%/isdv4-4838.tablet
 %%DATADIR%%/isdv4-4841.tablet
 %%DATADIR%%/isdv4-484c.tablet
 %%DATADIR%%/isdv4-4851.tablet
 %%DATADIR%%/isdv4-485e.tablet
 %%DATADIR%%/isdv4-4865.tablet
 %%DATADIR%%/isdv4-486a.tablet
 %%DATADIR%%/isdv4-4870.tablet
 %%DATADIR%%/isdv4-4875.tablet
 %%DATADIR%%/isdv4-488f.tablet
 %%DATADIR%%/isdv4-48c9.tablet
 %%DATADIR%%/isdv4-48ca.tablet
 %%DATADIR%%/isdv4-48ce.tablet
 %%DATADIR%%/isdv4-48d6.tablet
 %%DATADIR%%/isdv4-48ec.tablet
 %%DATADIR%%/isdv4-48ed.tablet
 %%DATADIR%%/isdv4-48ee.tablet
 %%DATADIR%%/isdv4-490b.tablet
+%%DATADIR%%/isdv4-4957.tablet
+%%DATADIR%%/isdv4-495f.tablet
 %%DATADIR%%/isdv4-5000.tablet
 %%DATADIR%%/isdv4-5002.tablet
 %%DATADIR%%/isdv4-5010.tablet
 %%DATADIR%%/isdv4-5013.tablet
 %%DATADIR%%/isdv4-5014.tablet
 %%DATADIR%%/isdv4-502a.tablet
 %%DATADIR%%/isdv4-503e.tablet
 %%DATADIR%%/isdv4-503f.tablet
 %%DATADIR%%/isdv4-5040.tablet
 %%DATADIR%%/isdv4-5044.tablet
 %%DATADIR%%/isdv4-5048.tablet
 %%DATADIR%%/isdv4-504a.tablet
 %%DATADIR%%/isdv4-5090.tablet
 %%DATADIR%%/isdv4-5099.tablet
 %%DATADIR%%/isdv4-509d.tablet
 %%DATADIR%%/isdv4-509f.tablet
 %%DATADIR%%/isdv4-50b4.tablet
 %%DATADIR%%/isdv4-50b6.tablet
 %%DATADIR%%/isdv4-50b8.tablet
 %%DATADIR%%/isdv4-50db.tablet
 %%DATADIR%%/isdv4-50e9.tablet
 %%DATADIR%%/isdv4-50ef.tablet
 %%DATADIR%%/isdv4-50f1.tablet
 %%DATADIR%%/isdv4-50f8.tablet
 %%DATADIR%%/isdv4-50fd.tablet
 %%DATADIR%%/isdv4-5110.tablet
 %%DATADIR%%/isdv4-5115.tablet
 %%DATADIR%%/isdv4-5122.tablet
 %%DATADIR%%/isdv4-5128.tablet
 %%DATADIR%%/isdv4-513b.tablet
+%%DATADIR%%/isdv4-5144.tablet
 %%DATADIR%%/isdv4-5146.tablet
 %%DATADIR%%/isdv4-5147.tablet
 %%DATADIR%%/isdv4-5150.tablet
 %%DATADIR%%/isdv4-5157.tablet
 %%DATADIR%%/isdv4-5158.tablet
 %%DATADIR%%/isdv4-515a.tablet
 %%DATADIR%%/isdv4-5169.tablet
 %%DATADIR%%/isdv4-516b.tablet
 %%DATADIR%%/isdv4-517d.tablet
 %%DATADIR%%/isdv4-5196.tablet
 %%DATADIR%%/isdv4-51a0.tablet
 %%DATADIR%%/isdv4-51af.tablet
 %%DATADIR%%/isdv4-51b0.tablet
 %%DATADIR%%/isdv4-51b1.tablet
 %%DATADIR%%/isdv4-51b2.tablet
 %%DATADIR%%/isdv4-51b3.tablet
 %%DATADIR%%/isdv4-51b6.tablet
 %%DATADIR%%/isdv4-51b7.tablet
 %%DATADIR%%/isdv4-51b8.tablet
 %%DATADIR%%/isdv4-51b9.tablet
 %%DATADIR%%/isdv4-51ba.tablet
 %%DATADIR%%/isdv4-51bb.tablet
 %%DATADIR%%/isdv4-51bc.tablet
 %%DATADIR%%/isdv4-51bd.tablet
 %%DATADIR%%/isdv4-51be.tablet
 %%DATADIR%%/isdv4-51bf.tablet
 %%DATADIR%%/isdv4-51c4.tablet
 %%DATADIR%%/isdv4-51e2.tablet
 %%DATADIR%%/isdv4-51f5.tablet
 %%DATADIR%%/isdv4-51f6.tablet
 %%DATADIR%%/isdv4-521f.tablet
 %%DATADIR%%/isdv4-5221.tablet
 %%DATADIR%%/isdv4-5222.tablet
 %%DATADIR%%/isdv4-90.tablet
 %%DATADIR%%/isdv4-93.tablet
 %%DATADIR%%/isdv4-e2.tablet
 %%DATADIR%%/isdv4-e3.tablet
 %%DATADIR%%/isdv4-e5.tablet
 %%DATADIR%%/isdv4-e6.tablet
 %%DATADIR%%/isdv4-ec.tablet
 %%DATADIR%%/isdv4-ed.tablet
 %%DATADIR%%/isdv4-ef.tablet
 %%DATADIR%%/layouts/bamboo-0fg-s-p-alt.svg
 %%DATADIR%%/layouts/bamboo-0fg-s-p.svg
 %%DATADIR%%/layouts/bamboo-16fg-m-pt.svg
 %%DATADIR%%/layouts/bamboo-16fg-s-pt.svg
 %%DATADIR%%/layouts/bamboo-16fg-s-t.svg
 %%DATADIR%%/layouts/bamboo-2fg-fun-m-pt.svg
 %%DATADIR%%/layouts/bamboo-2fg-fun-s-pt.svg
 %%DATADIR%%/layouts/bamboo-2fg-s-pt.svg
 %%DATADIR%%/layouts/bamboo-2fg-s-t.svg
 %%DATADIR%%/layouts/bamboo-4fg-fun-m-pt.svg
 %%DATADIR%%/layouts/bamboo-4fg-fun-s-pt.svg
 %%DATADIR%%/layouts/bamboo-4fg-s-pt.svg
 %%DATADIR%%/layouts/bamboo-4fg-s-t.svg
 %%DATADIR%%/layouts/bamboo-4fg-se-m-pt.svg
 %%DATADIR%%/layouts/bamboo-4fg-se-s-pt.svg
 %%DATADIR%%/layouts/bamboo-pad.svg
 %%DATADIR%%/layouts/cintiq-12wx.svg
 %%DATADIR%%/layouts/cintiq-13hd.svg
 %%DATADIR%%/layouts/cintiq-20wsx.svg
 %%DATADIR%%/layouts/cintiq-21ux.svg
 %%DATADIR%%/layouts/cintiq-21ux2.svg
 %%DATADIR%%/layouts/cintiq-22hd.svg
 %%DATADIR%%/layouts/cintiq-24hd.svg
 %%DATADIR%%/layouts/cintiq-companion-2.svg
 %%DATADIR%%/layouts/cintiq-companion-hybrid.svg
 %%DATADIR%%/layouts/cintiq-companion.svg
 %%DATADIR%%/layouts/dth-2242.svg
 %%DATADIR%%/layouts/dth-2452.svg
 %%DATADIR%%/layouts/dti-520.svg
 %%DATADIR%%/layouts/dtk-1651.svg
 %%DATADIR%%/layouts/dtk-2451.svg
 %%DATADIR%%/layouts/dtu-1031.svg
 %%DATADIR%%/layouts/dtu-1141.svg
 %%DATADIR%%/layouts/dtu-1141b.svg
 %%DATADIR%%/layouts/ek-remote.svg
+%%DATADIR%%/layouts/gaomon-s620.svg
 %%DATADIR%%/layouts/graphire-wireless-8x6.svg
 %%DATADIR%%/layouts/graphire4-4x5.svg
 %%DATADIR%%/layouts/graphire4-6x8.svg
 %%DATADIR%%/layouts/huion-h420.svg
 %%DATADIR%%/layouts/huion-h610-pro.svg
 %%DATADIR%%/layouts/huion-new-1060-plus.svg
 %%DATADIR%%/layouts/intuos-m-p.svg
 %%DATADIR%%/layouts/intuos-m-p2.svg
 %%DATADIR%%/layouts/intuos-m-p3.svg
 %%DATADIR%%/layouts/intuos-m-pt.svg
 %%DATADIR%%/layouts/intuos-m-pt2.svg
 %%DATADIR%%/layouts/intuos-pro-2-l.svg
 %%DATADIR%%/layouts/intuos-pro-2-m.svg
 %%DATADIR%%/layouts/intuos-pro-2-s.svg
 %%DATADIR%%/layouts/intuos-pro-l.svg
 %%DATADIR%%/layouts/intuos-pro-m.svg
 %%DATADIR%%/layouts/intuos-pro-s.svg
 %%DATADIR%%/layouts/intuos-s-p.svg
 %%DATADIR%%/layouts/intuos-s-p2.svg
 %%DATADIR%%/layouts/intuos-s-p3.svg
 %%DATADIR%%/layouts/intuos-s-pt.svg
 %%DATADIR%%/layouts/intuos-s-pt2.svg
 %%DATADIR%%/layouts/intuos3-12x12.svg
 %%DATADIR%%/layouts/intuos3-12x19.svg
 %%DATADIR%%/layouts/intuos3-4x5.svg
 %%DATADIR%%/layouts/intuos3-4x6.svg
 %%DATADIR%%/layouts/intuos3-6x11.svg
 %%DATADIR%%/layouts/intuos3-6x8.svg
 %%DATADIR%%/layouts/intuos3-9x12.svg
 %%DATADIR%%/layouts/intuos4-12x19.svg
 %%DATADIR%%/layouts/intuos4-4x6.svg
 %%DATADIR%%/layouts/intuos4-6x9-wl.svg
 %%DATADIR%%/layouts/intuos4-6x9.svg
 %%DATADIR%%/layouts/intuos4-8x13.svg
 %%DATADIR%%/layouts/intuos5-l.svg
 %%DATADIR%%/layouts/intuos5-m.svg
 %%DATADIR%%/layouts/intuos5-s.svg
 %%DATADIR%%/layouts/mobilestudio-pro-13.svg
 %%DATADIR%%/layouts/mobilestudio-pro-16.svg
 %%DATADIR%%/layouts/xp-pen-star03.svg
 %%DATADIR%%/libwacom.stylus
 %%DATADIR%%/mobilestudio-pro-13-2.tablet
 %%DATADIR%%/mobilestudio-pro-13.tablet
 %%DATADIR%%/mobilestudio-pro-16-2.tablet
 %%DATADIR%%/mobilestudio-pro-16-3.tablet
 %%DATADIR%%/mobilestudio-pro-16.tablet
 %%DATADIR%%/n-trig-pen.tablet
 %%DATADIR%%/one-by-wacom-m-p.tablet
 %%DATADIR%%/one-by-wacom-m-p2.tablet
 %%DATADIR%%/one-by-wacom-s-p.tablet
 %%DATADIR%%/one-by-wacom-s-p2.tablet
 %%DATADIR%%/serial-wacf004.tablet
 %%DATADIR%%/volito-4x5.tablet
 %%DATADIR%%/wacom-one.tablet
 %%DATADIR%%/xp-pen-star03.tablet