I finally got close to -current.  Installed a new kernel and userland
and now I'm trying to get my /etc stuff updated.  Running into a few
problems:

1. etcupdate complains about

	install: /tmp/temproot/etc/powerd/scripts: mkstemp: No such
	file or directory

   If I manually mkdir /tmp/temproot/etc/powerd and then mkdir
   /tmp/temproot/etc/powerd/scripts and rerun (telling it not to
   continue with the aborted update and not to remove /tmp/temproot)
   it will then proceed to problem #2

2. For every file which is different and a merge is attempted, I get

	sdiff: subsidiary program `ed' failed

   at the end of the merge.

3. postinstall also has a problem - when I run

	# /usr/src/etc/postinstall -s /usr/src -d / fix makedev
	Source directory: /usr/src
	Target directory: /
	makedev fix:
	        Can't find source directory for MAKEDEV

I'm obviously missing something important but I have no idea what it
might be.  Clue-by-four up against the head would be appreciated!

----------------------------------------------------------------------
|   Paul Goyette   | PGP DSS Key fingerprint: |  E-mail addresses:   |
| Network Engineer | FA29 0E3B 35AF E8AE 6651 |  paul@whooppee.com   |
|  & World Cruiser | 0786 F758 55DE 53BA 7731 | pgoyette@juniper.net |
----------------------------------------------------------------------