Index: x11/libwacom/Makefile
===================================================================
--- x11/libwacom/Makefile
+++ x11/libwacom/Makefile
@@ -4,10 +4,11 @@
 PORTNAME=	libwacom
 DISTVERSIONPREFIX=libwacom-
 DISTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	x11
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	419badb800eb.patch:-p1 # https://github.com/linuxwacom/libwacom/pull/216
+PATCHFILES+=	7756497eaf87.patch:-p1 # https://github.com/linuxwacom/libwacom/pull/217
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Adds tablet support to libinput
@@ -17,17 +18,10 @@
 
 LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
 
+USES=		gnome meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxwacom
-
-USES=		autoreconf gettext-runtime gmake gnome libtool \
-		pkgconfig pathfix tar:bzip2
 USE_GNOME=	glib20
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/-printf "%P\\n"/-print0 | xargs -0 basename/' ${WRKSRC}/data/Makefile.am
 
 .include <bsd.port.mk>
Index: x11/libwacom/distinfo
===================================================================
--- x11/libwacom/distinfo
+++ x11/libwacom/distinfo
@@ -1,5 +1,5 @@
 TIMESTAMP = 1577051129
 SHA256 (linuxwacom-libwacom-libwacom-1.2_GH0.tar.gz) = 102fd9c8a9ae30d76003ed58df0fb349625d49697c7c7c4e1aacf85d58039f9f
 SIZE (linuxwacom-libwacom-libwacom-1.2_GH0.tar.gz) = 110520
-SHA256 (419badb800eb.patch) = f145e6c3baeaf1954db01baf8a3aaa5be41f6b7b8f19353bd1eb094e7e839b8c
-SIZE (419badb800eb.patch) = 909
+SHA256 (7756497eaf87.patch) = eaa358f2ec825be0f60ea155b4e7b8dfb593e806ba07e90042ed246fe0da2a66
+SIZE (7756497eaf87.patch) = 3896
Index: x11/libwacom/pkg-plist
===================================================================
--- x11/libwacom/pkg-plist
+++ x11/libwacom/pkg-plist
@@ -1,6 +1,5 @@
 bin/libwacom-list-local-devices
 include/libwacom-1.0/libwacom/libwacom.h
-lib/libwacom.a
 lib/libwacom.so
 lib/libwacom.so.2
 lib/libwacom.so.2.6.1
@@ -220,6 +219,80 @@
 %%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/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/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