Index: x11-drivers/xf86-input-synaptics/Makefile =================================================================== --- x11-drivers/xf86-input-synaptics/Makefile (revision 431992) +++ x11-drivers/xf86-input-synaptics/Makefile (working copy) @@ -1,17 +1,25 @@ # $FreeBSD$ PORTNAME= xf86-input-synaptics -PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTVERSION= 1.9.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org synaptics input driver -CONFLICTS= synaptics-[0-9]* +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING +OPTIONS_DEFINE= EVDEV +EVDEV_DESC= Support for input event devices + USES= pathfix USE_XORG= x11 xtst XORG_CAT= driver +INSTALL_TARGET= install-strip +EVDEV_CONFIGURE_ENV= BUILD_EVENTCOMM=yes +EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:multimedia/v4l_compat +EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev + .include Index: x11-drivers/xf86-input-synaptics/distinfo =================================================================== --- x11-drivers/xf86-input-synaptics/distinfo (revision 431992) +++ x11-drivers/xf86-input-synaptics/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80 -SIZE (xorg/driver/xf86-input-synaptics-1.8.2.tar.bz2) = 484261 +TIMESTAMP = 1479731896 +SHA256 (xorg/driver/xf86-input-synaptics-1.9.0.tar.bz2) = afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a +SIZE (xorg/driver/xf86-input-synaptics-1.9.0.tar.bz2) = 501814 Index: x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c =================================================================== --- x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c (nonexistent) +++ x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c (working copy) @@ -0,0 +1,18 @@ +--- src/eventcomm.c.orig 2016-04-26 23:29:23 UTC ++++ src/eventcomm.c +@@ -421,10 +421,15 @@ event_get_abs(struct libevdev *evdev, in + /* We dont trust a zero fuzz as it probably is just a lazy value */ + if (fuzz && abs->fuzz > 0) + *fuzz = abs->fuzz; ++#ifdef __linux__ + #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30) + if (res) + *res = abs->resolution; + #endif ++#elif defined(__FreeBSD__) ++ if (res) ++ *res = abs->resolution; ++#endif + + return 0; + } Property changes on: x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h =================================================================== --- x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h (nonexistent) +++ x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h (working copy) @@ -0,0 +1,18 @@ +--- src/eventcomm.h.orig 2015-11-24 23:47:05 UTC ++++ src/eventcomm.h +@@ -30,7 +30,15 @@ + #include + + #include ++#ifdef __linux__ + #include ++#else ++#undef BUS_NONE ++#undef BUS_PCI ++#undef BUS_SBUS ++#undef BUS_PLATFORM ++#undef BUS_last ++#endif + #include + #include "synproto.h" + Property changes on: x11-drivers/xf86-input-synaptics/files/patch-src_eventcomm.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: x11-drivers/xf86-input-synaptics/pkg-plist =================================================================== --- x11-drivers/xf86-input-synaptics/pkg-plist (revision 431992) +++ x11-drivers/xf86-input-synaptics/pkg-plist (working copy) @@ -6,4 +6,4 @@ man/man1/synclient.1.gz man/man1/syndaemon.1.gz man/man4/synaptics.4x.gz -share/X11/xorg.conf.d/50-synaptics.conf +share/X11/xorg.conf.d/70-synaptics.conf