8 files changed, 26 insertions, 26 deletions

diff --git a/x11-drivers/input-wacom/Makefile b/x11-drivers/input-wacom/Makefile
index 1c483b12c858..f077e952d83c 100644
--- a/x11-drivers/input-wacom/Makefile
+++ b/x11-drivers/input-wacom/Makefile
@@ -44,8 +44,9 @@ USE_XORG=	xi xrandr
 
 LINUXWACOM=	xf86-input-wacom-${WACOM_VERSION}
 BSDWACOM=	bsdwacom-${KLD_VERSION}
-WACOM_VERSION=	0.11.1
+WACOM_VERSION=	0.15.0
 KLD_VERSION=	40
+PATCH_WRKSRC=	${WRKDIR}/${LINUXWACOM}
 CONFIGURE_WRKSRC=	${WRKDIR}/${LINUXWACOM}
 USE_AUTOTOOLS=	autoconf
 MAKE_ARGS+=	UDEV_CFLAGS=""
@@ -85,7 +86,7 @@ do-install:
 .endif
 	@${MKDIR} ${PREFIX}/${XINPUTMODDIR} ${PREFIX}/${MAN4DIR}
 	@cd ${WRKDIR}/${LINUXWACOM}/tools/ \
-		&& ${SETENV} ${MAKE_ENV} ${GMAKE} install
+		&& ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL}
 	@${INSTALL} ${WRKDIR}/${LINUXWACOM}/src/.libs/wacom_drv.so \
 		${PREFIX}/${XINPUTMODDIR}/
 	@${INSTALL_MAN} ${WRKDIR}/${LINUXWACOM}/man/wacom.4x \
@@ -101,7 +102,7 @@ plist: clean configure
 		&& ${SETENV} ${MAKE_ENV} PREFIX=${WRKDIR}/plist ./run_configure
 	@${MKDIR} ${WRKDIR}/plist
 	@cd ${WRKDIR}/linuxwacom/${LINUXWACOM}/src/util \
-		&& ${SETENV} ${MAKE_ENV} ${GMAKE} install
+		&& ${SETENV} ${MAKE_ENV} ${GMAKE} ${INSTALL}
 	@cd ${WRKDIR}/linuxwacom \
 		&& ${SETENV} ${MAKE_ENV} ./run_configure
 	@${FIND} ${WRKDIR}/plist/ -not -type d \
diff --git a/x11-drivers/input-wacom/distinfo b/x11-drivers/input-wacom/distinfo
index 92ee5f8f6375..70254fd1dc1f 100644
--- a/x11-drivers/input-wacom/distinfo
+++ b/x11-drivers/input-wacom/distinfo
@@ -1,4 +1,4 @@
 SHA256 (xorg/driver/bsdwacom-40.tbz) = 42c37d321768ff29fef10eb088a87a83c94753a1b4ae5f92fd453781039a5df9
 SIZE (xorg/driver/bsdwacom-40.tbz) = 19305
-SHA256 (xorg/driver/xf86-input-wacom-0.11.1.tar.bz2) = 9d32f94610f8faae3214227a8e8f050cd3b469b3fe9d60ef9272a884dcccb6ca
-SIZE (xorg/driver/xf86-input-wacom-0.11.1.tar.bz2) = 505180
+SHA256 (xorg/driver/xf86-input-wacom-0.15.0.tar.bz2) = 2e9b64c30fb223c46407bd0e105a54a1e83f378eb33ac68bd8a73fdbface000f
+SIZE (xorg/driver/xf86-input-wacom-0.15.0.tar.bz2) = 528528
diff --git a/x11-drivers/input-wacom/files/patch-configure.ac b/x11-drivers/input-wacom/files/patch-configure.ac
index d76adae28cbe..3ac3ac30719a 100644
--- a/x11-drivers/input-wacom/files/patch-configure.ac
+++ b/x11-drivers/input-wacom/files/patch-configure.ac
@@ -1,5 +1,5 @@
---- xf86-input-wacom-0.11.1/configure.ac.orig
-+++ xf86-input-wacom-0.11.1/configure.ac
+--- configure.ac.orig
++++ configure.ac
 @@ -56,7 +56,7 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 
  PKG_CHECK_MODULES(X11, x11 xi xrandr)
  
diff --git a/x11-drivers/input-wacom/files/patch-src-Makefile.in b/x11-drivers/input-wacom/files/patch-src-Makefile.in
index 3ff3402dd5d7..b71548003d27 100644
--- a/x11-drivers/input-wacom/files/patch-src-Makefile.in
+++ b/x11-drivers/input-wacom/files/patch-src-Makefile.in
@@ -1,5 +1,5 @@
---- xf86-input-wacom-0.11.1/src/Makefile.in.orig
-+++ xf86-input-wacom-0.11.1/src/Makefile.in
+--- src/Makefile.in.orig
++++ src/Makefile.in
 @@ -97,7 +97,7 @@ am__base_list = \
  am__installdirs = "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)"
  LTLIBRARIES = $(@DRIVER_NAME@_drv_la_LTLIBRARIES)
@@ -25,17 +25,16 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcmTouchFilter.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcmUSB.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcmValidateDevice.Plo@am__quote@
-@@ -438,13 +436,8 @@ wcmConfig.lo: $(top_srcdir)/src/wcmConfi
+@@ -467,12 +465,7 @@ wcmConfig.lo: $(top_srcdir)/src/wcmConfi
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wcmConfig.lo `test -f '$(top_srcdir)/src/wcmConfig.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmConfig.c
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wcmConfig.lo `test -f '$(top_srcdir)/src/wcmConfig.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmConfig.c
  
 -wcmISDV4.lo: $(top_srcdir)/src/wcmISDV4.c
 -@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wcmISDV4.lo -MD -MP -MF $(DEPDIR)/wcmISDV4.Tpo -c -o wcmISDV4.lo `test -f '$(top_srcdir)/src/wcmISDV4.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmISDV4.c
 -@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wcmISDV4.Tpo $(DEPDIR)/wcmISDV4.Plo
- @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/wcmISDV4.c' object='wcmISDV4.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/src/wcmISDV4.c' object='wcmISDV4.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wcmISDV4.lo `test -f '$(top_srcdir)/src/wcmISDV4.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmISDV4.c
+-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wcmISDV4.lo `test -f '$(top_srcdir)/src/wcmISDV4.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmISDV4.c
  
  wcmFilter.lo: $(top_srcdir)/src/wcmFilter.c
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wcmFilter.lo -MD -MP -MF $(DEPDIR)/wcmFilter.Tpo -c -o wcmFilter.lo `test -f '$(top_srcdir)/src/wcmFilter.c' || echo '$(srcdir)/'`$(top_srcdir)/src/wcmFilter.c
diff --git a/x11-drivers/input-wacom/files/patch-src-wcmConfig.c b/x11-drivers/input-wacom/files/patch-src-wcmConfig.c
index e14aa2fa082c..62bbda8bac56 100644
--- a/x11-drivers/input-wacom/files/patch-src-wcmConfig.c
+++ b/x11-drivers/input-wacom/files/patch-src-wcmConfig.c
@@ -1,5 +1,5 @@
---- xf86-input-wacom-0.11.1/src/wcmConfig.c.orig
-+++ xf86-input-wacom-0.11.1/src/wcmConfig.c
+--- src/wcmConfig.c.orig
++++ src/wcmConfig.c
 @@ -373,9 +373,12 @@ wcmDetectDeviceClass(const InputInfoPtr 
  		return TRUE;
  
diff --git a/x11-drivers/input-wacom/files/patch-src-wcmUSB.c b/x11-drivers/input-wacom/files/patch-src-wcmUSB.c
index 5595f84483a1..9f97ad748033 100644
--- a/x11-drivers/input-wacom/files/patch-src-wcmUSB.c
+++ b/x11-drivers/input-wacom/files/patch-src-wcmUSB.c
@@ -1,5 +1,5 @@
---- xf86-input-wacom-0.11.1/src/wcmUSB.c.orig
-+++ xf86-input-wacom-0.11.1/src/wcmUSB.c
+--- src/wcmUSB.c.orig
++++ src/wcmUSB.c
 @@ -23,10 +23,17 @@
  
  #include "xf86Wacom.h"
diff --git a/x11-drivers/input-wacom/files/patch-src-xf86WacomDefs.h b/x11-drivers/input-wacom/files/patch-src-xf86WacomDefs.h
index fdca8e8c5a14..dd7f3f5d55e0 100644
--- a/x11-drivers/input-wacom/files/patch-src-xf86WacomDefs.h
+++ b/x11-drivers/input-wacom/files/patch-src-xf86WacomDefs.h
@@ -1,9 +1,9 @@
---- xf86-input-wacom-0.11.1/src/xf86WacomDefs.h.orig
-+++ xf86-input-wacom-0.11.1/src/xf86WacomDefs.h
-@@ -23,7 +23,9 @@
- /*****************************************************************************
+--- src/xf86WacomDefs.h.orig
++++ src/xf86WacomDefs.h
+@@ -24,7 +24,9 @@
   * General Defines
   ****************************************************************************/
+ #include <wacom-util.h>
 +#ifndef __FreeBSD__
  #include <asm/types.h>
 +#endif
diff --git a/x11-drivers/input-wacom/files/patch-tools-Makefile.in b/x11-drivers/input-wacom/files/patch-tools-Makefile.in
index 15f672de7b87..882726d59df9 100644
--- a/x11-drivers/input-wacom/files/patch-tools-Makefile.in
+++ b/x11-drivers/input-wacom/files/patch-tools-Makefile.in
@@ -1,6 +1,6 @@
---- xf86-input-wacom-0.11.1/tools/Makefile.in.orig
-+++ xf86-input-wacom-0.11.1/tools/Makefile.in
-@@ -54,7 +54,7 @@ PRE_UNINSTALL = :
+--- tools/Makefile.in.orig
++++ tools/Makefile.in
+@@ -54,6 +54,6 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -8,4 +8,4 @@
 +bin_PROGRAMS = xsetwacom$(EXEEXT) 
  @UNITTESTS_TRUE@check_PROGRAMS = xsetwacom-test$(EXEEXT)
  subdir = tools
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
\ No newline at end of file
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in