Date: Sat, 24 Jan 2009 14:41:53 GMT From: Dominic Fandrey <kamikaze@bsdforen.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/130946: [maintainer-update] x11-drivers/input-wacom Message-ID: <200901241441.n0OEfrdo085129@www.freebsd.org> Resent-Message-ID: <200901241450.n0OEo1NQ051841@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 130946
>Category: ports
>Synopsis: [maintainer-update] x11-drivers/input-wacom
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 24 14:50:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Dominic Fandrey
>Release: RELENG_7
>Organization:
private
>Environment:
FreeBSD mobileKamikaze.norad 7.1-STABLE FreeBSD 7.1-STABLE #0: Tue Jan 13 17:15:12 CET 2009 root@mobileKamikaze.norad:/usr/obj/HP6510b/amd64/usr/src/sys/HP6510b amd64
>Description:
Update to the latest driver release.
>How-To-Repeat:
>Fix:
diff -Pur ports/x11-drivers/input-wacom.orig/Makefile ports/x11-drivers/input-wacom/Makefile
--- ports/x11-drivers/input-wacom.orig/Makefile 2009-01-21 11:16:38.000000000 +0100
+++ ports/x11-drivers/input-wacom/Makefile 2009-01-21 11:26:06.000000000 +0100
@@ -6,10 +6,10 @@
#
PORTNAME= input-wacom
-PORTVERSION= ${WACOM_VERSION:C/-/./g}.${KLD_VERSION}
+PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g}
CATEGORIES= x11-drivers kld
MASTER_SITES= http://www.chillt.de/bsdwacom/ \
- ${MASTER_SITE_SOURCEFORGE}
+ SF
MASTER_SITE_SUBDIR= linuxwacom
DISTFILES= ${BSDWACOM}.tbz \
${LINUXWACOM}.tar.bz2
@@ -41,8 +41,8 @@
LINUXWACOM= linuxwacom-${WACOM_VERSION}
BSDWACOM= bsdwacom-${KLD_VERSION}
-WACOM_VERSION= 0.8.1-3
-KLD_VERSION= 38
+WACOM_VERSION= 0.8.2-2
+KLD_VERSION= 40
OPTIONS= UWACOMKLD "Install USB kernel module" On
diff -Pur ports/x11-drivers/input-wacom.orig/distinfo ports/x11-drivers/input-wacom/distinfo
--- ports/x11-drivers/input-wacom.orig/distinfo 2009-01-21 11:16:38.000000000 +0100
+++ ports/x11-drivers/input-wacom/distinfo 2009-01-21 11:23:51.000000000 +0100
@@ -1,6 +1,6 @@
-MD5 (xorg/driver/bsdwacom-38.tbz) = fae10723e12b5bfc5daea411639f0ed4
-SHA256 (xorg/driver/bsdwacom-38.tbz) = 0d9027b5d781cd520ebe41287b388973465e8d62109c5d3f52d68f12ede03507
-SIZE (xorg/driver/bsdwacom-38.tbz) = 19993
-MD5 (xorg/driver/linuxwacom-0.8.1-3.tar.bz2) = d09b212946e321cc503adf84e243ca99
-SHA256 (xorg/driver/linuxwacom-0.8.1-3.tar.bz2) = cf1ac159d87666d16e2e3bfad81ede93e088b3bf64bb6d2d469adceb2a4c9dee
-SIZE (xorg/driver/linuxwacom-0.8.1-3.tar.bz2) = 1209228
+MD5 (xorg/driver/bsdwacom-40.tbz) = 022a5225cca8bbf3af1014d32d5c12de
+SHA256 (xorg/driver/bsdwacom-40.tbz) = 42c37d321768ff29fef10eb088a87a83c94753a1b4ae5f92fd453781039a5df9
+SIZE (xorg/driver/bsdwacom-40.tbz) = 19305
+MD5 (xorg/driver/linuxwacom-0.8.2-2.tar.bz2) = bdfaf6da49b446e251ac1f98754a89a2
+SHA256 (xorg/driver/linuxwacom-0.8.2-2.tar.bz2) = 1d3b8dc397510309b14239291781135af0c4fab99907d8e0b8aad95465390733
+SIZE (xorg/driver/linuxwacom-0.8.2-2.tar.bz2) = 1098067
diff -Pur ports/x11-drivers/input-wacom.orig/files/patch-linuxwacom-run_configure ports/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure
--- ports/x11-drivers/input-wacom.orig/files/patch-linuxwacom-run_configure 2009-01-21 11:16:38.000000000 +0100
+++ ports/x11-drivers/input-wacom/files/patch-linuxwacom-run_configure 2009-01-21 11:27:57.000000000 +0100
@@ -1,8 +1,11 @@
---- linuxwacom/run_configure.orig 2008-11-18 22:53:45.000000000 +0100
-+++ linuxwacom/run_configure 2008-11-18 22:56:25.000000000 +0100
-@@ -13,4 +13,4 @@
- cp files/input.h linuxwacom-0.8.1-3/src/xdrv/linux
- cd linuxwacom-0.8.1-3
- patch < ../files/patch_configure
--./configure --with-linux=yes --with-tcl=/usr/local/include/tcl8.4 --with-tk=/usr/local/include/tk8.4 CFLAGS="-I/usr/local/include"
-+./configure --with-linux=yes --with-tcl=/usr/local/include/tcl8.4 --with-tk=/usr/local/include/tk8.4 CFLAGS="-I/usr/local/include" --prefix=${PREFIX} --enable-dlloader
+--- linuxwacom/run_configure.orig 2009-01-21 11:26:52.000000000 +0100
++++ linuxwacom/run_configure 2009-01-21 11:27:00.000000000 +0100
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # $Id: run_configure 40 2008-12-26 01:08:35Z undo $
+
+-LINUXWACOM=0.8.2
++LINUXWACOM=0.8.2-2
+
+ rm -rf linuxwacom-${LINUXWACOM}
+ tar xf linuxwacom-${LINUXWACOM}.tar.bz2
diff -Pur ports/x11-drivers/input-wacom.orig/files/wacom.in ports/x11-drivers/input-wacom/files/wacom.in
--- ports/x11-drivers/input-wacom.orig/files/wacom.in 2009-01-21 11:16:38.000000000 +0100
+++ ports/x11-drivers/input-wacom/files/wacom.in 2009-01-21 14:04:18.000000000 +0100
@@ -6,13 +6,18 @@
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
# to enable this service:
#
-# wacom_enable (bool): Set to NO by default.
-# Set it to YES to enable wacom.
+# wacom_enable (bool): Set to NO by default.
+# Set it to YES to enable wacom.
+# wacom_types (list): Set to "stylus eraser cursor pad touch" by
+# default. A list of wacom profiles to set up.
+# wacom_porttype (enum): Set to "%%PORTTYPE%%" by default.
+# Set this to usb or serial.
#
# This script additionally offers setup and cleanup to configure Xorg
# for use of the driver or remove the configuration settings.
# The input devices are only added to the first ServerLayout section
# and also only removed once.
+# In USB mode the file /boot/loader.conf is also adjusted.
#
. %%RC_SUBR%%
@@ -286,6 +291,14 @@
section_insert_line "$config" "ServerLayout" " InputDevice \"$ident\" \"SendCoreEvents\""
}
+ if [ "$(eval "echo \${${name}_porttype}")" = "usb" ]; then
+ if ! /usr/bin/grep -qx 'uwacom_load="YES"' \
+ /boot/loader.conf; then
+ echo "Setting up /boot/loader.conf"
+ /bin/cp /boot/loader.conf /boot/loader.conf.orig
+ echo 'uwacom_load="YES"' >> /boot/loader.conf
+ fi
+ fi
}
#
@@ -381,11 +394,21 @@
/bin/rm "$config.$$"
done
}
+
+ if [ "$(eval "echo \${${name}_porttype}")" = "usb" ]; then
+ if /usr/bin/grep -qx 'uwacom_load="YES"' \
+ /boot/loader.conf; then
+ echo "Cleaning up /boot/loader.conf"
+ /bin/cp /boot/loader.conf /boot/loader.conf.orig
+ /usr/bin/grep -xv 'uwacom_load="YES"' \
+ /boot/loader.conf.orig > /boot/loader.conf
+ fi
+ fi
+
}
do_start() {
if /sbin/kldstat | /usr/bin/grep -q uwacom; then
- echo "${name} is already running."
return 0
fi
echo "Starting ${name}."
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901241441.n0OEfrdo085129>