3 files changed, 81 insertions, 10 deletions

diff --git a/x11/libwacom/Makefile b/x11/libwacom/Makefile
index bc09daee54bc..557c6476528b 100644
--- a/x11/libwacom/Makefile
+++ b/x11/libwacom/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	libwacom
-PORTVERSION=	0.23
-PORTREVISION=	1
+PORTVERSION=	0.32
+DISTVERSIONPREFIX=libwacom-
 CATEGORIES=	x11
-MASTER_SITES=	https://sourceforge.net/projects/linuxwacom/files/libwacom/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Adds tablet support to libinput
@@ -13,16 +12,20 @@ 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
 
-USES=		gettext-runtime gmake libtool localbase pkgconfig \
-		pathfix tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=	linuxwacom
+
+USES=		autoreconf gettext-runtime gmake gnome libtool localbase \
+		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.in
+	@${REINPLACE_CMD} -e 's/-printf "%P\\n"/-print0 | xargs -0 basename/' ${WRKSRC}/data/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/x11/libwacom/distinfo b/x11/libwacom/distinfo
index a77d835989e7..957225b9f2f3 100644
--- a/x11/libwacom/distinfo
+++ b/x11/libwacom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486412570
-SHA256 (libwacom-0.23.tar.bz2) = a08ac59ff26dbdf5888a6ad7bd97a66741807cda6bb1c7e7f299a555129c3162
-SIZE (libwacom-0.23.tar.bz2) = 473700
+TIMESTAMP = 1546211624
+SHA256 (linuxwacom-libwacom-libwacom-0.32_GH0.tar.gz) = 316ea0985260ec95884bf6c5cd3e962f344ef1d43dd3fbed6d95555fdb3e4aca
+SIZE (linuxwacom-libwacom-libwacom-0.32_GH0.tar.gz) = 120925
diff --git a/x11/libwacom/pkg-plist b/x11/libwacom/pkg-plist
index efea85c7b54f..c9cc2b612cc7 100644
--- a/x11/libwacom/pkg-plist
+++ b/x11/libwacom/pkg-plist
@@ -3,8 +3,9 @@ include/libwacom-1.0/libwacom/libwacom.h
 lib/libwacom.a
 lib/libwacom.so
 lib/libwacom.so.2
-lib/libwacom.so.2.5.1
+lib/libwacom.so.2.6.1
 libdata/pkgconfig/libwacom.pc
+man/man1/libwacom-list-local-devices.1.gz
 %%DATADIR%%/bamboo-0fg-s-p.tablet
 %%DATADIR%%/bamboo-16fg-m-pt.tablet
 %%DATADIR%%/bamboo-16fg-s-p.tablet
@@ -23,6 +24,8 @@ libdata/pkgconfig/libwacom.pc
 %%DATADIR%%/bamboo-4fg-se-m-pt.tablet
 %%DATADIR%%/bamboo-4fg-se-s-pt.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
@@ -38,23 +41,40 @@ libdata/pkgconfig/libwacom.pc
 %%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-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-22e2.tablet
+%%DATADIR%%/elan-24db.tablet
+%%DATADIR%%/elan-2537.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-h610-pro.tablet
 %%DATADIR%%/intuos-12x12.tablet
 %%DATADIR%%/intuos-12x18.tablet
@@ -63,13 +83,21 @@ libdata/pkgconfig/libwacom.pc
 %%DATADIR%%/intuos-9x12.tablet
 %%DATADIR%%/intuos-m-p.tablet
 %%DATADIR%%/intuos-m-p2.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-wl.tablet
+%%DATADIR%%/intuos-pro-2-l.tablet
+%%DATADIR%%/intuos-pro-2-m-wl.tablet
+%%DATADIR%%/intuos-pro-2-m.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-wl.tablet
+%%DATADIR%%/intuos-s-p3.tablet
 %%DATADIR%%/intuos-s-pt.tablet
 %%DATADIR%%/intuos-s-pt2.tablet
 %%DATADIR%%/intuos2-12x12.tablet
@@ -96,19 +124,56 @@ libdata/pkgconfig/libwacom.pc
 %%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-4004.tablet
 %%DATADIR%%/isdv4-4800.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-484c.tablet
+%%DATADIR%%/isdv4-485e.tablet
+%%DATADIR%%/isdv4-486a.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-50b4.tablet
+%%DATADIR%%/isdv4-50b6.tablet
+%%DATADIR%%/isdv4-50b8.tablet
+%%DATADIR%%/isdv4-50f1.tablet
+%%DATADIR%%/isdv4-50f8.tablet
+%%DATADIR%%/isdv4-50fd.tablet
+%%DATADIR%%/isdv4-5110.tablet
+%%DATADIR%%/isdv4-5122.tablet
+%%DATADIR%%/isdv4-5146.tablet
+%%DATADIR%%/isdv4-5150.tablet
+%%DATADIR%%/isdv4-516b.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
@@ -120,5 +185,8 @@ libdata/pkgconfig/libwacom.pc
 %%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%%/xp-pen-star03.tablet