top(1): Take out from the contrib.
authorzrj <rimvydas.jasinskas@gmail.com>
Mon, 4 Mar 2019 17:31:30 +0000 (19:31 +0200)
committerzrj <zrj@dragonflybsd.org>
Mon, 4 Mar 2019 18:38:12 +0000 (20:38 +0200)
There are several issues:
  * many local modification;
  * no new releases by upstream;
  * vendor/TOP branch was created incorrectly.

Last reason alone is enough to perform this, because vendor/TOP branch
needs to be recreated to prevent future source repository incidents.

In-discussion-with: swildner

26 files changed:
usr.bin/top/Makefile
usr.bin/top/boolean.h [moved from contrib/top/boolean.h with 100% similarity]
usr.bin/top/color.c [moved from contrib/top/color.c with 100% similarity]
usr.bin/top/color.h [moved from contrib/top/color.h with 100% similarity]
usr.bin/top/commands.c [moved from contrib/top/commands.c with 100% similarity]
usr.bin/top/commands.h [moved from contrib/top/commands.h with 100% similarity]
usr.bin/top/display.c [moved from contrib/top/display.c with 100% similarity]
usr.bin/top/display.h [moved from contrib/top/display.h with 100% similarity]
usr.bin/top/globalstate.h [moved from contrib/top/globalstate.h with 100% similarity]
usr.bin/top/hash.c [moved from contrib/top/hash.c with 100% similarity]
usr.bin/top/hash.h [moved from contrib/top/hash.h with 100% similarity]
usr.bin/top/layout.h [moved from contrib/top/layout.h with 100% similarity]
usr.bin/top/loadavg.h [moved from contrib/top/loadavg.h with 100% similarity]
usr.bin/top/machine.h [moved from contrib/top/machine.h with 100% similarity]
usr.bin/top/message.h [moved from contrib/top/message.h with 100% similarity]
usr.bin/top/os.h [moved from contrib/top/os.h with 100% similarity]
usr.bin/top/screen.c [moved from contrib/top/screen.c with 100% similarity]
usr.bin/top/screen.h [moved from contrib/top/screen.h with 100% similarity]
usr.bin/top/top.c [moved from contrib/top/top.c with 100% similarity]
usr.bin/top/top.h [moved from contrib/top/top.h with 100% similarity]
usr.bin/top/username.c [moved from contrib/top/username.c with 100% similarity]
usr.bin/top/username.h [moved from contrib/top/username.h with 100% similarity]
usr.bin/top/utils.c [moved from contrib/top/utils.c with 100% similarity]
usr.bin/top/utils.h [moved from contrib/top/utils.h with 100% similarity]
usr.bin/top/version.c [moved from contrib/top/version.c with 100% similarity]
usr.bin/top/version.h [moved from contrib/top/version.h with 100% similarity]

index 8003a6a..042db1d 100644 (file)
@@ -1,11 +1,8 @@
 # $FreeBSD: src/usr.bin/top/Makefile,v 1.5.6.2 2002/08/11 17:09:54 dwmalone Exp $
 PROG=  top
 
-TOPDIR=        ${.CURDIR}/../../contrib/top
-.PATH: ${TOPDIR}
-
 CFLAGS+= -DHAVE_GETOPT -DHAVE_STRERROR -I${.CURDIR} -I${.OBJDIR} \
-                -I${TOPDIR} -I. -DORDER
+                -I. -DORDER
 
 .if ${MACHINE_ARCH} == "x86_64"
 CFLAGS+=-D_ENABLEX64
similarity index 100%
rename from contrib/top/boolean.h
rename to usr.bin/top/boolean.h
similarity index 100%
rename from contrib/top/color.c
rename to usr.bin/top/color.c
similarity index 100%
rename from contrib/top/color.h
rename to usr.bin/top/color.h
similarity index 100%
rename from contrib/top/display.c
rename to usr.bin/top/display.c
similarity index 100%
rename from contrib/top/display.h
rename to usr.bin/top/display.h
similarity index 100%
rename from contrib/top/hash.c
rename to usr.bin/top/hash.c
similarity index 100%
rename from contrib/top/hash.h
rename to usr.bin/top/hash.h
similarity index 100%
rename from contrib/top/layout.h
rename to usr.bin/top/layout.h
similarity index 100%
rename from contrib/top/loadavg.h
rename to usr.bin/top/loadavg.h
similarity index 100%
rename from contrib/top/machine.h
rename to usr.bin/top/machine.h
similarity index 100%
rename from contrib/top/message.h
rename to usr.bin/top/message.h
similarity index 100%
rename from contrib/top/os.h
rename to usr.bin/top/os.h
similarity index 100%
rename from contrib/top/screen.c
rename to usr.bin/top/screen.c
similarity index 100%
rename from contrib/top/screen.h
rename to usr.bin/top/screen.h
similarity index 100%
rename from contrib/top/top.c
rename to usr.bin/top/top.c
similarity index 100%
rename from contrib/top/top.h
rename to usr.bin/top/top.h
similarity index 100%
rename from contrib/top/utils.c
rename to usr.bin/top/utils.c
similarity index 100%
rename from contrib/top/utils.h
rename to usr.bin/top/utils.h
similarity index 100%
rename from contrib/top/version.c
rename to usr.bin/top/version.c
similarity index 100%
rename from contrib/top/version.h
rename to usr.bin/top/version.h