Moved $FreeBSD$ to its usual place after the CSRG id.

Fixed some style bugs for cam (superflous umask and missing newline).

Fixed bogons for apm.  The pattern "apm*" matched too many things; apm
and apmctl were both made twice by `MAKEDEV all'.  Hopefully no one
depends on `MAKEDEV apm0' making apm or on `MAKEDEV apm' making apmctl.

etc/MAKEDEV

@@ -20,6 +20,7 @@
 # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 #	@(#)MAKEDEV	5.2 (Berkeley) 6/22/90
+# $FreeBSD$
 #
 # Device "make" file.  Valid arguments:
 #	all	makes all known devices, standard number of units (or close)
@@ -131,8 +132,6 @@
 #	pci	PCI configuration-space access from user mode
 #	kbd	keyboard devices
 #
-# $FreeBSD$
-#
 
 if [ -n "$MAKEDEVPATH" ]; then
 	PATH="$MAKEDEVPATH"
@@ -606,7 +605,6 @@ targ[0-9]*)
 
 # CAM transport layer device
 xpt*)
-	umask 077
 	# This major number is temporary
 	chr=104
 	name=xpt
@@ -623,9 +621,9 @@ xpt*)
 		i=$(($i + 1))
 	done	
 	;;
+
 # CAM passthrough device
 pass*|uk*)
-	umask 077
 	# This major number is temporary
 	chr=31
 	name=pass
@@ -1293,13 +1291,15 @@ gsc*)
 	chmod 666 gsc${unit}*
 	;;
 
-apm*)
-	chr=39
-	mknod apm c $chr 0
-	mknod apmctl c $chr 8
+apm)
+	mknod apm c 39 0
 	chgrp operator apm
-	chgrp operator apmctl
 	chmod 660 apm
+	;;
+
+apmctl)
+	mknod apmctl c 39 8
+	chgrp operator apmctl
 	chmod 660 apmctl
 	;;