summaryrefslogtreecommitdiff
path: root/x11-drivers
diff options
context:
space:
mode:
authorNorikatsu Shigemura <nork@FreeBSD.org>2008-02-19 17:20:21 +0000
committerNorikatsu Shigemura <nork@FreeBSD.org>2008-02-19 17:20:21 +0000
commit64c2e6db28cf3c6309045213f87cf5819e37afca (patch)
tree97cdc681204211f8b6d3e01956ec8e044028f3b4 /x11-drivers
parentUse sysctl for getting swap related information. Now, GKrellM doesn't (diff)
o Fix invalid synaptics issue with x11-drivers/xf86-input-void
driver by displaing NOTICE on pkg-message. o Fix invalid compiling on amd64. PR: ports/120783 Submitted and Summraized by: Eygene Ryabinkin rea-fbsd a codelabs.ru
Notes
Notes: svn path=/head/; revision=207590
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/synaptics/files/patch-Makefile3
-rw-r--r--x11-drivers/synaptics/pkg-message12
2 files changed, 10 insertions, 5 deletions
diff --git a/x11-drivers/synaptics/files/patch-Makefile b/x11-drivers/synaptics/files/patch-Makefile
index 1ae3cbea89ad..f57b5dba5316 100644
--- a/x11-drivers/synaptics/files/patch-Makefile
+++ b/x11-drivers/synaptics/files/patch-Makefile
@@ -8,7 +8,8 @@
+ ARCH = $(shell uname -m)
endif
ifeq ($(ARCH),amd64)
- ARCH = x86_64
+- ARCH = x86_64
++ override ARCH = x86_64
endif
ifeq ($(ARCH),x86_64)
ARCH_DEFINES = -D__x86_64__ -D_XSERVER64
diff --git a/x11-drivers/synaptics/pkg-message b/x11-drivers/synaptics/pkg-message
index 7f6039d68c45..fb6808b99934 100644
--- a/x11-drivers/synaptics/pkg-message
+++ b/x11-drivers/synaptics/pkg-message
@@ -2,10 +2,6 @@
* SETUP NOTE * SETUP NOTE *
-o Please remove ${X11BASE}/lib/modules/input/synaptics_drv.so
- manually, If you have installed synaptics-0.14.4_1. I forgot
- to chase pkg-plist on 0.14.4_1.
-
o Add boot time tunable to /boot/loader.conf.
Set hw.psm.synaptics_support=1 and shutdown -r now!
@@ -29,6 +25,9 @@ o Set your /etc/xorg.conf (or /etc/XF86Config)
Please disable your existing "CorePointer" in "ServerLayout"
section, only use "Synaptics_Touchpad" CorePointer.
+ * IMPORTANT NOTICE *
+ Please set *AllowEmptyInput* option at ServerFlags section.
+
/etc/xorg.conf (or /etc/XF86Config) ---------------
:
Section "Module"
@@ -36,6 +35,11 @@ Section "Module"
Load "synaptics"
EndSection
+Section "ServerFlags"
+ :
+ Option "AllowEmptyInput"
+EndSection
+
Section "ServerLayout"
:
# InputDevice "Standard_PS/2_Mouse" "CorePointer"