Move to flat package hierarchy

Note to self: never try to move submodules again

To migrate your existing submodules (more or less):

	set -x
	set -e

	mkdir .git/modules/pkg
	for old in */*/src ; do
	        new="pkg/${old#*/}"
	        if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
			continue
		fi
		git -C ".git/modules/$old" config core.worktree "../../../../../$new"
		rmdir "$new"
		mv "$old" "$new"
	        sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
	        mv "$new/.git.tmp" "$new/.git"
		mkdir ".git/modules/${new%/src}"
	        mv ".git/modules/$old" ".git/modules/$new"

		rm "${old%/src}"/*.ninja
		mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
		rmdir "${old%/src}" || true
	done
	sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
	mv .git/config.tmp .git/config

1 files changed, 282 insertions, 0 deletions

diff --git a/pkg/file/magic.txt b/pkg/file/magic.txt
new file mode 100644
index 00000000..89286288
--- /dev/null
+++ b/pkg/file/magic.txt
@@ -0,0 +1,282 @@
+# <cd src/magic/Magdir && printf '%s\n' *
+acorn
+adi
+adventure
+algol68
+allegro
+alliant
+alpha
+amanda
+amigaos
+android
+animation
+aout
+apl
+apple
+application
+applix
+apt
+archive
+assembler
+asterix
+att3b
+audio
+basis
+ber
+bflt
+bioinformatics
+blackberry
+blcr
+blender
+blit
+bout
+bsdi
+bsi
+btsnoop
+c-lang
+c64
+cad
+cafebabe
+cbor
+cddb
+chord
+cisco
+citrus
+clarion
+claris
+clipper
+coff
+commands
+communications
+compress
+console
+convex
+coverage
+cracklib
+ctags
+ctf
+cubemap
+cups
+dact
+database
+der
+diamond
+diff
+digital
+dolby
+dump
+dyadic
+ebml
+editors
+efi
+elf
+encore
+epoc
+erlang
+esri
+etf
+fcs
+filesystems
+finger
+flash
+flif
+fonts
+fortran
+frame
+freebsd
+fsav
+fusecompress
+games
+gcc
+geo
+geos
+gimp
+gnome
+gnu
+gnumeric
+gpt
+grace
+graphviz
+gringotts
+guile
+hitachi-sh
+hp
+human68k
+ibm370
+ibm6000
+icc
+iff
+images
+inform
+intel
+interleaf
+island
+ispell
+isz
+java
+javascript
+jpeg
+karma
+kde
+keepass
+kerberos
+kml
+lecter
+lex
+lif
+linux
+lisp
+llvm
+lua
+luks
+m4
+mach
+macintosh
+macos
+magic
+mail.news
+make
+map
+maple
+marc21
+mathcad
+mathematica
+matroska
+mcrypt
+mercurial
+metastore
+meteorological
+microfocus
+mime
+mips
+mirage
+misctools
+mkid
+mlssa
+mmdf
+modem
+motorola
+mozilla
+msdos
+msooxml
+msvc
+msx
+mup
+music
+nasa
+natinst
+ncr
+neko
+netbsd
+netscape
+netware
+news
+nitpicker
+oasis
+ocaml
+octave
+ole2compounddocs
+olf
+os2
+os400
+os9
+osf1
+palm
+parix
+parrot
+pascal
+pbf
+pbm
+pc88
+pc98
+pdf
+pdp
+perl
+pgf
+pgp
+pkgadd
+plan9
+plus5
+polyml
+printer
+project
+psdbms
+psl
+pulsar
+pwsafe
+pyramid
+python
+qt
+revision
+riff
+rinex
+rpm
+rtf
+ruby
+sc
+sccs
+scientific
+securitycerts
+selinux
+sendmail
+sequent
+sereal
+sgi
+sgml
+sharc
+sinclair
+sisu
+sketch
+smalltalk
+smile
+sniffer
+softquad
+spec
+spectrum
+sql
+ssh
+ssl
+sun
+symbos
+sysex
+tcl
+teapot
+terminfo
+tex
+tgif
+ti-8x
+timezone
+troff
+tuxedo
+typeset
+unicode
+unknown
+uterus
+uuencode
+vacuum-cleaner
+varied.out
+varied.script
+vax
+vicar
+virtual
+virtutech
+visx
+vms
+vmware
+vorbis
+vxl
+warc
+weak
+windows
+wireless
+wordprocessors
+wsdl
+x68000
+xdelta
+xenix
+xilinx
+xo65
+xwindows
+zfs
+zilog
+zyxel