Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

1 files changed, 9 insertions, 9 deletions

diff --git a/source/a/gpm/setup.mouse b/source/a/gpm/setup.mouse
index dcdc6a8f9..4703671ff 100644
--- a/source/a/gpm/setup.mouse
+++ b/source/a/gpm/setup.mouse
@@ -4,8 +4,8 @@ T_PX=$1
 TMP=/var/log/setup/tmp
 GPM=/usr/sbin/gpm
 # If the mouse is USB, we can autodetect it:
-if [ -r /proc/bus/usb/devices ]; then
- if cat /proc/bus/usb/devices | grep usb_mouse 1> /dev/null 2> /dev/null ; then
+if [ -r /proc/bus/input/devices ]; then
+ if grep -B3 Handlers=mouse /proc/bus/input/devices | grep Phys=usb 1>/dev/null 2>/dev/null; then
   MOUSE_TYPE=usb
   MTYPE="imps2"
   ( cd $T_PX/dev ; rm -f mouse ; ln -sf input/mice mouse )
@@ -15,11 +15,11 @@ fi
 if [ "$MOUSE_TYPE" = "" ]; then
  dialog --title "MOUSE CONFIGURATION" --default-item "imps2" --menu \
 "This part of the configuration \
-process will create a /dev/mouse link pointing to your default mouse device.  \
+process will create a /dev/mouse link pointing to your default mouse device. \
 You can change the /dev/mouse link later if the mouse doesn't work, or if \
-you switch to a different type of pointing device.  We will also use the \
+you switch to a different type of pointing device. We will also use the \
 information about the mouse to set the correct protocol for gpm, the Linux \
-mouse server.  Please select a mouse type \
+mouse server. Please select a mouse type \
 from the list below:" 20 76 8 \
  "ps2" "PS/2 port mouse (most desktops and laptops)" \
  "usb" "USB connected mouse" \
@@ -124,13 +124,13 @@ else # assume \$1 = start:
 fi
 
 # There is another way to run GPM, where it acts as a repeater outputting a
-# virtual MouseSystems mouse on /dev/gpmdata.  This is useful for feeding
+# virtual MouseSystems mouse on /dev/gpmdata. This is useful for feeding
 # gpm's data to X, especially if you've got a busmouse (in that situation X
-# and gpm may not coexist without using a repeater).  To try running a GPM
+# and gpm may not coexist without using a repeater). To try running a GPM
 # repeater for X, change the gpm command line to look like this:
 # $GPM -R msc -m /dev/mouse -t $MTYPE
 # Then, make sure that the mouse configuration in your XF86Config file refers
-# to the repeater device (/dev/gpmdata) and a MouseSystems mouse type.  If you
+# to the repeater device (/dev/gpmdata) and a MouseSystems mouse type. If you
 # edit the file directly, you'll want the lines to look like this (minus the
 # comment marks '#' shown here, of course):
 #Section "Pointer"
@@ -142,7 +142,7 @@ chmod 755 $T_PX/etc/rc.d/rc.gpm-sample
 # Now ask if this should be the new rc.gpm:
  dialog --title "GPM CONFIGURATION" --yesno \
 "The gpm program allows you to cut and paste text on\n\
-the virtual consoles using a mouse.  If you choose to\n\
+the virtual consoles using a mouse. If you choose to\n\
 run it at boot time, this line will be added to your\n\
 /etc/rc.d/rc.gpm:\n\
 \n\