Move usr.bin/top/Makefile -> bin/Makefile, and tweak accordingly:

- bin (instead of usr.bin) follows ../README
- no point having a sub-subdir for a single reachover (bin vs bin/top),
  although we could debate the pros & cons of that endlessly.

external/bsd/top/Makefile

@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.1 2008/07/16 00:36:14 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2008/07/17 10:46:56 lukem Exp $
 
-SUBDIR=		usr.bin
+SUBDIR=		bin
 
 .include <bsd.subdir.mk>

external/bsd/top/bin/Makefile

@@ -1,11 +1,15 @@
-#	$NetBSD: Makefile,v 1.4 2008/07/16 14:29:11 christos Exp $
+#	$NetBSD: Makefile,v 1.1 2008/07/17 10:46:56 lukem Exp $
 
 .include <bsd.own.mk>
-PROG=	top
 
-TOPDIR=${.CURDIR}/../../dist
+PROG=	top
+BINDIR=	/usr/bin
+
+TOPDIR=${.CURDIR}/../dist
 .PATH:	${TOPDIR} ${TOPDIR}/machine
 
+WARNS=	0
+
 CPPFLAGS+=-I${.CURDIR} -I${TOPDIR} -I.
 SRCS=	color.c commands.c display.c hash.c screen.c \
 	top.c username.c utils.c version.c m_netbsd.c

external/bsd/top/usr.bin/Makefile

@@ -1,5 +0,0 @@
-#	$NetBSD: Makefile,v 1.1 2008/07/16 00:36:15 christos Exp $
-
-SUBDIR=	top
-
-.include <bsd.subdir.mk>

external/bsd/top/usr.bin/Makefile.inc

@@ -1,3 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2008/07/16 00:41:50 christos Exp $
-BINDIR?=/usr/bin
-WARNS?=0