diff --git a/astronaut/astrohelp b/astronaut/astrohelp
index 8aa4bfc..3726c6a 100755
--- a/astronaut/astrohelp
+++ b/astronaut/astrohelp
@@ -24,6 +24,8 @@ function="$2"
 # Functions reused in all wrappers
 global="$(printf '
     download_only=true
+    name_sat="%s"
+    name="$name_sat"
 
     import() {
         . "%s/functions/$1.sh"
@@ -32,7 +34,7 @@ global="$(printf '
     # Allowed external utility commands
     cut() { "%s" "$@"; }
     expr() { "%s" "$@"; }
-' "$(dirname "$satellite")" "$(command -v cut)" "$(command -v expr)")"
+' "$(basename "$satellite" .sat)" "$(dirname "$satellite")" "$(command -v cut)" "$(command -v expr)")"
 
 if [ "$function" = "variable" ]; then
     name="$3"
@@ -42,7 +44,7 @@ if [ "$function" = "variable" ]; then
     fi
 
     printf "$global"'
-        header_end() {
+        _() {
             variable="$%s"
             [ "$variable" ] && echo "$variable"
             exit $?
@@ -60,7 +62,7 @@ elif [ "$function" = "downloads" ]; then
         dlfile() {
             [ "$1" ] && echo "$1"
         }
-        header_end() { exit 0; }
+        _() { exit 0; }
         . %s
     ' "$satellite" | PATH= /bin/sh 2> /dev/null
 elif [ "$function" = "options" ]; then
@@ -68,7 +70,7 @@ elif [ "$function" = "options" ]; then
         define_option() {
             [ "$1" ] && echo "$1"
         }
-        header_end() { exit 0; }
+        _() { exit 0; }
         . %s
     ' "$satellite" | PATH= /bin/sh 2> /dev/null
 else
diff --git a/astronaut/astronaut b/astronaut/astronaut
index ccb57b5..98f025b 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -1,7 +1,7 @@
 #!/bin/sh
-set -e
+set -eu
 
-# Configuration
+# Astronaut configuration
 
 # Build/install-time directories
 dir_build='/tmp/astronaut/build'  # Temporary directory to build packages
@@ -9,8 +9,6 @@ dir_source='/tmp/astronaut/source'  # Directory where the package sources will b
 dir_install='/tmp/astronaut/install'  # Directory where the package will be installed
 # The source directory will have subdirs for each different $name,
 #   specified inside the satellite file.
-# The $dir_install variable will have '{pkg}' replaced with $_satname,
-#   which is the filename of the satellite, without the .sat suffix.
 
 # Runtime directories
 dir_prefix='usr'  # Prefix directory
@@ -18,17 +16,17 @@ dir_prefix='usr'  # Prefix directory
 # Finer-grained control of runtime dirs
 # This can't be set from the command line, but might need to be adapted for your distro.
 
-dir_bindir='bin'
-dir_sbindir='sbin'
-dir_libexecdir='libexec'
-dir_sysconfdir='etc'
-dir_libdir='lib'
-dir_includedir='include'
-dir_datadir='share'
-dir_infodir='share/info'
-dir_localedir='share/locale'
-dir_mandir='share/man'
-dir_docdir='share/doc'
+dir_bin='bin'
+dir_sbin='sbin'
+dir_libexec='libexec'
+dir_sysconf='etc'
+dir_lib='lib'
+dir_include='include'
+dir_data='share'
+dir_info='share/info'
+dir_locale='share/locale'
+dir_man='share/man'
+dir_doc='share/doc'
 
 # Default commands
 cmd_download='curl -# -L -o {dst} {src}'  # Command to execute to download files
@@ -56,13 +54,11 @@ package_options() { :; }  # Per-package options function.
 
 # Options not in the configuration
 download_only=false
-_vcs_only=false
-_nuke_dir_install=false
-_user_options=  # Options specified in the command line get the highest priority
-_sat_options=  # Options defined by the satellite
+_astronaut_vcs_only=false
+_astronaut_nuke_install=false
+_astronaut_options_user=  # Options specified in the command line get the highest priority
 
 # Should be specified in the satellite
-name=
 version=
 update_url=
 vcs_compile=false
@@ -92,18 +88,18 @@ Usage: $0 [-bsip <dir>] [-hIdv] [-o <options>] <satellite>...
 -v   Only build vcs package if any updates have been made to it
 -o   Set package options (comma-separated)
 
-Tips:$([ "$(basename "$0")" = "astronaut" ] && printf "\n- Use \`head -n 51 $0 > astronaut.conf.example\` to generate a default configuration file.")
+Tips:$([ "$(basename "$0")" = "astronaut" ] && printf "\n- Use \`head -n 49 $0 | tail -n +4 > astronaut.conf.example\` to generate a default configuration file.")
 - Keep in mind that when specifying options on the command line in a string, the first always takes priority.
     For example, in \"opt,someotheropt,!opt\", opt is enabled, due to it being the first occurrence.
 - If you have set \$dir_satellites in the config, you can omit the .sat suffix.
 "
 }
 
-_msg() {
+_astronaut_msg() {
     echo "=> $@"
 }
 
-_exiterr() {
+_astronaut_error() {
     echo "===> Houston, we've got a problem: $@" 1>&2
     exit 1
 }
@@ -115,37 +111,23 @@ while getopts "h?s:b:i:p:Idvo:" opt; do
             _show_help
             exit 0
             ;;
-        s)
-            dir_source="$OPTARG"
-            ;;
-        b)
-            dir_build="$OPTARG"
-            ;;
-        i)
-            dir_install="$OPTARG"
-            ;;
-        p)
-            dir_prefix="$OPTARG"
-            ;;
-        I)
-            _nuke_dir_install=true
-            ;;
-        d)
-            download_only=true
-            ;;
-        v)
-            _vcs_only=true
-            ;;
-        o)
-            _user_options="$OPTARG,$_user_options"
-            ;;
+
+        s) dir_source="$OPTARG" ;;
+        b) dir_build="$OPTARG" ;;
+        i) dir_install="$OPTARG" ;;
+        p) dir_prefix="$OPTARG" ;;
+
+        I) _astronaut_nuke_install=true ;;
+        d) download_only=true ;;
+        v) _astronaut_vcs_only=true ;;
+        o) _astronaut_options_user="$OPTARG,$_astronaut_options_user" ;;
     esac
 done
 
 shift $(expr $OPTIND - 1)
-[ "$1" = "--" ] && shift
+[ "$#" -ge 1 ] && [ "$1" = "--" ] && shift
 
-if [ ! "$1" ]; then
+if [ "$#" -lt 1 ]; then
     _show_help
     exit 1
 fi
@@ -162,29 +144,29 @@ safe_sed() {
 download() {
     mkdir -p "$dir_source/$name"
 
-    [ "$3" ] && local filename="$3" || local filename="$(basename $(echo "$1" | cut -d? -f1))"
+    [ "$#" -ge 3 ] && local filename="$3" || local filename="$(basename $(echo "$1" | cut -d? -f1))"
     local path="$dir_source/$name/$filename"
 
-    if [ ! -e "$path" -o "$(_mksum "$path")" != "$2" ]; then
-        _msg "Downloading $filename"
+    if [ ! -e "$path" ] || [ "$#" -ge 2 -a "$(_mksum "$path")" != "$2" ]; then
+        _astronaut_msg "Downloading $filename"
 
-        [ "$4" ] && local cmd="$4" || local cmd="$cmd_download"
+        [ "$#" -ge 4 ] && local cmd="$4" || local cmd="$cmd_download"
         eval $(echo "$cmd" | sed -e "s/{dst}/'$(safe_sed "$path")'/g" -e "s/{src}/'$(safe_sed "$1")'/g")
 
         local checksum="$(_mksum "$path")"
-        if [ "$2" -a "$checksum" != "$2" ]; then
-            _msg "Checksum: $checksum"
-            _exiterr 'Checksum failed'
+        if [ "$#" -ge 2 -a "$checksum" != "$2" ]; then
+            _astronaut_msg "Checksum: $checksum"
+            _astronaut_error 'Checksum failed'
         fi
     elif [ ! -f "$path" ]; then
-        _exiterr "'$path' exists but isn't a file?"
+        _astronaut_error "'$path' exists but isn't a file?"
     fi
 }
 
 extract() {
-    _msg "Extracting $1"
-    [ "$2" ] && local dest="$2" || local dest='.'
-    [ "$3" ] && local cmd="$3" || local cmd="$cmd_extract"
+    _astronaut_msg "Extracting $1"
+    [ "$#" -ge 2 ] && local dest="$2" || local dest='.'
+    [ "$#" -ge 3 ] && local cmd="$3" || local cmd="$cmd_extract"
     eval $(echo "$cmd" | sed -e "s/{src}/'$(safe_sed "$dir_source/$name/$1")'/g" -e "s/{dst}/'$(safe_sed "$dest")'/g")
 }
 
@@ -193,7 +175,7 @@ getfile() {
 }
 
 extrafile() {
-    local dir="$(dirname "$_satellite")"
+    local dir="$(dirname "$_astronaut_satellite")"
     [ -d "$dir/extrafiles" ] && local dir="$dir/extrafiles/$name" || true
 
     cp -a "$dir/$1" "./$1"
@@ -247,8 +229,8 @@ option() {
 
         if [ "$option" = "$check" ]; then
             if [ "$variable" = true -a "$option_variable" = false ]; then
-                _msg 'Tip: Define the option as option=value.' 1>&2
-                _exiterr "Satellite requested a variable option, but there was no value for option: '$option'."
+                _astronaut_msg 'Tip: Define the option as option=value.' 1>&2
+                _astronaut_error "Satellite requested a variable option, but there was no value for option: '$option'."
             fi
 
             [ "$option_negate" = true ] && local enabled=false || local enabled=true
@@ -258,8 +240,8 @@ option() {
     done
 
     if [ "$found" = false ]; then
-        _msg 'Tip: Make sure to define every option you use in the satellite.' 1>&2
-        _exiterr "Option '$check' was nowhere to be found."
+        _astronaut_msg 'Tip: Make sure to define every option you use in the satellite.' 1>&2
+        _astronaut_error "Option '$check' was nowhere to be found."
     fi
 
     if [ "$variable" = true ]; then
@@ -272,7 +254,7 @@ option() {
         [ "$enabled" = true ] && local enabled=false || local enabled=true
     fi
 
-    if [ "$1" ]; then
+    if [ "$#" -ge 1 ]; then
         if [ "$enabled" = true ]; then
             "$@"
         fi
@@ -287,13 +269,13 @@ define_option() {
 }
 
 import() {
-    . "$(dirname "$_satellite")/functions/$1.sh"
+    . "$(dirname "$_astronaut_satellite")/functions/$1.sh"
 }
 
 # Set some functions in accordance to the different options.
-header_end() { :; }
-if [ "$_vcs_only" = true ]; then
-    header_end() {
+_() { :; }
+if [ "$_astronaut_vcs_only" = true ]; then
+    _() {
         if [ "$vcs_compile" = false ]; then
             exit
         fi
@@ -306,7 +288,7 @@ if [ "$download_only" = true ]; then
     extrafile() { :; }
 
     # Exit at the end of the header
-    header_end() { exit; }
+    _() { exit; }
 fi
 
 # Create the directories
@@ -320,38 +302,39 @@ if [ "$download_only" = false ]; then
     dir_install="$(realpath "$dir_install")"
 fi
 
-for _satellite in "$@"; do
-    _satname="$(basename "$_satellite" .sat)"
+for _astronaut_satellite in "$@"; do
+    name_sat="$(basename "$_astronaut_satellite" .sat)"
+    name="$name_sat"
 
     # Try to find the satellite file if it can't be found.
-    if [ ! -f "$_satellite" ]; then
+    if [ ! -f "$_astronaut_satellite" ]; then
         if [ -d "$dir_satellites" ]; then
-            file="$(find "$dir_satellites" -type f \( -name "$_satname.sat" -o -name "$_satname" \) -print -quit)"
+            file="$(find "$dir_satellites" -type f \( -name "$name_sat.sat" -o -name "$name_sat" \) -print -quit)"
             if [ -f "$file" ]; then
-                _satellite="$file"
-                _satname="$(basename "$_satellite" .sat)"
+                _astronaut_satellite="$file"
+                name_sat="$(basename "$_astronaut_satellite" .sat)"
             fi
         fi
 
         # If it still can't be found, exit.
-        if [ ! -f "$_satellite" ]; then
-            _exiterr "Can't find satellite: $_satellite"
+        if [ ! -f "$_astronaut_satellite" ]; then
+            _astronaut_error "Can't find satellite: $_astronaut_satellite"
         fi
     fi
 
-    _satellite="$(realpath "$_satellite")"
+    _astronaut_satellite="$(realpath "$_astronaut_satellite")"
 
     (
-        options="$_user_options$(package_options "$_satname"),$options"
+        options="$_astronaut_options_user$(package_options "$name_sat"),$options"
 
         if [ "$download_only" = true ]; then
             # Just download it
-            . "$_satellite"
+            . "$_astronaut_satellite"
         else
             _astronaut_wrapper_pre
 
             # Remove install dir if appropriate
-            if [ "$_nuke_dir_install" = true -a ! -z "$dir_install" ]; then
+            if [ "$_astronaut_nuke_install" = true -a ! -z "$dir_install" ]; then
                 rm -rf "$dir_install"
                 mkdir -p "$dir_install"
             fi
@@ -360,9 +343,9 @@ for _satellite in "$@"; do
             mkdir -p "$dir_build"
 
             # Create the satellite
-            options="$_user_options$(package_options "$_satname"),$options"
+            options="$_astronaut_options_user$(package_options "$name_sat"),$options"
             cd "$dir_build"
-            . "$_satellite"
+            . "$_astronaut_satellite"
 
             _astronaut_wrapper_post
         fi
diff --git a/astronaut/astronaut.sat b/astronaut/astronaut.sat
index 445fc66..b376056 100644
--- a/astronaut/astronaut.sat
+++ b/astronaut/astronaut.sat
@@ -16,21 +16,21 @@ fi
 option xbps extrafile 'xbps-astronaut'
 option pacman extrafile 'pacman-astronaut'
 option pkgtools extrafile 'astronautpkg'
-header_end
+_
 
 # Fix paths
-sed -i -e "s/\/etc\/astronaut.conf/$(safe_sed "/$dir_prefix/$dir_sysconfdir/astronaut.conf")/g" astronaut
+sed -i -e "s/\/etc\/astronaut.conf/$(safe_sed "/$dir_prefix/$dir_sysconf/astronaut.conf")/g" astronaut
 
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" astronaut
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" astronaut
 
 # Optional helper tools
 if option helpers; then
-    install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" astrohelp freshnaut
+    install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" astrohelp freshnaut
 fi
 
 # Wrappers for specific package managers
-option xbps install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" xbps-astronaut
-option pacman install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" pacman-astronaut
-option pkgtools install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" astronautpkg
+option xbps install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" xbps-astronaut
+option pacman install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" pacman-astronaut
+option pkgtools install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" astronautpkg
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/astronaut/astronautpkg b/astronaut/astronautpkg
index d1fefbe..0403826 100755
--- a/astronaut/astronautpkg
+++ b/astronaut/astronautpkg
@@ -25,18 +25,18 @@ dir_wrapper_pkgtools="$PWD"  # Where the packages should be stored
 # Wrapper functions
 _astronaut_wrapper_pre() {
     # Make sure to remove the contents of the install directory before building
-    _nuke_dir_install=true
+    _astronaut_nuke_install=true
 }
 
 _astronaut_wrapper_post() {
     # Gzip man and info pages
-    if [ -d "$dir_install/$dir_prefix/$dir_mandir" ]; then
-        find "$dir_install/$dir_prefix/$dir_mandir" -type f -exec gzip -9 {} \;
-        for i in $(find "$dir_install/$dir_prefix/$dir_mandir" -type l); do ln -s "$(readlink "$i").gz" "$i.gz"; rm "$i"; done
+    if [ -d "$dir_install/$dir_prefix/$dir_man" ]; then
+        find "$dir_install/$dir_prefix/$dir_man" -type f -exec gzip -9 {} \;
+        for i in $(find "$dir_install/$dir_prefix/$dir_man" -type l); do ln -s "$(readlink "$i").gz" "$i.gz"; rm "$i"; done
     fi
-    if [ -d "$dir_install/$dir_prefix/$dir_infodir" ]; then
-        rm -f "$dir_install/$dir_prefix/$dir_infodir/dir"
-        find "$dir_install/$dir_prefix/$dir_infodir" -type f -name '*.info' -exec gzip -9 '{}' \;
+    if [ -d "$dir_install/$dir_prefix/$dir_info" ]; then
+        rm -f "$dir_install/$dir_prefix/$dir_info/dir"
+        find "$dir_install/$dir_prefix/$dir_info" -type f -name '*.info' -exec gzip -9 '{}' \;
     fi
 
     # Strip binaries
@@ -52,22 +52,22 @@ _astronaut_wrapper_post() {
 ## make exactly 11 lines for the formatting to be correct.  It's also
 ## customary to leave one space after the ':'.
 
-#$(printf %$(printf '%s' "$_satname" | wc -c)s)|-----handy-ruler------------------------------------------------------|
-#$_satname: $_satname (Generated with astronautpkg)
-#$_satname:
-#$_satname:
-#$_satname:
-#$_satname:
-#$_satname:
-#$_satname:
-#$_satname:
-#$_satname:
-#$_satname:
-#$_satname:
+#$(printf %$(printf '%s' "$name_sat" | wc -c)s)|-----handy-ruler------------------------------------------------------|
+#$name_sat: $name_sat (Generated with astronautpkg)
+#$name_sat:
+#$name_sat:
+#$name_sat:
+#$name_sat:
+#$name_sat:
+#$name_sat:
+#$name_sat:
+#$name_sat:
+#$name_sat:
+#$name_sat:
 #EOF
 
     # Move configuration files to .new and install them for proper compliance.
-    if [ -d "$dir_install/$dir_prefix/$dir_sysconfdir" ]; then
+    if [ -d "$dir_install/$dir_prefix/$dir_sysconf" ]; then
         mkdir -p "$dir_install/install"
 cat >> "$dir_install/install/doinst.sh" << 'EOF'
 config() {
@@ -84,42 +84,42 @@ config() {
 
 EOF
 
-        find "$dir_install/$dir_prefix/$dir_sysconfdir" -type f -printf '%P\n' | while IFS= read file; do
-            mv "$dir_install/$dir_prefix/$dir_sysconfdir/$file" "$dir_install/$dir_prefix/$dir_sysconfdir/$file.new"
-            echo "config '$dir_prefix/$dir_sysconfdir/$file.new'" >> "$dir_install/install/doinst.sh"
+        find "$dir_install/$dir_prefix/$dir_sysconf" -type f -printf '%P\n' | while IFS= read file; do
+            mv "$dir_install/$dir_prefix/$dir_sysconf/$file" "$dir_install/$dir_prefix/$dir_sysconf/$file.new"
+            echo "config '$dir_prefix/$dir_sysconf/$file.new'" >> "$dir_install/install/doinst.sh"
         done
         echo >> "$dir_install/install/doinst.sh"
     fi
 
     # Update desktop database if new files were added
-    if [ -d "$dir_install/$dir_prefix/$dir_datadir/applications" ]; then
+    if [ -d "$dir_install/$dir_prefix/$dir_data/applications" ]; then
         mkdir -p "$dir_install/install"
 cat >> "$dir_install/install/doinst.sh" << EOF
-if [ -x /$dir_prefix/$dir_bindir/update-desktop-database ]; then
-  /$dir_prefix/$dir_bindir/update-desktop-database -q $dir_prefix/$dir_datadir/applications >/dev/null 2>&1
+if [ -x /$dir_prefix/$dir_bin/update-desktop-database ]; then
+  /$dir_prefix/$dir_bin/update-desktop-database -q $dir_prefix/$dir_data/applications >/dev/null 2>&1
 fi
 
 EOF
     fi
 
     # Update mime database if new files were added
-    if [ -d "$dir_install/$dir_prefix/$dir_datadir/mime" ]; then
+    if [ -d "$dir_install/$dir_prefix/$dir_data/mime" ]; then
         mkdir -p "$dir_install/install"
 cat >> "$dir_install/install/doinst.sh" << EOF
-if [ -x /$dir_prefix/$dir_bindir/update-mime-database ]; then
-  /$dir_prefix/$dir_bindir/update-mime-database $dir_prefix/$dir_datadir/mime >/dev/null 2>&1
+if [ -x /$dir_prefix/$dir_bin/update-mime-database ]; then
+  /$dir_prefix/$dir_bin/update-mime-database $dir_prefix/$dir_data/mime >/dev/null 2>&1
 fi
 
 EOF
     fi
 
     # Update icon cache if new files were added
-    if [ -d "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor" ]; then
+    if [ -d "$dir_install/$dir_prefix/$dir_data/icons/hicolor" ]; then
         mkdir -p "$dir_install/install"
 cat >> "$dir_install/install/doinst.sh" << EOF
-if [ -e $dir_prefix/$dir_datadir/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /$dir_prefix/$dir_bindir/gtk-update-icon-cache ]; then
-    /$dir_prefix/$dir_bindir/gtk-update-icon-cache -f $dir_prefix/$dir_datadir/icons/hicolor >/dev/null 2>&1
+if [ -e $dir_prefix/$dir_data/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /$dir_prefix/$dir_bin/gtk-update-icon-cache ]; then
+    /$dir_prefix/$dir_bin/gtk-update-icon-cache -f $dir_prefix/$dir_data/icons/hicolor >/dev/null 2>&1
   fi
 fi
 
@@ -127,12 +127,12 @@ EOF
     fi
 
     # Compile schemas if new files were added
-    if [ -d "$dir_install/$dir_prefix/$dir_datadir/glib-2.0/schemas" ]; then
+    if [ -d "$dir_install/$dir_prefix/$dir_data/glib-2.0/schemas" ]; then
         mkdir -p "$dir_install/install"
 cat >> "$dir_install/install/doinst.sh" << EOF
-if [ -e $dir_prefix/$dir_datadir/glib-2.0/schemas ]; then
-  if [ -x /$dir_prefix/$dir_datadir/glib-compile-schemas ]; then
-    /$dir_prefix/$dir_datadir/glib-compile-schemas $dir_prefix/$dir_datadir/glib-2.0/schemas >/dev/null 2>&1
+if [ -e $dir_prefix/$dir_data/glib-2.0/schemas ]; then
+  if [ -x /$dir_prefix/$dir_data/glib-compile-schemas ]; then
+    /$dir_prefix/$dir_data/glib-compile-schemas $dir_prefix/$dir_data/glib-2.0/schemas >/dev/null 2>&1
   fi
 fi
 
@@ -140,20 +140,20 @@ EOF
     fi
 
     # Query gio modules if new files were added
-    if [ -d "$dir_install/$dir_prefix/$dir_libdir/gio/modules" ]; then
+    if [ -d "$dir_install/$dir_prefix/$dir_lib/gio/modules" ]; then
         mkdir -p "$dir_install/install"
 cat >> "$dir_install/install/doinst.sh" << EOF
-chroot . /$dir_prefix/$dir_bindir/gio-querymodules $dir_prefix/$dir_libdir/gio/modules/ 1> /dev/null 2> /dev/null
+chroot . /$dir_prefix/$dir_bin/gio-querymodules $dir_prefix/$dir_lib/gio/modules/ 1> /dev/null 2> /dev/null
 
 EOF
     fi
 
     # Install new info files if they were added
-    if [ -d "$dir_install/$dir_prefix/$dir_infodir" ]; then
+    if [ -d "$dir_install/$dir_prefix/$dir_info" ]; then
         mkdir -p "$dir_install/install"
-        echo "if [ -x /$dir_prefix/$dir_bindir/install-info ]; then" >> "$dir_install/install/doinst.sh"
-        find "$dir_install/$dir_prefix/$dir_infodir" -type f -name '*.info.gz' -printf '%P\0' | while read -d '' -r file; do
-            echo "  chroot . /$dir_prefix/$dir_bindir/install-info --info-dir=/$dir_prefix/$dir_infodir /$file 2> /dev/null" >> "$dir_install/install/doinst.sh"
+        echo "if [ -x /$dir_prefix/$dir_bin/install-info ]; then" >> "$dir_install/install/doinst.sh"
+        find "$dir_install/$dir_prefix/$dir_info" -type f -name '*.info.gz' -printf '%P\0' | while read -d '' -r file; do
+            echo "  chroot . /$dir_prefix/$dir_bin/install-info --info-dir=/$dir_prefix/$dir_info /$file 2> /dev/null" >> "$dir_install/install/doinst.sh"
         done
         echo 'fi' >> "$dir_install/install/doinst.sh"
         echo >> "$dir_install/install/doinst.sh"
@@ -162,7 +162,7 @@ EOF
     # Create the package
     cd "$dir_install"
     mkdir -p "$dir_wrapper_pkgtools"
-    PATH="$PATH:/sbin" $_astronaut_wrapper_fakeroot makepkg -l y -c n "$dir_wrapper_pkgtools/$_satname-$(echo "$version" | tr - _)-$(uname -m)-astro.txz"
+    PATH="$PATH:/sbin" $_astronaut_wrapper_fakeroot makepkg -l y -c n "$dir_wrapper_pkgtools/$name_sat-$(echo "$version" | tr - _)-$(uname -m)-astro.txz"
 }
 
 . "$_astronaut"
diff --git a/astronaut/examples/hello.sat b/astronaut/examples/hello.sat
index 997588b..6cc5e20 100644
--- a/astronaut/examples/hello.sat
+++ b/astronaut/examples/hello.sat
@@ -1,14 +1,45 @@
 # Example of a satellite file, which is just a shell script with a cool name.
 
+# Astronaut will generally prefix internal variables and functions with "_astronaut".
+#   Some of those you can touch, some not.
+# None of your variables should start with "_astronaut".
+
+# There are, however, a few exceptions. You shouldn't modify these variables directly, as they will affect how astronaut and it's wrappers run.
+
+# Astronaut directory variables:
+# - dir_build -- The directory where the package is built. You are by default in this directory.
+# - dir_source -- The directory where the sources are placed. Don't rely on this unless necessary. Place everything in $dir_source/$name!
+# - dir_install -- The directory where you will have to install the software.
+
+# Package directory variables, taken straight from GNU autotools:
+# - dir_prefix
+# - dir_bin
+# - dir_sbin
+# - dir_libexec
+# - dir_sysconf
+# - dir_lib
+# - dir_include
+# - dir_data
+# - dir_info
+# - dir_locale
+# - dir_man
+# - dir_doc
+
+# Command variables (see the default astronaut configuration)
+# - cmd_download -- Used to download files
+# - cmd_extract -- Used to extract files
+
+# Misc variables
+# - options -- The options this package is built with.
+# - download_only -- Whether we're in 'download only' mode or not. If we are, you may only create files in $dir_source/$name.
+
 import 'say_hello'  # Import some functions. See functions/say_hello.sh for more info.
 
-# Info (Please declare it, as it will be used outside of this script, too)
-# Required info
+# Satellite info
 name=hello  # Name of the software, not the package name.
             # Same source files will be used for the same software, despite the package name being different.
-version=2.10
-
-# Optional info
+            # By default, it's the same as the filename, without the .sat extension.
+version=2.10  # REQUIRED! Please declare it, as it will be used outside of the script as well.
 update_url="https://ftp.gnu.org/gnu/$name/"  # URL to a downloadable plain-text file which updates when a new version is available.
 update_names="$name-$version.tar.gz"  # Specify what the lines containing the version number look like on the download page.
                                       # It's a comma-separated list, and can contain multiple entries.
@@ -16,7 +47,15 @@ update_names="$name-$version.tar.gz"  # Specify what the lines containing the ve
                                       #   as another program will look for any different versions on the same page.
                                       # You may not need to set this, in which case the program will try to guess it from the download commands.
 
-vcs_compile=true  # Set this to true if it's a vcs package, and we've just downloaded an update for it. This is meant to be used in functions, and has to be set before header_end is called.
+# By default, astronaut doesn't use a "package name".
+# It only uses the name variable, above, to create some sort of "namespaces", so that files from different projects don't overlap.
+# The downloaded files and extra files in the "namespace" can be used by multiple satellites with the same name variable.
+# This effectively gives you the ability to use the same files in multiple satellites.
+
+# A few of the wrappers, however, do use a "package name". This is the same as the filename without the .sat extension.
+# This "package name" can be accessed through the $name_sat variable, and you may use it as well.
+
+vcs_compile=true  # Set this to true if it's a vcs package, and we've just downloaded an update for it. This is meant to be used in conjunction with git, and has to be set before the end of the header.
 
 # Define options used in this satellite.
 define_option '!check: Enable the testsuite.'  # Due to the '!' at the start, check is false by default.
@@ -26,25 +65,7 @@ define_option 'test=Default value'  # It is also allowed to provide no descripti
 
 # Please note that setting the above info in an imported script is supported, as long as it's done in the header.
 
-# Astronaut will generally prefix internal variables with "_". There are, however, a few exceptions.
-#   Some of those you can touch, some not.
-
-# "You shouldn't even look, unless you're hacking really bad, but definitely don't touch"-variables:
-# - dir_build (You cd into it automatically. Just use relative paths or $PWD.)
-# - dir_source (This is handled by the commands detailed below. You should have no use for it.)
-
-# "Look, but don't touch"-variables:
-# - All other dir_* variables
-
-# "You'll only make your own life more difficult if you use them wrong, so I don't care what you do"-variables:
-#   (Only use these to change the behaviour of some commands over the whole script, ignoring default/user config.)
-# - cmd_download
-# - cmd_extract
-# - vcs_compile
-# - download_only
-# - options
-
-# Get them files.
+# Get the files.
 # URL [REQUIRED], MD5sum, Custom filename, Custom command
 download "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
          '6cd0ffea3884a4e79330338dcc2987d6' \
@@ -62,7 +83,7 @@ download "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
 # Copy local file to build directory. File should be stored in $(basedir <satellite file>)/extrafiles/$name/
 #extrafile 'Herpaderp.txt'
 
-header_end # End of the header.
+_  # End of the header.
 # The only commands that are allowed to be in the header are:
 # - download
 # - dlextract
@@ -70,10 +91,11 @@ header_end # End of the header.
 # - extrafile
 # - import
 # - define_option
-# getfile and extract are technically allowed, but not encouraged.
+# getfile and extract are technically allowed, but not encouraged. Those should be outside of the header.
 # Basically, do not use anything that touches dir_build or dir_install or does anything other than fetching the required files.
 # The same rule above applies for imported commands.
 
+# Extract a downloaded file
 # Name [REQUIRED], Destination, Custom command
 extract "$name-$version.tar.gz" \
         '.' \
@@ -88,7 +110,7 @@ cd "$name-$version"
 make
 
 # Know if the user wants the package to be checked
-# Check if an option is disabled
+# Check if an option is enabled
 if option check; then
     make check
 fi
@@ -98,7 +120,7 @@ fi
 #option !check echo "The package wasn't checked"
 
 make DESTDIR="$dir_install" install
-rm "$dir_install/$dir_prefix/share/info/dir"  # This file collides with some other packages.
+rm "$dir_install/$dir_prefix/$dir_info/dir"  # This file collides with some other packages.
 
 # Call the function we imported. For more info see the top of the file, and functions/say_hello.sh
 say_hello
diff --git a/astronaut/pacman-astronaut b/astronaut/pacman-astronaut
index f58cc72..a810401 100755
--- a/astronaut/pacman-astronaut
+++ b/astronaut/pacman-astronaut
@@ -18,13 +18,13 @@ dir_wrapper_pacman="$PWD"  # Where the packages should be stored
 # Wrapper functions
 _astronaut_wrapper_pre() {
     # Make sure to remove the contents of the install directory before building
-    _nuke_dir_install=true
+    _astronaut_nuke_install=true
 }
 
 _astronaut_wrapper_post() {
     # Create the package info file
     cat > "$dir_install/.PKGINFO" << EOF
-pkgname = $_satname
+pkgname = $name_sat
 pkgver = $version-astro
 pkgdesc = Generated with pacman-astronaut
 url = $update_url
@@ -39,8 +39,8 @@ EOF
     # Create the package
     bsdtar --strip-components 1 -C "$dir_install" -czf .MTREE --format=mtree --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' .
     mv .MTREE "$dir_install/.MTREE"  # bsdtar doesn't like the file being in the same directory.
-    fakeroot -- bsdtar --strip-components 1 -C "$dir_install" -cf - . > "$_satname-$version-astro-$(uname -m).pkg.tar"
-    repo-add astronaut.db.tar.gz "$_satname-$version-astro-$(uname -m).pkg.tar"
+    fakeroot -- bsdtar --strip-components 1 -C "$dir_install" -cf - . > "$name_sat-$version-astro-$(uname -m).pkg.tar"
+    repo-add astronaut.db.tar.gz "$name_sat-$version-astro-$(uname -m).pkg.tar"
 }
 
 . "$_astronaut"
diff --git a/astronaut/template.sat b/astronaut/template.sat
index 1927d77..c1b01f7 100644
--- a/astronaut/template.sat
+++ b/astronaut/template.sat
@@ -8,7 +8,7 @@ define_option '!check: Enable the testsuite.'
 
 dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
           '6cd0ffea3884a4e79330338dcc2987d6'
-header_end
+_
 
 cd "$name-$version"
 
diff --git a/astronaut/xbps-astronaut b/astronaut/xbps-astronaut
index a1c5eb2..f945ec4 100755
--- a/astronaut/xbps-astronaut
+++ b/astronaut/xbps-astronaut
@@ -18,7 +18,7 @@ dir_wrapper_xbps="$PWD"
 # Wrapper functions
 _astronaut_wrapper_pre() {
     # Make sure to remove the contents of the install directory before building
-    _nuke_dir_install=true
+    _astronaut_nuke_install=true
 }
 
 _astronaut_wrapper_post() {
@@ -26,8 +26,8 @@ _astronaut_wrapper_post() {
     cd "$dir_wrapper_xbps"
 
     # Create the package
-    xbps-create --compression none -A "$(uname -m)" -n "$_satname-${version}_astro" -s "Generated with xbps-astronaut" -H "$update_url" "$dir_install"
-    xbps-rindex -f -a "$_satname-${version}_astro.$(uname -m).xbps"
+    xbps-create --compression none -A "$(uname -m)" -n "$name_sat-${version}_astro" -s "Generated with xbps-astronaut" -H "$update_url" "$dir_install"
+    xbps-rindex -f -a "$name_sat-${version}_astro.$(uname -m).xbps"
 }
 
 . "$_astronaut"
diff --git a/graveyard/first_attempt.cause_of_death b/graveyard/first_attempt.cause_of_death
deleted file mode 100644
index f908c3d..0000000
--- a/graveyard/first_attempt.cause_of_death
+++ /dev/null
@@ -1,9 +0,0 @@
-First attempt died on 18 november 2015.
-Latest update is unknown.
-Birth date is unknown.
-
-Description:
-The first attempt was the first attempt I made at making a distro.
-
-Cause of death:
-Because the latest changes only being version bumps, and me having never actually tested those changes, and after I've made some substantial changes in how satellites are written (adding functions, support for vcs, header_end hooks, etc.), I've decided that if I ever take up making a distro again, I'll rewrite all of these satellites from scratch anyway.
diff --git a/graveyard/first_attempt/satellites/acl.sat b/graveyard/first_attempt/satellites/acl.sat
deleted file mode 100644
index 51665ef..0000000
--- a/graveyard/first_attempt/satellites/acl.sat
+++ /dev/null
@@ -1,18 +0,0 @@
-name=acl
-version=2.2.52
-update_url="http://download.savannah.gnu.org/releases/$name/"
-
-enable_check=false  # These tests require a specific filesystem.
-
-dlextract "http://download.savannah.gnu.org/releases/$name/$name-$version.src.tar.gz" \
-          "a61415312426e9c2212bd7dc7929abda"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr
-make
-do_check make -j1 tests
-make DIST_ROOT="$dir_install" install install-lib install-dev
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/attr.sat b/graveyard/first_attempt/satellites/attr.sat
deleted file mode 100644
index b182185..0000000
--- a/graveyard/first_attempt/satellites/attr.sat
+++ /dev/null
@@ -1,18 +0,0 @@
-name=attr
-version=2.4.47
-update_url="http://download.savannah.gnu.org/releases/$name/"
-
-enable_check=false  # These tests require a specific filesystem.
-
-dlextract "http://download.savannah.gnu.org/releases/$name/$name-$version.src.tar.gz" \
-          "84f58dec00b60f2dc8fd1c9709291cc7"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr
-make
-do_check make -j1 tests root-tests
-make DIST_ROOT="$dir_install" install install-lib install-dev
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/binutils.sat b/graveyard/first_attempt/satellites/binutils.sat
deleted file mode 100644
index 6f4514f..0000000
--- a/graveyard/first_attempt/satellites/binutils.sat
+++ /dev/null
@@ -1,16 +0,0 @@
-name=binutils
-version=2.25.1
-enable_check=false
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2" \
-          "ac493a78de4fee895961d025b7905be4"
-header_end
-
-mkdir "$name-build"; cd "$name-build"
-
-"../$name-$version/configure" --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/coreutils.sat b/graveyard/first_attempt/satellites/coreutils.sat
deleted file mode 100644
index 1d65cd0..0000000
--- a/graveyard/first_attempt/satellites/coreutils.sat
+++ /dev/null
@@ -1,16 +0,0 @@
-name=coreutils
-version=8.24
-update_url="https://ftp.gnu.org/gnu/$name/"
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz" \
-          "40efdbce865d2458d8da0a9dcee7c16c"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr --enable-no-install-program=kill
-make
-do_check make check  # NEED: user nobody, group nogroup, diff -c
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/file.sat b/graveyard/first_attempt/satellites/file.sat
deleted file mode 100644
index b321edd..0000000
--- a/graveyard/first_attempt/satellites/file.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-name=file
-version=5.24
-
-dlextract "ftp://ftp.astron.com/pub/$name/$name-$version.tar.gz" \
-          "ec161b5a0d2aef147fb046e5630b1408"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/gcc.sat b/graveyard/first_attempt/satellites/gcc.sat
deleted file mode 100644
index e756cc4..0000000
--- a/graveyard/first_attempt/satellites/gcc.sat
+++ /dev/null
@@ -1,23 +0,0 @@
-name=gcc
-version=5.2.0
-enable_check=false
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.bz2" \
-          "a51bcfeb3da7dd4c623e27207ed43467"
-header_end
-
-mkdir "$name-build"; cd "$name-build"
-
-SED=sed "../$name-$version/configure" --prefix=/usr --enable-languages=c,c++ --with-system-zlib --disable-bootstrap --disable-multilib
-make
-if do_check; then
-    ulimit -s 32768
-    make -k check
-fi
-make DESTDIR="$dir_install" install
-
-ln -s gcc "$dir_install/usr/bin/cc"
-mkdir -p "$dir_install/usr/lib/bfd-plugins"
-ln -s "../../libexec/gcc/$(gcc -dumpmachine)/5.2.0/liblto_plugin.so" "$dir_install/usr/lib/bfd-plugins/"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/glibc.sat b/graveyard/first_attempt/satellites/glibc.sat
deleted file mode 100644
index 470030d..0000000
--- a/graveyard/first_attempt/satellites/glibc.sat
+++ /dev/null
@@ -1,19 +0,0 @@
-name=glibc
-version=2.22
-enable_check=false
-
-dlextract "https://ftp.gnu.org/gnu/libc/$name-$version.tar.xz" \
-          "e51e02bf552a0a1fbbdc948fb2f5e83c"
-header_end
-
-mkdir "$name-build"; cd "$name-build"
-
-"../$name-$version/configure" --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install
-
-# It likes leaving this file here. Something it really shouldn't.
-rm "$dir_install/etc/ld.so.cache"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/gmp.sat b/graveyard/first_attempt/satellites/gmp.sat
deleted file mode 100644
index 8070cd7..0000000
--- a/graveyard/first_attempt/satellites/gmp.sat
+++ /dev/null
@@ -1,16 +0,0 @@
-name=gmp
-shortver=6.0.0
-version=${shortver}a
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz" \
-          "1e6da4e434553d2811437aa42c7f7c76"
-header_end
-
-cd "$name-$shortver"
-
-./configure --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/groups/package-management b/graveyard/first_attempt/satellites/groups/package-management
deleted file mode 100644
index fe951d5..0000000
--- a/graveyard/first_attempt/satellites/groups/package-management
+++ /dev/null
@@ -1,7 +0,0 @@
-tar
-perl
-stow
-openssl
-ca-certificates
-curl
-astronaut
diff --git a/graveyard/first_attempt/satellites/groups/toolchain b/graveyard/first_attempt/satellites/groups/toolchain
deleted file mode 100644
index c2e3074..0000000
--- a/graveyard/first_attempt/satellites/groups/toolchain
+++ /dev/null
@@ -1,8 +0,0 @@
-linux-api
-glibc  # Adjust the toolchain after (http://linuxfromscratch.org/lfs/view/stable/chapter06/adjusting.html)
-binutils
-gmp  # From here, run ldconfig after every package install.
-mpfr
-mpc
-zlib  # Dependency of gcc
-gcc
diff --git a/graveyard/first_attempt/satellites/linux-api.sat b/graveyard/first_attempt/satellites/linux-api.sat
deleted file mode 100644
index 6116cdc..0000000
--- a/graveyard/first_attempt/satellites/linux-api.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=linux
-version=4.1.6
-
-dlextract "https://www.kernel.org/pub/$name/kernel/v4.x/$name-$version.tar.xz" \
-          "1dae0c808e34164cab3dfd57be88bd53"
-header_end
-
-cd "$name-$version"
-
-make mrproper
-make INSTALL_HDR_PATH="$dir_install/usr" headers_install
-find "$dir_install/usr/include" \( -name .install -o -name ..install.cmd \) -delete
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/mpc.sat b/graveyard/first_attempt/satellites/mpc.sat
deleted file mode 100644
index 7b60d64..0000000
--- a/graveyard/first_attempt/satellites/mpc.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-name=mpc
-version=1.0.3
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
-          "d6a1d5f8ddea3abd2cc3e98f58352d26"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/mpfr.sat b/graveyard/first_attempt/satellites/mpfr.sat
deleted file mode 100644
index 2df9e85..0000000
--- a/graveyard/first_attempt/satellites/mpfr.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-name=mpfr
-version=3.1.3
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz" \
-          "6969398cd2fbc56a6af570b5273c56a9"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/shadow.sat b/graveyard/first_attempt/satellites/shadow.sat
deleted file mode 100644
index e13d5ef..0000000
--- a/graveyard/first_attempt/satellites/shadow.sat
+++ /dev/null
@@ -1,16 +0,0 @@
-name=shadow
-version=4.2.1
-update_url="https://pkg-shadow.alioth.debian.org/"
-
-dlextract "https://pkg-shadow.alioth.debian.org/releases/$name-$version.tar.xz" \
-          "2bfafe7d4962682d31b5eba65dba4fc8"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/tar.sat b/graveyard/first_attempt/satellites/tar.sat
deleted file mode 100644
index b215bc3..0000000
--- a/graveyard/first_attempt/satellites/tar.sat
+++ /dev/null
@@ -1,16 +0,0 @@
-name=tar
-version=1.28
-update_url="https://ftp.gnu.org/gnu/$name/"
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz" \
-          "49b6306167724fe48f419a33a5beb857"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/tzdata.sat b/graveyard/first_attempt/satellites/tzdata.sat
deleted file mode 100644
index cca6e29..0000000
--- a/graveyard/first_attempt/satellites/tzdata.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-name=tzdata
-version=2015f
-
-dlextract "https://www.iana.org/time-zones/repository/releases/$name$version.tar.gz" \
-          "e3b82732d20e973e48af1c6f13df9a1d"
-header_end
-
-timezones="africa antarctica asia australasia backward backzone etcetera europe factory northamerica pacificnew southamerica systemv"
-
-zic -y ./yearistype -d "$dir_install/usr/share/zoneinfo" $timezones
-zic -y ./yearistype -d "$dir_install/usr/share/zoneinfo/posix" $timezones
-zic -y ./yearistype -d "$dir_install/usr/share/zoneinfo/right" -L leapseconds $timezones
-zic -y ./yearistype -d "$dir_install/usr/share/zoneinfo" -p America/New_York
-
-cp zone1970.tab iso3166.tab "$dir_install/usr/share/zoneinfo"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/util-linux.sat b/graveyard/first_attempt/satellites/util-linux.sat
deleted file mode 100644
index 88a3ed2..0000000
--- a/graveyard/first_attempt/satellites/util-linux.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-name=util-linux
-majver=2.26
-version=$majver.2
-update_url="https://www.kernel.org/pub/linux/utils/$name/"
-
-dlextract "https://www.kernel.org/pub/linux/utils/$name/v$majver/$name-$version.tar.xz" \
-          "9bdf368c395f1b70325d0eb22c7f48fb"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install  # NEEDS: group tty
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/satellites/zlib.sat b/graveyard/first_attempt/satellites/zlib.sat
deleted file mode 100644
index e2beb3f..0000000
--- a/graveyard/first_attempt/satellites/zlib.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-name=zlib
-version=1.2.8
-
-dlextract "http://zlib.net/$name-$version.tar.xz" \
-          "28f1205d8dd2001f26fec1e8c2cebe37"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/usr
-make
-do_check make check
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/chroot b/graveyard/first_attempt/tools/chroot
deleted file mode 100755
index 50e5a17..0000000
--- a/graveyard/first_attempt/tools/chroot
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-umask 022
-set -e
-
-if [ "$(id -u)" != "0" ]; then
-    echo "Please run this script as root" 1>&2
-    exit 1
-fi
-
-if [ ! "$rocket" ]; then
-    echo 'Please set the $rocket variable' 1>&2
-    exit 1
-fi
-
-rocket="$(realpath "$rocket")"
-
-mkdir -p "$rocket/dev" "$rocket/proc" "$rocket/sys" "$rocket/run"
-mount --bind /dev "$rocket/dev" 2> /dev/null || true
-mount --bind /dev/pts "$rocket/dev/pts" 2> /dev/null || true  # Bind-mounting this because not doing so breaks some things.
-mount -t proc proc "$rocket/proc" 2> /dev/null || true
-mount -t tmpfs tmpfs "$rocket/run" 2> /dev/null || true
-if [ -h "$rocket/dev/shm" ]; then
-    mkdir -p "$rocket/$(readlink "$rocket/dev/shm")"
-fi
-
-mkdir -p "$rocket/etc"
-cp /etc/resolv.conf "$rocket/etc/resolv.conf"
-
-# FORCE_UNSAFE_CONFIGURE is needed for building some packages as root
-chroot "$rocket" /tools/bin/env -i \
-    HOME=/root \
-    TERM="$TERM" \
-    PS1="(buildenv) \u:\w \$ " \
-    PATH=/bin:/sbin:/usr/bin:/usr/sbin:/tools/bin:/tools/sbin \
-    MAKEFLAGS="$MAKEFLAGS" \
-    FORCE_UNSAFE_CONFIGURE=1 \
-    /tools/bin/ash -l
-
-umount "$rocket/dev/pts" || true
-umount "$rocket/dev" || true
-umount "$rocket/proc" || true
-umount "$rocket/run" || true
diff --git a/graveyard/first_attempt/tools/library-check.sh b/graveyard/first_attempt/tools/library-check.sh
deleted file mode 100755
index 60a2bec..0000000
--- a/graveyard/first_attempt/tools/library-check.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# Copied from LFS 7.7
-for lib in lib{gmp,mpfr,mpc}.la; do
-  echo $lib: $(if find /usr/lib* -name $lib|
-               grep -q $lib;then :;else echo not;fi) found
-done
-unset lib
diff --git a/graveyard/first_attempt/tools/mktools b/graveyard/first_attempt/tools/mktools
deleted file mode 100755
index aba8290..0000000
--- a/graveyard/first_attempt/tools/mktools
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-# Tool to build tools to build the temporary system
-set -e
-umask 022
-
-download_only=false
-if [ "$1" = "download" ]; then
-    download_only=true
-fi
-
-command -v astronaut >/dev/null 2>&1 || {
-    echo 'Can'\''t find astronaut in $PATH' 1>&2
-    exit 1
-}
-
-if [ "$download_only" = false ]; then
-    if [ ! "$rocket" ]; then
-        echo 'Please set the $rocket variable' 1>&2
-        exit 1
-    fi
-
-    if [ "$(readlink /tools)" != "$(realpath "$rocket")/tools" ]; then
-        echo "Please create a symlink from /tools to $(realpath "$rocket")/tools" 1>&2
-        exit 1
-    fi
-fi
-
-# Options for supported shells
-if [ "$(basename "$(readlink /bin/sh)")" = "bash" ]; then
-    shellopts="+h"
-fi
-
-# Know where them satellites are
-satellite_dir="$(dirname "$(realpath "$0")")/satellites"
-
-envrun() {
-    if [ "$download_only" = true ]; then
-        $@
-        return
-    fi
-
-    env -i \
-        HOME="$HOME" \
-        TERM="$TERM" \
-        LC_ALL=C \
-        PATH="/tools/bin:$PATH" \
-        MAKEFLAGS="$MAKEFLAGS" \
-        rocket="$rocket" \
-        target="$(uname -m)-rocket-linux-gnu" \
-        /bin/sh "$shellopts" "$@"
-}
-
-astrobuild() {
-    if [ "$download_only" = true ]; then
-        envrun astronaut -d "$satellite_dir/$1.sat"
-    else
-        envrun astronaut -i "$rocket" "$satellite_dir/$1.sat"
-    fi
-}
-
-# Needed for x86_64
-if [ "$download_only" = false ]; then
-    mkdir -p "$rocket/tools/lib"
-    ln -sf lib "$rocket/tools/lib64"
-fi
-
-# Just enter the environment
-#envrun
-
-# List of packages to build
-
-# Toolchain
-astrobuild "binutils-1"
-astrobuild "gcc-1"
-astrobuild "linux-api"
-astrobuild "glibc"
-astrobuild "libstdcxx"
-astrobuild "binutils-2"
-astrobuild "gcc-2"
-
-# Utilities
-astrobuild "busybox"
-astrobuild "bash"
-astrobuild "gawk"
-astrobuild "make"
-astrobuild "m4"
-
-# Testing
-astrobuild "tcl-core"
-astrobuild "expect"
-astrobuild "dejagnu"
-astrobuild "check"
-
-# Package management
-astrobuild "perl"
-astrobuild "stow"
-astrobuild "openssl"
-astrobuild "ca-certificates"
-astrobuild "curl"
-astrobuild "astronaut"
diff --git a/graveyard/first_attempt/tools/prepchroot b/graveyard/first_attempt/tools/prepchroot
deleted file mode 100755
index 664d44f..0000000
--- a/graveyard/first_attempt/tools/prepchroot
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-umask 022
-set -e
-
-if [ "$(id -u)" != "0" ]; then
-    echo "Please run this script as root" 1>&2
-    exit 1
-fi
-
-if [ ! "$rocket" ]; then
-    echo 'Please set the $rocket variable' 1>&2
-    exit 1
-fi
-
-echo "Changing ownership of $rocket to root"
-chown -R 0.0 "$rocket"
-
-echo "Creating device nodes"
-mkdir -p "$rocket/dev"
-umount -R "$rocket/dev" 2> /dev/null || true
-mknod -m 600 "$rocket/dev/console" c 5 1 2> /dev/null || true
-mknod -m 666 "$rocket/dev/null" c 1 3 2> /dev/null || true
-
-echo "Creating directories"
-install -dm750 "$rocket/root"
-install -dm1777 "$rocket/tmp"
-mkdir -p "$rocket/etc" "$rocket/usr/pkg" "$rocket/usr/sat"
-
-echo "Creating temporary symlinks"
-mkdir -p "$rocket/usr/pkg/tmp-coreutils/bin"
-ln -f "$rocket/tools/bin/busybox" "$rocket/usr/pkg/tmp-coreutils/bin/pwd"
-mkdir -p "$rocket/usr/pkg/tmp-sh/bin"
-ln -f "$rocket/tools/bin/busybox" "$rocket/usr/pkg/tmp-sh/bin/sh"
-mkdir -p "$rocket/usr/pkg/tmp-bash/bin"
-ln -f "$rocket/tools/bin/bash" "$rocket/usr/pkg/tmp-bash/bin/bash"
-mkdir -p "$rocket/usr/pkg/tmp-ca-certificates/etc/ssl"
-ln -sf /tools/ssl/certs "$rocket/usr/pkg/tmp-ca-certificates/etc/ssl/certs"
-mkdir -p "$rocket/usr/pkg/tmp-gcc/usr/lib"
-ln -f "$rocket/tools/lib/libgcc_s.so" "$rocket/usr/pkg/tmp-gcc/usr/lib/libgcc_s.so"
-ln -f "$rocket/tools/lib/libgcc_s.so.1" "$rocket/usr/pkg/tmp-gcc/usr/lib/libgcc_s.so.1"
-ln -f "$rocket/tools/lib/libstdc++.so" "$rocket/usr/pkg/tmp-gcc/usr/lib/libstdc++.so"
-ln -f "$rocket/tools/lib/libstdc++.so.6" "$rocket/usr/pkg/tmp-gcc/usr/lib/libstdc++.so.6"
-ln -f "$rocket/tools/lib/libstdc++.so.6.0.21" "$rocket/usr/pkg/tmp-gcc/usr/lib/libstdc++.so.6.0.21"
-
-echo "Creating users and groups"
-echo 'root:x:0:0:root:/root:/bin/sh
-nobody:x:99:99:Unprivileged User:/dev/null:/bin/false' > "$rocket/etc/passwd"
-echo 'root:x:0:
-tty:x:1:
-nogroup:x:99:' > "$rocket/etc/group"
-
-echo "Configuring stow"
-echo '-d /usr/pkg
--t /' > "$rocket/etc/stowrc"
diff --git a/graveyard/first_attempt/tools/satellites/astronaut.sat b/graveyard/first_attempt/tools/satellites/astronaut.sat
deleted file mode 100644
index bbd74ab..0000000
--- a/graveyard/first_attempt/tools/satellites/astronaut.sat
+++ /dev/null
@@ -1,8 +0,0 @@
-# This is a hacky satellite. Please refrain of making more like this if possible.
-
-header_end
-msg "Installing astronaut"
-
-install -Dm755 "$(command -v "$0")" "$dir_install/tools/bin/astronaut"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/bash.sat b/graveyard/first_attempt/tools/satellites/bash.sat
deleted file mode 100644
index 0254ca3..0000000
--- a/graveyard/first_attempt/tools/satellites/bash.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=bash
-version=4.3.30
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
-          "a27b3ee9be83bd3ba448c0ff52b28447"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/tools --without-bash-malloc
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/binutils-1.sat b/graveyard/first_attempt/tools/satellites/binutils-1.sat
deleted file mode 100644
index 0650fa3..0000000
--- a/graveyard/first_attempt/tools/satellites/binutils-1.sat
+++ /dev/null
@@ -1,20 +0,0 @@
-name=binutils
-version=2.25.1
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2" \
-          "ac493a78de4fee895961d025b7905be4"
-header_end
-
-mkdir "$name-build"; cd "$name-build"
-
-"../$name-$version/configure" \
-    --prefix=/tools \
-    --with-sysroot="$dir_install" \
-    --with-lib-path=/tools/lib \
-    --target="$target" \
-    --disable-nls \
-    --disable-werror
-
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/binutils-2.sat b/graveyard/first_attempt/tools/satellites/binutils-2.sat
deleted file mode 100644
index 932c407..0000000
--- a/graveyard/first_attempt/tools/satellites/binutils-2.sat
+++ /dev/null
@@ -1,26 +0,0 @@
-name=binutils
-version=2.25.1
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2" \
-          "ac493a78de4fee895961d025b7905be4"
-header_end
-
-mkdir "$name-build"; cd "$name-build"
-
-CC="$target-gcc" \
-AR="$target-ar" \
-RANLIB="$target-ranlib" \
-"../$name-$version/configure" \
-    --prefix=/tools \
-    --disable-nls \
-    --disable-werror \
-    --with-lib-path=/tools/lib \
-    --with-sysroot
-
-make; make DESTDIR="$dir_install" install
-
-make -C ld clean
-make -C ld LIB_PATH=/lib:/lib64:/usr/lib:/usr/lib64
-cp ld/ld-new "$dir_install/tools/bin/ld-new"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/busybox.sat b/graveyard/first_attempt/tools/satellites/busybox.sat
deleted file mode 100644
index 0b4ac48..0000000
--- a/graveyard/first_attempt/tools/satellites/busybox.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=busybox
-version=1.23.2
-
-dlextract "http://www.busybox.net/downloads/$name-$version.tar.bz2" \
-          "7925683d7dd105aabe9b6b618d48cc73"
-extrafile "busybox.config"
-header_end
-
-sed 's@./_install@'"$dir_install/tools"'@' busybox.config > "$name-$version/.config"
-cd "$name-$version"
-
-make; make install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/ca-certificates.sat b/graveyard/first_attempt/tools/satellites/ca-certificates.sat
deleted file mode 100644
index 35cad1b..0000000
--- a/graveyard/first_attempt/tools/satellites/ca-certificates.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-name=ca-certificates
-version=$(date +%Y%m%d)
-
-dlfile "https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt"
-extrafile "make-ca.sh"
-extrafile "make-cert.pl"
-extrafile "remove-expired-certs.sh"
-header_end
-
-./make-ca.sh
-./remove-expired-certs.sh certs
-mkdir -p "$dir_install/tools/ssl/certs"
-cp certs/*.pem "$dir_install/tools/ssl/certs"
-c_rehash "$dir_install/tools/ssl/certs"
-cp ca-certificates.crt "$dir_install/tools/ssl/certs"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/check.sat b/graveyard/first_attempt/tools/satellites/check.sat
deleted file mode 100644
index 4937c8c..0000000
--- a/graveyard/first_attempt/tools/satellites/check.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=check
-version=0.10.0
-
-dlextract "https://sourceforge.net/projects/$name/files/$name/$version/$name-$version.tar.gz" \
-          "53c5e5c77d090e103a17f3ed7fd7d8b8"
-header_end
-
-cd "$name-$version"
-
-PKG_CONFIG= ./configure --prefix=/tools
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/curl.sat b/graveyard/first_attempt/tools/satellites/curl.sat
deleted file mode 100644
index 13c7c02..0000000
--- a/graveyard/first_attempt/tools/satellites/curl.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=curl
-version=7.44.0
-
-dlextract "http://curl.haxx.se/download/$name-$version.tar.bz2" \
-          "6b952ca00e5473b16a11f05f06aa8dae"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/tools --with-ssl
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/dejagnu.sat b/graveyard/first_attempt/tools/satellites/dejagnu.sat
deleted file mode 100644
index 9620196..0000000
--- a/graveyard/first_attempt/tools/satellites/dejagnu.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=dejagnu
-version=1.5.3
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
-          "5bda2cdb1af51a80aecce58d6e42bd2f"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/tools
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/expect.sat b/graveyard/first_attempt/tools/satellites/expect.sat
deleted file mode 100644
index e253aa1..0000000
--- a/graveyard/first_attempt/tools/satellites/expect.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=expect
-version=5.45
-
-dlextract "https://sourceforge.net/projects/$name/files/Expect/$version/$name$version.tar.gz" \
-          "44e1a4f4c877e9ddc5a542dfa7ecc92b"
-header_end
-
-cd "$name$version"
-
-sed -i 's:/usr/local/bin:/bin:' configure
-./configure --prefix=/tools --with-tcl=/tools/lib --with-tclinclude=/tools/include
-make; make DESTDIR="$dir_install" SCRIPTS="" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/extrafiles/busybox/busybox.config b/graveyard/first_attempt/tools/satellites/extrafiles/busybox/busybox.config
deleted file mode 100644
index 25bd73b..0000000
--- a/graveyard/first_attempt/tools/satellites/extrafiles/busybox/busybox.config
+++ /dev/null
@@ -1,1038 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.23.2
-# Thu Aug 27 07:40:27 2015
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-CONFIG_DESKTOP=y
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-# CONFIG_SHOW_USAGE is not set
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-# CONFIG_FEATURE_INSTALLER is not set
-CONFIG_INSTALL_NO_USR=y
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_UNICODE_SUPPORT is not set
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=0
-CONFIG_LAST_SUPPORTED_WCHAR=0
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-# CONFIG_PAM is not set
-CONFIG_FEATURE_USE_SENDFILE=y
-# CONFIG_LONG_OPTS is not set
-# CONFIG_FEATURE_DEVPTS is not set
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_PID_FILE_PATH=""
-# CONFIG_FEATURE_SUID is not set
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-# CONFIG_FEATURE_SYSLOG is not set
-# CONFIG_FEATURE_HAVE_RPC is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-# CONFIG_LFS is not set
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS=""
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_UNIT_TEST is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-# CONFIG_FEATURE_SYSTEMD is not set
-# CONFIG_FEATURE_RTMINMAX is not set
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SMALL=1
-CONFIG_SHA3_SMALL=1
-# CONFIG_FEATURE_FAST_TOP is not set
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_USE_TERMIOS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=255
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
-# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-# CONFIG_FEATURE_NON_POSIX_CP is not set
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_COPYBUF_KB=4
-# CONFIG_FEATURE_SKIP_ROOTFS is not set
-# CONFIG_MONOTONIC_SYSCALL is not set
-# CONFIG_IOCTL_HEX2STR_ERROR is not set
-# CONFIG_FEATURE_HWIB is not set
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-CONFIG_FEATURE_SEAMLESS_XZ=y
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-CONFIG_FEATURE_SEAMLESS_BZ2=y
-CONFIG_FEATURE_SEAMLESS_GZ=y
-# CONFIG_FEATURE_SEAMLESS_Z is not set
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-# CONFIG_FEATURE_AR_CREATE is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_GUNZIP is not set
-# CONFIG_BUNZIP2 is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-# CONFIG_UNXZ is not set
-# CONFIG_XZ is not set
-# CONFIG_BZIP2 is not set
-# CONFIG_CPIO is not set
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GZIP=y
-# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
-CONFIG_GZIP_FAST=0
-# CONFIG_LZOP is not set
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM is not set
-# CONFIG_RPM2CPIO is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_AUTODETECT=y
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
-CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_FEATURE_TAR_TO_COMMAND is not set
-CONFIG_FEATURE_TAR_UNAME_GNAME=y
-CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
-# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNZIP is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-# CONFIG_FEATURE_DATE_NANO is not set
-CONFIG_FEATURE_DATE_COMPAT=y
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_GROUPS=y
-CONFIG_SHUF=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_NODEREF=y
-CONFIG_FEATURE_TOUCH_SUSV3=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-CONFIG_FEATURE_TR_EQUIV=y
-CONFIG_UNLINK=y
-CONFIG_BASE64=y
-# CONFIG_WHO is not set
-# CONFIG_USERS is not set
-CONFIG_CAL=y
-CONFIG_CATV=y
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
-CONFIG_CHROOT=y
-CONFIG_CKSUM=y
-CONFIG_COMM=y
-CONFIG_CP=y
-# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
-CONFIG_CUT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
-CONFIG_FEATURE_DD_IBS_OBS=y
-CONFIG_DF=y
-CONFIG_FEATURE_DF_FANCY=y
-CONFIG_DIRNAME=y
-CONFIG_DOS2UNIX=y
-CONFIG_UNIX2DOS=y
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
-CONFIG_EXPAND=y
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-CONFIG_FOLD=y
-CONFIG_FSYNC=y
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_INSTALL=y
-# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-# CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-CONFIG_OD=y
-CONFIG_PRINTENV=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SHA3SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-CONFIG_SPLIT=y
-CONFIG_FEATURE_SPLIT_FANCY=y
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-CONFIG_STTY=y
-CONFIG_SUM=y
-CONFIG_SYNC=y
-CONFIG_TAC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_UNEXPAND=y
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options
-#
-CONFIG_FEATURE_VERBOSE=y
-
-#
-# Common options for cp and mv
-#
-CONFIG_FEATURE_PRESERVE_HARDLINKS=y
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-# CONFIG_FGCONSOLE is not set
-# CONFIG_CLEAR is not set
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-# CONFIG_KBD_MODE is not set
-# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
-# CONFIG_OPENVT is not set
-# CONFIG_RESET is not set
-# CONFIG_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
-# CONFIG_SETCONSOLE is not set
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETFONT is not set
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-# CONFIG_SHOWKEY is not set
-# CONFIG_FEATURE_LOADFONT_PSF2 is not set
-# CONFIG_FEATURE_LOADFONT_RAW is not set
-
-#
-# Debian Utilities
-#
-# CONFIG_MKTEMP is not set
-# CONFIG_PIPE_PROGRESS is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
-# CONFIG_WHICH is not set
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
-CONFIG_CMP=y
-CONFIG_DIFF=y
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_ED is not set
-CONFIG_PATCH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-# CONFIG_FEATURE_VI_8BIT is not set
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_UNDO=y
-CONFIG_FEATURE_VI_UNDO_QUEUE=y
-CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_MAXDEPTH=y
-CONFIG_FEATURE_FIND_NEWER=y
-CONFIG_FEATURE_FIND_INUM=y
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_EXEC_PLUS=y
-CONFIG_FEATURE_FIND_USER=y
-CONFIG_FEATURE_FIND_GROUP=y
-CONFIG_FEATURE_FIND_NOT=y
-CONFIG_FEATURE_FIND_DEPTH=y
-CONFIG_FEATURE_FIND_PAREN=y
-CONFIG_FEATURE_FIND_SIZE=y
-CONFIG_FEATURE_FIND_PRUNE=y
-CONFIG_FEATURE_FIND_DELETE=y
-CONFIG_FEATURE_FIND_PATH=y
-CONFIG_FEATURE_FIND_REGEX=y
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-CONFIG_FEATURE_FIND_LINKS=y
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-# CONFIG_HALT is not set
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-# CONFIG_INIT is not set
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_KILL_REMOVED is not set
-CONFIG_FEATURE_KILL_DELAY=0
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-CONFIG_INIT_TERMINAL_TYPE=""
-# CONFIG_MESG is not set
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_CRYPT is not set
-# CONFIG_USE_BB_CRYPT_SHA is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_LAST_ID=0
-CONFIG_FIRST_SYSTEM_ID=0
-CONFIG_LAST_SYSTEM_ID=0
-# CONFIG_ADDGROUP is not set
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-# CONFIG_DELUSER is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
-# CONFIG_LOGIN_SESSION_AS_CHILD is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_NOLOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_FSCK is not set
-# CONFIG_LSATTR is not set
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODINFO is not set
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-# CONFIG_INSMOD is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
-CONFIG_DEFAULT_MODULES_DIR=""
-CONFIG_DEFAULT_DEPMOD_FILE=""
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLOCKDEV is not set
-# CONFIG_FATATTR is not set
-# CONFIG_FSTRIM is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-# CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
-# CONFIG_DMESG is not set
-# CONFIG_FEATURE_DMESG_PRETTY is not set
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-# CONFIG_FLOCK is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_EXT2 is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-# CONFIG_GETOPT is not set
-# CONFIG_FEATURE_GETOPT_LONG is not set
-# CONFIG_HEXDUMP is not set
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-# CONFIG_HWCLOCK is not set
-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-# CONFIG_LOSETUP is not set
-# CONFIG_LSPCI is not set
-# CONFIG_LSUSB is not set
-# CONFIG_MKSWAP is not set
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-# CONFIG_MORE is not set
-# CONFIG_MOUNT is not set
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-# CONFIG_FEATURE_MOUNT_FLAGS is not set
-# CONFIG_FEATURE_MOUNT_FSTAB is not set
-# CONFIG_PIVOT_ROOT is not set
-# CONFIG_RDATE is not set
-# CONFIG_RDEV is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-# CONFIG_SETARCH is not set
-# CONFIG_SWAPONOFF is not set
-# CONFIG_FEATURE_SWAPON_DISCARD is not set
-# CONFIG_FEATURE_SWAPON_PRI is not set
-# CONFIG_SWITCH_ROOT is not set
-# CONFIG_UMOUNT is not set
-# CONFIG_FEATURE_UMOUNT_ALL is not set
-# CONFIG_FEATURE_MOUNT_LOOP is not set
-# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_F2FS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_NILFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
-# CONFIG_LESS is not set
-CONFIG_FEATURE_LESS_MAXLINES=0
-# CONFIG_FEATURE_LESS_BRACKETS is not set
-# CONFIG_FEATURE_LESS_FLAGS is not set
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-# CONFIG_RFKILL is not set
-# CONFIG_SETSERIAL is not set
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_UBIMKVOL is not set
-# CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
-# CONFIG_UBIUPDATEVOL is not set
-# CONFIG_WALL is not set
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_EJECT is not set
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_SMALL is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-# CONFIG_SETSID is not set
-# CONFIG_STRINGS is not set
-# CONFIG_TIME is not set
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NBDCLIENT is not set
-# CONFIG_NC is not set
-# CONFIG_NC_SERVER is not set
-# CONFIG_NC_EXTRA is not set
-# CONFIG_NC_110_COMPAT is not set
-# CONFIG_PING is not set
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING is not set
-# CONFIG_WHOIS is not set
-# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-# CONFIG_ARPING is not set
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FEATURE_FTP_AUTHENTICATION is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-# CONFIG_HOSTNAME is not set
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
-# CONFIG_IFCONFIG is not set
-# CONFIG_FEATURE_IFCONFIG_STATUS is not set
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-# CONFIG_FEATURE_IFCONFIG_HW is not set
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-# CONFIG_IFENSLAVE is not set
-# CONFIG_IFPLUGD is not set
-# CONFIG_IFUPDOWN is not set
-CONFIG_IFUPDOWN_IFSTATE_PATH=""
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-# CONFIG_IP is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
-# CONFIG_FEATURE_IP_ROUTE is not set
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_FEATURE_IP_RULE is not set
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_IPRULE is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NETSTAT is not set
-# CONFIG_FEATURE_NETSTAT_WIDE is not set
-# CONFIG_FEATURE_NETSTAT_PRG is not set
-# CONFIG_NSLOOKUP is not set
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_FEATURE_NTPD_CONF is not set
-# CONFIG_PSCAN is not set
-# CONFIG_ROUTE is not set
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-# CONFIG_TELNET is not set
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-# CONFIG_TFTP is not set
-# CONFIG_TFTPD is not set
-# CONFIG_FEATURE_TFTP_GET is not set
-# CONFIG_FEATURE_TFTP_PUT is not set
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
-# CONFIG_TFTP_DEBUG is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_TRACEROUTE6 is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-# CONFIG_UDHCPC6 is not set
-# CONFIG_UDHCPD is not set
-# CONFIG_DHCPRELAY is not set
-# CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE=""
-# CONFIG_UDHCPC is not set
-# CONFIG_FEATURE_UDHCPC_ARPING is not set
-# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
-# CONFIG_UDPSVD is not set
-# CONFIG_VCONFIG is not set
-# CONFIG_WGET is not set
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
-# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
-# CONFIG_FEATURE_WGET_TIMEOUT is not set
-# CONFIG_ZCIP is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-# CONFIG_IOSTAT is not set
-# CONFIG_LSOF is not set
-# CONFIG_MPSTAT is not set
-# CONFIG_NMETER is not set
-# CONFIG_PMAP is not set
-# CONFIG_POWERTOP is not set
-# CONFIG_PSTREE is not set
-# CONFIG_PWDX is not set
-# CONFIG_SMEMCAP is not set
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_UPTIME is not set
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
-# CONFIG_FREE is not set
-# CONFIG_FUSER is not set
-# CONFIG_KILL is not set
-# CONFIG_KILLALL is not set
-# CONFIG_KILLALL5 is not set
-# CONFIG_PGREP is not set
-# CONFIG_PIDOF is not set
-# CONFIG_FEATURE_PIDOF_SINGLE is not set
-# CONFIG_FEATURE_PIDOF_OMIT is not set
-# CONFIG_PKILL is not set
-# CONFIG_PS is not set
-# CONFIG_FEATURE_PS_WIDE is not set
-# CONFIG_FEATURE_PS_LONG is not set
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-# CONFIG_RENICE is not set
-# CONFIG_BB_SYSCTL is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-# CONFIG_WATCH is not set
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-# CONFIG_ASH_BASH_COMPAT is not set
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_HELP=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
-CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_ASH_EXPAND_PRMT=y
-# CONFIG_CTTYHACK is not set
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-CONFIG_SH_MATH_SUPPORT_64=y
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-CONFIG_FEATURE_SH_HISTFILESIZE=y
-
-#
-# System Logging Utilities
-#
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_FEATURE_KMSG_SYSLOG is not set
-# CONFIG_KLOGD is not set
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
-# CONFIG_LOGGER is not set
diff --git a/graveyard/first_attempt/tools/satellites/extrafiles/ca-certificates/make-ca.sh b/graveyard/first_attempt/tools/satellites/extrafiles/ca-certificates/make-ca.sh
deleted file mode 100644
index d7fe1d4..0000000
--- a/graveyard/first_attempt/tools/satellites/extrafiles/ca-certificates/make-ca.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-# Begin make-ca.sh
-# Script to populate OpenSSL's CApath from a bundle of PEM formatted CAs
-#
-# The file certdata.txt must exist in the local directory
-# Version number is obtained from the version of the data.
-#
-# Authors: DJ Lucas
-#          Bruce Dubbs
-#
-# Version 20120211
-
-certdata="certdata.txt"
-
-if [ ! -r $certdata ]; then
-  echo "$certdata must be in the local directory"
-  exit 1
-fi
-
-TEMPDIR=$(mktemp -d)
-BUNDLE="ca-certificates.crt"
-CONVERTSCRIPT="make-cert.pl"
-
-mkdir "${TEMPDIR}/certs"
-
-# Get a list of starting lines for each cert
-CERTBEGINLIST=$(grep -n "^# Certificate" "${certdata}" | cut -d ":" -f1)
-
-# Get a list of ending lines for each cert
-CERTENDLIST=`grep -n "^CKA_TRUST_STEP_UP_APPROVED" "${certdata}" | cut -d ":" -f 1`
-
-# Start a loop
-for certbegin in ${CERTBEGINLIST}; do
-  for certend in ${CERTENDLIST}; do
-    if test "${certend}" -gt "${certbegin}"; then
-      break
-    fi
-  done
-
-  # Dump to a temp file with the name of the file as the beginning line number
-  sed -n "${certbegin},${certend}p" "${certdata}" > "${TEMPDIR}/certs/${certbegin}.tmp"
-done
-
-unset CERTBEGINLIST CERTDATA CERTENDLIST certbegin certend
-
-mkdir -p certs
-rm -f certs/*      # Make sure the directory is clean
-
-for tempfile in ${TEMPDIR}/certs/*.tmp; do
-  # Make sure that the cert is trusted...
-  grep "CKA_TRUST_SERVER_AUTH" "${tempfile}" | \
-    egrep "TRUST_UNKNOWN|NOT_TRUSTED" > /dev/null
-
-  if test "${?}" = "0"; then
-    # Throw a meaningful error and remove the file
-    cp "${tempfile}" tempfile.cer
-    perl ${CONVERTSCRIPT} > tempfile.crt
-    keyhash=$(openssl x509 -noout -in tempfile.crt -hash)
-    echo "Certificate ${keyhash} is not trusted!  Removing..."
-    rm -f tempfile.cer tempfile.crt "${tempfile}"
-    continue
-  fi
-
-  # If execution made it to here in the loop, the temp cert is trusted
-  # Find the cert data and generate a cert file for it
-
-  cp "${tempfile}" tempfile.cer
-  perl ${CONVERTSCRIPT} > tempfile.crt
-  keyhash=$(openssl x509 -noout -in tempfile.crt -hash)
-  mv tempfile.crt "certs/${keyhash}.pem"
-  rm -f tempfile.cer "${tempfile}"
-  echo "Created ${keyhash}.pem"
-done
-
-# Remove blacklisted files
-# MD5 Collision Proof of Concept CA
-if test -f certs/8f111d69.pem; then
-  echo "Certificate 8f111d69 is not trusted!  Removing..."
-  rm -f certs/8f111d69.pem
-fi
-
-# Finally, generate the bundle and clean up.
-cat certs/*.pem >  ${BUNDLE}
-rm -r "${TEMPDIR}"
diff --git a/graveyard/first_attempt/tools/satellites/extrafiles/ca-certificates/make-cert.pl b/graveyard/first_attempt/tools/satellites/extrafiles/ca-certificates/make-cert.pl
deleted file mode 100644
index 60b6fea..0000000
--- a/graveyard/first_attempt/tools/satellites/extrafiles/ca-certificates/make-cert.pl
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/perl -w
-
-# Used to generate PEM encoded files from Mozilla certdata.txt.
-# Run as ./make-cert.pl > certificate.crt
-#
-# Parts of this script courtesy of RedHat (mkcabundle.pl)
-#
-# This script modified for use with single file data (tempfile.cer) extracted
-# from certdata.txt, taken from the latest version in the Mozilla NSS source.
-# mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-#
-# Authors: DJ Lucas
-#          Bruce Dubbs
-#
-# Version 20120211
-
-my $certdata = './tempfile.cer';
-
-open( IN, "cat $certdata|" )
-    || die "could not open $certdata";
-
-my $incert = 0;
-
-while ( <IN> )
-{
-    if ( /^CKA_VALUE MULTILINE_OCTAL/ )
-    {
-        $incert = 1;
-        open( OUT, "|openssl x509 -text -inform DER -fingerprint" )
-            || die "could not pipe to openssl x509";
-    }
-
-    elsif ( /^END/ && $incert )
-    {
-        close( OUT );
-        $incert = 0;
-        print "\n\n";
-    }
-
-    elsif ($incert)
-    {
-        my @bs = split( /\\/ );
-        foreach my $b (@bs)
-        {
-            chomp $b;
-            printf( OUT "%c", oct($b) ) unless $b eq '';
-        }
-    }
-}
diff --git a/graveyard/first_attempt/tools/satellites/extrafiles/ca-certificates/remove-expired-certs.sh b/graveyard/first_attempt/tools/satellites/extrafiles/ca-certificates/remove-expired-certs.sh
deleted file mode 100644
index 0882a26..0000000
--- a/graveyard/first_attempt/tools/satellites/extrafiles/ca-certificates/remove-expired-certs.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# Begin /usr/sbin/remove-expired-certs.sh
-#
-# Version 20120211
-
-# Make sure the date is parsed correctly on all systems
-mydate()
-{
-  local y=$( echo $1 | cut -d" " -f4 )
-  local M=$( echo $1 | cut -d" " -f1 )
-  local d=$( echo $1 | cut -d" " -f2 )
-  local m
-
-  if [ ${d} -lt 10 ]; then d="0${d}"; fi
-
-  case $M in
-    Jan) m="01";;
-    Feb) m="02";;
-    Mar) m="03";;
-    Apr) m="04";;
-    May) m="05";;
-    Jun) m="06";;
-    Jul) m="07";;
-    Aug) m="08";;
-    Sep) m="09";;
-    Oct) m="10";;
-    Nov) m="11";;
-    Dec) m="12";;
-  esac
-
-  certdate="${y}${m}${d}"
-}
-
-OPENSSL=/usr/bin/openssl
-DIR=/etc/ssl/certs
-
-if [ $# -gt 0 ]; then
-  DIR="$1"
-fi
-
-certs=$( find ${DIR} -type f -name "*.pem" -o -name "*.crt" )
-today=$( date +%Y%m%d )
-
-for cert in $certs; do
-  notafter=$( $OPENSSL x509 -enddate -in "${cert}" -noout )
-  date=$( echo ${notafter} |  sed 's/^notAfter=//' )
-  mydate "$date"
-
-  if [ ${certdate} -lt ${today} ]; then
-     echo "${cert} expired on ${certdate}! Removing..."
-     rm -f "${cert}"
-  fi
-done
diff --git a/graveyard/first_attempt/tools/satellites/extrafiles/stow/etc-stowrc.patch b/graveyard/first_attempt/tools/satellites/extrafiles/stow/etc-stowrc.patch
deleted file mode 100644
index 51f999b..0000000
--- a/graveyard/first_attempt/tools/satellites/extrafiles/stow/etc-stowrc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur stow-2.2.0-orig/bin/stow.in stow-2.2.0/bin/stow.in
---- stow-2.2.0-orig/bin/stow.in	2015-08-20 18:05:18.543173733 +0200
-+++ stow-2.2.0/bin/stow.in	2015-08-20 18:05:58.844669895 +0200
-@@ -577,15 +577,14 @@
- # Parameters: none
- # Returns   : a list of default options
- # Throws    : no exceptions
--# Comments  : prepends the contents of '~/.stowrc' and '.stowrc' to the command
-+# Comments  : prepends the contents of '/etc/stowrc', '~/.stowrc' and '.stowrc' to the command
- #           : line so they get parsed just like normal arguments. (This was
- #           : hacked in so that Emil and I could set different preferences).
- #=============================================================================
- sub get_config_file_options {
-     my @defaults = ();
--    for my $file ("$ENV{HOME}/.stowrc", '.stowrc') {
-+    for my $file ('/etc/stowrc', "$ENV{HOME}/.stowrc", '.stowrc') {
-         if (-r $file) {
--            warn "Loading defaults from $file\n";
-             open my $FILE, '<', $file
-                 or die "Could not open $file for reading\n";
-             while (my $line = <$FILE>){
diff --git a/graveyard/first_attempt/tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch b/graveyard/first_attempt/tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch
deleted file mode 100644
index 7932778..0000000
--- a/graveyard/first_attempt/tools/satellites/extrafiles/stow/fix-warning-message-perl5.20.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Source: ArchLinux (https://projects.archlinux.org/svntogit/community.git/tree/trunk/01-fix-warning-message-perl5.20.patch?h=packages/stow)
-# https://projects.archlinux.org/svntogit/community.git/plain/trunk/01-fix-warning-message-perl5.20.patch?h=packages/stow
---- a/lib/Stow.pm.in	2012-02-18 20:33:34.000000000 +0000
-+++ b/lib/Stow.pm.in	2014-06-08 22:46:03.420893651 +0100
-@@ -1732,7 +1732,7 @@
-     }
-     elsif (-l $path) {
-         debug(4, "  read_a_link($path): real link");
--        return readlink $path
-+        (return readlink $path)
-             or error("Could not read link: $path");
-     }
-     internal_error("read_a_link() passed a non link path: $path\n");
diff --git a/graveyard/first_attempt/tools/satellites/gawk.sat b/graveyard/first_attempt/tools/satellites/gawk.sat
deleted file mode 100644
index 3782b12..0000000
--- a/graveyard/first_attempt/tools/satellites/gawk.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=gawk
-version=4.1.3
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz" \
-          "97f8f44149ea9b9e94be97f68988be87"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/tools
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/gcc-1.sat b/graveyard/first_attempt/tools/satellites/gcc-1.sat
deleted file mode 100644
index 87b6f64..0000000
--- a/graveyard/first_attempt/tools/satellites/gcc-1.sat
+++ /dev/null
@@ -1,67 +0,0 @@
-name=gcc
-version=5.2.0
-gmp_shortver=6.0.0
-gmp_version=${gmp_shortver}a
-mpfr_version=3.1.3
-mpc_version=1.0.3
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.bz2" \
-          "a51bcfeb3da7dd4c623e27207ed43467"
-download "https://ftp.gnu.org/gnu/gmp/gmp-$gmp_version.tar.xz" \
-         "1e6da4e434553d2811437aa42c7f7c76"
-download "https://ftp.gnu.org/gnu/mpfr/mpfr-$mpfr_version.tar.xz" \
-         "6969398cd2fbc56a6af570b5273c56a9"
-download "https://ftp.gnu.org/gnu/mpc/mpc-$mpc_version.tar.gz" \
-         "d6a1d5f8ddea3abd2cc3e98f58352d26"
-header_end
-
-cd "$name-$version"
-
-extract "gmp-$gmp_version.tar.xz"
-extract "mpfr-$mpfr_version.tar.xz"
-extract "mpc-$mpc_version.tar.gz"
-mv "gmp-$gmp_shortver" gmp
-mv "mpfr-$mpfr_version" mpfr
-mv "mpc-$mpc_version" mpc
-
-for file in \
-    $(find gcc/config -name linux64.h -o -name linux.h -o -name sysv4.h)
-do
-    cp -u $file $file.orig
-    sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \
-        -e 's@/usr@/tools@g' $file.orig > $file
-    echo '
-#undef STANDARD_STARTFILE_PREFIX_1
-#undef STANDARD_STARTFILE_PREFIX_2
-#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"
-#define STANDARD_STARTFILE_PREFIX_2 ""' >> $file
-    touch $file.orig
-done
-
-mkdir "../$name-build"; cd "../$name-build"
-
-"../$name-$version/configure" \
-    --target="$target" \
-    --prefix=/tools \
-    --with-glibc-version=2.11 \
-    --with-sysroot="$dir_install" \
-    --with-newlib \
-    --without-headers \
-    --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include \
-    --disable-nls \
-    --disable-shared \
-    --disable-multilib \
-    --disable-decimal-float \
-    --disable-threads \
-    --disable-libatomic \
-    --disable-libgomp \
-    --disable-libquadmath \
-    --disable-libssp \
-    --disable-libvtv \
-    --disable-libstdcxx \
-    --enable-languages=c,c++
-
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/gcc-2.sat b/graveyard/first_attempt/tools/satellites/gcc-2.sat
deleted file mode 100644
index 9c44ee5..0000000
--- a/graveyard/first_attempt/tools/satellites/gcc-2.sat
+++ /dev/null
@@ -1,63 +0,0 @@
-name=gcc
-version=5.2.0
-gmp_shortver=6.0.0
-gmp_version=${gmp_shortver}a
-mpfr_version=3.1.3
-mpc_version=1.0.3
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.bz2" \
-          "a51bcfeb3da7dd4c623e27207ed43467"
-download "https://ftp.gnu.org/gnu/gmp/gmp-$gmp_version.tar.xz" \
-         "1e6da4e434553d2811437aa42c7f7c76"
-download "https://ftp.gnu.org/gnu/mpfr/mpfr-$mpfr_version.tar.xz" \
-         "6969398cd2fbc56a6af570b5273c56a9"
-download "https://ftp.gnu.org/gnu/mpc/mpc-$mpc_version.tar.gz" \
-         "d6a1d5f8ddea3abd2cc3e98f58352d26"
-header_end
-
-cd "$name-$version"
-
-extract "gmp-$gmp_version.tar.xz"
-extract "mpfr-$mpfr_version.tar.xz"
-extract "mpc-$mpc_version.tar.gz"
-mv "gmp-$gmp_shortver" gmp
-mv "mpfr-$mpfr_version" mpfr
-mv "mpc-$mpc_version" mpc
-
-cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \
-  "$(dirname "$($target-gcc -print-libgcc-file-name)")/include-fixed/limits.h"
-
-for file in \
-    $(find gcc/config -name linux64.h -o -name linux.h -o -name sysv4.h)
-do
-    cp -u $file $file.orig
-    sed -e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \
-        -e 's@/usr@/tools@g' $file.orig > $file
-    echo '
-#undef STANDARD_STARTFILE_PREFIX_1
-#undef STANDARD_STARTFILE_PREFIX_2
-#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"
-#define STANDARD_STARTFILE_PREFIX_2 ""' >> $file
-    touch $file.orig
-done
-
-mkdir "../$name-build"; cd "../$name-build"
-
-CC="$target-gcc" \
-CXX="$target-g++" \
-AR="$target-ar" \
-RANLIB="$target-ranlib" \
-"../$name-$version/configure" \
-    --prefix=/tools \
-    --with-local-prefix=/tools \
-    --with-native-system-header-dir=/tools/include \
-    --enable-languages=c,c++ \
-    --disable-libstdcxx-pch \
-    --disable-multilib \
-    --disable-bootstrap \
-    --disable-libgomp
-
-make; make DESTDIR="$dir_install" install
-ln -s gcc "$dir_install/tools/bin/cc"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/glibc.sat b/graveyard/first_attempt/tools/satellites/glibc.sat
deleted file mode 100644
index 9f67e7c..0000000
--- a/graveyard/first_attempt/tools/satellites/glibc.sat
+++ /dev/null
@@ -1,24 +0,0 @@
-name=glibc
-version=2.22
-
-dlextract "https://ftp.gnu.org/gnu/libc/$name-$version.tar.xz" \
-          "e51e02bf552a0a1fbbdc948fb2f5e83c"
-header_end
-
-mkdir "$name-build"; cd "$name-build"
-
-"../$name-$version/configure" \
-    --prefix=/tools \
-    --host="$target" \
-    --build="$(../$name-$version/scripts/config.guess)" \
-    --disable-profile \
-    --enable-kernel=2.6.32 \
-    --enable-obsolete-rpc \
-    --with-headers=/tools/include \
-    libc_cv_forced_unwind=yes \
-    libc_cv_ctors_header=yes \
-    libc_cv_c_cleanup=yes
-
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/libstdcxx.sat b/graveyard/first_attempt/tools/satellites/libstdcxx.sat
deleted file mode 100644
index dbb4528..0000000
--- a/graveyard/first_attempt/tools/satellites/libstdcxx.sat
+++ /dev/null
@@ -1,21 +0,0 @@
-name=gcc
-version=5.2.0
-
-dlextract "https://ftp.gnu.org/gnu/gcc/$name-$version/$name-$version.tar.bz2" \
-          "a51bcfeb3da7dd4c623e27207ed43467"
-header_end
-
-mkdir "$name-build"; cd "$name-build"
-
-"../$name-$version/libstdc++-v3/configure" \
-    --host="$target" \
-    --prefix=/tools \
-    --disable-multilib \
-    --disable-nls \
-    --disable-libstdcxx-threads \
-    --disable-libstdcxx-pch \
-    --with-gxx-include-dir="/tools/$target/include/c++/$version"
-
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/linux-api.sat b/graveyard/first_attempt/tools/satellites/linux-api.sat
deleted file mode 100644
index d54e101..0000000
--- a/graveyard/first_attempt/tools/satellites/linux-api.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=linux
-version=4.1.6
-
-dlextract "https://www.kernel.org/pub/$name/kernel/v4.x/$name-$version.tar.xz" \
-          "1dae0c808e34164cab3dfd57be88bd53"
-header_end
-
-cd "$name-$version"
-
-make mrproper
-make INSTALL_HDR_PATH="$dir_install/tools" headers_install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/m4.sat b/graveyard/first_attempt/tools/satellites/m4.sat
deleted file mode 100644
index 1b7c928..0000000
--- a/graveyard/first_attempt/tools/satellites/m4.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=m4
-version=1.4.17
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz" \
-          "12a3c829301a4fd6586a57d3fcf196dc"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/tools
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/make.sat b/graveyard/first_attempt/tools/satellites/make.sat
deleted file mode 100644
index 40dc9c1..0000000
--- a/graveyard/first_attempt/tools/satellites/make.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=make
-version=4.1
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2" \
-          "57a7a224a822f94789a587ccbcedff69"
-header_end
-
-cd "$name-$version"
-
-./configure --prefix=/tools --without-guile
-make; make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/openssl.sat b/graveyard/first_attempt/tools/satellites/openssl.sat
deleted file mode 100644
index dc7bb9b..0000000
--- a/graveyard/first_attempt/tools/satellites/openssl.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=openssl
-version=1.0.2d
-
-dlextract "https://www.openssl.org/source/$name-$version.tar.gz" \
-          "38dd619b2e77cbac69b99f52a053d25a"
-header_end
-
-cd "$name-$version"
-
-./config --prefix=/tools shared
-make all; make INSTALL_PREFIX="$dir_install" install_sw
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/perl.sat b/graveyard/first_attempt/tools/satellites/perl.sat
deleted file mode 100644
index 59590c1..0000000
--- a/graveyard/first_attempt/tools/satellites/perl.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-name=perl
-version=5.22.0
-
-dlextract "http://www.cpan.org/src/5.0/$name-$version.tar.gz" \
-          "e32cb6a8dda0084f2a43dac76318d68d"
-header_end
-
-cd "$name-$version"
-
-sh Configure -des -Dprefix=/tools -Dlibs=-lm
-make
-
-cp perl "$dir_install/tools/bin"
-mkdir -p "$dir_install/tools/lib/perl5"
-cp -r lib "$dir_install/tools/lib/perl5/$version"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/stow.sat b/graveyard/first_attempt/tools/satellites/stow.sat
deleted file mode 100644
index 6bbc310..0000000
--- a/graveyard/first_attempt/tools/satellites/stow.sat
+++ /dev/null
@@ -1,18 +0,0 @@
-name=stow
-version=2.2.0
-
-dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2" \
-          "5bb56592eff9aaf9dfb6c975b3004240"
-extrafile "fix-warning-message-perl5.20.patch"
-extrafile "etc-stowrc.patch"
-header_end
-
-cd "$name-$version"
-
-patch -p1 -i "../fix-warning-message-perl5.20.patch"
-patch -p1 -i "../etc-stowrc.patch"
-
-./configure --prefix=/tools
-make DESTDIR="$dir_install" install-exec-am install-pmDATA install-dist_pmstowDATA
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/satellites/tcl-core.sat b/graveyard/first_attempt/tools/satellites/tcl-core.sat
deleted file mode 100644
index f4491d1..0000000
--- a/graveyard/first_attempt/tools/satellites/tcl-core.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-name=tcl
-fullname=$name-core
-majver=8.6
-version=$majver.4
-
-dlextract "https://sourceforge.net/projects/tcl/files/Tcl/$version/$fullname$version-src.tar.gz" \
-          "8b8c9d85469d8dbe32e51117b8ef11e3"
-header_end
-
-cd "$name$version/unix"
-
-./configure --prefix=/tools
-make; make DESTDIR="$dir_install" install install-private-headers
-chmod u+w "$dir_install/tools/lib/libtcl$majver.so"
-ln -s tclsh$majver "$dir_install/tools/bin/tclsh"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/first_attempt/tools/version-check.sh b/graveyard/first_attempt/tools/version-check.sh
deleted file mode 100755
index 40673a4..0000000
--- a/graveyard/first_attempt/tools/version-check.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-# Simple script to list version numbers of critical development tools
-# Copied from LFS 7.7
-
-export LC_ALL=C
-bash --version | head -n1 | cut -d" " -f2-4
-echo "/bin/sh -> `readlink -f /bin/sh`"
-echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
-bison --version | head -n1
-
-if [ -h /usr/bin/yacc ]; then
-  echo "/usr/bin/yacc -> `readlink -f /usr/bin/yacc`";
-elif [ -x /usr/bin/yacc ]; then
-  echo yacc is `/usr/bin/yacc --version | head -n1`
-else
-  echo "yacc not found" 
-fi
-
-bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f1,6-
-echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
-diff --version | head -n1
-find --version | head -n1
-gawk --version | head -n1
-
-if [ -h /usr/bin/awk ]; then
-  echo "/usr/bin/awk -> `readlink -f /usr/bin/awk`";
-elif [ -x /usr/bin/awk ]; then
-  echo yacc is `/usr/bin/awk --version | head -n1`
-else 
-  echo "awk not found" 
-fi
-
-gcc --version | head -n1
-g++ --version | head -n1
-ldd --version | head -n1 | cut -d" " -f2-  # glibc version
-grep --version | head -n1
-gzip --version | head -n1
-cat /proc/version
-m4 --version | head -n1
-make --version | head -n1
-patch --version | head -n1
-echo Perl `perl -V:version`
-sed --version | head -n1
-tar --version | head -n1
-makeinfo --version | head -n1
-xz --version | head -n1
-curl --version | head -n1
-
-echo 'main(){}' > dummy.c && g++ -o dummy dummy.c
-if [ -x dummy ]
-  then echo "g++ compilation OK";
-  else echo "g++ compilation failed"; fi
-rm -f dummy.c dummy
diff --git a/graveyard/freshnaut b/graveyard/freshnaut
deleted file mode 100755
index 4e858a4..0000000
--- a/graveyard/freshnaut
+++ /dev/null
@@ -1,161 +0,0 @@
-#!/bin/sh -e
-
-# A script to check for satellite updates.
-# It just downloads the documents which should be updated when the software has an update.
-# It's a shitty method, but it kinda works... Other than having a lot of false-positives.
-
-_show_help() {
-echo "This program will help keep your satellites fresh and up to date.
-Usage: $0 <[\$dir_satellites] [\$_dir_fresh]|ignore <diff> <ignorediff>>
-
-\$dir_satellites = The directory where all the satellites are you want to update.
-\$_dir_fresh = The directory that will be used to keep all the files for checking.
-ignore = Use this option to generate an ignorediff.
-diff = A diff file. Generated without -u or any other fancy options.
-ignorediff = A file containing the differences to be ignored (this file will be appended to).
-
-The variables (starting with \$) can also be set from a configuration file."
-}
-
-get_variable() {
-    printf "
-        download() { :; }
-        extract() { :; }
-        getfile() { :; }
-        extrafile() { :; }
-        dlextract() { :; }
-        dlfile() { :; }
-        header_end() { echo \$$1; exit; }
-        . %s
-    " $2 | sh
-}
-
-download() {
-    $(echo "$cmd_download" | sed -e 's@{dst}@'"$2"'@g' -e 's@{src}@'"$1"'@g') 2> /dev/null
-}
-
-diff_extractlines() {
-    # Extract all the line numbers from a diff.
-
-    stage=0
-    for line in $(echo "$1" | awk '{print $1}'); do
-        if [ "$stage" = 0 ]; then
-            if [ "$line" != ">" -a "$line" != "<" ]; then
-                echo "$line"
-                stage=1
-            fi
-        elif [ "$stage" = 1 ]; then
-            if [ "$line" != ">" -a "$line" != "<" ]; then
-                if [ "$line" = "---" ]; then
-                    stage=0
-                else
-                    echo "$line"
-                fi
-            fi
-        fi
-    done
-}
-
-apply_ignorediff() {
-    # Filter a diff, only return the differences that shouldn't be ignored.
-    # TODO: This function is slow, due to the usage of awk on every line. A solution for this problem would be great.
-
-    stage=0
-    ignore=0
-    echo "$1" | while read line; do
-        first="$(echo "$line" | awk '{print $1}')"
-        if [ "$stage" = 0 ]; then
-            if [ "$first" != ">" -a "$first" != "<" ]; then
-                stage=1
-                ignore=0
-                if grep -e "^$line\$" "$2" > /dev/null; then
-                    ignore=1
-                fi
-            fi
-        elif [ "$stage" = 1 ]; then
-            if [ "$first" != ">" -a "$first" != "<" ]; then
-                if [ "$line" = "---" ]; then
-                    stage=0
-                else
-                    ignore=0
-                    if grep -e "^$line\$" "$2" > /dev/null; then
-                        ingore=1
-                    fi
-                fi
-            fi
-        fi
-
-        if [ "$ignore" = 0 ]; then
-            echo "$line"
-        fi
-    done
-}
-
-# Do something completely different when this option is provided.
-if [ "$1" = "ignore" ]; then
-    if [ $# -lt 3 ]; then
-        _show_help
-        exit 1
-    fi
-
-    diff_extractlines "$(cat "$2")" >> "$3"
-
-    # Don't do anything else
-    exit
-fi
-
-# Load the config
-cmd_download="curl -L -o {dst} {src}"  # Command to execute to download files
-[ -f /etc/astronaut.conf ] && . /etc/astronaut.conf
-[ -f "$HOME/.astronaut.conf" ] && . "$HOME/.astronaut.conf"
-
-# Override config with command-line parameters.
-[ "$1" ] && dir_satellites="$1"
-[ "$2" ] && _dir_fresh="$2"
-
-if [ ! "$dir_satellites" -o ! "$_dir_fresh" ]; then
-    _show_help
-    exit 1
-fi
-
-mkdir -p "$_dir_fresh"
-
-for sat in "$dir_satellites"/*.sat; do
-    update_url="$(get_variable update_url "$sat")"
-    name="$(basename "$sat" .sat)"
-
-    if [ "$update_url" ]; then
-        printf "Checking: $name..."
-        cols="$(expr $(tput cols) - $(printf "Checking: $name..." | wc -c))"
-
-        download "$update_url" "$_dir_fresh/$name.fresh"
-
-        if [ -f "$_dir_fresh/$name" ]; then
-            check="$(diff "$_dir_fresh/$name" "$_dir_fresh/$name.fresh" || true)"
-
-            if [ -f "$_dir_fresh/$name.ignorediff" ]; then
-                check="$(apply_ignorediff "$check" "$_dir_fresh/$name.ignorediff")"
-            fi
-
-            if [ "$check" ]; then
-                printf "%${cols}s\n" "Update detected"
-                echo "$check" >> "$_dir_fresh/$name-$(date +%Y%m%d%H%M%S).diff"
-            else
-                printf "\n"
-            fi
-        else
-            printf "%${cols}s\n" "First update check, creating new file"
-            download "$update_url" "$_dir_fresh/$name.checkfresh"
-            check="$(diff "$_dir_fresh/$name.fresh" "$_dir_fresh/$name.checkfresh" || true)"
-
-            if [ "$check" ]; then
-                echo "$(diff_extractlines "$check")" >> "$_dir_fresh/$name.ignorediff"
-                echo "> Created ignorediff"
-            fi
-
-            rm "$_dir_fresh/$name.checkfresh"
-        fi
-
-        mv "$_dir_fresh/$name.fresh" "$_dir_fresh/$name"
-    fi
-done
diff --git a/graveyard/freshnaut.cause_of_death b/graveyard/freshnaut.cause_of_death
deleted file mode 100644
index 4f2ee3b..0000000
--- a/graveyard/freshnaut.cause_of_death
+++ /dev/null
@@ -1,6 +0,0 @@
-Freshnaut died on 19 december 2015.
-It's latest known update was 4 november of the same year.
-Birth date is unknown.
-
-Cause of death:
-I've started working on freshnaut as a way of checking software for updates with as little missed updates as possible. At the time, I thought regex methods were prone to missing a lot of updates, and while they do, this method is even worse. Yes, diffing websites is hell. The only websites this worked on were things like palemoon, but even that one updated a few times for halloween and other unnecessary things. As soon as you get into generated websites like sourceforge, everything changes every time you fetch it, and even if you try to ignore some ever-changing lines, you'll start noticing every single update they do to their site anyway (they even have some line in the file which tells the page's version). So, I've started doing a different approach (this time in lua), which relies on regex shenanigans, but that's all handled by the implementation, as the satellite writer doesn't have to worry about it too much.
diff --git a/graveyard/internaut b/graveyard/internaut
deleted file mode 100755
index 62a7a9b..0000000
--- a/graveyard/internaut
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh -e
-
-# This is a very hacky script to generate satellites.
-# A honestly shitty attempt to auto-generate satellites.
-
-astronaut="$(dirname "$0")/astronaut"
-[ ! -f "$astronaut" ] && astronaut="astronaut"
-
-# TODO: These variables won't always be valid
-dir_build="$PWD/build"
-dir_source="$PWD/source"
-dir_install="$PWD/install"
-
-tempdir="/tmp/internaut"
-rm -rf "$tempdir"
-mkdir -p "$tempdir"
-
-intshell() {
-    # This is the most hacky part in the script, so bear with me.
-    # Why this is even a thing, is because I need two things:
-    # - Run some commands on start
-    # - Capture all input
-    # I'm sure "tee ouput | bash --rcfile filewithcommands" would effectively do the same thing, but fuck bash.
-
-    echo "Entering shell..."
-
-    cmdfifo="$tempdir/cmdfifo"
-    waitfifo="$tempdir/waitfifo"
-    mkfifo "$cmdfifo" 2> /dev/null || true
-    mkfifo "$waitfifo" 2> /dev/null || true
-
-    sh -s < "$cmdfifo" "$pkgfile" &
-    shpid=$!
-
-    echo ". \"$astronaut\"; set +e; echo \$PWD > \"$waitfifo\"; cat \"$waitfifo\"" > "$cmdfifo"
-    while ps -p $shpid > /dev/null; do
-        printf "$(cat "$waitfifo")> "
-        read cmd
-
-        case "$cmd" in
-            exit) ;;
-            !*) cmd="$(echo "$cmd" | cut -c 2-)" ;;
-            *) echo "$cmd" >> "$pkgfile" ;;
-        esac
-
-        echo "$cmd" > "$cmdfifo"
-
-        echo "echo \$PWD > \"$waitfifo\"; cat \"$waitfifo\"" > "$cmdfifo"
-        printf '' > "$waitfifo"
-    done
-
-    rm -f "$waitfifo" "$cmdfifo"
-    echo 'End shell.'
-}
-
-# The rest of this script is your olde gather info stuff.
-
-printf 'Package name: '
-read pkgname
-pkgfile="$PWD/$pkgname.sat"
-
-echo "# Generated with internaut. Please revise and edit." > "$pkgfile"
-echo >> "$pkgfile"
-
-printf 'Software name [enter for same as package]: '
-read name
-if [ "$name" ]; then
-    echo "name=$name" >> "$pkgfile"
-else
-    echo "name=$pkgname" >> "$pkgfile"
-fi
-
-printf 'Version: '
-read version
-echo "version=$version" >> "$pkgfile"
-
-printf 'Update URL: '
-read update_url
-echo "update_url=\"$update_url\"" >> "$pkgfile"
-
-echo >> "$pkgfile"
-
-# Now we ask the user to fetch the files they need.
-echo '=> Header'
-intshell
-
-# Generate the md5sums, append them to the satellite, for manual inspection.
-for file in $(find "$dir_source" -type f); do
-    printf '# ' >> "$pkgfile"
-    md5sum "$file" >> "$pkgfile"
-done
-
-printf 'header_end\n\n' >> "$pkgfile"
-
-# Now we ask the user to build and install the program in question.
-echo '=> Build'
-intshell
-
-# Replacing all the instances of the name and the version with the variable.
-#sed -i -e "s/$name/\$name/g" -e "s/$version/\$version/g" -e "s/name=\$name/name=$name/g" -e "s/version=\$version/version=$version/g" "$pkgfile"
-# TODO: Why dun dis shit work?
-
-# The usual vim config line.
-printf '\n# vim:set tabstop=4 shiftwidth=4 syntax=sh et:\n' >> "$pkgfile"
-
-rm -rf "$tempdir"
diff --git a/graveyard/internaut.cause_of_death b/graveyard/internaut.cause_of_death
deleted file mode 100644
index 2e4623f..0000000
--- a/graveyard/internaut.cause_of_death
+++ /dev/null
@@ -1,6 +0,0 @@
-Internaut died on 14 november 2015.
-It's latest known update was 31 october of the same year.
-Birth date is unknown.
-
-Cause of death:
-I initially wanted something that could generate satellites easily, and after hacking together internaut, I may have used it one or two times, but that was it. I haven't touched it in a few months and it's latest update has been to change the way the astronaut program is found. It just isn't practical, and the implementation is awful. After deciding I wanted to make some changes to the way satellites work, I've come to realize that maintaining it is more work than it's worth.
diff --git a/graveyard/unmaintained_satellites/3dsfat16tool.sat b/graveyard/unmaintained_satellites/3dsfat16tool.sat
deleted file mode 100644
index c20467b..0000000
--- a/graveyard/unmaintained_satellites/3dsfat16tool.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=3DSFAT16tool
-version=3.2
-update_url="https://github.com/d0k3/$name/releases"
-update_names="v$version.tar.gz"
-
-dlextract "https://github.com/d0k3/$name/archive/v$version.tar.gz" \
-          'c4a2a0d4e8eed7b882ea090ccdb2e929'
-header_end
-
-cd "$name-$version"
-cc -O3 "$name.c" -o "$name"
-install -Dm755 "$name" "$dir_install/$dir_prefix/bin/$name"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/3dstool-git.sat b/graveyard/unmaintained_satellites/3dstool-git.sat
deleted file mode 100644
index ff91eb0..0000000
--- a/graveyard/unmaintained_satellites/3dstool-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'compile/cmake'
-import 'vcs/git'
-
-name=3dstool
-
-vcs_git "https://github.com/dnasdw/$name"
-header_end
-
-cd "$name"
-compile_cmake -I
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "bin/Release/$name"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/3dstool.sat b/graveyard/unmaintained_satellites/3dstool.sat
deleted file mode 100644
index 9d7ec3b..0000000
--- a/graveyard/unmaintained_satellites/3dstool.sat
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'compile/cmake'
-
-name=3dstool
-version=1.0.18  # TODO: Untested
-update_url="https://github.com/dnasdw/$name/releases"
-update_names="/archive/v$version.tar.gz"
-
-dlextract "https://github.com/dnasdw/$name/archive/v$version.tar.gz" \
-          'cfba027c749b4b600dae36f508f0af48'
-header_end
-
-cd "$name-$version"
-compile_cmake -I
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "bin/Release/$name"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/apulse.sat b/graveyard/unmaintained_satellites/apulse.sat
deleted file mode 100644
index 7943514..0000000
--- a/graveyard/unmaintained_satellites/apulse.sat
+++ /dev/null
@@ -1,19 +0,0 @@
-import 'compile/cmake'
-
-name=apulse
-version=0.1.7
-update_url="https://github.com/i-rinat/$name/releases"
-
-dlextract "https://github.com/i-rinat/$name/archive/v$version.tar.gz" \
-          'd489c93132fd201037372d3d9caf62ba'
-header_end
-
-cd "$name-$version"
-compile_cmake -I
-
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_libdir" \
-    build/libpulse-simple.so.0 build/libpulse.so.0 build/libpulsecommon-5.0.so
-ln -s libpulse-simple.so.0 "$dir_install/$dir_prefix/$dir_libdir/libpulse-simple.so"
-ln -s libpulse.so.0 "$dir_install/$dir_prefix/$dir_libdir/libpulse.so"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/bam.sat b/graveyard/unmaintained_satellites/bam.sat
deleted file mode 100644
index 474f499..0000000
--- a/graveyard/unmaintained_satellites/bam.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-name=bam
-version=0.5.1
-revision=a23a89d580a0408ca330ab42857157e443ec9b6f
-#update_url="https://github.com/matricks/$name/releases" -- Disabled temporarily until new version (0.5.1) is tagged. Development seems stagnant lately though.
-
-dlextract "https://github.com/matricks/$name/archive/$revision.tar.gz" \
-          '590b81a95a927eff56d4f4c7462eaafd'
-header_end
-
-cd "$name-$revision"
-
-make
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/bctoolbox.sat b/graveyard/unmaintained_satellites/bctoolbox.sat
deleted file mode 100644
index db84269..0000000
--- a/graveyard/unmaintained_satellites/bctoolbox.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'compile/cmake'
-
-name=bctoolbox
-version=0.4.0
-update_url="https://github.com/BelledonneCommunications/$name/releases"
-update_names="/archive/$version.tar.gz"
-
-dlextract "https://github.com/BelledonneCommunications/$name/archive/$version.tar.gz" \
-          '963e0a83feda8b0a6c10d646573aae28'
-header_end
-
-cd "$name-$version"
-compile_cmake -- -DENABLE_TESTS=OFF -DENABLE_TESTS_COMPONENT=OFF -DENABLE_STATIC=OFF
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/bcunit-git.sat b/graveyard/unmaintained_satellites/bcunit-git.sat
deleted file mode 100644
index 6ef22a5..0000000
--- a/graveyard/unmaintained_satellites/bcunit-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'vcs/git'
-import 'compile/configure'
-
-name=bcunit
-
-vcs_git "https://github.com/BelledonneCommunications/$name"
-header_end
-
-cd "$name"
-./autogen.sh
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/bin/default_arm7.sat b/graveyard/unmaintained_satellites/bin/default_arm7.sat
deleted file mode 100644
index f2b6f75..0000000
--- a/graveyard/unmaintained_satellites/bin/default_arm7.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=default_arm7
-libname=libnds
-version=0.6.0
-update_url="https://sourceforge.net/projects/devkitpro/files/default arm7/"
-update_names="<tr title=\"$version\" class=\"folder \">"
-
-download "https://sourceforge.net/projects/devkitpro/files/default arm7/$version/$name-$version.tar.bz2" \
-         "11cf9d749c3d346ca35c5d586364fad3"
-header_end
-
-mkdir -p "$dir_install/opt/devkitPRO/$libname"
-extract "$name-$version.tar.bz2" "$dir_install/opt/devkitPRO/$libname"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/bin/extrafiles/palemoon/palemoon.desktop b/graveyard/unmaintained_satellites/bin/extrafiles/palemoon/palemoon.desktop
deleted file mode 100644
index 2538f46..0000000
--- a/graveyard/unmaintained_satellites/bin/extrafiles/palemoon/palemoon.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Pale Moon Web Browser
-Comment=Browse the World Wide Web
-Keywords=Internet;WWW;Browser;Web;Explorer
-Exec=palemoon %u
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Icon=palemoon
-Categories=Network;WebBrowser;Internet
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
-StartupNotify=true
diff --git a/graveyard/unmaintained_satellites/bin/libfat-nds.sat b/graveyard/unmaintained_satellites/bin/libfat-nds.sat
deleted file mode 100644
index 4eb48e3..0000000
--- a/graveyard/unmaintained_satellites/bin/libfat-nds.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=libfat-nds
-libname=libnds
-version=1.0.14
-update_url="https://sourceforge.net/projects/devkitpro/files/libfat/"
-update_names="<tr title=\"$version\" class=\"folder \">"
-
-download "https://sourceforge.net/projects/devkitpro/files/libfat/$version/$name-$version.tar.bz2" \
-         "cc1712a56c8b0c133974936c69599f0e"
-header_end
-
-mkdir -p "$dir_install/opt/devkitPRO/$libname"
-extract "$name-$version.tar.bz2" "$dir_install/opt/devkitPRO/$libname"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/bin/libnds.sat b/graveyard/unmaintained_satellites/bin/libnds.sat
deleted file mode 100644
index 442df08..0000000
--- a/graveyard/unmaintained_satellites/bin/libnds.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-name=libnds
-version=1.5.12
-update_url="https://sourceforge.net/projects/devkitpro/files/$name/"
-update_names="<tr title=\"$version\" class=\"folder \">"
-
-download "https://sourceforge.net/projects/devkitpro/files/$name/$version/$name-$version.tar.bz2" \
-         "49f4e8dfee73c3fd9897cf314eb6d359"
-header_end
-
-mkdir -p "$dir_install/opt/devkitPRO/$name"
-extract "$name-$version.tar.bz2" "$dir_install/opt/devkitPRO/$name"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/bluez-alsa-git.sat b/graveyard/unmaintained_satellites/bluez-alsa-git.sat
deleted file mode 100644
index 7aadb4c..0000000
--- a/graveyard/unmaintained_satellites/bluez-alsa-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'vcs/git'
-import 'compile/configure'
-
-name=bluez-alsa
-
-vcs_git "https://github.com/Arkq/$name"
-header_end
-
-cd "$name"
-autoreconf -fi
-compile_configure -- --enable-aac --enable-debug --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/broadcom-wl.sat b/graveyard/unmaintained_satellites/broadcom-wl.sat
deleted file mode 100644
index 79cae6b..0000000
--- a/graveyard/unmaintained_satellites/broadcom-wl.sat
+++ /dev/null
@@ -1,32 +0,0 @@
-name=broadcom-wl
-version=6_30_223_271
-update_url="https://aur.archlinux.org/packages/$name-dkms/"
-
-define_option "kver=$(uname -r): The kernel version we're building for"
-
-dlextract "http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-$version.tar.gz" \
-          '115903050c41d466161784d4c843f4f9'
-dlfile "https://aur.archlinux.org/cgit/aur.git/plain/$name-dkms.conf?h=$name-dkms&id=cea4c9bc92dab37ed89d2c68e9ce0a3896f34d71" \
-       'b6e8ae4cf217bf68dcf08599bf43fce4'
-dlfile "https://aur.archlinux.org/cgit/aur.git/plain/001-null-pointer-fix.patch?h=$name-dkms&id=cea4c9bc92dab37ed89d2c68e9ce0a3896f34d71" \
-       'fabbf528164f5e3a9dcf46f46a678f86'
-dlfile "https://aur.archlinux.org/cgit/aur.git/plain/002-rdtscl.patch?h=$name-dkms&id=cea4c9bc92dab37ed89d2c68e9ce0a3896f34d71" \
-       '76c168a0271cb57d2539a10877979fbd'
-dlfile "https://aur.archlinux.org/cgit/aur.git/plain/003-linux47.patch?h=$name-dkms&id=cea4c9bc92dab37ed89d2c68e9ce0a3896f34d71" \
-       'c5074307a37698b11780237beb8f52b2'
-dlfile "https://aur.archlinux.org/cgit/aur.git/plain/004-linux48.patch?h=$name-dkms&id=cea4c9bc92dab37ed89d2c68e9ce0a3896f34d71" \
-       '6ba8d147afe6112112b03af593ae38a0'
-header_end
-
-kver="$(option =kver)"
-
-sed -i -e '/BRCM_WLAN_IFNAME/s:eth:wlan:' src/wl/sys/wl_linux.c
-patch -p1 -i 001-null-pointer-fix.patch
-patch -p1 -i 002-rdtscl.patch
-patch -p1 -i 003-linux47.patch
-patch -p1 -i 004-linux48.patch
-make KBUILD_DIR="$dir_sysroot/lib/modules/$kver/build"
-install -Dm644 -t "$dir_install/lib/modules/$kver/kernel/drivers/net/wireless" wl.ko
-install -Dm644 "$name-dkms.conf" "$dir_install/$dir_sysconfdir/modprobe.d/$name.conf"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/cabextract.sat b/graveyard/unmaintained_satellites/cabextract.sat
deleted file mode 100644
index 3cc73a3..0000000
--- a/graveyard/unmaintained_satellites/cabextract.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=cabextract
-version=1.6
-update_url='http://cabextract.org.uk/'
-
-dlextract "http://cabextract.org.uk/$name-$version.tar.gz" \
-          'ee3ded0b1f84e5c6e3309bb36d701916'
-header_end
-
-cd "$name-$version"
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/ctrtool.sat b/graveyard/unmaintained_satellites/ctrtool.sat
deleted file mode 100644
index af728d2..0000000
--- a/graveyard/unmaintained_satellites/ctrtool.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=Project_CTR
-version=0.15
-update_url="https://github.com/profi200/$name/releases"
-update_names="archive/$version.tar.gz"
-
-dlextract "https://github.com/profi200/$name/archive/$version.tar.gz" \
-          'ff68864fade3dd822850180076a08357'
-header_end
-
-cd "$name-$version/ctrtool"
-make
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" ctrtool
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/ctrulib-bin.sat b/graveyard/unmaintained_satellites/ctrulib-bin.sat
deleted file mode 100644
index 4a9f355..0000000
--- a/graveyard/unmaintained_satellites/ctrulib-bin.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=ctrulib
-libname=libctru
-version=1.1.0
-update_url="https://sourceforge.net/projects/devkitpro/files/$libname/"
-update_names="<tr title=\"$version\" class=\"folder \">"
-
-download "https://sourceforge.net/projects/devkitpro/files/$libname/$version/$libname-$version.tar.bz2" \
-         '9c65ae1f9474a03a727d346c6507d4b4'
-header_end
-
-mkdir -p "$dir_install/$dir_prefix/$dir_libdir/devkitPRO/$libname"
-extract "$libname-$version.tar.bz2" "$dir_install/$dir_prefix/$dir_libdir/devkitPRO/$libname"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/ctrulib-git.sat b/graveyard/unmaintained_satellites/ctrulib-git.sat
deleted file mode 100644
index 63e26b3..0000000
--- a/graveyard/unmaintained_satellites/ctrulib-git.sat
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'vcs/git'
-
-name=ctrulib
-
-vcs_git "https://github.com/smealum/$name"
-header_end
-
-cd "$name/libctru"
-make DEVKITPRO="$dir_install/$dir_prefix/$dir_libdir/devkitPRO" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/devkitarm-bin.sat b/graveyard/unmaintained_satellites/devkitarm-bin.sat
deleted file mode 100644
index 2c2a455..0000000
--- a/graveyard/unmaintained_satellites/devkitarm-bin.sat
+++ /dev/null
@@ -1,16 +0,0 @@
-name=devkitARM
-version=r45
-update_url="https://sourceforge.net/projects/devkitpro/files/$name/"
-update_names="/$name/${name}_$version/"
-
-download "https://sourceforge.net/projects/devkitpro/files/$name/${name}_$version/${name}_$version-x86_64-linux.tar.bz2" \
-         '660dd47bae0e4b70a0a649b4bc833e33'
-extrafile 'devkitarm.sh'
-header_end
-
-mkdir -p "$dir_install/$dir_prefix/$dir_libdir/devkitPRO"
-extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/$dir_prefix/$dir_libdir/devkitPRO"
-sed -i -e "s/%DEVKITPRO%/$(safe_sed "$dir_sysroot/$dir_prefix/$dir_libdir/devkitPRO")/g" devkitarm.sh
-install -Dm755 -t "$dir_install/$dir_sysconfdir/profile.d/" devkitarm.sh
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/extrafiles/nxengine/nxengine.desktop b/graveyard/unmaintained_satellites/extrafiles/nxengine/nxengine.desktop
deleted file mode 100644
index 139b310..0000000
--- a/graveyard/unmaintained_satellites/extrafiles/nxengine/nxengine.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=NXEngine (Cave Story)
-Comment=A clone/engine-rewrite of the classic jump-and-run platformer Cave Story/Doukutsu Monogatari
-Exec=nxengine
-Icon=nxengine
-Type=Application
-Categories=Game;AdventureGame;
diff --git a/graveyard/unmaintained_satellites/extrafiles/nxengine/nxengine.png b/graveyard/unmaintained_satellites/extrafiles/nxengine/nxengine.png
deleted file mode 100644
index ee55f85..0000000
Binary files a/graveyard/unmaintained_satellites/extrafiles/nxengine/nxengine.png and /dev/null differ
diff --git a/graveyard/unmaintained_satellites/extrafiles/nxengine/nxengine.sh b/graveyard/unmaintained_satellites/extrafiles/nxengine/nxengine.sh
deleted file mode 100644
index 1c8aaf4..0000000
--- a/graveyard/unmaintained_satellites/extrafiles/nxengine/nxengine.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh -e
-
-dir_prefix="%PREFIX%"
-dir_runtime="%RUNTIME%"
-dir_libdir="%LIBDIR%"
-dir_datadir="%DATADIR%"
-
-files="
-    $dir_libdir/nxengine/nx
-    $dir_datadir/nxengine/font.ttf
-    $dir_datadir/nxengine/smalfont.bmp
-    $dir_datadir/nxengine/sprites.sif
-    $dir_datadir/nxengine/tilekey.dat
-    $dir_datadir/nxengine/Doukutsu.exe
-    $dir_datadir/nxengine/data
-"
-
-mkdir -p "$dir_runtime"
-
-for file in $files; do
-    [ ! -L "$dir_runtime/$(basename "$file")" ] && ln -sf -t "$dir_runtime" "$dir_prefix/$file"
-done
-
-cd "$dir_runtime" && ./nx
diff --git a/graveyard/unmaintained_satellites/fdk-aac.sat b/graveyard/unmaintained_satellites/fdk-aac.sat
deleted file mode 100644
index 72ef170..0000000
--- a/graveyard/unmaintained_satellites/fdk-aac.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=fdk-aac
-version=0.1.4
-update_url="https://sourceforge.net/projects/opencore-amr/files/$name/"
-
-dlextract "https://sourceforge.net/projects/opencore-amr/files/$name/$name-$version.tar.gz" \
-          'e274a7d7f6cd92c71ec5c78e4dc9f8b7'
-header_end
-
-cd "$name-$version"
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/fluidsynth.sat b/graveyard/unmaintained_satellites/fluidsynth.sat
deleted file mode 100644
index 924b682..0000000
--- a/graveyard/unmaintained_satellites/fluidsynth.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'compile/configure'
-
-name=fluidsynth
-version=1.1.6
-update_url="https://sourceforge.net/projects/$name/files/"
-update_names="/files/$name-$version/"
-
-dlextract "https://sourceforge.net/projects/$name/files/$name-$version/$name-$version.tar.bz2" \
-          'f6e696690e989098f70641364fdffad7'
-header_end
-
-cd "$name-$version"
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/gfm-git.sat b/graveyard/unmaintained_satellites/gfm-git.sat
deleted file mode 100644
index d651acd..0000000
--- a/graveyard/unmaintained_satellites/gfm-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'vcs/git'
-import 'compile/configure'
-
-name=tilp
-
-vcs_git 'https://github.com/debrouxl/tilp_and_gfm'
-header_end
-
-cd tilp_and_gfm/gfm/trunk
-autoreconf -fi
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/giblib.sat b/graveyard/unmaintained_satellites/giblib.sat
deleted file mode 100644
index e618330..0000000
--- a/graveyard/unmaintained_satellites/giblib.sat
+++ /dev/null
@@ -1,25 +0,0 @@
-import 'compile/configure'
-
-name=giblib
-majver=1.2.4
-version=$majver-11
-update_url="https://packages.debian.org/sid/${name}1"
-update_names="${name}_$version.debian.tar.xz"
-
-dlextract "http://http.debian.net/debian/pool/main/g/$name/${name}_$majver.orig.tar.gz" \
-          '598711e2cb631c59f6ad11cba4383f2c'
-dlextract "http://http.debian.net/debian/pool/main/g/$name/${name}_$version.debian.tar.xz" \
-          '85d5fb2f8a78d23b3a7929f3f8828f44'
-header_end
-
-cd "$name-$majver.orig"
-
-# Updating with debian patches as appropiate
-for x in $(cat ../debian/patches/series); do
-    patch -p1 -i ../debian/patches/$x
-done
-
-autoreconf -fi
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/gtksourceview2.sat b/graveyard/unmaintained_satellites/gtksourceview2.sat
deleted file mode 100644
index 22f9906..0000000
--- a/graveyard/unmaintained_satellites/gtksourceview2.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'compile/configure'
-
-name=gtksourceview
-majver=2.10
-version=$majver.5  # I'm not sure why, but everybody seems to use this version.
-update_url="https://download.gnome.org/sources/$name/cache.json"
-
-dlextract "https://download.gnome.org/sources/$name/$majver/$name-$version.tar.bz2" \
-          '1219ad1694df136f126507466aeb41aa'
-header_end
-
-cd "$name-$version"
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/heimdall.sat b/graveyard/unmaintained_satellites/heimdall.sat
deleted file mode 100644
index 7abccf8..0000000
--- a/graveyard/unmaintained_satellites/heimdall.sat
+++ /dev/null
@@ -1,18 +0,0 @@
-import 'compile/configure'
-
-name=Heimdall
-version=1.4.1
-update_url="https://github.com/Benjamin-Dobell/$name/releases"
-
-dlextract "https://github.com/Benjamin-Dobell/$name/archive/v$version.tar.gz" \
-          '22c911e9042f5ed8fd90cbeeb9589015'
-header_end
-
-cd "$name-$version/libpit"
-./configure
-make
-
-cd "../heimdall"
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/include-what-you-use.sat b/graveyard/unmaintained_satellites/include-what-you-use.sat
deleted file mode 100644
index cd1ece6..0000000
--- a/graveyard/unmaintained_satellites/include-what-you-use.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'compile/cmake'
-
-name=include-what-you-use
-version=0.6
-update_url="http://include-what-you-use.org/downloads/"
-
-dlextract "http://include-what-you-use.org/downloads/$name-$version.src.tar.gz" \
-          'e4dffc7c2396f0e3f2b7499c077325b5'
-header_end
-
-cd "$name"
-
-compile_cmake -DIWYU_LLVM_LIB_PATH=/usr/lib -DIWYU_LLVM_INCLUDE_PATH=/usr/include/llvm
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/intel-ucode.sat b/graveyard/unmaintained_satellites/intel-ucode.sat
deleted file mode 100644
index 7b7ae8a..0000000
--- a/graveyard/unmaintained_satellites/intel-ucode.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-name=intel-ucode
-version=20160714
-
-dlextract "https://downloadmirror.intel.com/26156/eng/microcode-$version.tgz" \
-          '84e4c0530dc38fd7b804daf894b1bdf9'
-dlfile 'https://git.archlinux.org/svntogit/packages.git/plain/trunk/intel-microcode2ucode.c?h=packages/intel-ucode&id=98b27b5f007b03d50146864efb078cba99b772ad' \
-       '580276790cfc62dfd82b76085bd1e743'
-header_end
-
-cc $CFLAGS -o intel-microcode2ucode intel-microcode2ucode.c
-./intel-microcode2ucode ./microcode.dat
-
-install -Dm644 microcode.bin kernel/x86/microcode/GenuineIntel.bin
-echo kernel/x86/microcode/GenuineIntel.bin | cpio -o -H newc -R 0:0 > intel-ucode.img
-install -Dm644 -t "$dir_install/boot/" intel-ucode.img
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/json-glib.sat b/graveyard/unmaintained_satellites/json-glib.sat
deleted file mode 100644
index 549d363..0000000
--- a/graveyard/unmaintained_satellites/json-glib.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'compile/configure'
-
-name=json-glib
-majver=1.2
-version=$majver.2
-update_url="https://download.gnome.org/sources/$name/cache.json"
-
-dlextract "https://download.gnome.org/sources/$name/$majver/$name-$version.tar.xz" \
-          'c1daefb8d0fb59612af0c072c8aabb58'
-header_end
-
-cd "$name-$version"
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/jsoncpp.sat b/graveyard/unmaintained_satellites/jsoncpp.sat
deleted file mode 100644
index 297906f..0000000
--- a/graveyard/unmaintained_satellites/jsoncpp.sat
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'compile/cmake'
-
-name=jsoncpp
-version=1.7.7
-update_url="https://github.com/open-source-parsers/$name/releases"
-update_names="/archive/$version.tar.gz"
-
-dlextract "https://github.com/open-source-parsers/$name/archive/$version.tar.gz" \
-          '9b51c65c563463220a8cb5fa33d525f8'
-header_end
-
-cd "$name-$version"
-
-# Fix paths
-sed -i -e "s/lib\${LIB_SUFFIX}\/pkgconfig/$(safe_sed "$dir_libdir/pkgconfig")/" CMakeLists.txt
-
-compile_cmake -- \
-    -DBUILD_SHARED_LIBS=ON \
-    -DBUILD_STATIC_LIBS=OFF \
-    -DRUNTIME_INSTALL_DIR="/$dir_prefix/$dir_bindir" \
-    -DLIBRARY_INSTALL_DIR="/$dir_prefix/$dir_libdir"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/kbuild.sat b/graveyard/unmaintained_satellites/kbuild.sat
deleted file mode 100644
index db30c86..0000000
--- a/graveyard/unmaintained_satellites/kbuild.sat
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'vcs/svn'
-
-name=kBuild
-revision=2823
-version=r$revision
-
-vcs_svn 'http://svn.netlabs.org/repos/kbuild/trunk' 2823
-header_end
-
-cd trunk
-rm -rf kBuild/bin  # Remove prebuilts
-
-variables="
-    NIX_INSTALL_DIR=/$dir_prefix
-    MY_INST_BIN=$dir_prefix/$dir_bindir/
-    MY_INST_DATA=$dir_prefix/$dir_datadir/$name/
-    MY_INST_DOC=$dir_prefix/$dir_docdir/$name/
-"
-
-kBuild/env.sh --full make -f bootstrap.gmk $variables
-kBuild/env.sh --full-with-bin kmk $variables PATH_INS="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/kexec-tools.sat b/graveyard/unmaintained_satellites/kexec-tools.sat
deleted file mode 100644
index a804102..0000000
--- a/graveyard/unmaintained_satellites/kexec-tools.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=kexec-tools
-version=2.0.14
-update_url='https://www.kernel.org/pub/linux/utils/kernel/kexec/'
-
-dlextract "https://www.kernel.org/pub/linux/utils/kernel/kexec/$name-$version.tar.xz" \
-          '4164abff8ed21e9f94d57f535c2f77bf'
-header_end
-
-cd "$name-$version"
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/kpartx.sat b/graveyard/unmaintained_satellites/kpartx.sat
deleted file mode 100644
index 32d8c6c..0000000
--- a/graveyard/unmaintained_satellites/kpartx.sat
+++ /dev/null
@@ -1,19 +0,0 @@
-name=multipath-tools
-version=0.6.4
-revision=922421cf795d53d339862bb2d99f1a85c96ad9a3
-update_url="http://git.opensvc.com/?p=$name/.git;a=tags"
-update_names="href=\"/?p=$name/.git;a=shortlog;h=refs/tags/$version\""
-
-download "http://git.opensvc.com/?p=$name/.git;a=snapshot;h=$revision;sf=tgz" \
-         '48e2c62e6216f57cfac166b3a4b387a7' \
-         "$name-$version.tar.gz"
-header_end
-
-extract "$name-$version.tar.gz"
-
-cd "$name-$(echo "$revision" | cut -c -7)/kpartx"
-make
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" kpartx
-install -Dm655 -t "$dir_install/$dir_prefix/$dir_mandir/man8" kpartx.8
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/libbsd.sat b/graveyard/unmaintained_satellites/libbsd.sat
deleted file mode 100644
index cc33615..0000000
--- a/graveyard/unmaintained_satellites/libbsd.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=libbsd
-version=0.8.3
-update_url='https://libbsd.freedesktop.org/releases/'
-
-dlextract "https://libbsd.freedesktop.org/releases/$name-$version.tar.xz" \
-          'e935c1bb6cc98a4a43cb1da22795493a'
-header_end
-
-cd "$name-$version"
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/libgdiplus.sat b/graveyard/unmaintained_satellites/libgdiplus.sat
deleted file mode 100644
index 9f2b3fb..0000000
--- a/graveyard/unmaintained_satellites/libgdiplus.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=libgdiplus
-version=4.2
-update_url="https://download.mono-project.com/sources/$name/"
-
-dlextract "https://download.mono-project.com/sources/$name/$name-$version.tar.gz" \
-          '3e68075aa0911d5ebc2b3739e85af0ea'
-header_end
-
-cd "$name-$version"
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/libretro-bsnes.sat b/graveyard/unmaintained_satellites/libretro-bsnes.sat
deleted file mode 100644
index bb4e203..0000000
--- a/graveyard/unmaintained_satellites/libretro-bsnes.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'vcs/git'
-
-name=bsnes-libretro
-
-vcs_git -r libretro "https://github.com/libretro/$name"
-header_end
-
-cd "$name"
-for profile in accuracy balanced performance; do
-    make profile="$profile"
-    make profile="$profile" core_installdir="/$dir_prefix/$dir_libdir/libretro" DESTDIR="$dir_install" install
-done
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/libsrtp.sat b/graveyard/unmaintained_satellites/libsrtp.sat
deleted file mode 100644
index f69660d..0000000
--- a/graveyard/unmaintained_satellites/libsrtp.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=libsrtp
-version=1.5.4
-update_url="https://github.com/cisco/$name/releases"
-
-dlextract "https://github.com/cisco/$name/archive/v$version.tar.gz" \
-          '64a9580f86a9c3e1c4986e944e6a5a84'
-header_end
-
-cd "$name-$version"
-compile_configure -m shared_library
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/libticables-git.sat b/graveyard/unmaintained_satellites/libticables-git.sat
deleted file mode 100644
index 9a4a18c..0000000
--- a/graveyard/unmaintained_satellites/libticables-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'vcs/git'
-import 'compile/configure'
-
-name=tilp
-
-vcs_git 'https://github.com/debrouxl/tilibs'
-header_end
-
-cd tilibs/libticables/trunk
-autoreconf -fi
-compile_configure -- --enable-libusb10
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/libticalcs-git.sat b/graveyard/unmaintained_satellites/libticalcs-git.sat
deleted file mode 100644
index b4ddf71..0000000
--- a/graveyard/unmaintained_satellites/libticalcs-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'vcs/git'
-import 'compile/configure'
-
-name=tilp
-
-vcs_git 'https://github.com/debrouxl/tilibs'
-header_end
-
-cd tilibs/libticalcs/trunk
-autoreconf -fi
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/libticonv-git.sat b/graveyard/unmaintained_satellites/libticonv-git.sat
deleted file mode 100644
index ea3cab4..0000000
--- a/graveyard/unmaintained_satellites/libticonv-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'vcs/git'
-import 'compile/configure'
-
-name=tilp
-
-vcs_git 'https://github.com/debrouxl/tilibs'
-header_end
-
-cd tilibs/libticonv/trunk
-autoreconf -fi
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/libtifiles-git.sat b/graveyard/unmaintained_satellites/libtifiles-git.sat
deleted file mode 100644
index 2d54775..0000000
--- a/graveyard/unmaintained_satellites/libtifiles-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'vcs/git'
-import 'compile/configure'
-
-name=tilp
-
-vcs_git 'https://github.com/debrouxl/tilibs'
-header_end
-
-cd tilibs/libtifiles/trunk
-autoreconf -fi
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/livestreamer.sat b/graveyard/unmaintained_satellites/livestreamer.sat
deleted file mode 100644
index 224f973..0000000
--- a/graveyard/unmaintained_satellites/livestreamer.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/python'
-
-name=livestreamer
-version=1.12.2
-update_url="https://pypi.python.org/pypi/$name"
-
-dlextract "https://pypi.python.org/packages/ee/d6/efbe3456160a2c62e3dd841c5d9504d071c94449a819148bb038b50d862a/$name-$version.tar.gz" \
-          '63fb477bb3e28b7fe26b3cbba6f7937c'
-header_end
-
-cd "$name-$version"
-compile_python 3
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/makerom.sat b/graveyard/unmaintained_satellites/makerom.sat
deleted file mode 100644
index 8cb87a3..0000000
--- a/graveyard/unmaintained_satellites/makerom.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=Project_CTR
-version=0.15
-update_url="https://github.com/profi200/$name/releases"
-update_names="archive/$version.tar.gz"
-
-dlextract "https://github.com/profi200/$name/archive/$version.tar.gz" \
-          "ff68864fade3dd822850180076a08357"
-header_end
-
-cd "$name-$version/makerom"
-make
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" makerom
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/mbedtls.sat b/graveyard/unmaintained_satellites/mbedtls.sat
deleted file mode 100644
index 3c82628..0000000
--- a/graveyard/unmaintained_satellites/mbedtls.sat
+++ /dev/null
@@ -1,24 +0,0 @@
-name=mbedtls
-version=2.4.0
-update_url='https://tls.mbed.org/'
-
-dlextract "https://tls.mbed.org/download/$name-$version-apache.tgz" \
-          '4debf0e0eed7e75a00b7780830c9688e'
-header_end
-
-cd "$name-$version"
-
-# enable flags for non-embedded systems (from ArchLinux)
-sed -i 's|//\(#define MBEDTLS_THREADING_C\)|\1|' include/mbedtls/config.h
-sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h
-
-# Don't build static libraries
-sed -i -e '/^all: shared/s/static//' library/Makefile
-
-# Fix paths
-sed -i -e "s/\(\$(DESTDIR)\/\)lib/\1$(safe_sed "$dir_libdir")/" \
-       -e "s/\(\$(DESTDIR)\/\)bin/\1$(safe_sed "$dir_bindir")/" Makefile
-
-make SHARED=1 DESTDIR="$dir_install/$dir_prefix" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/minitube.sat b/graveyard/unmaintained_satellites/minitube.sat
deleted file mode 100644
index 184bfdc..0000000
--- a/graveyard/unmaintained_satellites/minitube.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'compile/qt'
-
-name=minitube
-version=2.5.2
-update_url="https://github.com/flaviotordini/$name/releases"
-update_names="archive/$version.tar.gz"
-
-dlextract "https://github.com/flaviotordini/$name/archive/$version.tar.gz" \
-          '9545f0e9bf70bcb648b25af4813338cb'
-header_end
-
-cd "$name-$version"
-compile_qt 5 DEFINES+='APP_GOOGLE_API_KEY=AIzaSyBzMj41taMuHLAF95-y9cTXL4JpPGqMORk'  # API key provided by Gottox (https://raw.githubusercontent.com/voidlinux/void-packages/master/srcpkgs/minitube/template)
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/minizip.sat b/graveyard/unmaintained_satellites/minizip.sat
deleted file mode 100644
index 89af459..0000000
--- a/graveyard/unmaintained_satellites/minizip.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'compile/configure'
-
-name=zlib
-version=1.2.8
-update_url='http://zlib.net/'
-
-dlextract "http://zlib.net/$name-$version.tar.xz" \
-          '28f1205d8dd2001f26fec1e8c2cebe37'
-header_end
-
-cd "$name-$version/contrib/minizip"
-autoreconf -fi
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/mono.sat b/graveyard/unmaintained_satellites/mono.sat
deleted file mode 100644
index 2b69353..0000000
--- a/graveyard/unmaintained_satellites/mono.sat
+++ /dev/null
@@ -1,20 +0,0 @@
-import 'compile/configure'
-
-name=mono
-majver=4.6.2
-version=$majver.7  # TODO: Untested
-update_url="https://download.mono-project.com/sources/$name/"
-
-dlextract "https://download.mono-project.com/sources/$name/$name-$version.tar.bz2" \
-          '601a96baa96a2e7acde1fb7e622322c4'
-header_end
-
-cd "$name-$majver"
-
-# Fix mono_libdir
-#sed -i -e "/mono_libdir=/s/\/lib/\/$(safe_sed "$dir_libdir")/" ./configure
-
-# TODO: Move everything to the proper user-selected libdir
-compile_configure -- --libdir="/$dir_prefix/lib"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/nxengine.sat b/graveyard/unmaintained_satellites/nxengine.sat
deleted file mode 100644
index 872fb56..0000000
--- a/graveyard/unmaintained_satellites/nxengine.sat
+++ /dev/null
@@ -1,52 +0,0 @@
-name=nxengine
-version=1006
-update_url='http://nxengine.sourceforge.net/'
-
-define_option 'dir_runtime=$HOME/.nxengine: The directory used to store the nxengine configuration and save files'
-define_option 'console_key=`: The key used to access the debug console'
-
-dlextract "http://nxengine.sourceforge.net/dl/nx-src-$version.tar.bz2" \
-          'cc0d1f5608bba70df86a6f5a3b4dd3bd'
-download "http://www.cavestory.org/downloads/cavestoryen.zip" \
-         '5aad47f1cb72185d6e7f4c8c392f6b6e'
-
-extrafile "$name.sh"
-extrafile "$name.desktop"
-extrafile "$name.png"
-header_end
-
-extract 'cavestoryen.zip' '' 'unzip -qd {dst} {src}'
-
-# Some keyboards don't have an accessible backtick.
-console_key="$(safe_sed $(option =console_key))"
-sed -i -e "s/\`/$console_key/" nx/input.cpp
-sed -i -e "s/\`/$console_key/" nx/console.cpp
-
-# Allow custom CFLAGS to the Makefile
-sed -i -e '/g++/s/-o/$(CFLAGS) -o/g' nx/Makefile
-
-# Build the nx executable
-make -C nx
-
-# Install the nxengine executable
-install -Dm755 nx/nx "$dir_install/$dir_prefix/$dir_libdir/$name/nx"
-
-# Install the necessary data
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/$name" nx/font.ttf nx/smalfont.bmp nx/sprites.sif nx/tilekey.dat CaveStory/Doukutsu.exe
-cp -a CaveStory/data "$dir_install/$dir_prefix/$dir_datadir/$name/data"
-
-# Install the run script
-# Where the files will be copied to on runtime.
-dir_runtime="$(option =dir_runtime)"
-sed -i -e "s/%PREFIX%/$(safe_sed "$dir_sysroot/$dir_prefix")/" \
-       -e "s/%RUNTIME%/$(safe_sed "$dir_runtime")/" \
-       -e "s/%LIBDIR%/$(safe_sed "$dir_libdir")/" \
-       -e "s/%DATADIR%/$(safe_sed "$dir_datadir")/" \
-       nxengine.sh
-install -Dm755 "$name.sh" "$dir_install/$dir_prefix/$dir_bindir/$name"
-
-# Install desktop file and icon
-install -Dm644 "$name.png" "$dir_install/$dir_prefix/$dir_datadir/pixmaps/$name.png"
-install -Dm644 "$name.desktop" "$dir_install/$dir_prefix/$dir_datadir/applications/$name.desktop"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/openrc.sat b/graveyard/unmaintained_satellites/openrc.sat
deleted file mode 100644
index d244d2b..0000000
--- a/graveyard/unmaintained_satellites/openrc.sat
+++ /dev/null
@@ -1,20 +0,0 @@
-name=openrc
-version=0.22.4  # TODO: Untested
-update_url="https://github.com/OpenRC/$name/releases"
-update_names="/archive/$version.tar.gz"
-
-dlextract "https://github.com/OpenRC/$name/archive/$version.tar.gz" \
-          '23e32cb3dc9fdb9de0c935b059207f74'
-header_end
-
-cd "$name-$version"
-make install \
-    DESTDIR="$dir_install" \
-    LIBNAME="$dir_libdir" \
-    PKG_PREFIX="/$dir_prefix" \
-    LIBEXECDIR="/$dir_libdir" \
-    BINDIR="/$dir_bindir" \
-    SBINDIR="/$dir_sbindir" \
-    SYSCONFDIR="/$dir_sysconfdir"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/opus.sat b/graveyard/unmaintained_satellites/opus.sat
deleted file mode 100644
index 28180ff..0000000
--- a/graveyard/unmaintained_satellites/opus.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=opus
-version=1.1.3
-update_url='http://www.opus-codec.org/downloads/'
-
-dlextract "http://downloads.xiph.org/releases/$name/$name-$version.tar.gz" \
-          '32bbb6b557fe1b6066adc0ae1f08b629'
-header_end
-
-cd "$name-$version"
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/ortp.sat b/graveyard/unmaintained_satellites/ortp.sat
deleted file mode 100644
index 830f670..0000000
--- a/graveyard/unmaintained_satellites/ortp.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=ortp
-version=0.27.0
-update_url="https://download.savannah.gnu.org/releases/linphone/$name/sources/"
-
-dlextract "https://download.savannah.gnu.org/releases/linphone/$name/sources/$name-$version.tar.gz" \
-          '301d1e9e32d1ba5399bc82ceb11debf7'
-header_end
-
-cd "$name-$version"
-compile_configure -- --disable-strict
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/padxorer.sat b/graveyard/unmaintained_satellites/padxorer.sat
deleted file mode 100644
index 7395939..0000000
--- a/graveyard/unmaintained_satellites/padxorer.sat
+++ /dev/null
@@ -1,12 +0,0 @@
-name=padxorer
-version=1
-paste=CjR8J0PM
-
-dlfile "http://pastebin.com/raw/$paste" \
-       "75f67fab50e0b74ddcc8144d2a75bc87"
-header_end
-
-cc -x c -O3 "$paste" -o "$name"
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/palemoon-beta-bin.sat b/graveyard/unmaintained_satellites/palemoon-beta-bin.sat
deleted file mode 100644
index 4b699e7..0000000
--- a/graveyard/unmaintained_satellites/palemoon-beta-bin.sat
+++ /dev/null
@@ -1,30 +0,0 @@
-name=palemoon
-version=27.0.0a2
-update_url='http://www.palemoon.org/WIP/'
-
-download "http://relmirror.palemoon.org/beta/tycho/$name-$version.linux-x86_64.tar.bz2" \
-         '073d3c946fc75b48443be6ec7a48685b'
-extrafile "$name.desktop"
-header_end
-
-# Install files
-mkdir -p "$dir_install/$dir_prefix/$dir_libdir"
-extract "$name-$version.linux-x86_64.tar.bz2" "$dir_install/$dir_prefix/$dir_libdir/"
-
-# Install executable
-mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-ln -s "$dir_sysroot/$dir_prefix/$dir_libdir/$name/$name" "$dir_install/$dir_prefix/$dir_bindir/$name"
-
-# Install icons
-for x in 16 32 48; do
-    mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps"
-    ln -s "$dir_sysroot/$dir_prefix/$dir_libdir/$name/browser/chrome/icons/default/default$x.png" "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/$name.png"
-done
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps"
-ln -s "$dir_sysroot/$dir_prefix/$dir_libdir/$name/browser/icons/mozicon128.png" "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps/$name.png"
-
-# Install desktop file
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/applications"
-cp "$name.desktop" "$dir_install/$dir_prefix/share/applications/$name.desktop"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/palemoon-git.sat b/graveyard/unmaintained_satellites/palemoon-git.sat
deleted file mode 100644
index f6ee8ed..0000000
--- a/graveyard/unmaintained_satellites/palemoon-git.sat
+++ /dev/null
@@ -1,103 +0,0 @@
-# NOTE: Requires GCC 5.x to build properly (Untested with 6.x, might cause segfaults)
-
-import 'vcs/git'
-
-name=Pale-Moon
-version_autoconf=2.13
-
-define_option 'pulseaudio: Build with support for PulseAudio'
-
-vcs_git "https://github.com/MoonchildProductions/$name"
-( name=autoconf version="$version_autoconf"
-    dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
-              '9de56d4a161a723228220b0f425dc711'
-)
-extrafile 'palemoon.desktop'
-header_end
-
-( cd "autoconf-$version_autoconf"
-    ./configure --prefix="$PWD/install" --program-suffix=-$version_autoconf
-    make
-    make install
-)
-
-cd "$name"
-
-cat > .mozconfig << EOF
-# Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding.
-#ac_add_options --enable-official-branding
-#export MOZILLA_OFFICIAL=1
-
-mk_add_options MOZ_CO_PROJECT=browser
-ac_add_options --enable-application=browser
-
-mk_add_options MOZ_OBJDIR="$PWD/pmbuild/"
-
-ac_add_options --enable-optimize="-O2 -msse2 -mfpmath=sse"
-ac_add_options --with-pthreads
-
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-
-ac_add_options --enable-release
-ac_add_options --enable-devtools
-ac_add_options --enable-jemalloc
-ac_add_options --enable-shared-js
-
-ac_add_options --enable-strip
-
-ac_add_options --x-libraries="/$dir_prefix/$dir_libdir"
-
-# The section before this is kept up to date with https://developer.palemoon.org/Developer_Guide:Build_Instructions/Pale_Moon/Linux#head:Mozconfig_Files (with minor changes)
-# The following section are my additions.
-
-# Use system libraries (./configure --help | grep system)
-ac_add_options --with-system-nspr
-ac_add_options --with-system-libevent
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-webp
-#ac_add_options --with-system-png - The APNG patch is not upstrean
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-ffi
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-system-icu
-
-# Make pulseaudio support optional
-$(option pulseaudio && echo ac_add_options --enable-pulseaudio || echo ac_add_options --disable-pulseaudio)
-EOF
-
-# Build
-PATH="$PWD/../autoconf-$version_autoconf/install/bin:$PATH" \
-make -f client.mk build
-
-# Install
-cd pmbuild
-make package
-
-mkdir -p "$dir_install/$dir_prefix/$dir_libdir/palemoon"
-cp -Ta dist/palemoon "$dir_install/$dir_prefix/$dir_libdir/palemoon"
-mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-ln -sf "/$dir_prefix/$dir_libdir/palemoon/palemoon" "$dir_install/$dir_prefix/$dir_bindir/palemoon"
-
-cd ../..
-
-# Install icons
-for x in 16 32 48; do
-    mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps"
-    ln -sf "/$dir_prefix/$dir_libdir/palemoon/browser/chrome/icons/default/default$x.png" \
-          "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/palemoon.png"
-done
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps"
-ln -sf "/$dir_prefix/$dir_libdir/palemoon/browser/icons/mozicon128.png" \
-      "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps/palemoon.png"
-
-# Install desktop
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" palemoon.desktop
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/pdnsd.sat b/graveyard/unmaintained_satellites/pdnsd.sat
deleted file mode 100644
index b1e8458..0000000
--- a/graveyard/unmaintained_satellites/pdnsd.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=pdnsd
-version=1.2.9a
-update_url="http://members.home.nl/p.a.rombouts/$name/dl.html"
-
-dlextract "http://members.home.nl/p.a.rombouts/$name/releases/$name-$version-par.tar.gz" \
-          '2f3e705d59a0f9308ad9504b24400769'
-header_end
-
-cd "$name-$version"
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/pidgin-libnotify.sat b/graveyard/unmaintained_satellites/pidgin-libnotify.sat
deleted file mode 100644
index cbc53ad..0000000
--- a/graveyard/unmaintained_satellites/pidgin-libnotify.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'compile/configure'
-
-name=pidgin-libnotify
-version=0.14
-update_url="https://sourceforge.net/projects/gaim-libnotify/files/$name/"
-update_names="/files/$name/$name-$version/"
-
-dlextract "https://sourceforge.net/projects/gaim-libnotify/files/$name/$name-$version/$name-$version.tar.gz" \
-          'bfb5368b69c02d429b2b17c00a6673c0'
-dlfile "https://git.archlinux.org/svntogit/community.git/plain/trunk/pidgin-libnotify-0.14-libnotify-0.7.patch?h=packages/$name&id=4c6a9d12d0ffce3bfa86331a0da4f1ba0a48c30c"
-header_end
-
-cd "$name-$version"
-patch -p0 -i ../pidgin-libnotify-0.14-libnotify-0.7.patch
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/protobuf.sat b/graveyard/unmaintained_satellites/protobuf.sat
deleted file mode 100644
index ac88816..0000000
--- a/graveyard/unmaintained_satellites/protobuf.sat
+++ /dev/null
@@ -1,20 +0,0 @@
-import 'compile/configure'
-
-name=protobuf
-version=3.1.0
-update_url="https://github.com/google/$name/releases"
-update_names="/archive/v$version.tar.gz"
-
-dlextract "https://github.com/google/$name/archive/v$version.tar.gz" \
-          '14a532a7538551d5def317bfca41dace'
-header_end
-
-cd "$name-$version"
-
-# From autogen.sh
-autoreconf -f -i -Wall,no-obsolete
-rm -rf autom4te.cache config.h.in~
-
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/purple-skypeweb.sat b/graveyard/unmaintained_satellites/purple-skypeweb.sat
deleted file mode 100644
index 71061f4..0000000
--- a/graveyard/unmaintained_satellites/purple-skypeweb.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-name=skype4pidgin
-version=1.2.2
-update_url="https://github.com/EionRobb/$name/releases"
-update_names="/archive/$version.tar.gz"
-
-dlextract "https://github.com/EionRobb/$name/archive/$version.tar.gz" \
-          'a2da8649f7bdfd191a00cce0717aa885'
-header_end
-
-cd "$name-$version/skypeweb"
-make
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/purple-telegram.sat b/graveyard/unmaintained_satellites/purple-telegram.sat
deleted file mode 100644
index 6f1abcf..0000000
--- a/graveyard/unmaintained_satellites/purple-telegram.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=telegram-purple
-version=1.3.0
-update_url="https://github.com/majn/$name/releases"
-
-dlextract "https://github.com/majn/$name/releases/download/v$version/${name}_$version.orig.tar.gz" \
-          '7749f02b9b024094bf6aec38dc3969c0'
-header_end
-
-cd "$name"
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/pygtksourceview2.sat b/graveyard/unmaintained_satellites/pygtksourceview2.sat
deleted file mode 100644
index 00592a5..0000000
--- a/graveyard/unmaintained_satellites/pygtksourceview2.sat
+++ /dev/null
@@ -1,15 +0,0 @@
-import 'compile/configure'
-
-name=pygtksourceview
-majver=2.10
-version=$majver.1
-update_url="https://download.gnome.org/sources/$name/cache.json"
-
-dlextract "https://download.gnome.org/sources/$name/$majver/$name-$version.tar.bz2" \
-          '2654354d61422fb79d8375fc3a3b5393'
-header_end
-
-cd "$name-$version"
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/python3-jinja2.sat b/graveyard/unmaintained_satellites/python3-jinja2.sat
deleted file mode 100644
index 0f314f5..0000000
--- a/graveyard/unmaintained_satellites/python3-jinja2.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/python'
-
-name=Jinja2
-version=2.8
-update_url="https://pypi.python.org/pypi/$name"
-
-dlextract "https://pypi.python.org/packages/f2/2f/0b98b06a345a761bec91a079ccae392d282690c2d8272e708f4d10829e22/$name-$version.tar.gz" \
-          'edb51693fe22c53cee5403775c71a99e'
-header_end
-
-cd "$name-$version"
-compile_python 3
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/python3-markupsafe.sat b/graveyard/unmaintained_satellites/python3-markupsafe.sat
deleted file mode 100644
index 86350dc..0000000
--- a/graveyard/unmaintained_satellites/python3-markupsafe.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/python'
-
-name=MarkupSafe
-version=0.23
-update_url="https://pypi.python.org/pypi/$name"
-
-dlextract "https://pypi.python.org/packages/c0/41/bae1254e0396c0cc8cf1751cb7d9afc90a602353695af5952530482c963f/$name-$version.tar.gz" \
-          'f5ab3deee4c37cd6a922fb81e730da6e'
-header_end
-
-cd "$name-$version"
-compile_python 3
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/python3-peg2.sat b/graveyard/unmaintained_satellites/python3-peg2.sat
deleted file mode 100644
index 3debe67..0000000
--- a/graveyard/unmaintained_satellites/python3-peg2.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/python'
-
-name=pyPEG2
-version=2.15.2
-update_url="https://pypi.python.org/pypi/$name"
-
-dlextract "https://pypi.python.org/packages/f9/bd/10398e2c2d2070cc8a9c7153abfbd4ddb2895a2c52a32722ab8689e0cc7d/$name-$version.tar.gz" \
-          '84057d292808553290f0b78f42c64bbe'
-header_end
-
-cd "$name-$version"
-compile_python 3
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/python3-pygments.sat b/graveyard/unmaintained_satellites/python3-pygments.sat
deleted file mode 100644
index d446030..0000000
--- a/graveyard/unmaintained_satellites/python3-pygments.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/python'
-
-name=Pygments
-version=2.1.3
-update_url="https://pypi.python.org/pypi/$name"
-
-dlextract "https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504/$name-$version.tar.gz" \
-          'ed3fba2467c8afcda4d317e4ef2c6150'
-header_end
-
-cd "$name-$version"
-compile_python 3
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/python3-qt5.sat b/graveyard/unmaintained_satellites/python3-qt5.sat
deleted file mode 100644
index f227ded..0000000
--- a/graveyard/unmaintained_satellites/python3-qt5.sat
+++ /dev/null
@@ -1,21 +0,0 @@
-import 'compile/python'
-import 'compile/qt'
-
-name=PyQt5
-version=5.7
-update_url='https://www.riverbankcomputing.com/software/pyqt/download5'
-
-dlextract "http://sourceforge.net/projects/pyqt/files/$name/PyQt-$version/${name}_gpl-$version.tar.gz" \
-          'e3dc21f31fd714659f0688e1eb31bacf'
-header_end
-
-cd "${name}_gpl-$version"
-
-qmake="$(command -v "$(compile_qt_get_cmd qmake 5)")" || echo "Missing qmake for Qt5"
-[ "$qmake" ]
-
-python3 configure.py --qmake "$qmake" --confirm-license
-make
-make DESTDIR="$dir_install" INSTALL_ROOT="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/python3-sip.sat b/graveyard/unmaintained_satellites/python3-sip.sat
deleted file mode 100644
index 9f2feb9..0000000
--- a/graveyard/unmaintained_satellites/python3-sip.sat
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'compile/python'
-
-name=sip
-version=4.18.1
-update_url="https://www.riverbankcomputing.com/software/$name/download"
-
-dlextract "http://sourceforge.net/projects/pyqt/files/$name/$name-$version/$name-$version.tar.gz" \
-          '9d664c33e8d0eabf1238a7ff44a399e9'
-header_end
-
-cd "$name-$version"
-python3 configure.py CFLAGS="$CFLAGS" LFLAGS="$LDFLAGS" --no-tools
-make
-make DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/python3.5-crc16.sat b/graveyard/unmaintained_satellites/python3.5-crc16.sat
deleted file mode 100644
index f3bb918..0000000
--- a/graveyard/unmaintained_satellites/python3.5-crc16.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import "compile/python"
-
-name=pycrc16
-version=0.1.1
-update_url="https://github.com/gennady/$name/releases"
-
-dlextract "https://github.com/gennady/$name/archive/v$version.tar.gz" \
-          "0e6432cea6cd71a151cfe7fba96b67c9"
-header_end
-
-cd "$name-$version"
-compile_python 3.5
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/python3.5-websocket-client.sat b/graveyard/unmaintained_satellites/python3.5-websocket-client.sat
deleted file mode 100644
index 58a2545..0000000
--- a/graveyard/unmaintained_satellites/python3.5-websocket-client.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import "compile/python"
-
-name=websocket-client
-version=0.37.0
-update_url="https://github.com/liris/$name/releases"
-
-dlextract "https://github.com/liris/$name/archive/v$version.tar.gz" \
-          "8fc57a49ff1c5505cf3484e8209c3b6f"
-header_end
-
-cd "$name-$version"
-compile_python 3.5
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/pyyaml.sat b/graveyard/unmaintained_satellites/pyyaml.sat
deleted file mode 100644
index 976e8f8..0000000
--- a/graveyard/unmaintained_satellites/pyyaml.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import "compile/python"
-
-name=PyYAML
-version=3.11
-update_url="http://pyyaml.org/wiki/$name"
-
-dlextract "http://pyyaml.org/download/pyyaml/$name-$version.tar.gz" \
-          "f50e08ef0fe55178479d3a618efe21db"
-header_end
-
-cd "$name-$version"
-compile_python 3
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/qt5-declarative.sat b/graveyard/unmaintained_satellites/qt5-declarative.sat
deleted file mode 100644
index f1c4d05..0000000
--- a/graveyard/unmaintained_satellites/qt5-declarative.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'compile/qt'
-
-name=qt5
-submodule=declarative
-majver=5.8
-version=$majver.0
-update_url='https://www.qt.io/download-open-source/'
-update_names="qt-everywhere-opensource-src-$version.tar.gz"
-
-dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
-          '4f55b3617abdff14706d02d761d5a0aa'
-header_end
-
-cd "qt$submodule-opensource-src-$version"
-compile_qt 5
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/qt5-styleplugins-git.sat b/graveyard/unmaintained_satellites/qt5-styleplugins-git.sat
deleted file mode 100644
index 8026431..0000000
--- a/graveyard/unmaintained_satellites/qt5-styleplugins-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'vcs/git'
-import 'compile/qt'
-
-name=qt5
-submodule=styleplugins
-
-vcs_git "https://code.qt.io/qt/qt$submodule"
-header_end
-
-cd "qt$submodule"
-compile_qt 5
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/qt5-webchannel.sat b/graveyard/unmaintained_satellites/qt5-webchannel.sat
deleted file mode 100644
index 05c5b7d..0000000
--- a/graveyard/unmaintained_satellites/qt5-webchannel.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'compile/qt'
-
-name=qt5
-submodule=webchannel
-majver=5.7
-version=$majver.0
-update_url='https://www.qt.io/download-open-source/'
-update_names="qt-everywhere-opensource-src-$version.tar.gz"
-
-dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
-          'dd7699ddeb203d77237ab58a06f9fbfa'
-header_end
-
-cd "qt$submodule-opensource-src-$version"
-compile_qt 5
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/qt5-webengine.sat b/graveyard/unmaintained_satellites/qt5-webengine.sat
deleted file mode 100644
index 704741f..0000000
--- a/graveyard/unmaintained_satellites/qt5-webengine.sat
+++ /dev/null
@@ -1,31 +0,0 @@
-import 'compile/qt'
-
-name=qt5
-submodule=webengine
-majver=5.7
-version=$majver.0
-update_url='https://www.qt.io/download-open-source/'
-update_names="qt-everywhere-opensource-src-$version.tar.gz"
-
-dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
-          '937f64886fbcb038d6fa4b44ae80cbeb'
-header_end
-
-cd "qt$submodule-opensource-src-$version"
-
-compile_qt 5 \
-    WEBENGINE_CONFIG+=use_system_icu \
-    WEBENGINE_CONFIG+=use_system_ffmpeg \
-    WEBENGINE_CONFIG+=use_system_minizip \
-    WEBENGINE_CONFIG+=use_system_libwebp \
-    WEBENGINE_CONFIG+=use_system_libxslt \
-    WEBENGINE_CONFIG+=use_system_libevent \
-    WEBENGINE_CONFIG+=use_system_jsoncpp \
-    WEBENGINE_CONFIG+=use_system_opus \
-    WEBENGINE_CONFIG+=use_system_protobuf \
-    WEBENGINE_CONFIG+=use_system_libsrtp \
-    WEBENGINE_CONFIG+=use_system_snappy
-#    WEBENGINE_CONFIG+=use_system_vpx \  It requires a newer version of libvpx. A patch for that from debian just won't apply.
-# Options can be found in tools/qmake/mkspecs/features/configure.prf
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/qt5-webkit.sat b/graveyard/unmaintained_satellites/qt5-webkit.sat
deleted file mode 100644
index 02e6468..0000000
--- a/graveyard/unmaintained_satellites/qt5-webkit.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'compile/qt'
-
-name=qt5
-submodule=webkit
-majver=5.7
-version=$majver.0
-update_url='https://www.qt.io/download-open-source/'
-update_names="qt-everywhere-opensource-src-$version.tar.gz"
-
-dlextract "http://download.qt.io/community_releases/$majver/$version/qt$submodule-opensource-src-$version.tar.xz" \
-          '9379b8829639645c184fa63532035098'
-header_end
-
-cd "qt$submodule-opensource-src-$version"
-compile_qt 5
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/qutebrowser-git.sat b/graveyard/unmaintained_satellites/qutebrowser-git.sat
deleted file mode 100644
index 0b9399a..0000000
--- a/graveyard/unmaintained_satellites/qutebrowser-git.sat
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'vcs/git'
-import 'compile/python'
-
-name=qutebrowser
-
-vcs_git "https://github.com/The-Compiler/$name"
-header_end
-
-cd "$name"
-
-# Fix paths
-sed -i -e "s/usr\/share/$(safe_sed "$dir_prefix/$dir_datadir")/" qutebrowser/utils/standarddir.py
-
-compile_python 3
-
-sed -e '/^Name=/s/$/ (Webengine)/' \
-    -e '/^Exec=/s/%u/--backend webengine &/' "$name.desktop" > "$name-webengine.desktop"
-
-# Install manpage
-a2x -f manpage "doc/$name.1.asciidoc"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" "doc/$name.1"
-
-# Install desktop and icons
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" "$name.desktop" "$name-webengine.desktop"
-for x in 16 24 32 48 64 96 128 256 512; do
-    install -Dm644 "icons/$name-${x}x$x.png" "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/$name.png"
-done
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/scalable/apps" "icons/$name.svg"
-
-# Install userscripts
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_datadir/$name/userscripts/" misc/userscripts/*
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/qutebrowser.sat b/graveyard/unmaintained_satellites/qutebrowser.sat
deleted file mode 100644
index 21b4169..0000000
--- a/graveyard/unmaintained_satellites/qutebrowser.sat
+++ /dev/null
@@ -1,35 +0,0 @@
-import 'compile/python'
-
-name=qutebrowser
-version=0.8.4
-update_url="https://github.com/The-Compiler/$name/releases"
-
-dlextract "https://github.com/The-Compiler/$name/releases/download/v$version/$name-$version.tar.gz" \
-          '5bba7dae261762d423c20a7bc8bf0734'
-header_end
-
-cd "$name-$version"
-
-# Fix paths
-sed -i -e "s/usr\/share/$(safe_sed "$dir_prefix/$dir_datadir")/" qutebrowser/utils/standarddir.py
-
-compile_python 3
-
-sed -e '/^Name=/s/$/ (Webengine)/' \
-    -e '/^Exec=/s/%u/--backend webengine &/' "$name.desktop" > "$name-webengine.desktop"
-
-# Install manpage
-a2x -f manpage "doc/$name.1.asciidoc"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" "doc/$name.1"
-
-# Install desktop and icons
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" "$name.desktop" "$name-webengine.desktop"
-for x in 16 24 32 48 64 96 128 256 512; do
-    install -Dm644 "icons/$name-${x}x$x.png" "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/$name.png"
-done
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/scalable/apps" "icons/$name.svg"
-
-# Install userscripts
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_datadir/$name/userscripts/" misc/userscripts/*
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/qwbfsmanager.sat b/graveyard/unmaintained_satellites/qwbfsmanager.sat
deleted file mode 100644
index 7e30d4e..0000000
--- a/graveyard/unmaintained_satellites/qwbfsmanager.sat
+++ /dev/null
@@ -1,19 +0,0 @@
-# This program includes libfresh, but since it's only needed by this, and has seen no versioned release, I'll just include it in this package.
-import "compile/qt"
-import "download/git"
-
-name=qwbfsmanager
-version=1.2.6
-update_url="https://github.com/pasnox/$name/releases"
-update_names="v$version.tar.gz"
-
-# Downloading this way to get dependencies.
-download_git "https://github.com/pasnox/$name" "$version"
-header_end
-
-cd "$name-$version"
-sed -i -e "s/CONFIG \*= fresh//" qwbfs.pro qwbfs/qwbfs.pro  # Make sure we always use the bundled library.
-
-compile_qt 5
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/retroarch-assets-xmb.sat b/graveyard/unmaintained_satellites/retroarch-assets-xmb.sat
deleted file mode 100644
index 5904a25..0000000
--- a/graveyard/unmaintained_satellites/retroarch-assets-xmb.sat
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'vcs/git'
-
-name=retroarch-assets
-
-vcs_git "https://github.com/libretro/$name"
-header_end
-
-cd "$name"
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/retroarch/assets"
-cp -av xmb "$dir_install/$dir_prefix/$dir_datadir/retroarch/assets"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/retroarch.sat b/graveyard/unmaintained_satellites/retroarch.sat
deleted file mode 100644
index 256f1d4..0000000
--- a/graveyard/unmaintained_satellites/retroarch.sat
+++ /dev/null
@@ -1,42 +0,0 @@
-name=RetroArch
-version=1.4.1
-update_url="https://github.com/libretro/$name/releases"
-update_names="/archive/v$version.tar.gz"
-
-dlextract "https://github.com/libretro/$name/archive/v$version/$name-$version.tar.gz" \
-          'a2431adfee081c5cab3c6b7930e5bfab'
-dlfile "https://slackbuilds.org/slackbuilds/14.2/games/$name/disable_core_update.patch.gz" \
-       '5c55e7b66e1d1bc38f0bee3813861460'
-header_end
-
-cd "$name-$version"
-
-# Patch retroarch.cfg to point to the correct directories for cores and other files.
-sed -i -e "/^[# ]*libretro_directory/clibretro_directory = \"$(safe_sed "/$dir_prefix/$dir_libdir/libretro")\"" \
-       -e "/^[# ]*libretro_info_path/clibretro_info_path = \"$(safe_sed "/$dir_prefix/$dir_libdir/libretro/info")\"" \
-       -e "/^[# ]*audio_filter_dir/caudio_filter_dir = \"$(safe_sed "/$dir_prefix/$dir_libdir/retroarch/filters/audio")\"" \
-       -e "/^[# ]*video_filter_dir/cvideo_filter_dir = \"$(safe_sed "/$dir_prefix/$dir_libdir/retroarch/filters/video")\"" \
-       -e "/^[# ]*assets_directory/cassets_directory = \"$(safe_sed "/$dir_prefix/$dir_datadir/retroarch/assets")\"" retroarch.cfg
-
-# Disable updating of cores
-zcat ../disable_core_update.patch.gz | patch -p1
-
-# Custom configure-style script.
-./configure --disable-update_assets --disable-update_cores \
-    --prefix="/$dir_prefix" \
-    --global-config-dir="/$dir_prefix/$dir_sysconfdir" \
-    --with-assets_dir="/$dir_prefix/$dir_datadir" \
-    --with-bin_dir="/$dir_prefix/$dir_bindir" \
-    --with-man_dir="/$dir_prefix/$dir_mandir"
-
-make DESTDIR="$dir_install" install
-
-# Compile and install audio filters
-make -C libretro-common/audio/dsp_filters
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_libdir/retroarch/filters/audio" libretro-common/audio/dsp_filters/*.{dsp,so}
-
-# Compile and install video filters
-make -C gfx/video_filters
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_libdir/retroarch/filters/video" gfx/video_filters/*.{filt,so}
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/scrot.sat b/graveyard/unmaintained_satellites/scrot.sat
deleted file mode 100644
index e5f6c69..0000000
--- a/graveyard/unmaintained_satellites/scrot.sat
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'compile/configure'
-
-name=scrot
-majver=0.8
-version=$majver-17
-update_url="https://packages.debian.org/sid/$name"
-update_names="${name}_$version.debian.tar.xz"
-
-dlextract "http://http.debian.net/debian/pool/main/s/$name/${name}_$majver.orig.tar.gz" \
-          'ccae904d225609571bdd3b03445c1e88'
-dlextract "http://http.debian.net/debian/pool/main/s/$name/${name}_$version.debian.tar.xz" \
-          '7d6a067f67586623c72a7c83076af842'
-header_end
-
-cd "$name-$majver"
-
-for x in $(cat ../debian/patches/series); do
-    patch -p1 -i ../debian/patches/$x
-done
-
-autoreconf -fi
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/snappy.sat b/graveyard/unmaintained_satellites/snappy.sat
deleted file mode 100644
index 6a9b26b..0000000
--- a/graveyard/unmaintained_satellites/snappy.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import 'compile/configure'
-
-name=snappy
-version=1.1.3
-update_url="https://github.com/google/$name/releases"
-
-dlextract "https://github.com/google/$name/releases/download/$version/$name-$version.tar.gz" \
-          '7358c82f133dc77798e4c2062a749b73'
-header_end
-
-cd "$name-$version"
-compile_configure -- --disable-static
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/spasm-ng-git.sat b/graveyard/unmaintained_satellites/spasm-ng-git.sat
deleted file mode 100644
index a49bbd0..0000000
--- a/graveyard/unmaintained_satellites/spasm-ng-git.sat
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'vcs/git'
-
-name=spasm-ng
-
-vcs_git "https://github.com/alberthdev/$name"
-header_end
-
-cd "$name"
-make
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" spasm
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/speedtest-cli.sat b/graveyard/unmaintained_satellites/speedtest-cli.sat
deleted file mode 100644
index ffb902d..0000000
--- a/graveyard/unmaintained_satellites/speedtest-cli.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import "compile/python"
-
-name=speedtest-cli
-version=0.3.4
-update_url="https://github.com/sivel/$name/releases"
-
-dlextract "https://github.com/sivel/$name/archive/v$version.tar.gz" \
-          "45344501fab5e19492ae3ef1de4ed9ae"
-header_end
-
-cd "$name-$version"
-compile_python 3.4
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/steam.sat b/graveyard/unmaintained_satellites/steam.sat
deleted file mode 100644
index c4914ba..0000000
--- a/graveyard/unmaintained_satellites/steam.sat
+++ /dev/null
@@ -1,23 +0,0 @@
-name=steam
-version=1.0.0.54
-update_url="http://repo.steampowered.com/$name/archive/precise/"
-
-dlextract "http://repo.steampowered.com/$name/archive/precise/${name}_$version.tar.gz" \
-          'd1398490635615c428165e984a1ec71b'
-header_end
-
-cd "$name"
-
-# Fix directories
-sed -i -e "s/\$(PREFIX)\/bin/\$(PREFIX)\/$(safe_sed "$dir_bindir")/" \
-       -e "s/\$(PREFIX)\/lib/\$(PREFIX)\/$(safe_sed "$dir_libdir")/" \
-       -e "s/\$(PREFIX)\/share\/man/\$(PREFIX)\/$(safe_sed "$dir_mandir")/" \
-       -e "s/\$(PREFIX)\/share\/doc/\$(PREFIX)\/$(safe_sed "$dir_docdir")/" \
-       -e "s/\$(PREFIX)\/share/\$(PREFIX)\/$(safe_sed "$dir_datadir")/" Makefile
-
-sed -i -e "/LAUNCHSTEAMBOOTSTRAPFILE=/s/usr\/lib/$(safe_sed "$dir_prefix/$dir_libdir")/" \
-       -e "s/usr\/share\/applications/$(safe_sed "$dir_prefix/$dir_datadir/applications")/" "$name"
-
-make PREFIX="/$dir_prefix" DESTDIR="$dir_install" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/stepmania.sat b/graveyard/unmaintained_satellites/stepmania.sat
deleted file mode 100644
index 6418010..0000000
--- a/graveyard/unmaintained_satellites/stepmania.sat
+++ /dev/null
@@ -1,33 +0,0 @@
-# NOTE: This application uses an old version of ffmpeg and has a few external libraries in it's source tree as well.
-
-import 'compile/cmake'
-
-name=stepmania
-majver=5.0
-version=$majver.12
-ffmpeg_version=2.1.8
-update_url="https://github.com/$name/$name/releases"
-update_names="/archive/v$version.tar.gz"
-
-dlextract "https://github.com/$name/$name/archive/v$version.tar.gz" \
-          '04dcba99ec1a6fd544e58a56e26e21ff'
-download "https://ffmpeg.org/releases/ffmpeg-$ffmpeg_version.tar.bz2" \
-         'b11231d7ff0aa4f675958ea6b51caa96'
-header_end
-
-cd "$name-$version"
-
-# Set up ffmpeg
-extract "ffmpeg-$ffmpeg_version.tar.bz2" extern
-sed -i -e '/set(SM_FFMPEG_SRC_LIST/s/ffmpeg-linux-/ffmpeg-/' \
-       -e "/set(SM_FFMPEG_VERSION/s/2.1.3/$(safe_sed "$ffmpeg_version")/" CMake/SetupFfmpeg.cmake
-
-compile_cmake -- -DCMAKE_INSTALL_PREFIX="/$dir_prefix/$dir_libdir" -DWITH_STATIC_LINKING=OFF
-
-mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-ln -sf "$dir_sysroot/$dir_prefix/$dir_libdir/$name-$majver/$name" "$dir_install/$dir_prefix/$dir_bindir/$name"
-
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" "$name.desktop"
-cp -r icons "$dir_install/$dir_prefix/$dir_datadir/"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/texmaker.sat b/graveyard/unmaintained_satellites/texmaker.sat
deleted file mode 100644
index 04cd7c8..0000000
--- a/graveyard/unmaintained_satellites/texmaker.sat
+++ /dev/null
@@ -1,16 +0,0 @@
-# TODO: Qt5
-
-import 'compile/qt'
-
-name=texmaker
-version=4.5
-update_url="http://www.xm1math.net/$name/download.html"
-
-dlextract "http://www.xm1math.net/$name/$name-$version.tar.bz2" \
-          '156ffad5b7193e0cfecd2d3689f3a7a4'
-header_end
-
-cd "$name-$version"
-compile_qt 4
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/tilp-git.sat b/graveyard/unmaintained_satellites/tilp-git.sat
deleted file mode 100644
index cbe9555..0000000
--- a/graveyard/unmaintained_satellites/tilp-git.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'vcs/git'
-import 'compile/configure'
-
-name=tilp
-
-vcs_git 'https://github.com/debrouxl/tilp_and_gfm'
-header_end
-
-cd tilp_and_gfm/tilp/trunk
-autoreconf -fi
-compile_configure
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/tlp.sat b/graveyard/unmaintained_satellites/tlp.sat
deleted file mode 100644
index c66590c..0000000
--- a/graveyard/unmaintained_satellites/tlp.sat
+++ /dev/null
@@ -1,22 +0,0 @@
-name=TLP
-version=0.9
-update_url="https://github.com/linrunner/$name/releases"
-update_names="/archive/$version.tar.gz"
-
-dlextract "https://github.com/linrunner/$name/archive/$version.tar.gz" \
-          '952712c5de56e5fcb9a165b1cd8ba4e0'
-header_end
-
-cd "$name-$version"
-make install-tlp \
-    TLP_SBIN="/$dir_prefix/$dir_sbindir" \
-    TLP_BIN="/$dir_prefix/$dir_bindir" \
-    TLP_TLIB="/$dir_prefix/$dir_datadir/tlp-pm" \
-    TLP_PLIB="/$dir_prefix/$dir_libdir/pm-utils" \
-    TLP_CONF="/$dir_sysconfdir/default/tlp" \
-    TLP_SHCPL="/$dir_prefix/$dir_datadir/bash-completion/completions" \
-    TLP_MAN="/$dir_prefix/$dir_mandir" \
-    TLP_NO_INIT=1 \
-    DESTDIR="$dir_install"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/unetbootin.sat b/graveyard/unmaintained_satellites/unetbootin.sat
deleted file mode 100644
index f4d3c83..0000000
--- a/graveyard/unmaintained_satellites/unetbootin.sat
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'compile/qt'
-
-name=unetbootin
-version=625
-update_url='https://unetbootin.github.io/linux_download.html'
-
-dlextract "http://launchpad.net/$name/trunk/625/+download/$name-source-$version.tar.gz" \
-          'fa7bc1aa37d04ad7f85ea85e5dbf68cc'
-header_end
-
-# Allow custom CFLAGS
-cat >> unetbootin.pro << EOF
-QMAKE_CXXFLAGS += \$\$(CXXFLAGS)
-QMAKE_CFLAGS += \$\$(CFLAGS)
-QMAKE_LFLAGS += \$\$(LDFLAGS)
-EOF
-
-$(compile_qt_get_cmd lupdate 4) unetbootin.pro
-$(compile_qt_get_cmd lrelease 4) unetbootin.pro
-compile_qt 4
-
-# Install the program
-install -Dm755 "$name" "$dir_install/$dir_prefix/$dir_bindir/$name"
-
-# Install the translations
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/$name" "$name"_*.qm
-
-# Fix the desktop file
-sed -i -e "/Exec=/cExec=$name" "$name.desktop"
-
-# Install the desktop file and icons
-install -Dm644 "$name.desktop" "$dir_install/$dir_prefix/$dir_datadir/applications/$name.desktop"
-for x in 16 22 24 32 48 64 128 192 256 512; do
-    install -Dm644 "${name}_$x.png" "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/$name.png"
-done
-install -Dm644 "${name}_icons.svg" "$dir_install/$dir_prefix/$dir_datadir/icons/scalable/apps/$name.svg"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/graveyard/unmaintained_satellites/vcs/bannertool.sat b/graveyard/unmaintained_satellites/vcs/bannertool.sat
deleted file mode 100644
index f184135..0000000
--- a/graveyard/unmaintained_satellites/vcs/bannertool.sat
+++ /dev/null
@@ -1,17 +0,0 @@
-import "vcs/git"
-
-name=bannertool
-
-vcs_git "https://github.com/Steveice10/$name"
-header_end
-
-cd "$name"
-
-# Fix retarded build system
-sed -i -e "s@/usr/local@'$dir_install/$dir_prefix'@g" buildtools/make_base
-mkdir -p "$dir_install/$dir_prefix/bin"
-
-make
-make install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/vcs/compton.sat b/graveyard/unmaintained_satellites/vcs/compton.sat
deleted file mode 100644
index 72b7ea1..0000000
--- a/graveyard/unmaintained_satellites/vcs/compton.sat
+++ /dev/null
@@ -1,13 +0,0 @@
-import "vcs/git"
-
-name=compton
-
-vcs_git "https://github.com/chjj/$name"
-header_end
-
-cd "$name"
-make
-make docs
-make DESTDIR="$dir_install" PREFIX="$dir_prefix" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/vcs/ctr.sat b/graveyard/unmaintained_satellites/vcs/ctr.sat
deleted file mode 100644
index 09fc91c..0000000
--- a/graveyard/unmaintained_satellites/vcs/ctr.sat
+++ /dev/null
@@ -1,12 +0,0 @@
-import "vcs/git"
-
-name=ctr
-
-vcs_git "https://github.com/b1l1s/$name"
-header_end
-
-cd "$name"
-mkdir -p "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/lib"
-make DEVKITARM="$dir_install/opt/devkitPRO/devkitARM" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/vcs/ctrff.sat b/graveyard/unmaintained_satellites/vcs/ctrff.sat
deleted file mode 100644
index e9b0cb3..0000000
--- a/graveyard/unmaintained_satellites/vcs/ctrff.sat
+++ /dev/null
@@ -1,12 +0,0 @@
-import "vcs/git"
-
-name=ctrff
-
-vcs_git "https://github.com/b1l1s/$name"
-header_end
-
-cd "$name"
-mkdir -p "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/include" "$dir_install/opt/devkitPRO/devkitARM/arm-none-eabi/lib"
-make DEVKITARM="$dir_install/opt/devkitPRO/devkitARM" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/vcs/ctrtool-git.sat b/graveyard/unmaintained_satellites/vcs/ctrtool-git.sat
deleted file mode 100644
index e2678bb..0000000
--- a/graveyard/unmaintained_satellites/vcs/ctrtool-git.sat
+++ /dev/null
@@ -1,12 +0,0 @@
-import "vcs/git"
-
-name=Project_CTR
-
-vcs_git "https://github.com/profi200/$name"
-header_end
-
-cd "$name/ctrtool"
-make
-install -D ctrtool "$dir_install/$dir_prefix/bin/ctrtool"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/vcs/makerom-git.sat b/graveyard/unmaintained_satellites/vcs/makerom-git.sat
deleted file mode 100644
index e4eb3db..0000000
--- a/graveyard/unmaintained_satellites/vcs/makerom-git.sat
+++ /dev/null
@@ -1,12 +0,0 @@
-import "vcs/git"
-
-name=Project_CTR
-
-vcs_git "https://github.com/profi200/$name"
-header_end
-
-cd "$name/makerom"
-make
-install -D makerom "$dir_install/$dir_prefix/bin/makerom"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/vcs/sockfile.sat b/graveyard/unmaintained_satellites/vcs/sockfile.sat
deleted file mode 100644
index 0b0e92d..0000000
--- a/graveyard/unmaintained_satellites/vcs/sockfile.sat
+++ /dev/null
@@ -1,12 +0,0 @@
-import "compile/cmake"
-import "vcs/git"
-
-name=sockfile
-
-vcs_git "https://github.com/mid-kid/$name"
-header_end
-
-cd "$name"
-compile_cmake_installbin "$name"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/graveyard/unmaintained_satellites/vcs/spasm-ng-git.sat b/graveyard/unmaintained_satellites/vcs/spasm-ng-git.sat
deleted file mode 100644
index 22313b5..0000000
--- a/graveyard/unmaintained_satellites/vcs/spasm-ng-git.sat
+++ /dev/null
@@ -1,14 +0,0 @@
-import "vcs/git"
-
-name=spasm-ng
-
-vcs_git "https://github.com/alberthdev/$name"
-header_end
-
-cd "$name"
-
-make
-mkdir -p "$dir_install/$dir_prefix/bin"
-make DESTDIR="$dir_install/$dir_prefix" install
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/android-tools.sat b/satellites/android-tools.sat
index 4916c3c..2f13a0e 100644
--- a/satellites/android-tools.sat
+++ b/satellites/android-tools.sat
@@ -9,7 +9,7 @@ vcs_git -Vr "android-$version" 'https://android.googlesource.com/platform/extern
 vcs_git -Vr "android-$version" 'https://android.googlesource.com/platform/external/f2fs-tools'
 extrafile 'Makefile'
 extrafile 'fix_core.patch'
-header_end
+_
 
 ( cd core
     patch -p0 -i ../fix_core.patch
@@ -20,6 +20,6 @@ make \
     MYCFLAGS="$CFLAGS" \
     MYCXXFLAGS="$CXXFLAGS"
 
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" adb fastboot
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" adb fastboot
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ant.sat b/satellites/ant.sat
index 3342b8e..f3aa117 100644
--- a/satellites/ant.sat
+++ b/satellites/ant.sat
@@ -4,7 +4,7 @@ update_url='https://www.apache.org/dist/ant/source/'
 
 dlextract "https://www.apache.org/dist/ant/source/$name-$version-src.tar.xz" \
           'ebecbe7488c624b06bc6a264a3a7c4ec'
-header_end
+_
 
 cd "$name-$version"
 ./build.sh
@@ -13,9 +13,9 @@ cd "$name-$version"
 rm -f dist/bin/*.bat dist/bin/*.cmd
 
 # Install
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/$name"
-cp -Ta dist "$dir_install/$dir_prefix/$dir_datadir/$name"
-mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-ln -Tfs "/$dir_prefix/$dir_datadir/$name/bin/ant" "$dir_install/$dir_prefix/$dir_bindir/ant"
+mkdir -p "$dir_install/$dir_prefix/$dir_data/$name"
+cp -Ta dist "$dir_install/$dir_prefix/$dir_data/$name"
+mkdir -p "$dir_install/$dir_prefix/$dir_bin"
+ln -Tfs "/$dir_prefix/$dir_data/$name/bin/ant" "$dir_install/$dir_prefix/$dir_bin/ant"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/armips-git.sat b/satellites/armips-git.sat
index e4dc095..64a2b49 100644
--- a/satellites/armips-git.sat
+++ b/satellites/armips-git.sat
@@ -5,10 +5,10 @@ name=armips
 
 vcs_git "https://github.com/Kingcom/$name"
 vcs_git -V 'https://github.com/Kingcom/tinyformat' "$name/ext/tinyformat"
-header_end
+_
 
 cd "$name"
 compile_cmake -I
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "build/$name"
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" "build/$name"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/cabextract.sat b/satellites/cabextract.sat
index c2ece1d..bd45f40 100644
--- a/satellites/cabextract.sat
+++ b/satellites/cabextract.sat
@@ -6,7 +6,7 @@ update_url='https://www.cabextract.org.uk/'
 
 dlextract "https://www.cabextract.org.uk/$name-$version.tar.gz" \
           'ee3ded0b1f84e5c6e3309bb36d701916'
-header_end
+_
 
 cd "$name-$version"
 compile_configure
diff --git a/satellites/compton-git.sat b/satellites/compton-git.sat
index 02d69fb..e3f9bf2 100644
--- a/satellites/compton-git.sat
+++ b/satellites/compton-git.sat
@@ -3,15 +3,15 @@ import 'vcs/git'
 name=compton
 
 vcs_git "https://github.com/chjj/$name"
-header_end
+_
 
 cd "$name"
 make install \
     DESTDIR="$dir_install" \
     PREFIX="/$dir_prefix" \
-    BINDIR="/$dir_prefix/$dir_bindir" \
-    MANDIR="/$dir_prefix/$dir_mandir/man1" \
-    APPDIR="/$dir_prefix/$dir_datadir/applications" \
-    ICODIR="/$dir_prefix/$dir_datadir/icons/hicolor"
+    BINDIR="/$dir_prefix/$dir_bin" \
+    MANDIR="/$dir_prefix/$dir_man/man1" \
+    APPDIR="/$dir_prefix/$dir_data/applications" \
+    ICODIR="/$dir_prefix/$dir_data/icons/hicolor"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/confuse.sat b/satellites/confuse.sat
index 8ae011b..f8a8371 100644
--- a/satellites/confuse.sat
+++ b/satellites/confuse.sat
@@ -6,7 +6,7 @@ update_url="https://github.com/martinh/lib$name/releases"
 
 dlextract "https://github.com/martinh/lib$name/releases/download/v$version/$name-$version.tar.xz" \
           '84259ac3bd495645ab2fe61654917232'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static
diff --git a/satellites/create_ap.sat b/satellites/create_ap.sat
index 37772bd..bd61f5c 100644
--- a/satellites/create_ap.sat
+++ b/satellites/create_ap.sat
@@ -5,12 +5,12 @@ update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/oblique/$name/archive/v$version/$name-$version.tar.gz" \
           '4eaa1200204542670458cc7e9411b651'
-header_end
+_
 
 cd "$name-$version"
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_sysconfdir" "$name.conf"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/bash-completion/$name" bash_completion
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_docdir/$name" README.md
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" "$name"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_sysconf" "$name.conf"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/bash-completion/$name" bash_completion
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_doc/$name" README.md
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ctrtool-git.sat b/satellites/ctrtool-git.sat
index 2dc66ab..6c3bfa8 100644
--- a/satellites/ctrtool-git.sat
+++ b/satellites/ctrtool-git.sat
@@ -3,10 +3,10 @@ import 'vcs/git'
 name=Project_CTR
 
 vcs_git "https://github.com/profi200/$name"
-header_end
+_
 
 cd "$name/ctrtool"
 make
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" ctrtool
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" ctrtool
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/devkitarm-general-tools.sat b/satellites/devkitarm-general-tools.sat
index 0b2f801..33ff2a1 100644
--- a/satellites/devkitarm-general-tools.sat
+++ b/satellites/devkitarm-general-tools.sat
@@ -4,11 +4,11 @@ update_url='https://sourceforge.net/projects/devkitpro/files/sources/tools/'
 
 dlextract "https://sourceforge.net/projects/devkitpro/files/sources/tools/$name-$version.tar.bz2" \
           'ad13e4e3521e49156340c57ecb3c1b76'
-header_end
+_
 
 cd "$name-$version"
 
-./configure --prefix="/$dir_prefix/$dir_libdir/devkitPRO/devkitARM"
+./configure --prefix="/$dir_prefix/$dir_lib/devkitPRO/devkitARM"
 make
 make DESTDIR="$dir_install" install
 
diff --git a/satellites/devkitarm-libctru.sat b/satellites/devkitarm-libctru.sat
index 738a0fe..f173826 100644
--- a/satellites/devkitarm-libctru.sat
+++ b/satellites/devkitarm-libctru.sat
@@ -4,7 +4,7 @@ update_url="https://github.com/smealum/ctrulib/releases"
 
 dlextract "https://github.com/smealum/ctrulib/releases/download/v$version/$name-src-$version.tar.bz2" \
           '2bdc36451a6d4068e50ea7712939b319'
-header_end
+_
 
 # The makefile doesn't like it when this directory is named build
 builddir=build
@@ -13,13 +13,13 @@ if [ "$(basename "$PWD")" = 'build' ]; then
 fi
 
 make \
-    DEVKITPRO="/$dir_prefix/$dir_libdir/devkitPRO" \
-    DEVKITARM="/$dir_prefix/$dir_libdir/devkitPRO/devkitARM" \
+    DEVKITPRO="/$dir_prefix/$dir_lib/devkitPRO" \
+    DEVKITARM="/$dir_prefix/$dir_lib/devkitPRO/devkitARM" \
     BUILD="$builddir"
 
 make install \
-    DEVKITPRO="$dir_install/$dir_prefix/$dir_libdir/devkitPRO" \
-    DEVKITARM="/$dir_prefix/$dir_libdir/devkitPRO/devkitARM" \
+    DEVKITPRO="$dir_install/$dir_prefix/$dir_lib/devkitPRO" \
+    DEVKITARM="/$dir_prefix/$dir_lib/devkitPRO/devkitARM" \
     BUILD="$builddir"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/devkitarm.sat b/satellites/devkitarm.sat
index b8b5c84..10c94f8 100644
--- a/satellites/devkitarm.sat
+++ b/satellites/devkitarm.sat
@@ -24,7 +24,7 @@ dlextract "https://sourceforge.net/projects/devkitpro/files/buildscripts/buildsc
     download "https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz" \
              'c3d35cd949084be53b92cc1e03485f88'
 )
-header_end
+_
 
 cd buildscripts
 
@@ -53,15 +53,15 @@ EOF
 ./build-devkit.sh
 
 # Install
-mkdir -p "$dir_install/$dir_prefix/$dir_libdir/devkitPRO"
-cp -Ta "install/$name" "$dir_install/$dir_prefix/$dir_libdir/devkitPRO/devkitARM"
+mkdir -p "$dir_install/$dir_prefix/$dir_lib/devkitPRO"
+cp -Ta "install/$name" "$dir_install/$dir_prefix/$dir_lib/devkitPRO/devkitARM"
 
 # Install environment
 cat > devkitarm.sh << EOF
-export DEVKITPRO="/$dir_prefix/$dir_libdir/devkitPRO"
+export DEVKITPRO="/$dir_prefix/$dir_lib/devkitPRO"
 export DEVKITARM="\$DEVKITPRO/$name"
 export PATH="\$PATH:\$DEVKITARM/bin"
 EOF
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_sysconfdir/profile.d" devkitarm.sh
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_sysconf/profile.d" devkitarm.sh
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/dolphin-emu.sat b/satellites/dolphin-emu.sat
index 974f7bb..482074c 100644
--- a/satellites/dolphin-emu.sat
+++ b/satellites/dolphin-emu.sat
@@ -9,13 +9,13 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/$name/dolphin/archive/$version/dolphin-$version.tar.gz" \
           'ed94272956adbec690808f6e4d8ff065'
-header_end
+_
 
 cd "dolphin-$version"
 
 # Fix paths
-sed -i -e "/DESTINATION \${CMAKE_INSTALL_PREFIX}/s/share/$(safe_sed "$dir_datadir")/" CMakeLists.txt
+sed -i -e "/DESTINATION \${CMAKE_INSTALL_PREFIX}/s/share/$(safe_sed "$dir_data")/" CMakeLists.txt
 
-compile_cmake -- -Dbindir="/$dir_prefix/$dir_bindir" -Ddatadir="/$dir_prefix/$dir_datadir/$name" -Dmandir="/$dir_prefix/$dir_mandir"
+compile_cmake -- -Dbindir="/$dir_prefix/$dir_bin" -Ddatadir="/$dir_prefix/$dir_data/$name" -Dmandir="/$dir_prefix/$dir_man"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/dunst.sat b/satellites/dunst.sat
index 52ebeac..30b1d64 100644
--- a/satellites/dunst.sat
+++ b/satellites/dunst.sat
@@ -3,22 +3,22 @@ version=1.2.0
 update_url="https://github.com/dunst-project/$name/releases"
 update_names="/archive/v$version.tar.gz"
 
-define_option '!fancy-progressbar: Apply a patch that draws the progress value in a fancy way'
+define_option '!patch: Apply some custom patches'
 
 dlextract "https://github.com/dunst-project/dunst/archive/v$version/$name-$version.tar.gz" \
           '425d5bb10a8b571c7494c5e60aaae7e1'
-option fancy-progressbar extrafile "$name-$version-fancy-progressbar.patch"
-header_end
+option patch extrafile "$name-$version-fancy-progressbar.patch"
+_
 
 cd "$name-$version"
-option fancy-progressbar patch -p1 -i "../$name-$version-fancy-progressbar.patch"
+option patch patch -p1 -i "../$name-$version-fancy-progressbar.patch"
 
-sed -i -e "s/\${PREFIX}\/bin/\${PREFIX}\/$(safe_sed "$dir_bindir")/" \
-       -e "s/\${PREFIX}\/share/\${PREFIX}\/$(safe_sed "$dir_datadir")/" Makefile
+sed -i -e "s/\${PREFIX}\/bin/\${PREFIX}\/$(safe_sed "$dir_bin")/" \
+       -e "s/\${PREFIX}\/share/\${PREFIX}\/$(safe_sed "$dir_data")/" Makefile
 
 make install \
     DESTDIR="$dir_install" \
     PREFIX="/$dir_prefix" \
-    MANPREFIX="/$dir_prefix/$dir_mandir"
+    MANPREFIX="/$dir_prefix/$dir_man"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/fakeroot.sat b/satellites/fakeroot.sat
index dd3c304..39741c9 100644
--- a/satellites/fakeroot.sat
+++ b/satellites/fakeroot.sat
@@ -7,7 +7,7 @@ version=1.21
 misc_debian_download 3.1 \
                      'fb44d1c6494a2ba035479efe8193ccf7' \
                      'be5c9a0e516869fca4a6758105968e5a'
-header_end
+_
 
 cd "$name-$version"
 misc_debian_patch
@@ -22,7 +22,7 @@ if command -v po4a 2> /dev/null; then
     )
     make DESTDIR="$dir_install" install-data
 else
-    install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" doc/*.1
+    install -Dm644 -t "$dir_install/$dir_prefix/$dir_man/man1" doc/*.1
 fi
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/feh.sat b/satellites/feh.sat
index e3e2b35..3d559bc 100644
--- a/satellites/feh.sat
+++ b/satellites/feh.sat
@@ -4,7 +4,7 @@ update_url='https://feh.finalrewind.org/'
 
 dlextract "https://feh.finalrewind.org/$name-$version.tar.bz2" \
           '54fc20a0f35f0e2fea24541e622ae1d7'
-header_end
+_
 
 cd "$name-$version"
 
@@ -12,13 +12,13 @@ make
 make install \
     DESTDIR="$dir_install" \
     PREFIX="/$dir_prefix" \
-    ICON_PREFIX="$dir_install/$dir_prefix/$dir_datadir/icons" \
-    man_dir="$dir_install/$dir_prefix/$dir_mandir" \
-    bin_dir="$dir_install/$dir_prefix/$dir_bindir" \
-    doc_dir="$dir_install/$dir_prefix/$dir_docdir/$name" \
-    image_dir="$dir_install/$dir_prefix/$dir_datadir/$name/images" \
-    font_dir="$dir_install/$dir_prefix/$dir_datadir/$name/fonts" \
-    example_dir="$dir_install/$dir_prefix/$dir_docdir/$name/examples" \
-    desktop_dir="$dir_install/$dir_prefix/$dir_datadir/applications"
+    ICON_PREFIX="$dir_install/$dir_prefix/$dir_data/icons" \
+    man_dir="$dir_install/$dir_prefix/$dir_man" \
+    bin_dir="$dir_install/$dir_prefix/$dir_bin" \
+    doc_dir="$dir_install/$dir_prefix/$dir_doc/$name" \
+    image_dir="$dir_install/$dir_prefix/$dir_data/$name/images" \
+    font_dir="$dir_install/$dir_prefix/$dir_data/$name/fonts" \
+    example_dir="$dir_install/$dir_prefix/$dir_doc/$name/examples" \
+    desktop_dir="$dir_install/$dir_prefix/$dir_data/applications"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ffmpeg.sat b/satellites/ffmpeg.sat
index f00a151..da97f23 100644
--- a/satellites/ffmpeg.sat
+++ b/satellites/ffmpeg.sat
@@ -17,7 +17,7 @@ done
 
 dlextract "http://ffmpeg.org/releases/$name-$version.tar.bz2" \
           'e6e3b5f85eb5cb5448501fe4d8ca5bd0'
-header_end
+_
 
 cd "$name-$version"
 
@@ -38,12 +38,12 @@ done
 # Not using compile_configure due to that.
 ./configure --disable-static --enable-shared \
     --prefix="/$dir_prefix" \
-    --bindir="/$dir_prefix/$dir_bindir" \
-    --datadir="/$dir_prefix/$dir_datadir/$name" \
-    --docdir="/$dir_prefix/$dir_docdir/$name" \
-    --libdir="/$dir_prefix/$dir_libdir" \
-    --incdir="/$dir_prefix/$dir_includedir" \
-    --mandir="/$dir_prefix/$dir_mandir" \
+    --bindir="/$dir_prefix/$dir_bin" \
+    --datadir="/$dir_prefix/$dir_data/$name" \
+    --docdir="/$dir_prefix/$dir_doc/$name" \
+    --libdir="/$dir_prefix/$dir_lib" \
+    --incdir="/$dir_prefix/$dir_include" \
+    --mandir="/$dir_prefix/$dir_man" \
     --enable-gpl \
     --enable-version3 \
     $optional
diff --git a/satellites/firejail.sat b/satellites/firejail.sat
index 329b863..c7e0da5 100644
--- a/satellites/firejail.sat
+++ b/satellites/firejail.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/netblue30/firejail/archive/$version/$name-$version.tar.gz" \
           'b3d6bfd7da6be598f0a6f52c2b8254c6'
-header_end
+_
 
 cd "$name-$version"
 autoreconf -fi
diff --git a/satellites/firmtool.sat b/satellites/firmtool.sat
index 12411a5..b727b23 100644
--- a/satellites/firmtool.sat
+++ b/satellites/firmtool.sat
@@ -7,7 +7,7 @@ update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/TuxSH/$name/archive/v$version/$name-$version.tar.gz" \
           '3eab4dbe8051e7811b34edb574d21601'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/functions/compile/cmake.sh b/satellites/functions/compile/cmake.sh
index 35c7342..4cef946 100644
--- a/satellites/functions/compile/cmake.sh
+++ b/satellites/functions/compile/cmake.sh
@@ -16,17 +16,17 @@ compile_cmake() {
     cmake "$olddir" \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX="/$dir_prefix" \
-        -DCMAKE_INSTALL_FULL_SYSCONFDIR="/$dir_prefix/$dir_sysconfdir" \
-        -DCMAKE_INSTALL_FULL_BINDIR="/$dir_prefix/$dir_bindir" \
-        -DCMAKE_INSTALL_FULL_SBINDIR="/$dir_prefix/$dir_sbindir" \
-        -DCMAKE_INSTALL_FULL_LIBEXECDIR="/$dir_prefix/$dir_libexecdir" \
-        -DCMAKE_INSTALL_FULL_LIBDIR="/$dir_prefix/$dir_libdir" \
-        -DCMAKE_INSTALL_FULL_INCLUDEDIR="/$dir_prefix/$dir_includedir" \
-        -DCMAKE_INSTALL_FULL_DATADIR="/$dir_prefix/$dir_datadir" \
-        -DCMAKE_INSTALL_FULL_MANDIR="/$dir_prefix/$dir_mandir" \
-        -DCMAKE_INSTALL_FULL_DOCDIR="/$dir_prefix/$dir_docdir/$name" \
-        -DCMAKE_INSTALL_FULL_INFODIR="/$dir_prefix/$dir_infodir" \
-        -DCMAKE_INSTALL_FULL_LOCALEDIR="/$dir_prefix/$dir_localedir" \
+        -DCMAKE_INSTALL_FULL_SYSCONFDIR="/$dir_prefix/$dir_sysconf" \
+        -DCMAKE_INSTALL_FULL_BINDIR="/$dir_prefix/$dir_bin" \
+        -DCMAKE_INSTALL_FULL_SBINDIR="/$dir_prefix/$dir_sbin" \
+        -DCMAKE_INSTALL_FULL_LIBEXECDIR="/$dir_prefix/$dir_libexec" \
+        -DCMAKE_INSTALL_FULL_LIBDIR="/$dir_prefix/$dir_lib" \
+        -DCMAKE_INSTALL_FULL_INCLUDEDIR="/$dir_prefix/$dir_include" \
+        -DCMAKE_INSTALL_FULL_DATADIR="/$dir_prefix/$dir_data" \
+        -DCMAKE_INSTALL_FULL_MANDIR="/$dir_prefix/$dir_man" \
+        -DCMAKE_INSTALL_FULL_DOCDIR="/$dir_prefix/$dir_doc/$name" \
+        -DCMAKE_INSTALL_FULL_INFODIR="/$dir_prefix/$dir_info" \
+        -DCMAKE_INSTALL_FULL_LOCALEDIR="/$dir_prefix/$dir_locale" \
         "$@"
     make
 
diff --git a/satellites/functions/compile/configure.sh b/satellites/functions/compile/configure.sh
index 5bfd62e..adb6aaf 100644
--- a/satellites/functions/compile/configure.sh
+++ b/satellites/functions/compile/configure.sh
@@ -31,17 +31,17 @@ compile_configure() {
 
     "$olddir/configure" \
         --prefix="/$dir_prefix" \
-        --bindir="/$dir_prefix/$dir_bindir" \
-        --sbindir="/$dir_prefix/$dir_sbindir" \
-        --libexecdir="/$dir_prefix/$dir_libexecdir" \
-        --sysconfdir="/$dir_prefix/$dir_sysconfdir" \
-        --libdir="/$dir_prefix/$dir_libdir" \
-        --includedir="/$dir_prefix/$dir_includedir" \
-        --datadir="/$dir_prefix/$dir_datadir" \
-        --infodir="/$dir_prefix/$dir_infodir" \
-        --localedir="/$dir_prefix/$dir_localedir" \
-        --mandir="/$dir_prefix/$dir_mandir" \
-        --docdir="/$dir_prefix/$dir_docdir/$name" \
+        --bindir="/$dir_prefix/$dir_bin" \
+        --sbindir="/$dir_prefix/$dir_sbin" \
+        --libexecdir="/$dir_prefix/$dir_libexec" \
+        --sysconfdir="/$dir_prefix/$dir_sysconf" \
+        --libdir="/$dir_prefix/$dir_lib" \
+        --includedir="/$dir_prefix/$dir_include" \
+        --datadir="/$dir_prefix/$dir_data" \
+        --infodir="/$dir_prefix/$dir_info" \
+        --localedir="/$dir_prefix/$dir_locale" \
+        --mandir="/$dir_prefix/$dir_man" \
+        --docdir="/$dir_prefix/$dir_doc/$name" \
         $build $cross "$@"
 
     if [ "$nomake" = false ]; then
diff --git a/satellites/functions/compile/perl.sh b/satellites/functions/compile/perl.sh
index 886da2e..e0eb269 100644
--- a/satellites/functions/compile/perl.sh
+++ b/satellites/functions/compile/perl.sh
@@ -13,10 +13,10 @@ compile_perl() {
         --prefix="/$dir_prefix" \
         --destdir="$dir_install" \
         --installdirs vendor \
-        --install_path script="/$dir_prefix/$dir_bindir" \
-        --install_path bin="/$dir_prefix/$dir_bindir" \
-        --install_path bindoc="/$dir_prefix/$dir_mandir/man1" \
-        --install_path libdoc="/$dir_prefix/$dir_mandir/man3" \
+        --install_path script="/$dir_prefix/$dir_bin" \
+        --install_path bin="/$dir_prefix/$dir_bin" \
+        --install_path bindoc="/$dir_prefix/$dir_man/man1" \
+        --install_path libdoc="/$dir_prefix/$dir_man/man3" \
         "$@"
     ./Build
 
diff --git a/satellites/functions/compile/waf.sh b/satellites/functions/compile/waf.sh
index f161949..2fa0f8f 100644
--- a/satellites/functions/compile/waf.sh
+++ b/satellites/functions/compile/waf.sh
@@ -11,8 +11,8 @@ compile_waf() {
 
     $binary configure build install \
         --prefix="/$dir_prefix" \
-        --bindir="/$dir_prefix/$dir_bindir" \
-        --libdir="/$dir_prefix/$dir_libdir" \
+        --bindir="/$dir_prefix/$dir_bin" \
+        --libdir="/$dir_prefix/$dir_lib" \
         --destdir="$dir_install" \
         "$WAFFLAGS" "$@"
 }
diff --git a/satellites/functions/vcs/git.sh b/satellites/functions/vcs/git.sh
index a01801d..566726c 100644
--- a/satellites/functions/vcs/git.sh
+++ b/satellites/functions/vcs/git.sh
@@ -34,8 +34,8 @@ vcs_git() {
 
     # Check if it's actually been updated
     local commit="$(git rev-parse "$rev")"
-    if [ "$commit" != "$(cat "${dir}_rev_$_satname" 2> /dev/null || true)" ]; then
-        echo "$commit" > "${dir}_rev_$_satname"
+    if [ "$commit" != "$(cat "${dir}_rev_$name_sat" 2> /dev/null || true)" ]; then
+        echo "$commit" > "${dir}_rev_$name_sat"
         vcs_compile=true
     fi
 
diff --git a/satellites/functions/vcs/svn.sh b/satellites/functions/vcs/svn.sh
index 9c4a619..b442581 100644
--- a/satellites/functions/vcs/svn.sh
+++ b/satellites/functions/vcs/svn.sh
@@ -17,13 +17,13 @@ vcs_svn() {
     if [ ! -d "$dir" ]; then
         # Clone new repo
         svn co $revision "$1" "$dir"
-        echo "$(svn info "$dir" --show-item revision)" > "${dir}_rev_$_satname"
+        echo "$(svn info "$dir" --show-item revision)" > "${dir}_rev_$name_sat"
         vcs_compile=true
     else
         svn up $revision "$dir" || true
         local rev="$(svn info "$dir" --show-item revision)"
-        if [ "$rev" != "$(cat "${dir}_rev_$_satname" 2> /dev/null || true)" ]; then
-            echo "$rev" > "${dir}_rev_$_satname"
+        if [ "$rev" != "$(cat "${dir}_rev_$name_sat" 2> /dev/null || true)" ]; then
+            echo "$rev" > "${dir}_rev_$name_sat"
             vcs_compile=true
         fi
     fi
diff --git a/satellites/gifsicle.sat b/satellites/gifsicle.sat
index b3bb7b8..896a63c 100644
--- a/satellites/gifsicle.sat
+++ b/satellites/gifsicle.sat
@@ -6,7 +6,7 @@ update_url="https://www.lcdf.org/$name/"
 
 dlextract "https://www.lcdf.org/$name/$name-$version.tar.gz" \
           'fe12e1dddc1cdd34804a2a345bb8552b'
-header_end
+_
 
 cd "$name-$version"
 compile_configure
diff --git a/satellites/glm.sat b/satellites/glm.sat
index 78a4092..60dc062 100644
--- a/satellites/glm.sat
+++ b/satellites/glm.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/g-truc/$name/archive/$version/$name-$version.tar.gz" \
           '26ca8792038da90f67301fa0a3d5b693'
-header_end
+_
 
 cd "$name-$version"
 compile_cmake
diff --git a/satellites/go.sat b/satellites/go.sat
index 5aa185d..aec7a58 100644
--- a/satellites/go.sat
+++ b/satellites/go.sat
@@ -13,7 +13,7 @@ if option bootstrap; then
     download "https://storage.googleapis.com/golang/$name$bootstrap_version.src.tar.gz" \
              'dfb604511115dd402a77a553a5923a04'
 fi
-header_end
+_
 
 if option bootstrap; then
     mkdir bootstrap; cd bootstrap
@@ -33,7 +33,7 @@ cd "$name"
 export GOROOT="$PWD"
 
 ( cd src
-    GOROOT_FINAL="/$dir_prefix/$dir_libdir/go/$name$majver" \
+    GOROOT_FINAL="/$dir_prefix/$dir_lib/go/$name$majver" \
     ./make.bash
     ../bin/go install -buildmode=shared -linkshared std
 )
@@ -43,14 +43,14 @@ rm -rf pkg/bootstrap pkg/obj
 find src -type f \( ! -name "*.go" -a ! -name "*.c" -a ! -name "*.s" -a ! -name "*.S" -a ! -name "*.h" \) -delete
 find src -type d -empty -delete
 
-mkdir -p "$dir_install/$dir_prefix/$dir_libdir/go/$name$majver"
-cp -at "$dir_install/$dir_prefix/$dir_libdir/go/$name$majver" bin pkg src
+mkdir -p "$dir_install/$dir_prefix/$dir_lib/go/$name$majver"
+cp -at "$dir_install/$dir_prefix/$dir_lib/go/$name$majver" bin pkg src
 
 # Set global GOPATH for external libraries
 cat > go.sh << EOF
-export GOROOT="/$dir_prefix/$dir_libdir/go/$name$majver"
+export GOROOT="/$dir_prefix/$dir_lib/go/$name$majver"
 export PATH="\$PATH:\$GOROOT/bin"
 EOF
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_sysconfdir/profile.d" go.sh
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_sysconf/profile.d" go.sh
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/gtk-engine-murrine.sat b/satellites/gtk-engine-murrine.sat
index c191343..51d93d5 100644
--- a/satellites/gtk-engine-murrine.sat
+++ b/satellites/gtk-engine-murrine.sat
@@ -6,7 +6,7 @@ version=$majver.2
 
 dlextract "https://ftp.gnome.org/pub/GNOME/sources/$name/$majver/$name-$version.tar.xz" \
           'bf01e0097b5f1e164dbcf807f4b9745e'
-header_end
+_
 
 cd "$name-$version"
 compile_configure
diff --git a/satellites/gtk-engines.sat b/satellites/gtk-engines.sat
index dcce935..785b861 100644
--- a/satellites/gtk-engines.sat
+++ b/satellites/gtk-engines.sat
@@ -5,7 +5,7 @@ majver=2.20
 version=$majver.2
 
 dlextract "https://ftp.gnome.org/pub/GNOME/sources/$name/$majver/$name-$version.tar.bz2"
-header_end
+_
 
 cd "$name-$version"
 compile_configure
diff --git a/satellites/hostapd.sat b/satellites/hostapd.sat
index 7d1bc24..5b0fc35 100644
--- a/satellites/hostapd.sat
+++ b/satellites/hostapd.sat
@@ -11,7 +11,7 @@ if option rtlxdrv; then
     dlfile 'https://raw.githubusercontent.com/pritambaral/hostapd-rtl871xdrv/601a3f19d78393018f39a2e38ad14bf2e3315a0a/rtlxdrv.patch' \
            'fef4f428e4aae71f5202a61f656952da'
 fi
-header_end
+_
 
 cd "$name-$version"
 option rtlxdrv patch -p1 -i ../rtlxdrv.patch
@@ -21,10 +21,10 @@ cp defconfig .config
 option rtlxdrv echo CONFIG_DRIVER_RTW=y >> .config
 make
 
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name" "${name}_cli"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" "${name}_cli.1"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man8" "${name}.8"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_docdir/$name" \
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" "$name" "${name}_cli"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_man/man1" "${name}_cli.1"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_man/man8" "${name}.8"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_doc/$name" \
     $name.accept $name.conf $name.deny $name.eap_user $name.radius_clients \
     $name.sim_db $name.vlan $name.wpa_psk wired.conf hlr_auc_gw.milenage_db
 
diff --git a/satellites/i3.sat b/satellites/i3.sat
index ed9e64f..29c7481 100644
--- a/satellites/i3.sat
+++ b/satellites/i3.sat
@@ -5,7 +5,7 @@ version=4.13
 update_url='http://i3wm.org/downloads/'
 
 define_option '!gaps: Use the i3-gaps fork'
-define_option '!window-icons: Patch for support for icons in the title'
+define_option '!patch: Apply some custom patches'
 
 if option gaps; then
     dlextract "https://github.com/Airblader/$name/archive/$version/$name-gaps-$version.tar.gz" \
@@ -14,8 +14,8 @@ else
     dlextract "http://i3wm.org/downloads/$name-$version.tar.bz2" \
               '08d17dcf1fde665a15f7d411486546ae'
 fi
-option window-icons extrafile "$name-$version-window-icons.patch"
-header_end
+option patch extrafile "$name-$version-window-icons.patch"
+_
 
 cd "$name-$version"
 
diff --git a/satellites/i3lock.sat b/satellites/i3lock.sat
index 1943452..1f0d662 100644
--- a/satellites/i3lock.sat
+++ b/satellites/i3lock.sat
@@ -7,25 +7,25 @@ define_option 'pam: Use PAM for authentication'
 dlextract "https://i3wm.org/$name/$name-$version.tar.bz2" \
           '2983fff62236d54687dc7d51a6895edb'
 option !pam extrafile "$name-$version-no-pam.patch"
-header_end
+_
 
 cd "$name-$version"
 
 option !pam patch -p0 -i "../$name-$version-no-pam.patch"
 
 # Fix install directories
-sed -i -e "/\$(INSTALL)/s/bin/$(safe_sed "$dir_bindir")/" Makefile
+sed -i -e "/\$(INSTALL)/s/bin/$(safe_sed "$dir_bin")/" Makefile
 
 make install \
     PREFIX="/$dir_prefix" \
-    SYSCONFDIR="/$dir_sysconfdir" \
+    SYSCONFDIR="/$dir_sysconf" \
     DESTDIR="$dir_install"
 
 # Install the manpage
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1/" "$name.1"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_man/man1/" "$name.1"
 
 # If not using PAM, we need setuid to hash the user's password, as well as make sure the locker isn't killed by the kernel.
 # Don't worry, the locker drops privileges back to your user as soon as possible.
-option !pam chmod 4711 "$dir_install/$dir_prefix/$dir_bindir/$name"
+option !pam chmod 4711 "$dir_install/$dir_prefix/$dir_bin/$name"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/i3status.sat b/satellites/i3status.sat
index e8f5fc1..8e27b93 100644
--- a/satellites/i3status.sat
+++ b/satellites/i3status.sat
@@ -7,20 +7,20 @@ define_option 'pulseaudio: Build with support for PulseAudio'
 dlextract "https://i3wm.org/$name/$name-$version.tar.bz2" \
           'a5c0a364d917ffc57c42af3f6936e700'
 extrafile "$name-$version-disable-pulseaudio.patch"
-header_end
+_
 
 cd "$name-$version"
 
 option !pulseaudio patch -p0 -i "../$name-$version-disable-pulseaudio.patch"
 
 # Fix paths
-sed -i -e "/install -m/s/bin/$(safe_sed "$dir_bindir")/" \
-       -e "/install -m/s/share\/man/$(safe_sed "$dir_mandir")/" Makefile
+sed -i -e "/install -m/s/bin/$(safe_sed "$dir_bin")/" \
+       -e "/install -m/s/share\/man/$(safe_sed "$dir_man")/" Makefile
 
 make
 make install \
     PREFIX="/$dir_prefix" \
-    SYSCONFDIR="/$dir_prefix/$dir_sysconfdir" \
+    SYSCONFDIR="/$dir_prefix/$dir_sysconf" \
     DESTDIR="$dir_install"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/iasl.sat b/satellites/iasl.sat
index a1c52d0..c2bf385 100644
--- a/satellites/iasl.sat
+++ b/satellites/iasl.sat
@@ -5,10 +5,10 @@ update_names="/files/$name-unix-$version.tar.gz"
 
 dlextract "https://acpica.org/sites/$name/files/$name-unix-$version.tar.gz" \
           '7ed057451c602d994d629ece68bf09ae'
-header_end
+_
 
 cd "$name-unix-$version"
 make
-make DESTDIR="$dir_install" INSTALLDIR="/$dir_prefix/$dir_bindir" install
+make DESTDIR="$dir_install" INSTALLDIR="/$dir_prefix/$dir_bin" install
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/icedtea.sat b/satellites/icedtea.sat
index 3d4e4ed..c618306 100644
--- a/satellites/icedtea.sat
+++ b/satellites/icedtea.sat
@@ -3,7 +3,7 @@ import 'compile/configure'
 name=icedtea
 version=3.5.1
 version_bootstrap=2.6.11
-version_gcc=6.3.0
+version_gcc=6.4.0
 version_ecj=4.9
 version_apache_ant=1.9.9
 update_url='http://icedtea.wildebeest.org/download/source/'
@@ -33,8 +33,8 @@ done
 
 if option bootstrap; then
     ( name=gcc version="$version_gcc"
-        dlextract "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.bz2" \
-                  '677a7623c7ef6ab99881bc4e048debb6'
+        dlextract "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.xz" \
+                  '11ba51a0cfb8471927f387c8895fe232'
     )
     download "ftp://sourceware.org/pub/java/ecj-$version_ecj.jar" \
              '7339f199ba11c941890031fd9981d7be'
@@ -65,7 +65,7 @@ if option bootstrap; then
                  "$name-$version_bootstrap-$package"
     done
 fi
-header_end
+_
 
 # From: https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/multiprocessing.eclass
 makeopts_jobs() {
@@ -158,18 +158,18 @@ export PATH="$JAVA_HOME/bin:$PATH"
 make
 
 # Install
-mkdir -p "$dir_install/$dir_prefix/$dir_libdir/jvm/${name}8"
-cp -Ta openjdk.build/images/j2sdk-image "$dir_install/$dir_prefix/$dir_libdir/jvm/${name}8"
+mkdir -p "$dir_install/$dir_prefix/$dir_lib/jvm/${name}8"
+cp -Ta openjdk.build/images/j2sdk-image "$dir_install/$dir_prefix/$dir_lib/jvm/${name}8"
 
 # Link default jvm
-ln -s "${name}8" "$dir_install/$dir_prefix/$dir_libdir/jvm/default"
+ln -s "${name}8" "$dir_install/$dir_prefix/$dir_lib/jvm/default"
 
 # Add profile script
 cat > java.sh << EOF
-export JAVA_HOME="/$dir_prefix/$dir_libdir/jvm/default"
+export JAVA_HOME="/$dir_prefix/$dir_lib/jvm/default"
 export PATH="\$PATH:\$JAVA_HOME/bin"
 export MANPATH="\$MANPATH:\$JAVA_HOME/man"
 EOF
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_sysconfdir/profile.d" java.sh
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_sysconf/profile.d" java.sh
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/imlib2.sat b/satellites/imlib2.sat
index 9456779..03fd6a6 100644
--- a/satellites/imlib2.sat
+++ b/satellites/imlib2.sat
@@ -7,7 +7,7 @@ update_names="/projects/enlightenment/files/$name-src/$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/enlightenment/files/$name-src/$version/$name-$version.tar.bz2" \
           'a0de8524592bbd9f24fcc6cb8352137c'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static
diff --git a/satellites/iucode-tool.sat b/satellites/iucode-tool.sat
index 5b866b1..101b691 100644
--- a/satellites/iucode-tool.sat
+++ b/satellites/iucode-tool.sat
@@ -6,7 +6,7 @@ update_url="https://gitlab.com/$name/releases/tree/master"
 
 dlextract "https://gitlab.com/$name/releases/raw/master/${name}_$version.tar.xz" \
           'c6f131a0b69443f5498782a2335973fa'
-header_end
+_
 
 cd "$name-$version"
 compile_configure
diff --git a/satellites/jstest-gtk-git.sat b/satellites/jstest-gtk-git.sat
index 0900f5e..0b4f9dc 100644
--- a/satellites/jstest-gtk-git.sat
+++ b/satellites/jstest-gtk-git.sat
@@ -4,17 +4,17 @@ import 'compile/cmake'
 name=jstest-gtk
 
 vcs_git "https://github.com/Grumbel/$name/"
-header_end
+_
 
 cd "$name"
 
 # Fix paths
-sed -i -e "/^std::string find_datadir/!b;n;a\return \"$(safe_sed "/$dir_prefix/$dir_datadir/$name/")\";" src/main.cpp
+sed -i -e "/^std::string find_datadir/!b;n;a\return \"$(safe_sed "/$dir_prefix/$dir_data/$name/")\";" src/main.cpp
 
 compile_cmake -b build -I
 
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "build/$name"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" "data/$name.1"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/$name" data/*.png
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" "build/$name"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_man/man1" "data/$name.1"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/$name" data/*.png
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/kbuild.sat b/satellites/kbuild.sat
index 5f1b2e3..7d80e8f 100644
--- a/satellites/kbuild.sat
+++ b/satellites/kbuild.sat
@@ -9,7 +9,7 @@ define_option '!bootstrap: Bootstrap this program'
 misc_debian_download -v "$dir_version" 2 \
                      'ce194754401fed5a7f992f07b7304b31' \
                      '30f6102dc004235f276a5c2d9cfbe781'
-header_end
+_
 
 cd "$name-$version"
 misc_debian_patch
@@ -18,15 +18,15 @@ option bootstrap kBuild/env.sh --full make -f bootstrap.gmk
 kBuild/env.sh kmk rebuild
 kBuild/env.sh kmk install \
     NIX_INSTALL_DIR="/$dir_prefix" \
-    MY_INST_BIN="\$(MY_INST_ROOT)$dir_bindir/" \
-    MY_INST_DATA="\$(MY_INST_ROOT)$dir_datadir/$name/" \
-    MY_INST_DOC="\$(MY_INST_ROOT)$dir_docdir/$name/"
+    MY_INST_BIN="\$(MY_INST_ROOT)$dir_bin/" \
+    MY_INST_DATA="\$(MY_INST_ROOT)$dir_data/$name/" \
+    MY_INST_DOC="\$(MY_INST_ROOT)$dir_doc/$name/"
 
 cp -aT out/*/release/dist "$dir_install"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" debian/manpages/kmk.1
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_man/man1" debian/manpages/kmk.1
 for x in $(ls out/*/release/dist/usr/bin/* | fgrep -vx 'kmk'); do
     bin="$(basename "$x")"
-    ln -sf kmk.1 "$dir_install/$dir_prefix/$dir_mandir/man1/$bin.1"
+    ln -sf kmk.1 "$dir_install/$dir_prefix/$dir_man/man1/$bin.1"
 done
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libass.sat b/satellites/libass.sat
index 270456b..96baf96 100644
--- a/satellites/libass.sat
+++ b/satellites/libass.sat
@@ -6,7 +6,7 @@ update_url="https://github.com/libass/$name/releases"
 
 dlextract "https://github.com/libass/$name/releases/download/$version/$name-$version.tar.xz" \
           'ed16057b34a7f13330f416dd8c9a2032'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static
diff --git a/satellites/libconfig.sat b/satellites/libconfig.sat
index d6ca288..9ad79df 100644
--- a/satellites/libconfig.sat
+++ b/satellites/libconfig.sat
@@ -6,7 +6,7 @@ update_url="http://www.hyperrealm.com/$name/"
 
 dlextract "http://www.hyperrealm.com/$name/$name-$version.tar.gz" \
           'a939c4990d74e6fc1ee62be05716f633'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static
diff --git a/satellites/libev.sat b/satellites/libev.sat
index 29c35d5..266a4be 100644
--- a/satellites/libev.sat
+++ b/satellites/libev.sat
@@ -6,7 +6,7 @@ update_url="http://dist.schmorp.de/$name/"
 
 dlextract "http://dist.schmorp.de/$name/$name-$version.tar.gz" \
           '94459a5a22db041dec6f98424d6efe54'
-header_end
+_
 
 cd "$name-$version"
 
diff --git a/satellites/libmodplug.sat b/satellites/libmodplug.sat
index 68adf4a..0bde664 100644
--- a/satellites/libmodplug.sat
+++ b/satellites/libmodplug.sat
@@ -7,7 +7,7 @@ update_names="$name-$version.tar.gz/download"
 
 dlextract "https://sourceforge.net/projects/modplug-xmms/files/$name/$version/$name-$version.tar.gz" \
           '5f30241db109d647781b784e62ddfaa1'
-header_end
+_
 
 cd "$name-$version"
 compile_configure
diff --git a/satellites/libtorrent-rasterbar.sat b/satellites/libtorrent-rasterbar.sat
index 970f608..6bf98ab 100644
--- a/satellites/libtorrent-rasterbar.sat
+++ b/satellites/libtorrent-rasterbar.sat
@@ -6,7 +6,7 @@ update_url='https://github.com/arvidn/libtorrent/releases'
 
 dlextract "https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(echo "$version" | tr . _)/$name-$version.tar.gz" \
           'b0511cebee7b57dde57bfc4ac5f8eefa'
-header_end
+_
 
 cd "$name-$version"
 
diff --git a/satellites/libxdg-basedir.sat b/satellites/libxdg-basedir.sat
index e214cd6..7f17411 100644
--- a/satellites/libxdg-basedir.sat
+++ b/satellites/libxdg-basedir.sat
@@ -8,7 +8,7 @@ misc_debian_download -O 1 \
                      'f76241c6490b3089aef5112bade4c6e5'
 dlextract "https://github.com/devnev/$name/archive/$name-$orig_version.tar.gz" \
           'bd3bb815c9e27fda9c721b9c0b29ddda'
-header_end
+_
 
 cd "$name-$name-$orig_version"
 extract "${name}_$version.debian.tar.xz"
@@ -18,8 +18,8 @@ autoreconf -fi
 compile_configure -- --disable-static
 
 # Install docs
-mkdir -p "$dir_install/$dir_prefix/$dir_docdir/$name"
-sed -i -e "/^OUTPUT_DIRECTORY/cOUTPUT_DIRECTORY = $(safe_sed "$dir_install/$dir_prefix/$dir_docdir/$name")" debian/doxygen.cfg
+mkdir -p "$dir_install/$dir_prefix/$dir_doc/$name"
+sed -i -e "/^OUTPUT_DIRECTORY/cOUTPUT_DIRECTORY = $(safe_sed "$dir_install/$dir_prefix/$dir_doc/$name")" debian/doxygen.cfg
 doxygen debian/doxygen.cfg
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libxkbcommon.sat b/satellites/libxkbcommon.sat
index e930751..f11e515 100644
--- a/satellites/libxkbcommon.sat
+++ b/satellites/libxkbcommon.sat
@@ -6,7 +6,7 @@ update_url='http://xkbcommon.org/'
 
 dlextract "http://xkbcommon.org/download/$name-$version.tar.xz" \
           '947ba609cb0239b9462127d5cf8908ee'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static
diff --git a/satellites/love.sat b/satellites/love.sat
index 50130e4..b405ccd 100644
--- a/satellites/love.sat
+++ b/satellites/love.sat
@@ -6,7 +6,7 @@ update_url='http://love2d.org/'
 
 dlextract "https://bitbucket.org/rude/love/downloads/$name-$version-linux-src.tar.gz" \
           '11936c4fafe666bdea077cb006c060a4'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static
diff --git a/satellites/lua.sat b/satellites/lua.sat
index 3f71042..8a70536 100644
--- a/satellites/lua.sat
+++ b/satellites/lua.sat
@@ -5,14 +5,14 @@ update_url="http://www.lua.org/download.html"
 
 dlextract "http://www.lua.org/ftp/$name-$version.tar.gz" \
           '53a9c68bcc0eda58bdc2095ad5cdfc63'
-header_end
+_
 
 cd "$name-$version"
 
 # Fix paths
 sed -i -e "/LUA_ROOT/s/usr\/local/$(safe_sed "$dir_prefix")/" \
-       -e "/LUA_LDIR/s/share/$(safe_sed "$dir_datadir")/" \
-       -e "/LUA_CDIR/s/lib/$(safe_sed "$dir_libdir")/" src/luaconf.h
+       -e "/LUA_LDIR/s/share/$(safe_sed "$dir_data")/" \
+       -e "/LUA_CDIR/s/lib/$(safe_sed "$dir_lib")/" src/luaconf.h
 
 make linux \
     MYLIBS="-lncurses" \
@@ -21,18 +21,18 @@ make linux \
 
 make install \
     INSTALL_TOP="$PWD/install" \
-    INSTALL_BIN="\$(INSTALL_TOP)/$dir_bindir" \
-    INSTALL_LIB="\$(INSTALL_TOP)/$dir_libdir" \
-    INSTALL_INC="\$(INSTALL_TOP)/$dir_includedir" \
-    INSTALL_MAN="\$(INSTALL_TOP)/$dir_mandir/man1" \
-    INSTALL_LMOD="\$(INSTALL_TOP)/$dir_datadir/$majver" \
-    INSTALL_CMOD="\$(INSTALL_TOP)/$dir_libdir/$majver"
+    INSTALL_BIN="\$(INSTALL_TOP)/$dir_bin" \
+    INSTALL_LIB="\$(INSTALL_TOP)/$dir_lib" \
+    INSTALL_INC="\$(INSTALL_TOP)/$dir_include" \
+    INSTALL_MAN="\$(INSTALL_TOP)/$dir_man/man1" \
+    INSTALL_LMOD="\$(INSTALL_TOP)/$dir_data/$majver" \
+    INSTALL_CMOD="\$(INSTALL_TOP)/$dir_lib/$majver"
 
 # Check the build log to find this
 libs="-lm -Wl,-E -ldl -lreadline -lncurses"
 
 # Build the shared library
-( cd "install/$dir_libdir"
+( cd "install/$dir_lib"
     ar x liblua.a
     rm liblua.a
     cc -shared "-Wl,-soname,liblua.so.$majver" *.o $libs -o "liblua.so.$version"
@@ -42,10 +42,10 @@ libs="-lm -Wl,-E -ldl -lreadline -lncurses"
 )
 
 # Link the binary against the shared library
-rm "install/$dir_bindir/lua"
-cc src/lua.o "install/$dir_libdir/liblua.so" $libs -o "install/$dir_bindir/lua"
-rm "install/$dir_bindir/luac"
-cc src/luac.o src/lopcodes.o src/ldump.o "install/$dir_libdir/liblua.so" $libs -o "install/$dir_bindir/luac"
+rm "install/$dir_bin/lua"
+cc src/lua.o "install/$dir_lib/liblua.so" $libs -o "install/$dir_bin/lua"
+rm "install/$dir_bin/luac"
+cc src/luac.o src/lopcodes.o src/ldump.o "install/$dir_lib/liblua.so" $libs -o "install/$dir_bin/luac"
 
 # Actually install
 mkdir -p "$dir_install"
diff --git a/satellites/luajit.sat b/satellites/luajit.sat
index e7cbf01..d6a25a4 100644
--- a/satellites/luajit.sat
+++ b/satellites/luajit.sat
@@ -5,7 +5,7 @@ update_names="href=\"download/$name-$version.tar.gz\""
 
 dlextract "http://luajit.org/download/$name-$version.tar.gz" \
           '48353202cbcacab84ee41a5a70ea0a2c'
-header_end
+_
 
 cd "$name-$version"
 
@@ -13,10 +13,10 @@ make install \
     BUILDMODE=dynamic \
     PREFIX="/$dir_prefix" \
     DESTDIR="$dir_install" \
-    MULTILIB="$dir_libdir" \
-    INSTALL_BIN="\$(DPREFIX)/$dir_bindir" \
-    INSTALL_SHARE="\$(DPREFIX)/$dir_datadir" \
-    INSTALL_MAN="\$(DPREFIX)/$dir_mandir/man1" \
-    INSTALL_INC="\$(DPREFIX)/$dir_includedir/luajit-\$(MAJVER).\$(MINVER)"
+    MULTILIB="$dir_lib" \
+    INSTALL_BIN="\$(DPREFIX)/$dir_bin" \
+    INSTALL_SHARE="\$(DPREFIX)/$dir_data" \
+    INSTALL_MAN="\$(DPREFIX)/$dir_man/man1" \
+    INSTALL_INC="\$(DPREFIX)/$dir_include/luajit-\$(MAJVER).\$(MINVER)"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/maim.sat b/satellites/maim.sat
index 1b1fc0c..880e915 100644
--- a/satellites/maim.sat
+++ b/satellites/maim.sat
@@ -7,14 +7,14 @@ update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/naelstrof/$name/archive/v$version/$name-$version.tar.gz" \
           '174c5d49caded14e1235d9e1af026519'
-header_end
+_
 
 cd "$name-$version"
 
 # Fix paths
-sed -i -e "/^install(/s/bin/$(safe_sed "$dir_bindir")/" CMakeLists.txt
+sed -i -e "/^install(/s/bin/$(safe_sed "$dir_bin")/" CMakeLists.txt
 
 # This project doesn't use GNUInstallDir's CMAKE_INSTALL_*
-compile_cmake -- -DCMAKE_INSTALL_MANDIR="/$dir_prefix/$dir_mandir"
+compile_cmake -- -DCMAKE_INSTALL_MANDIR="/$dir_prefix/$dir_man"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/makerom-git.sat b/satellites/makerom-git.sat
index d1c3daa..1009814 100644
--- a/satellites/makerom-git.sat
+++ b/satellites/makerom-git.sat
@@ -3,10 +3,10 @@ import 'vcs/git'
 name=Project_CTR
 
 vcs_git "https://github.com/profi200/$name"
-header_end
+_
 
 cd "$name/makerom"
 make
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" makerom
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" makerom
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/markdown.sat b/satellites/markdown.sat
index 51c0070..7334cb0 100644
--- a/satellites/markdown.sat
+++ b/satellites/markdown.sat
@@ -4,12 +4,12 @@ update_url='https://daringfireball.net/projects/markdown/'
 
 download "https://daringfireball.net/projects/downloads/${name}_$version.zip" \
          'f17b3c2b2830c6fd2fe0098226e59a2f'
-header_end
+_
 
 # TODO: Support other formats, such as zip, with the extract command.
 extract "${name}_$version.zip" \
         '' \
         'unzip -qd {dst} {src}'
-install -D "${name}_$version/$name.pl" "$dir_install/$dir_prefix/$dir_bindir/markdown"
+install -D "${name}_$version/$name.pl" "$dir_install/$dir_prefix/$dir_bin/markdown"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et:
diff --git a/satellites/mozplugger.sat b/satellites/mozplugger.sat
index 3378294..cc96c7f 100644
--- a/satellites/mozplugger.sat
+++ b/satellites/mozplugger.sat
@@ -6,7 +6,7 @@ update_url='http://mozplugger.mozdev.org/'
 
 dlextract "http://mozplugger.mozdev.org/files/$name-$version.tar.gz" \
           'abb42f3c3c2f3a940c1252a83f254116'
-header_end
+_
 
 cd "$name-$version"
 
@@ -16,6 +16,6 @@ sed -i -e '/install/s/@bindir@/$(DESTDIR)&/' \
        -e '/install/s/@mandir@/$(DESTDIR)&/' \
        -e '/install/s/$$a/$(DESTDIR)&/' Makefile.in
 
-compile_configure -m "PLUGINDIRS='/$dir_prefix/$dir_libdir/mozilla/plugins'"
+compile_configure -m "PLUGINDIRS='/$dir_prefix/$dir_lib/mozilla/plugins'"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/mpv.sat b/satellites/mpv.sat
index 5810ca9..e49d4e6 100644
--- a/satellites/mpv.sat
+++ b/satellites/mpv.sat
@@ -7,15 +7,15 @@ update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/mpv-player/$name/archive/v$version/$name-$version.tar.gz" \
           '038d0b660de07ff645ad6a741704ecab'
-header_end
+_
 
 cd "$name-$version"
 compile_waf -- \
-    --confdir="/$dir_prefix/$dir_sysconfdir" \
-    --incdir="/$dir_prefix/$dir_includedir" \
-    --datadir="/$dir_prefix/$dir_datadir" \
-    --mandir="/$dir_prefix/$dir_mandir" \
-    --docdir="/$dir_prefix/$dir_docdir/$name" \
+    --confdir="/$dir_prefix/$dir_sysconf" \
+    --incdir="/$dir_prefix/$dir_include" \
+    --datadir="/$dir_prefix/$dir_data" \
+    --mandir="/$dir_prefix/$dir_man" \
+    --docdir="/$dir_prefix/$dir_doc/$name" \
     --enable-zsh-comp
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ninja.sat b/satellites/ninja.sat
index 284fdcb..1ad7e55 100644
--- a/satellites/ninja.sat
+++ b/satellites/ninja.sat
@@ -7,7 +7,7 @@ define_option '!bootstrap: Bootstrap this program'
 
 dlextract "https://github.com/ninja-build/$name/archive/v$version/$name-$version.tar.gz" \
           '7b482218757acbaeac4d4d54a3cd94e1'
-header_end
+_
 
 cd "$name-$version"
 
@@ -18,10 +18,10 @@ else
     ninja
 fi
 
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
-install -Dm644 misc/bash-completion "$dir_install/$dir_prefix/$dir_datadir/bash-completion/completions/$name"
-install -Dm644 misc/zsh-completion "$dir_install/$dir_prefix/$dir_datadir/zsh/site-functions/_$name"
-install -Dm644 misc/ninja.vim "$dir_install/$dir_prefix/$dir_datadir/vim/vimfiles/syntax/$name.vim"
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" "$name"
+install -Dm644 misc/bash-completion "$dir_install/$dir_prefix/$dir_data/bash-completion/completions/$name"
+install -Dm644 misc/zsh-completion "$dir_install/$dir_prefix/$dir_data/zsh/site-functions/_$name"
+install -Dm644 misc/ninja.vim "$dir_install/$dir_prefix/$dir_data/vim/vimfiles/syntax/$name.vim"
 # Not installing emacs stuff because I have no idea how it works
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/nxengine-evo.sat b/satellites/nxengine-evo.sat
index 513c9b9..b90a67f 100644
--- a/satellites/nxengine-evo.sat
+++ b/satellites/nxengine-evo.sat
@@ -14,7 +14,7 @@ download "http://www.cavestory.org/downloads/cavestoryen.zip" \
 
 extrafile "$name.desktop"
 extrafile "$name.png"
-header_end
+_
 
 # Copy Cave Story executable and data to the source directory.
 extract 'cavestoryen.zip' '' 'unzip -qd {dst} {src}'
@@ -35,17 +35,17 @@ compile_cmake -I
 ./bin/extract
 
 # Install game
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_libdir/$name" bin/nx
-mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-ln -s "/$dir_prefix/$dir_libdir/$name/nx" "$dir_install/$dir_prefix/$dir_bindir/nxengine-evo"
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_lib/$name" bin/nx
+mkdir -p "$dir_install/$dir_prefix/$dir_bin"
+ln -s "/$dir_prefix/$dir_lib/$name/nx" "$dir_install/$dir_prefix/$dir_bin/nxengine-evo"
 
 # Install data
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/$name"
-cp -aT data "$dir_install/$dir_prefix/$dir_datadir/$name"
-ln -s "/$dir_prefix/$dir_datadir/$name" "$dir_install/$dir_prefix/$dir_libdir/$name/data"
+mkdir -p "$dir_install/$dir_prefix/$dir_data/$name"
+cp -aT data "$dir_install/$dir_prefix/$dir_data/$name"
+ln -s "/$dir_prefix/$dir_data/$name" "$dir_install/$dir_prefix/$dir_lib/$name/data"
 
 # Install desktop file and icon
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" "../$name.desktop"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/pixmaps" "../$name.png"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/applications" "../$name.desktop"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/pixmaps" "../$name.png"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/openal.sat b/satellites/openal.sat
index 4e85ac8..b995b24 100644
--- a/satellites/openal.sat
+++ b/satellites/openal.sat
@@ -6,15 +6,15 @@ update_url="https://github.com/kcat/$name/releases"
 
 dlextract "https://github.com/kcat/$name/archive/$name-$version.tar.gz" \
           'a714a3ee1a5d5e2d963f996bc9af50f2'
-header_end
+_
 
 cd "$name-$name-$version"
 
 # Fix paths
-sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bindir")\"/" \
-       -e "/DESTINATION/s/lib\${LIB_SUFFIX}/$(safe_sed "$dir_libdir")/" \
-       -e "/DESTINATION/s/include\/AL/$(safe_sed "$dir_includedir/AL")/" CMakeLists.txt
+sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bin")\"/" \
+       -e "/DESTINATION/s/lib\${LIB_SUFFIX}/$(safe_sed "$dir_lib")/" \
+       -e "/DESTINATION/s/include\/AL/$(safe_sed "$dir_include/AL")/" CMakeLists.txt
 
-compile_cmake -- -DSHARE_INSTALL_DIR="/$dir_prefix/$dir_datadir"
+compile_cmake -- -DSHARE_INSTALL_DIR="/$dir_prefix/$dir_data"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/p7zip.sat b/satellites/p7zip.sat
index 329c4c5..154d09c 100644
--- a/satellites/p7zip.sat
+++ b/satellites/p7zip.sat
@@ -5,7 +5,7 @@ update_names="/projects/$name/files/$name/$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/$name/files/$name/$version/${name}_${version}_src_all.tar.bz2" \
           'a0128d661cfe7cc8c121e73519c54fbf'
-header_end
+_
 
 cd "${name}_$version"
 
@@ -17,9 +17,9 @@ make all3 OPTFLAGS="$CFLAGS"
 make install \
     DEST_DIR="$dir_install" \
     DEST_HOME="/$dir_prefix" \
-    DEST_BIN="/$dir_prefix/$dir_bindir" \
-    DEST_SHARE="/$dir_prefix/$dir_libdir/$name" \
-    DEST_SHARE_DOC="/$dir_prefix/$dir_docdir/$name" \
-    DEST_MAN="/$dir_prefix/$dir_mandir"
+    DEST_BIN="/$dir_prefix/$dir_bin" \
+    DEST_SHARE="/$dir_prefix/$dir_lib/$name" \
+    DEST_SHARE_DOC="/$dir_prefix/$dir_doc/$name" \
+    DEST_MAN="/$dir_prefix/$dir_man"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon-decentraleyes.sat b/satellites/palemoon-decentraleyes.sat
index 1bdc78a..11061ab 100644
--- a/satellites/palemoon-decentraleyes.sat
+++ b/satellites/palemoon-decentraleyes.sat
@@ -6,8 +6,8 @@ update_url="https://github.com/Synzvato/$name/releases"
 
 dlfile "https://github.com/Synzvato/$name/releases/download/v$version/Decentraleyes.v$version-palemoon-unsigned.xpi" \
        '525ef066830acec9b3229ae8fc34a55b'
-header_end
+_
 
-install -Dm644 "Decentraleyes.v$version-palemoon-unsigned.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/jid1-BoFifL9Vbdl2zQ@jetpack.xpi"
+install -Dm644 "Decentraleyes.v$version-palemoon-unsigned.xpi" "$dir_install/$dir_prefix/$dir_lib/palemoon/browser/extensions/jid1-BoFifL9Vbdl2zQ@jetpack.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon-greasemonkey.sat b/satellites/palemoon-greasemonkey.sat
index d1a72c8..0dad382 100644
--- a/satellites/palemoon-greasemonkey.sat
+++ b/satellites/palemoon-greasemonkey.sat
@@ -5,10 +5,10 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/$name/$name/archive/$version/$name-$version.tar.gz" \
           'bdc40ff400a90ef6e360c30858dcf970'
-header_end
+_
 
 cd "$name-$version"
 ./build.sh official
-install -Dm644 "greasemonkey-$version.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi"
+install -Dm644 "greasemonkey-$version.xpi" "$dir_install/$dir_prefix/$dir_lib/palemoon/browser/extensions/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon-pentadactyl.sat b/satellites/palemoon-pentadactyl.sat
index 91cf5f7..a363f04 100644
--- a/satellites/palemoon-pentadactyl.sat
+++ b/satellites/palemoon-pentadactyl.sat
@@ -5,12 +5,12 @@ update_url="https://github.com/madand/$name-pm/releases"
 dlextract "https://github.com/madand/$name-pm/archive/$name-$version.tar.gz" \
           '9ffbd57120c5dd2b5b84208f5d6a0571'
 extrafile "$name-$version-disable-deprecated.patch"
-header_end
+_
 
 cd "$name-pm-$name-$version"
 patch -p0 -i "../$name-$version-disable-deprecated.patch"
 
 make pentadactyl.xpi
-install -Dm644 "downloads/$name-$version.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/pentadactyl@addons.palemoon.org.xpi"
+install -Dm644 "downloads/$name-$version.xpi" "$dir_install/$dir_prefix/$dir_lib/palemoon/browser/extensions/pentadactyl@addons.palemoon.org.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon-ublock.sat b/satellites/palemoon-ublock.sat
index e9f36f9..5cd6781 100644
--- a/satellites/palemoon-ublock.sat
+++ b/satellites/palemoon-ublock.sat
@@ -10,10 +10,10 @@ dlextract "https://github.com/gorhill/$name/archive/$version/$name-$version.tar.
 ( name=uAssets
     vcs_git -V "https://github.com/uBlockOrigin/uAssets"
 )
-header_end
+_
 
 cd "$name-$version"
 tools/make-firefox.sh all
-install -Dm644 "dist/build/${name}0.firefox.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/${name}0@raymondhill.net.xpi"
+install -Dm644 "dist/build/${name}0.firefox.xpi" "$dir_install/$dir_prefix/$dir_lib/palemoon/browser/extensions/${name}0@raymondhill.net.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon-umatrix.sat b/satellites/palemoon-umatrix.sat
index 3ad5427..93e77c9 100644
--- a/satellites/palemoon-umatrix.sat
+++ b/satellites/palemoon-umatrix.sat
@@ -10,7 +10,7 @@ dlextract "https://github.com/gorhill/$name/archive/$version/$name-$version.tar.
 ( name=uAssets
     vcs_git -V "https://github.com/uBlockOrigin/uAssets"
 )
-header_end
+_
 
 cd "$name-$version"
 
@@ -19,6 +19,6 @@ rm -f assets/checksums.txt
 cp -Ta ../uAssets/thirdparties assets/thirdparties
 
 tools/make-firefox.sh all
-install -Dm644 "dist/build/$name.firefox.xpi" "$dir_install/$dir_prefix/$dir_libdir/palemoon/browser/extensions/$name@raymondhill.net.xpi"
+install -Dm644 "dist/build/$name.firefox.xpi" "$dir_install/$dir_prefix/$dir_lib/palemoon/browser/extensions/$name@raymondhill.net.xpi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/palemoon.sat b/satellites/palemoon.sat
index a3b5dc9..90a399a 100644
--- a/satellites/palemoon.sat
+++ b/satellites/palemoon.sat
@@ -1,7 +1,8 @@
-# NOTE: Requires GCC 5.x to build properly (Untested with 6.x, might cause segfaults)
+# The Pale Moon team recommends building with GCC 4.9. While other versions like 5.x are known to work, they're unsupported.
 
 name=Pale-Moon
-version=27.4.1
+version=27.4.2
+version_gcc=4.9.4
 version_autoconf=2.13
 update_url="https://github.com/MoonchildProductions/$name/releases"
 update_names="/archive/${version}_Release.tar.gz"
@@ -9,13 +10,29 @@ update_names="/archive/${version}_Release.tar.gz"
 define_option 'pulseaudio: Build with support for PulseAudio'
 
 dlextract "https://github.com/MoonchildProductions/$name/archive/${version}_Release/$name-${version}_Release.tar.gz" \
-          'f0885cb445be3bb948d13e2105aef3d7'
+          'b48067fff5505e1b078c2bf2c7efdeff'
+extrafile 'palemoon.desktop'
+
+( name=gcc version="$version_gcc"
+    dlextract "https://ftp.gnu.org/gnu/$name/$name-$version/$name-$version.tar.bz2" \
+              '87c24a4090c1577ba817ec6882602491'
+)
 ( name=autoconf version="$version_autoconf"
     dlextract "https://ftp.gnu.org/gnu/$name/$name-$version.tar.gz" \
               '9de56d4a161a723228220b0f425dc711'
 )
-extrafile 'palemoon.desktop'
-header_end
+_
+
+( cd "gcc-$version_gcc"
+    sed -i -e 's/\.\/fixinc\.sh/-c true/' gcc/Makefile.in
+    mkdir build; cd build
+    ../configure \
+        --prefix="$PWD/../install" \
+        --disable-bootstrap \
+        --enable-languages=c++
+    make
+    make install
+)
 
 ( cd "autoconf-$version_autoconf"
     ./configure --prefix="$PWD/install" --program-suffix=-$version_autoconf
@@ -48,12 +65,12 @@ ac_add_options --enable-shared-js
 
 ac_add_options --enable-strip
 
-ac_add_options --x-libraries="/$dir_prefix/$dir_libdir"
+ac_add_options --x-libraries="/$dir_prefix/$dir_lib"
 
 # The section before this is kept up to date with https://developer.palemoon.org/Developer_Guide:Build_Instructions/Pale_Moon/Linux#head:Mozconfig_Files (with minor changes)
 # The following section are my additions.
 
-# Use system libraries (./configure --help | grep system)
+# Use system libraries (autoconf-2.13 && ./configure --help | grep system)
 ac_add_options --with-system-nspr
 ac_add_options --with-system-libevent
 ac_add_options --with-system-nss
@@ -75,31 +92,32 @@ $(option pulseaudio && echo ac_add_options --enable-pulseaudio || echo ac_add_op
 EOF
 
 # Build
-PATH="$PWD/../autoconf-$version_autoconf/install/bin:$PATH" \
+MOZ_MAKE_FLAGS="$MAKEFLAGS" \
+PATH="$PWD/../gcc-$version_gcc/install/bin:$PWD/../autoconf-$version_autoconf/install/bin:$PATH" \
 make -f client.mk build
 
 # Install
 cd pmbuild
 make package
 
-mkdir -p "$dir_install/$dir_prefix/$dir_libdir/palemoon"
-cp -Ta dist/palemoon "$dir_install/$dir_prefix/$dir_libdir/palemoon"
-mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-ln -sf "/$dir_prefix/$dir_libdir/palemoon/palemoon" "$dir_install/$dir_prefix/$dir_bindir/palemoon"
+mkdir -p "$dir_install/$dir_prefix/$dir_lib/palemoon"
+cp -Ta dist/palemoon "$dir_install/$dir_prefix/$dir_lib/palemoon"
+mkdir -p "$dir_install/$dir_prefix/$dir_bin"
+ln -sf "/$dir_prefix/$dir_lib/palemoon/palemoon" "$dir_install/$dir_prefix/$dir_bin/palemoon"
 
 cd ../..
 
 # Install icons
 for x in 16 32 48; do
-    mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps"
-    ln -sf "/$dir_prefix/$dir_libdir/palemoon/browser/chrome/icons/default/default$x.png" \
-           "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/${x}x$x/apps/palemoon.png"
+    mkdir -p "$dir_install/$dir_prefix/$dir_data/icons/hicolor/${x}x$x/apps"
+    ln -sf "/$dir_prefix/$dir_lib/palemoon/browser/chrome/icons/default/default$x.png" \
+           "$dir_install/$dir_prefix/$dir_data/icons/hicolor/${x}x$x/apps/palemoon.png"
 done
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps"
-ln -sf "/$dir_prefix/$dir_libdir/palemoon/browser/icons/mozicon128.png" \
-       "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/128x128/apps/palemoon.png"
+mkdir -p "$dir_install/$dir_prefix/$dir_data/icons/hicolor/128x128/apps"
+ln -sf "/$dir_prefix/$dir_lib/palemoon/browser/icons/mozicon128.png" \
+       "$dir_install/$dir_prefix/$dir_data/icons/hicolor/128x128/apps/palemoon.png"
 
 # Install desktop
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" palemoon.desktop
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/applications" palemoon.desktop
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/pcre2.sat b/satellites/pcre2.sat
index 6722051..85997ba 100644
--- a/satellites/pcre2.sat
+++ b/satellites/pcre2.sat
@@ -7,7 +7,7 @@ update_names="/projects/pcre/files/$name/$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/pcre/files/$name/$version/$name-$version.tar.bz2" \
           'b2cd00ca7e24049040099b0a46bb3649'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static \
diff --git a/satellites/perl-module-build.sat b/satellites/perl-module-build.sat
index 1d0e67f..d671411 100644
--- a/satellites/perl-module-build.sat
+++ b/satellites/perl-module-build.sat
@@ -6,7 +6,7 @@ update_url='http://www.cpan.org/authors/id/L/LE/LEONT/'
 
 dlextract "http://www.cpan.org/authors/id/L/LE/LEONT/$name-$version.tar.gz" \
           'b74c2f6e84b60aad3a3defd30b6f0f4d'
-header_end
+_
 
 cd "$name-$version"
 compile_perl
diff --git a/satellites/physfs.sat b/satellites/physfs.sat
index dbeeb13..1ce81ea 100644
--- a/satellites/physfs.sat
+++ b/satellites/physfs.sat
@@ -6,13 +6,13 @@ update_url="https://www.icculus.org/$name/downloads/"
 
 dlextract "https://www.icculus.org/$name/downloads/$name-$version.tar.bz2" \
           'c2c727a8a8deb623b521b52d0080f613'
-header_end
+_
 
 cd "$name-$version"
 
 # Fix paths
-sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bindir")\"/" \
-       -e "/DESTINATION/s/lib\${LIB_SUFFIX}/\"$(safe_sed "$dir_libdir")\"/" CMakeLists.txt
+sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bin")\"/" \
+       -e "/DESTINATION/s/lib\${LIB_SUFFIX}/\"$(safe_sed "$dir_lib")\"/" CMakeLists.txt
 
 compile_cmake -- -DPHYSFS_BUILD_STATIC=FALSE
 
diff --git a/satellites/po4a.sat b/satellites/po4a.sat
index 4d32acc..b0a9049 100644
--- a/satellites/po4a.sat
+++ b/satellites/po4a.sat
@@ -6,14 +6,14 @@ update_url='https://alioth.debian.org/frs/?group_id=30267'
 
 dlextract "https://alioth.debian.org/frs/download.php/latestfile/195/$name-$version.tar.gz" \
           '221971cdd862cfb91477f0d9fa67ab38'
-header_end
+_
 
 cd "$name-$version"
 compile_perl -I
 
 # Install the manages manually, to put them in the correct dir (Perl won't listen otherwise)
-mkdir -p "$dir_install/$dir_prefix/$dir_mandir"
-mv blib/man/* "$dir_install/$dir_prefix/$dir_mandir"
+mkdir -p "$dir_install/$dir_prefix/$dir_man"
+mv blib/man/* "$dir_install/$dir_prefix/$dir_man"
 rmdir blib/man
 
 # Install the rest
diff --git a/satellites/profile-sync-daemon.sat b/satellites/profile-sync-daemon.sat
index 3903e53..ef99801 100644
--- a/satellites/profile-sync-daemon.sat
+++ b/satellites/profile-sync-daemon.sat
@@ -6,7 +6,7 @@ update_names="/archive/v$version.tar.gz"
 dlextract "https://github.com/graysky2/$name/archive/v$version/$name-$version.tar.gz" \
           '159cabc39972be8d72e760a0025b5cd9'
 extrafile "$name-$version-fix-filenames-with-spaces.patch"
-header_end
+_
 
 cd "$name-$version"
 patch -p0 -i "../$name-$version-fix-filenames-with-spaces.patch"
@@ -14,9 +14,9 @@ patch -p0 -i "../$name-$version-fix-filenames-with-spaces.patch"
 make install-bin install-man COMPRESS_MAN=0 \
     DESTDIR="$dir_install" \
     PREFIX="/$dir_prefix" \
-    BINDIR="/$dir_prefix/$dir_bindir" \
-    SHAREDIR="/$dir_prefix/$dir_datadir/psd" \
-    MANDIR="/$dir_prefix/$dir_mandir/man1" \
-    ZSHDIR="/$dir_prefix/$dir_datadir/zsh/site-functions"
+    BINDIR="/$dir_prefix/$dir_bin" \
+    SHAREDIR="/$dir_prefix/$dir_data/psd" \
+    MANDIR="/$dir_prefix/$dir_man/man1" \
+    ZSHDIR="/$dir_prefix/$dir_data/zsh/site-functions"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-appdirs.sat b/satellites/python3-appdirs.sat
index 5446695..fc6fbb3 100644
--- a/satellites/python3-appdirs.sat
+++ b/satellites/python3-appdirs.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/ActiveState/$name/archive/$version/$name-$version.tar.gz" \
           'b0bd73c5dac1bee973e60adcbdcbb5ed'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-asn1crypto.sat b/satellites/python3-asn1crypto.sat
index 3307eda..fa9d23f 100644
--- a/satellites/python3-asn1crypto.sat
+++ b/satellites/python3-asn1crypto.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/wbond/$name/archive/$version/$name-$version.tar.gz" \
           '583cd7106c5137a208bd14f876ed2001'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-certifi.sat b/satellites/python3-certifi.sat
index b6533d9..3db12ed 100644
--- a/satellites/python3-certifi.sat
+++ b/satellites/python3-certifi.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/certifi/$name/archive/$version/$name-$version.tar.gz" \
           '34d86e84752e1870704228ef20868ba5'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-cffi.sat b/satellites/python3-cffi.sat
index 5175306..490f671 100644
--- a/satellites/python3-cffi.sat
+++ b/satellites/python3-cffi.sat
@@ -6,7 +6,7 @@ update_url="https://pypi.python.org/pypi/$name"
 
 dlextract "https://pypi.python.org/packages/5b/b9/790f8eafcdab455bcd3bd908161f802c9ce5adbf702a83aa7712fcc345b7/$name-$version.tar.gz" \
           '2b5fa41182ed0edaf929a789e602a070'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-chardet.sat b/satellites/python3-chardet.sat
index 6b8fbbe..66d6401 100644
--- a/satellites/python3-chardet.sat
+++ b/satellites/python3-chardet.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/chardet/$name/archive/$version/$name-$version.tar.gz" \
           'f37b246e5136c96828bb92f86d2354d1'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-cryptodome.sat b/satellites/python3-cryptodome.sat
index 9152ca2..5f96e65 100644
--- a/satellites/python3-cryptodome.sat
+++ b/satellites/python3-cryptodome.sat
@@ -7,7 +7,7 @@ update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/Legrandin/$name/archive/v$version/$name-$version.tar.gz" \
           '23f8d1921b69df462f2e62af5aaf4ce9'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-cryptography.sat b/satellites/python3-cryptography.sat
index 8f19aac..02e6592 100644
--- a/satellites/python3-cryptography.sat
+++ b/satellites/python3-cryptography.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/pyca/$name/archive/$version/$name-$version.tar.gz" \
           'fca95e34cd920837f2d2f83390a41dc1'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-docutils.sat b/satellites/python3-docutils.sat
index bd8c970..a4a5168 100644
--- a/satellites/python3-docutils.sat
+++ b/satellites/python3-docutils.sat
@@ -6,7 +6,7 @@ update_url='http://docutils.sourceforge.net/'
 
 dlextract "http://prdownloads.sourceforge.net/$name/$name-$version.tar.gz" \
           'ea4a893c633c788be9b8078b6b305d53'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-idna.sat b/satellites/python3-idna.sat
index d165056..36fd2b2 100644
--- a/satellites/python3-idna.sat
+++ b/satellites/python3-idna.sat
@@ -7,7 +7,7 @@ update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/kjd/$name/archive/v$version/$name-$version.tar.gz" \
           'f31cd2faf6954e13978f1d802a9dc9b6'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-iso3166.sat b/satellites/python3-iso3166.sat
index 2358c75..3f1075a 100644
--- a/satellites/python3-iso3166.sat
+++ b/satellites/python3-iso3166.sat
@@ -6,7 +6,7 @@ update_url="https://pypi.python.org/pypi/$name"
 
 dlextract "https://pypi.python.org/packages/46/06/64145b8d6be8474db1f09f6b01a083921c11a4c979d029677c7e943d2433/$name-$version.tar.gz" \
           '9b7a42df80495fe253d6edd035974128'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-iso639.sat b/satellites/python3-iso639.sat
index 9bb405b..2b9a055 100644
--- a/satellites/python3-iso639.sat
+++ b/satellites/python3-iso639.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/noumar/$name/archive/$version/$name-$version.tar.gz" \
           '4ecf572a2a14f628f141deb4d257827b'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-packaging.sat b/satellites/python3-packaging.sat
index 67de259..9a6fa64 100644
--- a/satellites/python3-packaging.sat
+++ b/satellites/python3-packaging.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/pypa/$name/archive/$version/$name-$version.tar.gz" \
           '02c9a248368c7b9d3236cac349a67825'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-parsing.sat b/satellites/python3-parsing.sat
index b003896..4be68f3 100644
--- a/satellites/python3-parsing.sat
+++ b/satellites/python3-parsing.sat
@@ -7,7 +7,7 @@ update_names="/projects/$name/files/$name/$name-$version/stats/timeline"
 
 dlextract "https://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.gz" \
           '0214e42d63af850256962b6744c948d9'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-requests.sat b/satellites/python3-requests.sat
index e558e67..9bcc32d 100644
--- a/satellites/python3-requests.sat
+++ b/satellites/python3-requests.sat
@@ -7,7 +7,7 @@ update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/kennethreitz/$name/archive/v$version/$name-$version.tar.gz" \
           'a3d6f123e328ab97131f8232a17eebdc'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-setuptools.sat b/satellites/python3-setuptools.sat
index df29d76..06d683d 100644
--- a/satellites/python3-setuptools.sat
+++ b/satellites/python3-setuptools.sat
@@ -9,7 +9,7 @@ define_option 'easy_install-symlink: Install the easy_install symlink (it may co
 
 dlextract "https://github.com/pypa/$name/archive/v$version/$name-$version.tar.gz" \
           '7b6f9ac436ed7e245e265daccc0e6c43'
-header_end
+_
 
 cd "$name-$version"
 
diff --git a/satellites/python3-six.sat b/satellites/python3-six.sat
index 7a34d2b..75c7c2e 100644
--- a/satellites/python3-six.sat
+++ b/satellites/python3-six.sat
@@ -6,7 +6,7 @@ update_url="https://pypi.python.org/pypi/$name"
 
 dlextract "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/$name-$version.tar.gz" \
           '34eed507548117b2ab523ab14b2f8b55'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-urllib3.sat b/satellites/python3-urllib3.sat
index 6807215..68797ea 100644
--- a/satellites/python3-urllib3.sat
+++ b/satellites/python3-urllib3.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/shazow/$name/archive/$version/$name-$version.tar.gz" \
           'b0a2c692ea273dc120b209a027b0df3c'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3-yaml.sat b/satellites/python3-yaml.sat
index 0f82094..bd0527b 100644
--- a/satellites/python3-yaml.sat
+++ b/satellites/python3-yaml.sat
@@ -6,7 +6,7 @@ update_url="http://pyyaml.org/wiki/$name"
 
 dlextract "http://pyyaml.org/download/pyyaml/$name-$version.tar.gz" \
           '4c129761b661d181ebf7ff4eb2d79950'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/python3.sat b/satellites/python3.sat
index 70bf21a..b4b9585 100644
--- a/satellites/python3.sat
+++ b/satellites/python3.sat
@@ -8,7 +8,7 @@ define_option '2to3-symlink: Install the 2to3 symlink (it may conflict with pyth
 
 dlextract "https://www.python.org/ftp/python/$version/$name-$version.tar.xz" \
           '2c68846471994897278364fc18730dd9'
-header_end
+_
 
 cd "$name-$version"
 
@@ -24,15 +24,15 @@ option !2to3-symlink sed -i -e '/$(LN) -s 2to3/d' Makefile.pre.in
 find Lib \( -name '*.exe' -o -name '*.bat' \) -delete
 
 # Fix paths
-sed -i -e "/os.path.join(prefix/s/lib/$(safe_sed "$dir_libdir")/" Lib/site.py
-sed -i -e "s/\/lib\/python/$(safe_sed "/$dir_libdir/python")/" \
-       -e "s/\/include\/python/$(safe_sed "/$dir_includedir/python")/" \
-       -e "s/\/bin/$(safe_sed "/$dir_bindir")/" Lib/sysconfig.py Lib/distutils/command/install.py
-sed -i -e "/libpython =/!b;n;s/lib/$(safe_sed "$dir_libdir")/" \
-       -e "/os.path.join/s/include/$(safe_sed "$dir_includedir")/" Lib/distutils/sysconfig.py
-sed -i -e "/lib_python =/s/lib\//$(safe_sed "$dir_libdir")\//" Modules/getpath.c
-sed -i -e "/SCRIPTDIR=/s/lib/$(safe_sed "$dir_libdir")/" Makefile.pre.in
-sed -i -e "/LIBPL=/s/lib/$(safe_sed "$dir_libdir")/" configure
+sed -i -e "/os.path.join(prefix/s/lib/$(safe_sed "$dir_lib")/" Lib/site.py
+sed -i -e "s/\/lib\/python/$(safe_sed "/$dir_lib/python")/" \
+       -e "s/\/include\/python/$(safe_sed "/$dir_include/python")/" \
+       -e "s/\/bin/$(safe_sed "/$dir_bin")/" Lib/sysconfig.py Lib/distutils/command/install.py
+sed -i -e "/libpython =/!b;n;s/lib/$(safe_sed "$dir_lib")/" \
+       -e "/os.path.join/s/include/$(safe_sed "$dir_include")/" Lib/distutils/sysconfig.py
+sed -i -e "/lib_python =/s/lib\//$(safe_sed "$dir_lib")\//" Modules/getpath.c
+sed -i -e "/SCRIPTDIR=/s/lib/$(safe_sed "$dir_lib")/" Makefile.pre.in
+sed -i -e "/LIBPL=/s/lib/$(safe_sed "$dir_lib")/" configure
 
 compile_configure -- \
     --enable-shared \
diff --git a/satellites/qbittorrent.sat b/satellites/qbittorrent.sat
index 8b0d252..485337d 100644
--- a/satellites/qbittorrent.sat
+++ b/satellites/qbittorrent.sat
@@ -10,7 +10,7 @@ define_option '!patch: Apply some custom patches'
 dlextract "http://sourceforge.net/projects/$name/files/$name/$name-$version/$name-$version.tar.xz" \
           '759f498b146bf3afb1593157407897d4'
 option patch extrafile "$name-$version-preview-file-on-double-click.patch"
-header_end
+_
 
 cd "$name-$version"
 option patch patch -p0 -i "../$name-$version-preview-file-on-double-click.patch"
diff --git a/satellites/qemu.sat b/satellites/qemu.sat
index 28fbe59..6be89e8 100644
--- a/satellites/qemu.sat
+++ b/satellites/qemu.sat
@@ -8,7 +8,7 @@ define_option 'targets=all: Define what targets to build (space-separated list)'
 
 dlextract "http://download.qemu-project.org/$name-$version.tar.xz" \
           '86c95eb3b24ffea3a84a4e3a856b4e26'
-header_end
+_
 
 cd "$name-$version"
 
diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat
index 0f4a0ae..d72f9cf 100644
--- a/satellites/qt5-base.sat
+++ b/satellites/qt5-base.sat
@@ -12,7 +12,7 @@ done
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
           '5a74869fc3731bcb8311e62e235d11a7'
-header_end
+_
 
 cd "qt$submodule-opensource-src-$version"
 
@@ -30,14 +30,14 @@ done
 # NOTE: Only double-conversion from Qt itself is used, as there's no recent stable version available, due to lack of maintenance (last I can find is 1.1.5 from 2014, but there's scripts to build 2.0.1, for example in AUR, yet there's no proper place to get the sources for that).
 ./configure -confirm-license -opensource \
     -prefix "/$dir_prefix" \
-    -libdir "/$dir_prefix/$dir_libdir" \
-    -headerdir "/$dir_prefix/$dir_includedir/$name" \
-    -sysconfdir "/$dir_prefix/$dir_sysconfdir/xdg" \
-    -datadir "/$dir_prefix/$dir_datadir/$name" \
-    -bindir "/$dir_prefix/$dir_libdir/$name/bin" \
-    -archdatadir "/$dir_prefix/$dir_libdir/$name" \
-    -docdir "/$dir_prefix/$dir_docdir/$name" \
-    -examplesdir "/$dir_prefix/$dir_docdir/$name/examples" \
+    -libdir "/$dir_prefix/$dir_lib" \
+    -headerdir "/$dir_prefix/$dir_include/$name" \
+    -sysconfdir "/$dir_prefix/$dir_sysconf/xdg" \
+    -datadir "/$dir_prefix/$dir_data/$name" \
+    -bindir "/$dir_prefix/$dir_lib/$name/bin" \
+    -archdatadir "/$dir_prefix/$dir_lib/$name" \
+    -docdir "/$dir_prefix/$dir_doc/$name" \
+    -examplesdir "/$dir_prefix/$dir_doc/$name/examples" \
     -system-sqlite \
     -system-zlib \
     -system-pcre \
@@ -49,9 +49,9 @@ done
 make
 make INSTALL_ROOT="$dir_install" install
 
-mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-find "$dir_install/$dir_prefix/$dir_libdir/$name/bin/" -type f -printf '%P\n' | while IFS= read bin; do
-    ln -s "/$dir_prefix/$dir_libdir/$name/bin/$bin" "$dir_install/$dir_prefix/$dir_bindir/$bin-$name"
+mkdir -p "$dir_install/$dir_prefix/$dir_bin"
+find "$dir_install/$dir_prefix/$dir_lib/$name/bin/" -type f -printf '%P\n' | while IFS= read bin; do
+    ln -s "/$dir_prefix/$dir_lib/$name/bin/$bin" "$dir_install/$dir_prefix/$dir_bin/$bin-$name"
 done
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qt5-styleplugins-git.sat b/satellites/qt5-styleplugins-git.sat
index 259738c..6b86765 100644
--- a/satellites/qt5-styleplugins-git.sat
+++ b/satellites/qt5-styleplugins-git.sat
@@ -5,7 +5,7 @@ name=qt5
 submodule=styleplugins
 
 vcs_git "git://code.qt.io/qt/qt$submodule.git"
-header_end
+_
 
 cd "qt$submodule.git"
 compile_qt 5
diff --git a/satellites/qt5-tools.sat b/satellites/qt5-tools.sat
index 903db3f..f1834f0 100644
--- a/satellites/qt5-tools.sat
+++ b/satellites/qt5-tools.sat
@@ -9,14 +9,14 @@ update_names="qt-everywhere-opensource-src-$version.tar.xz"
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
           '87bbad069322a03c3d365fdaac3c9f19'
-header_end
+_
 
 cd "qt$submodule-opensource-src-$version"
 compile_qt 5
 
-mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-find "$dir_install/$dir_prefix/$dir_libdir/$name/bin/" -type f -printf '%P\n' | while IFS= read bin; do
-    ln -s "/$dir_prefix/$dir_libdir/$name/bin/$bin" "$dir_install/$dir_prefix/$dir_bindir/$bin-$name"
+mkdir -p "$dir_install/$dir_prefix/$dir_bin"
+find "$dir_install/$dir_prefix/$dir_lib/$name/bin/" -type f -printf '%P\n' | while IFS= read bin; do
+    ln -s "/$dir_prefix/$dir_lib/$name/bin/$bin" "$dir_install/$dir_prefix/$dir_bin/$bin-$name"
 done
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qt5-x11extras.sat b/satellites/qt5-x11extras.sat
index fea71bb..783aa59 100644
--- a/satellites/qt5-x11extras.sat
+++ b/satellites/qt5-x11extras.sat
@@ -9,7 +9,7 @@ update_names="qt-everywhere-opensource-src-$version.tar.xz"
 
 dlextract "http://download.qt.io/official_releases/qt/$majver/$version/submodules/qt$submodule-opensource-src-$version.tar.xz" \
           '0cc2add29e952e9c81d38708185b0f14'
-header_end
+_
 
 cd "qt$submodule-opensource-src-$version"
 compile_qt 5
diff --git a/satellites/qt5ct.sat b/satellites/qt5ct.sat
index 822419c..2041cd0 100644
--- a/satellites/qt5ct.sat
+++ b/satellites/qt5ct.sat
@@ -6,7 +6,7 @@ update_url="https://sourceforge.net/projects/$name/files/"
 
 dlextract "https://sourceforge.net/projects/$name/files/$name-$version.tar.bz2" \
           '4853c8413af7487b78b00631040236ab'
-header_end
+_
 
 cd "$name-$version"
 compile_qt 5
diff --git a/satellites/radare2.sat b/satellites/radare2.sat
index e6cce93..51a4497 100644
--- a/satellites/radare2.sat
+++ b/satellites/radare2.sat
@@ -11,7 +11,7 @@ update_names="$name-$version.tar.gz\">$name"
 
 dlextract "http://radare.mikelloc.com/get/$version/$name-$version.tar.gz" \
           '5badf3e044616fa382e902e9f36b73fa'
-header_end
+_
 
 cd "$name-$version"
 
diff --git a/satellites/rofi.sat b/satellites/rofi.sat
index 99450c8..a381578 100644
--- a/satellites/rofi.sat
+++ b/satellites/rofi.sat
@@ -6,7 +6,7 @@ update_url="https://github.com/DaveDavenport/$name/releases"
 
 dlextract "https://github.com/DaveDavenport/$name/releases/download/$version/$name-$version.tar.xz" \
           'c1b0e12686cea1dab112586b0b1a5257'
-header_end
+_
 
 cd "$name-$version"
 compile_configure
diff --git a/satellites/rt8192cu-git.sat b/satellites/rt8192cu-git.sat
deleted file mode 100644
index 3ce51ec..0000000
--- a/satellites/rt8192cu-git.sat
+++ /dev/null
@@ -1,18 +0,0 @@
-import 'vcs/git'
-
-name=rt8192cu
-
-define_option "kver=$(uname -r): The kernel version we're building for"
-
-vcs_git "https://github.com/dz0ny/$name"
-header_end
-
-kver="$(option =kver)"
-
-cd "$name"
-make USER_EXTRA_CFLAGS='-Wno-error=incompatible-pointer-types' KSRC="/lib/modules/$kver/build" modules
-install -Dm644 -t "$dir_install/lib/modules/$kver/kernel/drivers/net/wireless" 8192cu.ko
-install -Dm644 blacklist-dkms-8192cu.conf "$dir_install/$dir_prefix/$dir_sysconfdir/modprobe.d/$name.conf"
-echo 'blacklist rtl8xxxu' >> "$dir_install/$dir_prefix/$dir_sysconfdir/modprobe.d/$name.conf"
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/rxvt-unicode.sat b/satellites/rxvt-unicode.sat
index 0b72706..a22a6f0 100644
--- a/satellites/rxvt-unicode.sat
+++ b/satellites/rxvt-unicode.sat
@@ -6,10 +6,10 @@ update_url="http://dist.schmorp.de/$name/"
 
 dlextract "http://dist.schmorp.de/$name/$name-$version.tar.bz2" \
           '93782dec27494eb079467dacf6e48185'
-header_end
+_
 
 cd "$name-$version"
-export TERMINFO="$dir_install/$dir_prefix/$dir_datadir/terminfo"
+export TERMINFO="$dir_install/$dir_prefix/$dir_data/terminfo"
 mkdir -p "$TERMINFO"
 compile_configure -- --enable-everything --enable-256-color
 
diff --git a/satellites/sdl2.sat b/satellites/sdl2.sat
index 6352b4d..dbb26cb 100644
--- a/satellites/sdl2.sat
+++ b/satellites/sdl2.sat
@@ -8,7 +8,7 @@ dlextract "https://libsdl.org/release/$name-$version.tar.gz" \
           'd4055424d556b4a908aa76fad63abd3c'
 dlfile "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libsdl2/files/libsdl2-$version-static-libs.patch" \
        '56001d3a5aa182b28db3cb7d477dc61d'
-header_end
+_
 
 cd "$name-$version"
 patch -p1 -i "../libsdl2-$version-static-libs.patch"
diff --git a/satellites/sdl2_image.sat b/satellites/sdl2_image.sat
index 86206c6..f609825 100644
--- a/satellites/sdl2_image.sat
+++ b/satellites/sdl2_image.sat
@@ -6,7 +6,7 @@ update_url='https://www.libsdl.org/projects/SDL_image/'
 
 dlextract "https://www.libsdl.org/projects/SDL_image/release/$name-$version.tar.gz" \
           'd94b94555ba022fa249a53a021dc3606'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static \
diff --git a/satellites/sdl2_mixer.sat b/satellites/sdl2_mixer.sat
index f1e3b81..dbdaa0d 100644
--- a/satellites/sdl2_mixer.sat
+++ b/satellites/sdl2_mixer.sat
@@ -7,7 +7,7 @@ update_names="$name-$version.tar.gz</A>"
 
 dlextract "https://www.libsdl.org/projects/SDL_mixer/release/$name-$version.tar.gz" \
           'c6c4f556d4415871f526248f5c9a627d'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static \
diff --git a/satellites/sdl2_ttf.sat b/satellites/sdl2_ttf.sat
index cd9bb25..36abcaa 100644
--- a/satellites/sdl2_ttf.sat
+++ b/satellites/sdl2_ttf.sat
@@ -6,7 +6,7 @@ update_url='https://www.libsdl.org/projects/SDL_ttf/'
 
 dlextract "https://www.libsdl.org/projects/SDL_ttf/release/$name-$version.tar.gz" \
           'e53c05e1e7f1382c316afd6c763388b1'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static
diff --git a/satellites/slop.sat b/satellites/slop.sat
index bca1a2b..acb6399 100644
--- a/satellites/slop.sat
+++ b/satellites/slop.sat
@@ -7,18 +7,18 @@ update_names="/archive/v$version.tar.gz"
 
 dlextract "https://github.com/naelstrof/$name/archive/v$version/$name-$version.tar.gz" \
           'd094a769ac3f8d444f6a903a3f076196'
-header_end
+_
 
 cd "$name-$version"
 
 # Fix paths
-sed -i -e "/^install(/s/bin/$(safe_sed "$dir_bindir")/" \
-       -e "/^install(/s/lib/$(safe_sed "$dir_libdir")/" \
-       -e "/^install(/s/include/$(safe_sed "$dir_includedir")/" CMakeLists.txt
+sed -i -e "/^install(/s/bin/$(safe_sed "$dir_bin")/" \
+       -e "/^install(/s/lib/$(safe_sed "$dir_lib")/" \
+       -e "/^install(/s/include/$(safe_sed "$dir_include")/" CMakeLists.txt
 
 # Disabling SLOP_UNICODE and defining USE_UNICODE manually to avoid CMake errors due to missing FindICU.cmake.
 CFLAGS="$CFLAGS -DCXXOPTS_USE_UNICODE $(pkg-config --cflags icu-uc)" \
 LDFLAGS="$LDFLAGS $(pkg-config --libs icu-uc)" \
-compile_cmake -- -DCMAKE_INSTALL_MANDIR="/$dir_prefix/$dir_mandir" -DSLOP_UNICODE=FALSE
+compile_cmake -- -DCMAKE_INSTALL_MANDIR="/$dir_prefix/$dir_man" -DSLOP_UNICODE=FALSE
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/speedtest-cli.sat b/satellites/speedtest-cli.sat
new file mode 100644
index 0000000..a5385e3
--- /dev/null
+++ b/satellites/speedtest-cli.sat
@@ -0,0 +1,15 @@
+import 'compile/python'
+
+name=speedtest-cli
+version=1.0.6
+update_url="https://github.com/sivel/$name/releases"
+update_names="/archive/v$version.tar.gz"
+
+dlextract "https://github.com/sivel/speedtest-cli/archive/v$version/$name-$version.tar.gz" \
+          'a2b4df4a4977fa28acba082c0a4e86b2'
+_
+
+cd "$name-$version"
+compile_python 3
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/streamlink.sat b/satellites/streamlink.sat
index df04f1c..6adbf42 100644
--- a/satellites/streamlink.sat
+++ b/satellites/streamlink.sat
@@ -6,7 +6,7 @@ update_url="https://github.com/$name/$name/releases"
 
 dlextract "https://github.com/$name/$name/releases/download/$version/$name-$version.tar.gz" \
           'fa4b53f95f862eb079fea5812fe912c3'
-header_end
+_
 
 cd "$name-$version"
 compile_python 3
diff --git a/satellites/syncthing.sat b/satellites/syncthing.sat
index bc705b4..494f526 100644
--- a/satellites/syncthing.sat
+++ b/satellites/syncthing.sat
@@ -5,7 +5,7 @@ update_url="https://github.com/$name/$name/releases"
 dlextract "https://github.com/$name/$name/releases/download/v$version/$name-source-v$version.tar.gz" \
           '3f5a4a413624572d9191e7032f480f3b'
 extrafile 'syncthing-browser.desktop'
-header_end
+_
 
 # Set up a GOPATH for all the included libraries
 mkdir -p "src/github.com/$name/"
@@ -20,15 +20,15 @@ sed -i -e 's/"install", "-v", "-ldflags"/"install", "-linkshared", "-v", "-ldfla
 go run build.go -no-upgrade
 
 # Install program
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" bin/syncthing
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" bin/syncthing
 
 # Install manpages
 for file in man/syncthing.1 man/*.5 man/*.7; do
     num="$(echo "$file" | cut -d '.' -f 2)"
-    install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man$num" "$file"
+    install -Dm644 -t "$dir_install/$dir_prefix/$dir_man/man$num" "$file"
 done
 
 # Install desktop
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" ../../../../syncthing-browser.desktop
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/applications" ../../../../syncthing-browser.desktop
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/teeworlds.sat b/satellites/teeworlds.sat
index caf3368..0be7b85 100644
--- a/satellites/teeworlds.sat
+++ b/satellites/teeworlds.sat
@@ -12,7 +12,7 @@ dlextract "https://downloads.teeworlds.com/$name-$version-src.tar.gz" \
               'f8b62ad553c3615a725a034df4fb4257'
 )
 extrafile "$name.desktop"
-header_end
+_
 
 ( cd "bam-$version_bam"
     sh -v make_unix.sh
@@ -25,16 +25,16 @@ convert other/icons/Teeworlds.ico "$name.png"
 sed -i -e "/CONF_RELEASE/arelease_settings.cc.flags:Add('$CFLAGS')\nrelease_settings.link.flags:Add('$LDFLAGS')" bam.lua
 
 # Fix data path
-sed -i -e "s/\/usr\/share\/$name\/data/$(safe_sed "$dir_sysroot/$dir_prefix/$dir_datadir/$name")/" src/engine/shared/storage.cpp
+sed -i -e "s/\/usr\/share\/$name\/data/$(safe_sed "$dir_sysroot/$dir_prefix/$dir_data/$name")/" src/engine/shared/storage.cpp
 
 "../bam-$version_bam/bam" $BAMFLAGS game_release
 
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/$name"
-cp -a data/* "$dir_install/$dir_prefix/$dir_datadir/$name/"
+mkdir -p "$dir_install/$dir_prefix/$dir_data/$name"
+cp -a data/* "$dir_install/$dir_prefix/$dir_data/$name/"
 
-install -Dm755 "$name" "$dir_install/$dir_prefix/$dir_bindir/$name"
-install -Dm755 "${name}_srv" "$dir_install/$dir_prefix/$dir_bindir/${name}_srv"
-install -Dm644 "$name-0.png" "$dir_install/$dir_prefix/$dir_datadir/pixmaps/$name.png"
-install -Dm644 "../$name.desktop" "$dir_install/$dir_prefix/$dir_datadir/applications/$name.desktop"
+install -Dm755 "$name" "$dir_install/$dir_prefix/$dir_bin/$name"
+install -Dm755 "${name}_srv" "$dir_install/$dir_prefix/$dir_bin/${name}_srv"
+install -Dm644 "$name-0.png" "$dir_install/$dir_prefix/$dir_data/pixmaps/$name.png"
+install -Dm644 "../$name.desktop" "$dir_install/$dir_prefix/$dir_data/applications/$name.desktop"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ttf-ms-corefonts.sat b/satellites/ttf-ms-corefonts.sat
index fa9c5bf..73ede96 100644
--- a/satellites/ttf-ms-corefonts.sat
+++ b/satellites/ttf-ms-corefonts.sat
@@ -21,14 +21,14 @@ for font in $fonts; do
     download "https://sourceforge.net/projects/$name/files/the%20fonts/$version/$file" \
              "$checksum"
 done
-header_end
+_
 
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/fonts/TTF"
+mkdir -p "$dir_install/$dir_prefix/$dir_data/fonts/TTF"
 
 for font in $fonts; do
     file="$(echo "$font" | cut -d- -f2)"
     extract "$file" \
-            "$dir_install/$dir_prefix/$dir_datadir/fonts/TTF" \
+            "$dir_install/$dir_prefix/$dir_data/fonts/TTF" \
             'cabextract -q -F *.ttf -d {dst} {src}'
 done
 
diff --git a/satellites/valgrind.sat b/satellites/valgrind.sat
index b60bf2f..b64d1ae 100644
--- a/satellites/valgrind.sat
+++ b/satellites/valgrind.sat
@@ -7,7 +7,7 @@ update_names="/downloads/$name-$version.tar.bz2"
 
 dlextract "http://valgrind.org/downloads/$name-$version.tar.bz2" \
           '6eb03c0c10ea917013a7622e483d61bb'
-header_end
+_
 
 cd "$name-$version"
 
diff --git a/satellites/vbindiff.sat b/satellites/vbindiff.sat
index 15bb9aa..11947a5 100644
--- a/satellites/vbindiff.sat
+++ b/satellites/vbindiff.sat
@@ -6,7 +6,7 @@ update_url="https://www.cjmweb.net/$name"
 
 dlextract "https://www.cjmweb.net/$name/$name-$version.tar.gz" \
           'dbda80ef580e1a0975ef50b9aaa5210e'
-header_end
+_
 
 cd "$name-$version"
 compile_configure
diff --git a/satellites/virtualbox.sat b/satellites/virtualbox.sat
index 4a3779b..f085f5b 100644
--- a/satellites/virtualbox.sat
+++ b/satellites/virtualbox.sat
@@ -15,7 +15,7 @@ misc_debian_download -r contrib -n "$deb_name" -O dfsg-2 \
                      '4784ea878d4e1b8f5bc9ce47c42c2831'
 dlfile "http://download.virtualbox.org/virtualbox/$orig_version/$name-$orig_version.tar.bz2" \
        '2938f2b75f99f35205e033753c3087f3'
-header_end
+_
 
 # Unpack and sanitize the source tarball
 extract "${deb_name}_$version.debian.tar.xz"
@@ -36,13 +36,13 @@ misc_debian_patch_exclude 12-make-module.patch  # Debian uses amd64 instead of x
 misc_debian_patch_exclude 13-modules-mismatch.patch  # Debian-specific error messages.
 
 # Replace /usr/include with whatever we're using
-sed -i -e "/^+\t\/usr\/include/s/usr\/include/$(safe_sed "$dir_prefix/$dir_includedir")/" debian/patches/18-system-xorg.patch
+sed -i -e "/^+\t\/usr\/include/s/usr\/include/$(safe_sed "$dir_prefix/$dir_include")/" debian/patches/18-system-xorg.patch
 
 # Apply debian patches
 misc_debian_patch
 
 # Fix path to sysconfdir in some scripts
-sed -i -e "s/\/etc\/vbox\//$(safe_sed "/$dir_prefix/$dir_sysconfdir/vbox/")/g" \
+sed -i -e "s/\/etc\/vbox\//$(safe_sed "/$dir_prefix/$dir_sysconf/vbox/")/g" \
     src/VBox/Installer/linux/VBox.sh \
     src/VBox/Installer/linux/vboxdrv.sh \
     src/VBox/Installer/linux/*-service.sh \
@@ -67,11 +67,11 @@ EOF
 
 # Append our configuration
 cat >> LocalConfig.kmk << EOF
-VBOX_PATH_APP_PRIVATE_ARCH := /$dir_prefix/$dir_libdir/$name
+VBOX_PATH_APP_PRIVATE_ARCH := /$dir_prefix/$dir_lib/$name
 VBOX_PATH_SHARED_LIBS := \$(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_WITH_RUNPATH := \$(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /$dir_prefix/$dir_datadir/$name
-VBOX_PATH_APP_DOCS = /$dir_prefix/$dir_docdir/$name
+VBOX_PATH_APP_PRIVATE := /$dir_prefix/$dir_data/$name
+VBOX_PATH_APP_DOCS = /$dir_prefix/$dir_doc/$name
 
 VBOX_GCC_OPT := $CXXFLAGS
 VBOX_USE_SYSTEM_XORG_HEADERS := 1
@@ -97,7 +97,7 @@ kmk LOCALCFG=./LocalConfig.kmk
 # Install VirtualBox
 
 # manpages (by debian)
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" \
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_man/man1" \
     debian/manpages/VirtualBox.1 \
     debian/manpages/VBoxManage.1 \
     debian/manpages/VBoxSDL.1 \
@@ -113,32 +113,32 @@ rm -f *.debug
 chmod 4711 VirtualBox VBoxSDL VBoxHeadless
 
 # binaries
-mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
+mkdir -p "$dir_install/$dir_prefix/$dir_bin"
 for i in VirtualBox VBoxManage VBoxSDL VBoxHeadless VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxDTrace vboxwebsrv; do
-    ln -sf "/$dir_prefix/$dir_libdir/$name/VBox.sh" "$dir_install/$dir_prefix/$dir_bindir/$i"
+    ln -sf "/$dir_prefix/$dir_lib/$name/VBox.sh" "$dir_install/$dir_prefix/$dir_bin/$i"
 done
 
 # icons
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/pixmaps"
-mv VBox.png "$dir_install/$dir_prefix/$dir_datadir/pixmaps"
+mkdir -p "$dir_install/$dir_prefix/$dir_data/pixmaps"
+mv VBox.png "$dir_install/$dir_prefix/$dir_data/pixmaps"
 
 for i in icons/*; do
-    mkdir -p "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/$(basename $i)/mimetypes"
-    mv $i/* "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/$(basename $i)/mimetypes"
+    mkdir -p "$dir_install/$dir_prefix/$dir_data/icons/hicolor/$(basename $i)/mimetypes"
+    mv $i/* "$dir_install/$dir_prefix/$dir_data/icons/hicolor/$(basename $i)/mimetypes"
 done
 rm -rf icons
 
 # desktop
-mkdir -p "$dir_install/$dir_prefix/$dir_datadir/applications" "$dir_install/$dir_prefix/$dir_datadir/mime/packages"
-mv virtualbox.desktop "$dir_install/$dir_prefix/$dir_datadir/applications"
-mv virtualbox.xml "$dir_install/$dir_prefix/$dir_datadir/mime/packages"
+mkdir -p "$dir_install/$dir_prefix/$dir_data/applications" "$dir_install/$dir_prefix/$dir_data/mime/packages"
+mv virtualbox.desktop "$dir_install/$dir_prefix/$dir_data/applications"
+mv virtualbox.xml "$dir_install/$dir_prefix/$dir_data/mime/packages"
 
 # install configuration
-mkdir -p "$dir_install/$dir_prefix/$dir_sysconfdir/vbox"
-echo "INSTALL_DIR='/$dir_prefix/$dir_libdir/$name'" > "$dir_install/$dir_prefix/$dir_sysconfdir/vbox/vbox.cfg"
+mkdir -p "$dir_install/$dir_prefix/$dir_sysconf/vbox"
+echo "INSTALL_DIR='/$dir_prefix/$dir_lib/$name'" > "$dir_install/$dir_prefix/$dir_sysconf/vbox/vbox.cfg"
 
 # Move the directory
-mkdir -p "$dir_install/$dir_prefix/$dir_libdir"
-cp -Ta . "$dir_install/$dir_prefix/$dir_libdir/$name"
+mkdir -p "$dir_install/$dir_prefix/$dir_lib"
+cp -Ta . "$dir_install/$dir_prefix/$dir_lib/$name"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/volumeicon.sat b/satellites/volumeicon.sat
index 4c9944d..7e1bf4f 100644
--- a/satellites/volumeicon.sat
+++ b/satellites/volumeicon.sat
@@ -13,7 +13,7 @@ if option !gtk3; then
     dlfile 'https://aur.archlinux.org/cgit/aur.git/plain/gtk2.patch?h=volumeicon-gtk2&id=213b105a3ead8ad197d2b9c41484abc5dc6627ab' \
            'eee04eeff1c5cfdd58e47c4528ee91a1'
 fi
-header_end
+_
 
 cd "$name-$version"
 
diff --git a/satellites/waf.sat b/satellites/waf.sat
index 09ab163..432d3e0 100644
--- a/satellites/waf.sat
+++ b/satellites/waf.sat
@@ -6,7 +6,7 @@ update_url='https://waf.io/'
 
 dlextract "https://waf.io/$name-$version.tar.bz2" \
           '601d7f5d92c9366f1196c2dfa32dee76'
-header_end
+_
 
 cd "$name-$version"
 compile_waf -b "python3 ./$name-light" -- --make-waf
@@ -20,16 +20,16 @@ sed -i -e '/dirname =/s/%s-%s-%s/%s/' \
 
 # Change the logic of checking dirs to find waflib to only check one dir, the dir where we installed it.
 sed -i -e "s/INSTALL,'\/usr','\/usr\/local','\/opt'/'$(safe_sed "/$dir_prefix")',/" \
-       -e "s/'\/lib\/'/'$(safe_sed "/$dir_libdir/")'/" "$name"
+       -e "s/'\/lib\/'/'$(safe_sed "/$dir_lib/")'/" "$name"
 
 # Fix the shebang to point to python3
 sed -i -e '1s/python/python3/' "$name"
 
 # Install program
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" "$name"
 
 # Install library
-wafdir="$dir_install/$dir_prefix/$dir_libdir/${name}3"
+wafdir="$dir_install/$dir_prefix/$dir_lib/${name}3"
 install -d "$wafdir"
 unzip -od "$wafdir" zip/waflib.zip
 python3 -OOm compileall "$wafdir"
diff --git a/satellites/webfs.sat b/satellites/webfs.sat
index 88f3eb6..80bb62a 100644
--- a/satellites/webfs.sat
+++ b/satellites/webfs.sat
@@ -4,7 +4,7 @@ update_url="https://www.kraxel.org/releases/$name/"
 
 dlextract "https://www.kraxel.org/releases/$name/$name-$version.tar.gz" \
           '6dc125fe160479404147e7bbfc781dbc'
-header_end
+_
 
 cd "$name-$version"
 
@@ -14,7 +14,7 @@ sed -i -e "s/echo -e/echo/g" mk/Autoconf.mk
 sed -i -e "s@/etc/mime.types@/dev/null@g" GNUmakefile
 
 make
-install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "${name}d"
-install -Dm644 "${name}d.man" "$dir_install/$dir_prefix/$dir_mandir/man1/${name}d.1"
+install -Dm755 -t "$dir_install/$dir_prefix/$dir_bin" "${name}d"
+install -Dm644 "${name}d.man" "$dir_install/$dir_prefix/$dir_man/man1/${name}d.1"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/wine-gecko.sat b/satellites/wine-gecko.sat
index cd27dfe..523bbed 100644
--- a/satellites/wine-gecko.sat
+++ b/satellites/wine-gecko.sat
@@ -11,11 +11,11 @@ if [ "$(uname -m)" = 'x86_64' ]; then
     dlfile "http://dl.winehq.org/$name/$name-gecko/$version/${name}_gecko-$version-x86_64.msi" \
            'd93ac0d2e6aceafe9113a9918916df45'
 fi
-header_end
+_
 
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/$name/gecko" "${name}_gecko-$version-x86.msi"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/$name/gecko" "${name}_gecko-$version-x86.msi"
 if [ "$(uname -m)" = 'x86_64' ]; then
-    install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/$name/gecko" "${name}_gecko-$version-x86_64.msi"
+    install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/$name/gecko" "${name}_gecko-$version-x86_64.msi"
 fi
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/wine-mono.sat b/satellites/wine-mono.sat
index 0af3a2d..79245a3 100644
--- a/satellites/wine-mono.sat
+++ b/satellites/wine-mono.sat
@@ -7,8 +7,8 @@ update_names="<a href=\"$version/\"><img src=\"/share/theme/icons/folder.png\" a
 
 dlfile "http://dl.winehq.org/$name/$name-mono/$version/$name-mono-$version.msi" \
        '9cc6ee353d912967f5d6a100b0104909'
-header_end
+_
 
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/$name/mono" "$name-mono-$version.msi"
+install -Dm644 -t "$dir_install/$dir_prefix/$dir_data/$name/mono" "$name-mono-$version.msi"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/wine.sat b/satellites/wine.sat
index f825a69..989dbb7 100644
--- a/satellites/wine.sat
+++ b/satellites/wine.sat
@@ -9,7 +9,7 @@ define_option 'wine32=: On x86_64, enable 32bit wine support. Specify the 32bit
 
 dlextract "http://dl.winehq.org/$name/source/2.x/$name-$version.tar.xz" \
           'f399d168a3e1129a6958119ec7c07252'
-header_end
+_
 
 cd "$name-$version"
 
diff --git a/satellites/xautolock.sat b/satellites/xautolock.sat
index 9811075..7175c26 100644
--- a/satellites/xautolock.sat
+++ b/satellites/xautolock.sat
@@ -7,7 +7,7 @@ misc_debian_download 5.1 \
                      'd3d2fefe3345fa380f4e3331b9f13ba3' \
                      '9526347a202694ad235d731d9d3de91f'
 extrafile "$name-$orig_version-do-not-restart.patch"
-header_end
+_
 
 cd "$name-$version"
 misc_debian_patch
@@ -18,6 +18,6 @@ make install \
     DESTDIR="$dir_install" \
     CCOPTIONS="$CFLAGS" \
     EXTRA_LDOPTIONS="$LDFLAGS"
-install -Dm644 xautolock.man "$dir_install/$dir_prefix/$dir_mandir/man1/xautolock.1"
+install -Dm644 xautolock.man "$dir_install/$dir_prefix/$dir_man/man1/xautolock.1"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/xcb-util-xrm.sat b/satellites/xcb-util-xrm.sat
index ddece66..2059380 100644
--- a/satellites/xcb-util-xrm.sat
+++ b/satellites/xcb-util-xrm.sat
@@ -6,7 +6,7 @@ update_url="https://github.com/Airblader/$name/releases"
 
 dlextract "https://github.com/Airblader/$name/releases/download/v$version/$name-$version.tar.bz2" \
           '242dfd4af757fc5ca0e952a714b9606a'
-header_end
+_
 
 cd "$name-$version"
 compile_configure -- --disable-static
diff --git a/satellites/xclip.sat b/satellites/xclip.sat
index 8ee4e24..ce4ba46 100644
--- a/satellites/xclip.sat
+++ b/satellites/xclip.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/astrand/$name/archive/$version/$name-$version.tar.gz" \
           '81e49f56288f299e3389a019f2550ad2'
-header_end
+_
 
 cd "$name-$version"
 ./bootstrap
diff --git a/satellites/yajl.sat b/satellites/yajl.sat
index 7c0602b..2b28aa3 100644
--- a/satellites/yajl.sat
+++ b/satellites/yajl.sat
@@ -7,7 +7,7 @@ update_names="/archive/$version.tar.gz"
 
 dlextract "https://github.com/lloyd/$name/archive/$version/$name-$version.tar.gz" \
           '6887e0ed7479d2549761a4d284d3ecb0'
-header_end
+_
 
 cd "$name-$version"
 
@@ -17,10 +17,10 @@ sed -i -e '/yajl_s/d' \
 find . -name "CMakeLists.txt" -exec sed -i -e '/TARGET_LINK_LIBRARIES/s/yajl_s/yajl/' '{}' \;
 
 # Fix paths
-sed -i -e "/DESTINATION/s/lib\${LIB_SUFFIX}/\"$(safe_sed "$dir_libdir")\"/" \
-       -e "/DESTINATION/s/share\/pkgconfig/\"$(safe_sed "$dir_datadir/pkgconfig")\"/" \
-       -e "/DESTINATION/s/include\/yajl/\"$(safe_sed "$dir_includedir/yajl")\"/" src/CMakeLists.txt
-sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bindir")\"/" \
+sed -i -e "/DESTINATION/s/lib\${LIB_SUFFIX}/\"$(safe_sed "$dir_lib")\"/" \
+       -e "/DESTINATION/s/share\/pkgconfig/\"$(safe_sed "$dir_data/pkgconfig")\"/" \
+       -e "/DESTINATION/s/include\/yajl/\"$(safe_sed "$dir_include/yajl")\"/" src/CMakeLists.txt
+sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bin")\"/" \
     verify/CMakeLists.txt reformatter/CMakeLists.txt
 
 compile_cmake
diff --git a/satellites/youtube-dl.sat b/satellites/youtube-dl.sat
index bc0b6df..277333b 100644
--- a/satellites/youtube-dl.sat
+++ b/satellites/youtube-dl.sat
@@ -6,7 +6,7 @@ update_url="http://rg3.github.io/$name/download.html"
 
 dlextract "https://yt-dl.org/downloads/$version/$name-$version.tar.gz" \
           '03926f2e46cfe993725734aa395a9413'
-header_end
+_
 
 cd "$name"
 
@@ -14,14 +14,14 @@ cd "$name"
 sed -i -e '/bash-completion/d' setup.py
 
 # Fix paths
-sed -i -e "s/etc\/fish\/completions/$(safe_sed "$dir_datadir/fish/completions")/" \
-       -e "s/share\/doc/$(safe_sed "$dir_docdir")/" \
-       -e "s/share\/man/$(safe_sed "$dir_mandir")/" setup.py
+sed -i -e "s/etc\/fish\/completions/$(safe_sed "$dir_data/fish/completions")/" \
+       -e "s/share\/doc/$(safe_sed "$dir_doc")/" \
+       -e "s/share\/man/$(safe_sed "$dir_man")/" setup.py
 
 compile_python 3
 
 # Install completions
-install -Dm644 "$name.bash-completion" "$dir_install/$dir_prefix/$dir_datadir/bash-completion/completions/$name"
-install -Dm644 "$name.zsh" "$dir_install/$dir_prefix/$dir_datadir/zsh/site-functions/_$name"
+install -Dm644 "$name.bash-completion" "$dir_install/$dir_prefix/$dir_data/bash-completion/completions/$name"
+install -Dm644 "$name.zsh" "$dir_install/$dir_prefix/$dir_data/zsh/site-functions/_$name"
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/zim.sat b/satellites/zim.sat
index b4b734a..693dbe7 100644
--- a/satellites/zim.sat
+++ b/satellites/zim.sat
@@ -6,14 +6,14 @@ update_url='http://zim-wiki.org/downloads/'
 
 dlextract "http://zim-wiki.org/downloads/$name-$version.tar.gz" \
           'e87975727f1166c723912c949bea51f2'
-header_end
+_
 
 cd "$name-$version"
 
 # Fix paths
-safe_datadir="$(safe_sed "$dir_datadir")"
+safe_datadir="$(safe_sed "$dir_data")"
 sed -i -e "s/share/$safe_datadir/g" \
-       -e "s/$safe_datadir\/man/$(safe_sed "$dir_mandir")/g" setup.py
+       -e "s/$safe_datadir\/man/$(safe_sed "$dir_man")/g" setup.py
 
 compile_python 2 --skip-xdg-cmd