Fri Mar 8 08:19:56 2019 UTC ()
XDM Xresources has been extended and the new values are important for proper
working of newer XDM. Check for the missing values and ask the user to
fix manually.


(martin)
diff -r1.222 -r1.223 src/usr.sbin/postinstall/postinstall
cvs diff -r1.222 -r1.223 src/usr.sbin/postinstall/Attic/postinstall (expand / switch to unified diff)

--- src/usr.sbin/postinstall/Attic/postinstall 2019/01/31 10:06:32 1.222
+++ src/usr.sbin/postinstall/Attic/postinstall 2019/03/08 08:19:56 1.223
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: postinstall,v 1.222 2019/01/31 10:06:32 msaitoh Exp $ 3# $NetBSD: postinstall,v 1.223 2019/03/08 08:19:56 martin Exp $
4# 4#
5# Copyright (c) 2002-2015 The NetBSD Foundation, Inc. 5# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
6# All rights reserved. 6# All rights reserved.
7# 7#
8# This code is derived from software contributed to The NetBSD Foundation 8# This code is derived from software contributed to The NetBSD Foundation
9# by Luke Mewburn. 9# by Luke Mewburn.
10# 10#
11# Redistribution and use in source and binary forms, with or without 11# Redistribution and use in source and binary forms, with or without
12# modification, are permitted provided that the following conditions 12# modification, are permitted provided that the following conditions
13# are met: 13# are met:
14# 1. Redistributions of source code must retain the above copyright 14# 1. Redistributions of source code must retain the above copyright
15# notice, this list of conditions and the following disclaimer. 15# notice, this list of conditions and the following disclaimer.
16# 2. Redistributions in binary form must reproduce the above copyright 16# 2. Redistributions in binary form must reproduce the above copyright
@@ -1845,26 +1845,32 @@ do_x11() @@ -1845,26 +1845,32 @@ do_x11()
1845 "contains files${_notfixed}" 1845 "contains files${_notfixed}"
1846 else 1846 else
1847 msg "Migrate ${sd} to ${td}${_notfixed}" 1847 msg "Migrate ${sd} to ${td}${_notfixed}"
1848 fi 1848 fi
1849 failed=1 1849 failed=1
1850 elif [ -e "${sd}" ]; then 1850 elif [ -e "${sd}" ]; then
1851 msg "Unexpected file ${sd}${_notfixed}" 1851 msg "Unexpected file ${sd}${_notfixed}"
1852 continue 1852 continue
1853 else 1853 else
1854 continue 1854 continue
1855 fi 1855 fi
1856 done 1856 done
1857 1857
 1858 # check if xdm resources have been updated
 1859 if ! ${GREP} 'inpColor:' ${_etcx11}/xdm/Xresources > /dev/null; then
 1860 msg "Update ${_etcx11}/xdm/Xresources${_notfixed}"
 1861 failed=1
 1862 fi
 1863
1858 return ${failed} 1864 return ${failed}
1859} 1865}
1860 1866
1861# 1867#
1862# xkb 1868# xkb
1863# 1869#
1864# /usr/X11R7/lib/X11/xkb/symbols/pc used to be a directory, but changed 1870# /usr/X11R7/lib/X11/xkb/symbols/pc used to be a directory, but changed
1865# to a file on 2009-06-12. Fixing this requires removing the directory 1871# to a file on 2009-06-12. Fixing this requires removing the directory
1866# (which we can do) and re-extracting the xbase set (which we can't do), 1872# (which we can do) and re-extracting the xbase set (which we can't do),
1867# or at least adding that one file (which we may be able to do if X11SRCDIR 1873# or at least adding that one file (which we may be able to do if X11SRCDIR
1868# is available). 1874# is available).
1869# 1875#
1870additem xkb "clean up for xkbdata to xkeyboard-config upgrade" 1876additem xkb "clean up for xkbdata to xkeyboard-config upgrade"