From 810d86dd7ecb33c82697265a3ab9a26c2b09353a Mon Sep 17 00:00:00 2001
From: emmett1 <emmett1.2miligrams@gmail.com>
Date: Thu, 3 Oct 2019 18:00:34 +0800
Subject: [PATCH] updated

---
 files/pkgin                                   | 21 +++++++------------
 ports/{core => }/Pkgfile                      |  0
 ports/{core => }/acl/Pkgfile                  |  0
 ports/{core => }/attr/Pkgfile                 |  0
 ports/{core => }/autoconf/Pkgfile             |  0
 ports/{core => }/automake/Pkgfile             |  0
 ports/{core => }/bash/Pkgfile                 |  0
 ports/{core => }/bash/post-install            |  0
 ports/{core => }/bc/Pkgfile                   |  0
 ports/{core => }/binutils/Pkgfile             |  0
 ports/{core => }/bison/Pkgfile                |  0
 ports/{core => }/bzip2/Pkgfile                |  0
 ports/{core => }/ca-certificates/Pkgfile      |  0
 ports/{core => }/coreutils/Pkgfile            |  0
 ports/{core => }/dbus/Pkgfile                 |  0
 ports/{core => }/dhcpcd/Pkgfile               |  0
 ports/{core => }/diffutils/Pkgfile            |  0
 ports/{core => }/e2fsprogs/Pkgfile            |  0
 ports/{core => }/elfutils/Pkgfile             |  0
 ports/{core => }/eudev/Pkgfile                |  0
 ports/{core => }/eudev/post-install           |  0
 ports/{core => }/expat/Pkgfile                |  0
 ports/{core => }/file/Pkgfile                 |  0
 ports/{core => }/filesystem/Pkgfile           |  0
 .../{core => }/filesystem/bash_completion.sh  |  0
 ports/{core => }/filesystem/bash_logout.skel  |  0
 ports/{core => }/filesystem/bash_profile.skel |  0
 ports/{core => }/filesystem/bashrc            |  0
 ports/{core => }/filesystem/bashrc.skel       |  0
 ports/{core => }/filesystem/dircolors.sh      |  0
 ports/{core => }/filesystem/extrapaths.sh     |  0
 ports/{core => }/filesystem/fstab             |  0
 ports/{core => }/filesystem/group             |  0
 ports/{core => }/filesystem/hostname          |  0
 ports/{core => }/filesystem/hosts             |  0
 ports/{core => }/filesystem/i18n.sh           |  0
 ports/{core => }/filesystem/inputrc           |  0
 ports/{core => }/filesystem/passwd            |  0
 ports/{core => }/filesystem/profile           |  0
 ports/{core => }/filesystem/profile.skel      |  0
 ports/{core => }/filesystem/readline.sh       |  0
 ports/{core => }/filesystem/resolv.conf       |  0
 ports/{core => }/filesystem/shells            |  0
 ports/{core => }/filesystem/umask.sh          |  0
 ports/{core => }/filesystem/usb.conf          |  0
 ports/{core => }/findutils/Pkgfile            |  0
 ports/{core => }/flex/Pkgfile                 |  0
 ports/{core => }/fuse2/Pkgfile                |  0
 ports/{core => }/gawk/Pkgfile                 |  0
 ports/{core => }/gcc/Pkgfile                  |  0
 ports/{core => }/gdbm/Pkgfile                 |  0
 ports/{core => }/gettext/Pkgfile              |  0
 ports/{core => }/glibc/Pkgfile                |  0
 ports/{core => }/glibc/bootstrap-post-install |  0
 ports/{core => }/gmp/Pkgfile                  |  0
 ports/{core => }/gperf/Pkgfile                |  0
 ports/{core => }/grep/Pkgfile                 |  0
 ports/{core => }/groff/Pkgfile                |  0
 ports/{core => }/grub/Pkgfile                 |  0
 ports/{core => }/gzip/Pkgfile                 |  0
 ports/{core => }/iana-etc/Pkgfile             |  0
 ports/{core => }/inetutils/Pkgfile            |  0
 ports/{core => }/intltool/Pkgfile             |  0
 ports/{core => }/iproute2/Pkgfile             |  0
 ports/{core => }/kbd/Pkgfile                  |  0
 ports/{core => }/kmod/Pkgfile                 |  0
 ports/{core => }/less/Pkgfile                 |  0
 ports/{core => }/lfs-bootscripts/Pkgfile      |  0
 ports/{core => }/lfs-bootscripts/clock        |  0
 ports/{core => }/lfs-bootscripts/console      |  0
 ports/{core => }/lfs-bootscripts/inittab      |  0
 ports/{core => }/libarchive/Pkgfile           |  0
 ports/{core => }/libcap/Pkgfile               |  0
 ports/{core => }/libffi/Pkgfile               |  0
 ports/{core => }/libnl/Pkgfile                |  0
 ports/{core => }/libpipeline/Pkgfile          |  0
 ports/{core => }/libtasn1/Pkgfile             |  0
 ports/{core => }/libtool/Pkgfile              |  0
 ports/{core => }/libxml2/Pkgfile              |  0
 ports/{core => }/linux-api-headers/Pkgfile    |  0
 ports/{core => }/linux-firmware/.nostrip      |  0
 ports/{core => }/linux-firmware/Pkgfile       |  0
 ports/{core => }/linux/.nostrip               |  0
 ports/{core => }/linux/Pkgfile                |  0
 ports/{core => }/linux/config-4.19.66         |  0
 ports/{core => }/m4/Pkgfile                   |  0
 ports/{core => }/make/Pkgfile                 |  0
 ports/{core => }/man-db/Pkgfile               |  0
 ports/{core => }/man-pages/Pkgfile            |  0
 ports/{core => }/mkinitramfs/Pkgfile          |  0
 ports/{core => }/mpc/Pkgfile                  |  0
 ports/{core => }/mpfr/Pkgfile                 |  0
 ports/{core => }/ncurses/Pkgfile              |  0
 ports/{core => }/openssl/Pkgfile              |  0
 ports/{core => }/p11-kit/Pkgfile              |  0
 ports/{core => }/patch/Pkgfile                |  0
 ports/{core => }/perl-xml-parser/Pkgfile      |  0
 ports/{core => }/perl/Pkgfile                 |  0
 ports/{core => }/pkg-config/Pkgfile           |  0
 ports/{core => }/pkgutils/Pkgfile             |  0
 ports/{core => }/pkgutils/pkgmk.conf          |  0
 .../pkgutils_add-compress-infopages.patch     |  0
 .../pkgutils/pkgutils_ignore-conflict.patch   |  0
 .../pkgutils/pkgutils_remove-libtool.patch    |  0
 ports/{core => }/procps-ng/Pkgfile            |  0
 ports/{core => }/psmisc/Pkgfile               |  0
 ports/{core => }/python3/Pkgfile              |  0
 ports/{core => }/readline/Pkgfile             |  0
 ports/{core => }/sed/Pkgfile                  |  0
 ports/{core => }/shadow/Pkgfile               |  0
 ports/{core => }/shadow/post-install          |  0
 ports/{core => }/sysklogd/Pkgfile             |  0
 ports/{core => }/sysvinit/Pkgfile             |  0
 ports/{core => }/tar/Pkgfile                  |  0
 ports/{core => }/texinfo/Pkgfile              |  0
 ports/{core => }/tzdata/Pkgfile               |  0
 ports/{core => }/util-linux/Pkgfile           |  0
 ports/{core => }/vim/Pkgfile                  |  0
 ports/{core => }/wget/Pkgfile                 |  0
 ports/{core => }/wpa_supplicant/Pkgfile       |  0
 .../wpa_supplicant/wpa_supplicant.conf        |  0
 ports/{core => }/xz/Pkgfile                   |  0
 ports/{core => }/zlib/Pkgfile                 |  0
 123 files changed, 8 insertions(+), 13 deletions(-)
 rename ports/{core => }/Pkgfile (100%)
 rename ports/{core => }/acl/Pkgfile (100%)
 rename ports/{core => }/attr/Pkgfile (100%)
 rename ports/{core => }/autoconf/Pkgfile (100%)
 rename ports/{core => }/automake/Pkgfile (100%)
 rename ports/{core => }/bash/Pkgfile (100%)
 rename ports/{core => }/bash/post-install (100%)
 rename ports/{core => }/bc/Pkgfile (100%)
 rename ports/{core => }/binutils/Pkgfile (100%)
 rename ports/{core => }/bison/Pkgfile (100%)
 rename ports/{core => }/bzip2/Pkgfile (100%)
 rename ports/{core => }/ca-certificates/Pkgfile (100%)
 rename ports/{core => }/coreutils/Pkgfile (100%)
 rename ports/{core => }/dbus/Pkgfile (100%)
 rename ports/{core => }/dhcpcd/Pkgfile (100%)
 rename ports/{core => }/diffutils/Pkgfile (100%)
 rename ports/{core => }/e2fsprogs/Pkgfile (100%)
 rename ports/{core => }/elfutils/Pkgfile (100%)
 rename ports/{core => }/eudev/Pkgfile (100%)
 rename ports/{core => }/eudev/post-install (100%)
 rename ports/{core => }/expat/Pkgfile (100%)
 rename ports/{core => }/file/Pkgfile (100%)
 rename ports/{core => }/filesystem/Pkgfile (100%)
 rename ports/{core => }/filesystem/bash_completion.sh (100%)
 rename ports/{core => }/filesystem/bash_logout.skel (100%)
 rename ports/{core => }/filesystem/bash_profile.skel (100%)
 rename ports/{core => }/filesystem/bashrc (100%)
 rename ports/{core => }/filesystem/bashrc.skel (100%)
 rename ports/{core => }/filesystem/dircolors.sh (100%)
 rename ports/{core => }/filesystem/extrapaths.sh (100%)
 rename ports/{core => }/filesystem/fstab (100%)
 rename ports/{core => }/filesystem/group (100%)
 rename ports/{core => }/filesystem/hostname (100%)
 rename ports/{core => }/filesystem/hosts (100%)
 rename ports/{core => }/filesystem/i18n.sh (100%)
 rename ports/{core => }/filesystem/inputrc (100%)
 rename ports/{core => }/filesystem/passwd (100%)
 rename ports/{core => }/filesystem/profile (100%)
 rename ports/{core => }/filesystem/profile.skel (100%)
 rename ports/{core => }/filesystem/readline.sh (100%)
 rename ports/{core => }/filesystem/resolv.conf (100%)
 rename ports/{core => }/filesystem/shells (100%)
 rename ports/{core => }/filesystem/umask.sh (100%)
 rename ports/{core => }/filesystem/usb.conf (100%)
 rename ports/{core => }/findutils/Pkgfile (100%)
 rename ports/{core => }/flex/Pkgfile (100%)
 rename ports/{core => }/fuse2/Pkgfile (100%)
 rename ports/{core => }/gawk/Pkgfile (100%)
 rename ports/{core => }/gcc/Pkgfile (100%)
 rename ports/{core => }/gdbm/Pkgfile (100%)
 rename ports/{core => }/gettext/Pkgfile (100%)
 rename ports/{core => }/glibc/Pkgfile (100%)
 rename ports/{core => }/glibc/bootstrap-post-install (100%)
 rename ports/{core => }/gmp/Pkgfile (100%)
 rename ports/{core => }/gperf/Pkgfile (100%)
 rename ports/{core => }/grep/Pkgfile (100%)
 rename ports/{core => }/groff/Pkgfile (100%)
 rename ports/{core => }/grub/Pkgfile (100%)
 rename ports/{core => }/gzip/Pkgfile (100%)
 rename ports/{core => }/iana-etc/Pkgfile (100%)
 rename ports/{core => }/inetutils/Pkgfile (100%)
 rename ports/{core => }/intltool/Pkgfile (100%)
 rename ports/{core => }/iproute2/Pkgfile (100%)
 rename ports/{core => }/kbd/Pkgfile (100%)
 rename ports/{core => }/kmod/Pkgfile (100%)
 rename ports/{core => }/less/Pkgfile (100%)
 rename ports/{core => }/lfs-bootscripts/Pkgfile (100%)
 rename ports/{core => }/lfs-bootscripts/clock (100%)
 rename ports/{core => }/lfs-bootscripts/console (100%)
 rename ports/{core => }/lfs-bootscripts/inittab (100%)
 rename ports/{core => }/libarchive/Pkgfile (100%)
 rename ports/{core => }/libcap/Pkgfile (100%)
 rename ports/{core => }/libffi/Pkgfile (100%)
 rename ports/{core => }/libnl/Pkgfile (100%)
 rename ports/{core => }/libpipeline/Pkgfile (100%)
 rename ports/{core => }/libtasn1/Pkgfile (100%)
 rename ports/{core => }/libtool/Pkgfile (100%)
 rename ports/{core => }/libxml2/Pkgfile (100%)
 rename ports/{core => }/linux-api-headers/Pkgfile (100%)
 rename ports/{core => }/linux-firmware/.nostrip (100%)
 rename ports/{core => }/linux-firmware/Pkgfile (100%)
 rename ports/{core => }/linux/.nostrip (100%)
 rename ports/{core => }/linux/Pkgfile (100%)
 rename ports/{core => }/linux/config-4.19.66 (100%)
 rename ports/{core => }/m4/Pkgfile (100%)
 rename ports/{core => }/make/Pkgfile (100%)
 rename ports/{core => }/man-db/Pkgfile (100%)
 rename ports/{core => }/man-pages/Pkgfile (100%)
 rename ports/{core => }/mkinitramfs/Pkgfile (100%)
 rename ports/{core => }/mpc/Pkgfile (100%)
 rename ports/{core => }/mpfr/Pkgfile (100%)
 rename ports/{core => }/ncurses/Pkgfile (100%)
 rename ports/{core => }/openssl/Pkgfile (100%)
 rename ports/{core => }/p11-kit/Pkgfile (100%)
 rename ports/{core => }/patch/Pkgfile (100%)
 rename ports/{core => }/perl-xml-parser/Pkgfile (100%)
 rename ports/{core => }/perl/Pkgfile (100%)
 rename ports/{core => }/pkg-config/Pkgfile (100%)
 rename ports/{core => }/pkgutils/Pkgfile (100%)
 rename ports/{core => }/pkgutils/pkgmk.conf (100%)
 rename ports/{core => }/pkgutils/pkgutils_add-compress-infopages.patch (100%)
 rename ports/{core => }/pkgutils/pkgutils_ignore-conflict.patch (100%)
 rename ports/{core => }/pkgutils/pkgutils_remove-libtool.patch (100%)
 rename ports/{core => }/procps-ng/Pkgfile (100%)
 rename ports/{core => }/psmisc/Pkgfile (100%)
 rename ports/{core => }/python3/Pkgfile (100%)
 rename ports/{core => }/readline/Pkgfile (100%)
 rename ports/{core => }/sed/Pkgfile (100%)
 rename ports/{core => }/shadow/Pkgfile (100%)
 rename ports/{core => }/shadow/post-install (100%)
 rename ports/{core => }/sysklogd/Pkgfile (100%)
 rename ports/{core => }/sysvinit/Pkgfile (100%)
 rename ports/{core => }/tar/Pkgfile (100%)
 rename ports/{core => }/texinfo/Pkgfile (100%)
 rename ports/{core => }/tzdata/Pkgfile (100%)
 rename ports/{core => }/util-linux/Pkgfile (100%)
 rename ports/{core => }/vim/Pkgfile (100%)
 rename ports/{core => }/wget/Pkgfile (100%)
 rename ports/{core => }/wpa_supplicant/Pkgfile (100%)
 rename ports/{core => }/wpa_supplicant/wpa_supplicant.conf (100%)
 rename ports/{core => }/xz/Pkgfile (100%)
 rename ports/{core => }/zlib/Pkgfile (100%)

diff --git a/files/pkgin b/files/pkgin
index 2515b38..a08fe05 100755
--- a/files/pkgin
+++ b/files/pkgin
@@ -11,7 +11,7 @@
 
 trap "exit 1" SIGHUP SIGINT SIGQUIT SIGTERM
 
-REPO="/usr/ports/core"
+PORT="/usr/ports"
 
 while [ $1 ]; do
 	case $1 in
@@ -31,18 +31,13 @@ for p in ${PKG[@]}; do
 		echo "Package '$p' is installed."
 		continue
 	fi
-	PKGFOUND=no
-	for r in $REPO; do
-		if [ -f $r/$p/Pkgfile ]; then
-			PKGFOUND=yes
-			cd $r/$p &>/dev/null
-			pkgmk ${PKGMK_CMD[@]} || exit $?
-			[ -x bootstrap-post-install ] && ./bootstrap-post-install
-			[ -x post-install ] && ./post-install
-			cd - &>/dev/null
-		fi
-	done
-	if [ "$PKGFOUND" = "no" ]; then
+	if [ -f $PORT/$p/Pkgfile ]; then
+		cd $PORT/$p &>/dev/null
+		pkgmk ${PKGMK_CMD[@]} || exit $?
+		[ -x bootstrap-post-install ] && ./bootstrap-post-install
+		[ -x post-install ] && ./post-install
+		cd - &>/dev/null
+	else
 		echo "Port '$p' not found."
 		exit 1
 	fi
diff --git a/ports/core/Pkgfile b/ports/Pkgfile
similarity index 100%
rename from ports/core/Pkgfile
rename to ports/Pkgfile
diff --git a/ports/core/acl/Pkgfile b/ports/acl/Pkgfile
similarity index 100%
rename from ports/core/acl/Pkgfile
rename to ports/acl/Pkgfile
diff --git a/ports/core/attr/Pkgfile b/ports/attr/Pkgfile
similarity index 100%
rename from ports/core/attr/Pkgfile
rename to ports/attr/Pkgfile
diff --git a/ports/core/autoconf/Pkgfile b/ports/autoconf/Pkgfile
similarity index 100%
rename from ports/core/autoconf/Pkgfile
rename to ports/autoconf/Pkgfile
diff --git a/ports/core/automake/Pkgfile b/ports/automake/Pkgfile
similarity index 100%
rename from ports/core/automake/Pkgfile
rename to ports/automake/Pkgfile
diff --git a/ports/core/bash/Pkgfile b/ports/bash/Pkgfile
similarity index 100%
rename from ports/core/bash/Pkgfile
rename to ports/bash/Pkgfile
diff --git a/ports/core/bash/post-install b/ports/bash/post-install
similarity index 100%
rename from ports/core/bash/post-install
rename to ports/bash/post-install
diff --git a/ports/core/bc/Pkgfile b/ports/bc/Pkgfile
similarity index 100%
rename from ports/core/bc/Pkgfile
rename to ports/bc/Pkgfile
diff --git a/ports/core/binutils/Pkgfile b/ports/binutils/Pkgfile
similarity index 100%
rename from ports/core/binutils/Pkgfile
rename to ports/binutils/Pkgfile
diff --git a/ports/core/bison/Pkgfile b/ports/bison/Pkgfile
similarity index 100%
rename from ports/core/bison/Pkgfile
rename to ports/bison/Pkgfile
diff --git a/ports/core/bzip2/Pkgfile b/ports/bzip2/Pkgfile
similarity index 100%
rename from ports/core/bzip2/Pkgfile
rename to ports/bzip2/Pkgfile
diff --git a/ports/core/ca-certificates/Pkgfile b/ports/ca-certificates/Pkgfile
similarity index 100%
rename from ports/core/ca-certificates/Pkgfile
rename to ports/ca-certificates/Pkgfile
diff --git a/ports/core/coreutils/Pkgfile b/ports/coreutils/Pkgfile
similarity index 100%
rename from ports/core/coreutils/Pkgfile
rename to ports/coreutils/Pkgfile
diff --git a/ports/core/dbus/Pkgfile b/ports/dbus/Pkgfile
similarity index 100%
rename from ports/core/dbus/Pkgfile
rename to ports/dbus/Pkgfile
diff --git a/ports/core/dhcpcd/Pkgfile b/ports/dhcpcd/Pkgfile
similarity index 100%
rename from ports/core/dhcpcd/Pkgfile
rename to ports/dhcpcd/Pkgfile
diff --git a/ports/core/diffutils/Pkgfile b/ports/diffutils/Pkgfile
similarity index 100%
rename from ports/core/diffutils/Pkgfile
rename to ports/diffutils/Pkgfile
diff --git a/ports/core/e2fsprogs/Pkgfile b/ports/e2fsprogs/Pkgfile
similarity index 100%
rename from ports/core/e2fsprogs/Pkgfile
rename to ports/e2fsprogs/Pkgfile
diff --git a/ports/core/elfutils/Pkgfile b/ports/elfutils/Pkgfile
similarity index 100%
rename from ports/core/elfutils/Pkgfile
rename to ports/elfutils/Pkgfile
diff --git a/ports/core/eudev/Pkgfile b/ports/eudev/Pkgfile
similarity index 100%
rename from ports/core/eudev/Pkgfile
rename to ports/eudev/Pkgfile
diff --git a/ports/core/eudev/post-install b/ports/eudev/post-install
similarity index 100%
rename from ports/core/eudev/post-install
rename to ports/eudev/post-install
diff --git a/ports/core/expat/Pkgfile b/ports/expat/Pkgfile
similarity index 100%
rename from ports/core/expat/Pkgfile
rename to ports/expat/Pkgfile
diff --git a/ports/core/file/Pkgfile b/ports/file/Pkgfile
similarity index 100%
rename from ports/core/file/Pkgfile
rename to ports/file/Pkgfile
diff --git a/ports/core/filesystem/Pkgfile b/ports/filesystem/Pkgfile
similarity index 100%
rename from ports/core/filesystem/Pkgfile
rename to ports/filesystem/Pkgfile
diff --git a/ports/core/filesystem/bash_completion.sh b/ports/filesystem/bash_completion.sh
similarity index 100%
rename from ports/core/filesystem/bash_completion.sh
rename to ports/filesystem/bash_completion.sh
diff --git a/ports/core/filesystem/bash_logout.skel b/ports/filesystem/bash_logout.skel
similarity index 100%
rename from ports/core/filesystem/bash_logout.skel
rename to ports/filesystem/bash_logout.skel
diff --git a/ports/core/filesystem/bash_profile.skel b/ports/filesystem/bash_profile.skel
similarity index 100%
rename from ports/core/filesystem/bash_profile.skel
rename to ports/filesystem/bash_profile.skel
diff --git a/ports/core/filesystem/bashrc b/ports/filesystem/bashrc
similarity index 100%
rename from ports/core/filesystem/bashrc
rename to ports/filesystem/bashrc
diff --git a/ports/core/filesystem/bashrc.skel b/ports/filesystem/bashrc.skel
similarity index 100%
rename from ports/core/filesystem/bashrc.skel
rename to ports/filesystem/bashrc.skel
diff --git a/ports/core/filesystem/dircolors.sh b/ports/filesystem/dircolors.sh
similarity index 100%
rename from ports/core/filesystem/dircolors.sh
rename to ports/filesystem/dircolors.sh
diff --git a/ports/core/filesystem/extrapaths.sh b/ports/filesystem/extrapaths.sh
similarity index 100%
rename from ports/core/filesystem/extrapaths.sh
rename to ports/filesystem/extrapaths.sh
diff --git a/ports/core/filesystem/fstab b/ports/filesystem/fstab
similarity index 100%
rename from ports/core/filesystem/fstab
rename to ports/filesystem/fstab
diff --git a/ports/core/filesystem/group b/ports/filesystem/group
similarity index 100%
rename from ports/core/filesystem/group
rename to ports/filesystem/group
diff --git a/ports/core/filesystem/hostname b/ports/filesystem/hostname
similarity index 100%
rename from ports/core/filesystem/hostname
rename to ports/filesystem/hostname
diff --git a/ports/core/filesystem/hosts b/ports/filesystem/hosts
similarity index 100%
rename from ports/core/filesystem/hosts
rename to ports/filesystem/hosts
diff --git a/ports/core/filesystem/i18n.sh b/ports/filesystem/i18n.sh
similarity index 100%
rename from ports/core/filesystem/i18n.sh
rename to ports/filesystem/i18n.sh
diff --git a/ports/core/filesystem/inputrc b/ports/filesystem/inputrc
similarity index 100%
rename from ports/core/filesystem/inputrc
rename to ports/filesystem/inputrc
diff --git a/ports/core/filesystem/passwd b/ports/filesystem/passwd
similarity index 100%
rename from ports/core/filesystem/passwd
rename to ports/filesystem/passwd
diff --git a/ports/core/filesystem/profile b/ports/filesystem/profile
similarity index 100%
rename from ports/core/filesystem/profile
rename to ports/filesystem/profile
diff --git a/ports/core/filesystem/profile.skel b/ports/filesystem/profile.skel
similarity index 100%
rename from ports/core/filesystem/profile.skel
rename to ports/filesystem/profile.skel
diff --git a/ports/core/filesystem/readline.sh b/ports/filesystem/readline.sh
similarity index 100%
rename from ports/core/filesystem/readline.sh
rename to ports/filesystem/readline.sh
diff --git a/ports/core/filesystem/resolv.conf b/ports/filesystem/resolv.conf
similarity index 100%
rename from ports/core/filesystem/resolv.conf
rename to ports/filesystem/resolv.conf
diff --git a/ports/core/filesystem/shells b/ports/filesystem/shells
similarity index 100%
rename from ports/core/filesystem/shells
rename to ports/filesystem/shells
diff --git a/ports/core/filesystem/umask.sh b/ports/filesystem/umask.sh
similarity index 100%
rename from ports/core/filesystem/umask.sh
rename to ports/filesystem/umask.sh
diff --git a/ports/core/filesystem/usb.conf b/ports/filesystem/usb.conf
similarity index 100%
rename from ports/core/filesystem/usb.conf
rename to ports/filesystem/usb.conf
diff --git a/ports/core/findutils/Pkgfile b/ports/findutils/Pkgfile
similarity index 100%
rename from ports/core/findutils/Pkgfile
rename to ports/findutils/Pkgfile
diff --git a/ports/core/flex/Pkgfile b/ports/flex/Pkgfile
similarity index 100%
rename from ports/core/flex/Pkgfile
rename to ports/flex/Pkgfile
diff --git a/ports/core/fuse2/Pkgfile b/ports/fuse2/Pkgfile
similarity index 100%
rename from ports/core/fuse2/Pkgfile
rename to ports/fuse2/Pkgfile
diff --git a/ports/core/gawk/Pkgfile b/ports/gawk/Pkgfile
similarity index 100%
rename from ports/core/gawk/Pkgfile
rename to ports/gawk/Pkgfile
diff --git a/ports/core/gcc/Pkgfile b/ports/gcc/Pkgfile
similarity index 100%
rename from ports/core/gcc/Pkgfile
rename to ports/gcc/Pkgfile
diff --git a/ports/core/gdbm/Pkgfile b/ports/gdbm/Pkgfile
similarity index 100%
rename from ports/core/gdbm/Pkgfile
rename to ports/gdbm/Pkgfile
diff --git a/ports/core/gettext/Pkgfile b/ports/gettext/Pkgfile
similarity index 100%
rename from ports/core/gettext/Pkgfile
rename to ports/gettext/Pkgfile
diff --git a/ports/core/glibc/Pkgfile b/ports/glibc/Pkgfile
similarity index 100%
rename from ports/core/glibc/Pkgfile
rename to ports/glibc/Pkgfile
diff --git a/ports/core/glibc/bootstrap-post-install b/ports/glibc/bootstrap-post-install
similarity index 100%
rename from ports/core/glibc/bootstrap-post-install
rename to ports/glibc/bootstrap-post-install
diff --git a/ports/core/gmp/Pkgfile b/ports/gmp/Pkgfile
similarity index 100%
rename from ports/core/gmp/Pkgfile
rename to ports/gmp/Pkgfile
diff --git a/ports/core/gperf/Pkgfile b/ports/gperf/Pkgfile
similarity index 100%
rename from ports/core/gperf/Pkgfile
rename to ports/gperf/Pkgfile
diff --git a/ports/core/grep/Pkgfile b/ports/grep/Pkgfile
similarity index 100%
rename from ports/core/grep/Pkgfile
rename to ports/grep/Pkgfile
diff --git a/ports/core/groff/Pkgfile b/ports/groff/Pkgfile
similarity index 100%
rename from ports/core/groff/Pkgfile
rename to ports/groff/Pkgfile
diff --git a/ports/core/grub/Pkgfile b/ports/grub/Pkgfile
similarity index 100%
rename from ports/core/grub/Pkgfile
rename to ports/grub/Pkgfile
diff --git a/ports/core/gzip/Pkgfile b/ports/gzip/Pkgfile
similarity index 100%
rename from ports/core/gzip/Pkgfile
rename to ports/gzip/Pkgfile
diff --git a/ports/core/iana-etc/Pkgfile b/ports/iana-etc/Pkgfile
similarity index 100%
rename from ports/core/iana-etc/Pkgfile
rename to ports/iana-etc/Pkgfile
diff --git a/ports/core/inetutils/Pkgfile b/ports/inetutils/Pkgfile
similarity index 100%
rename from ports/core/inetutils/Pkgfile
rename to ports/inetutils/Pkgfile
diff --git a/ports/core/intltool/Pkgfile b/ports/intltool/Pkgfile
similarity index 100%
rename from ports/core/intltool/Pkgfile
rename to ports/intltool/Pkgfile
diff --git a/ports/core/iproute2/Pkgfile b/ports/iproute2/Pkgfile
similarity index 100%
rename from ports/core/iproute2/Pkgfile
rename to ports/iproute2/Pkgfile
diff --git a/ports/core/kbd/Pkgfile b/ports/kbd/Pkgfile
similarity index 100%
rename from ports/core/kbd/Pkgfile
rename to ports/kbd/Pkgfile
diff --git a/ports/core/kmod/Pkgfile b/ports/kmod/Pkgfile
similarity index 100%
rename from ports/core/kmod/Pkgfile
rename to ports/kmod/Pkgfile
diff --git a/ports/core/less/Pkgfile b/ports/less/Pkgfile
similarity index 100%
rename from ports/core/less/Pkgfile
rename to ports/less/Pkgfile
diff --git a/ports/core/lfs-bootscripts/Pkgfile b/ports/lfs-bootscripts/Pkgfile
similarity index 100%
rename from ports/core/lfs-bootscripts/Pkgfile
rename to ports/lfs-bootscripts/Pkgfile
diff --git a/ports/core/lfs-bootscripts/clock b/ports/lfs-bootscripts/clock
similarity index 100%
rename from ports/core/lfs-bootscripts/clock
rename to ports/lfs-bootscripts/clock
diff --git a/ports/core/lfs-bootscripts/console b/ports/lfs-bootscripts/console
similarity index 100%
rename from ports/core/lfs-bootscripts/console
rename to ports/lfs-bootscripts/console
diff --git a/ports/core/lfs-bootscripts/inittab b/ports/lfs-bootscripts/inittab
similarity index 100%
rename from ports/core/lfs-bootscripts/inittab
rename to ports/lfs-bootscripts/inittab
diff --git a/ports/core/libarchive/Pkgfile b/ports/libarchive/Pkgfile
similarity index 100%
rename from ports/core/libarchive/Pkgfile
rename to ports/libarchive/Pkgfile
diff --git a/ports/core/libcap/Pkgfile b/ports/libcap/Pkgfile
similarity index 100%
rename from ports/core/libcap/Pkgfile
rename to ports/libcap/Pkgfile
diff --git a/ports/core/libffi/Pkgfile b/ports/libffi/Pkgfile
similarity index 100%
rename from ports/core/libffi/Pkgfile
rename to ports/libffi/Pkgfile
diff --git a/ports/core/libnl/Pkgfile b/ports/libnl/Pkgfile
similarity index 100%
rename from ports/core/libnl/Pkgfile
rename to ports/libnl/Pkgfile
diff --git a/ports/core/libpipeline/Pkgfile b/ports/libpipeline/Pkgfile
similarity index 100%
rename from ports/core/libpipeline/Pkgfile
rename to ports/libpipeline/Pkgfile
diff --git a/ports/core/libtasn1/Pkgfile b/ports/libtasn1/Pkgfile
similarity index 100%
rename from ports/core/libtasn1/Pkgfile
rename to ports/libtasn1/Pkgfile
diff --git a/ports/core/libtool/Pkgfile b/ports/libtool/Pkgfile
similarity index 100%
rename from ports/core/libtool/Pkgfile
rename to ports/libtool/Pkgfile
diff --git a/ports/core/libxml2/Pkgfile b/ports/libxml2/Pkgfile
similarity index 100%
rename from ports/core/libxml2/Pkgfile
rename to ports/libxml2/Pkgfile
diff --git a/ports/core/linux-api-headers/Pkgfile b/ports/linux-api-headers/Pkgfile
similarity index 100%
rename from ports/core/linux-api-headers/Pkgfile
rename to ports/linux-api-headers/Pkgfile
diff --git a/ports/core/linux-firmware/.nostrip b/ports/linux-firmware/.nostrip
similarity index 100%
rename from ports/core/linux-firmware/.nostrip
rename to ports/linux-firmware/.nostrip
diff --git a/ports/core/linux-firmware/Pkgfile b/ports/linux-firmware/Pkgfile
similarity index 100%
rename from ports/core/linux-firmware/Pkgfile
rename to ports/linux-firmware/Pkgfile
diff --git a/ports/core/linux/.nostrip b/ports/linux/.nostrip
similarity index 100%
rename from ports/core/linux/.nostrip
rename to ports/linux/.nostrip
diff --git a/ports/core/linux/Pkgfile b/ports/linux/Pkgfile
similarity index 100%
rename from ports/core/linux/Pkgfile
rename to ports/linux/Pkgfile
diff --git a/ports/core/linux/config-4.19.66 b/ports/linux/config-4.19.66
similarity index 100%
rename from ports/core/linux/config-4.19.66
rename to ports/linux/config-4.19.66
diff --git a/ports/core/m4/Pkgfile b/ports/m4/Pkgfile
similarity index 100%
rename from ports/core/m4/Pkgfile
rename to ports/m4/Pkgfile
diff --git a/ports/core/make/Pkgfile b/ports/make/Pkgfile
similarity index 100%
rename from ports/core/make/Pkgfile
rename to ports/make/Pkgfile
diff --git a/ports/core/man-db/Pkgfile b/ports/man-db/Pkgfile
similarity index 100%
rename from ports/core/man-db/Pkgfile
rename to ports/man-db/Pkgfile
diff --git a/ports/core/man-pages/Pkgfile b/ports/man-pages/Pkgfile
similarity index 100%
rename from ports/core/man-pages/Pkgfile
rename to ports/man-pages/Pkgfile
diff --git a/ports/core/mkinitramfs/Pkgfile b/ports/mkinitramfs/Pkgfile
similarity index 100%
rename from ports/core/mkinitramfs/Pkgfile
rename to ports/mkinitramfs/Pkgfile
diff --git a/ports/core/mpc/Pkgfile b/ports/mpc/Pkgfile
similarity index 100%
rename from ports/core/mpc/Pkgfile
rename to ports/mpc/Pkgfile
diff --git a/ports/core/mpfr/Pkgfile b/ports/mpfr/Pkgfile
similarity index 100%
rename from ports/core/mpfr/Pkgfile
rename to ports/mpfr/Pkgfile
diff --git a/ports/core/ncurses/Pkgfile b/ports/ncurses/Pkgfile
similarity index 100%
rename from ports/core/ncurses/Pkgfile
rename to ports/ncurses/Pkgfile
diff --git a/ports/core/openssl/Pkgfile b/ports/openssl/Pkgfile
similarity index 100%
rename from ports/core/openssl/Pkgfile
rename to ports/openssl/Pkgfile
diff --git a/ports/core/p11-kit/Pkgfile b/ports/p11-kit/Pkgfile
similarity index 100%
rename from ports/core/p11-kit/Pkgfile
rename to ports/p11-kit/Pkgfile
diff --git a/ports/core/patch/Pkgfile b/ports/patch/Pkgfile
similarity index 100%
rename from ports/core/patch/Pkgfile
rename to ports/patch/Pkgfile
diff --git a/ports/core/perl-xml-parser/Pkgfile b/ports/perl-xml-parser/Pkgfile
similarity index 100%
rename from ports/core/perl-xml-parser/Pkgfile
rename to ports/perl-xml-parser/Pkgfile
diff --git a/ports/core/perl/Pkgfile b/ports/perl/Pkgfile
similarity index 100%
rename from ports/core/perl/Pkgfile
rename to ports/perl/Pkgfile
diff --git a/ports/core/pkg-config/Pkgfile b/ports/pkg-config/Pkgfile
similarity index 100%
rename from ports/core/pkg-config/Pkgfile
rename to ports/pkg-config/Pkgfile
diff --git a/ports/core/pkgutils/Pkgfile b/ports/pkgutils/Pkgfile
similarity index 100%
rename from ports/core/pkgutils/Pkgfile
rename to ports/pkgutils/Pkgfile
diff --git a/ports/core/pkgutils/pkgmk.conf b/ports/pkgutils/pkgmk.conf
similarity index 100%
rename from ports/core/pkgutils/pkgmk.conf
rename to ports/pkgutils/pkgmk.conf
diff --git a/ports/core/pkgutils/pkgutils_add-compress-infopages.patch b/ports/pkgutils/pkgutils_add-compress-infopages.patch
similarity index 100%
rename from ports/core/pkgutils/pkgutils_add-compress-infopages.patch
rename to ports/pkgutils/pkgutils_add-compress-infopages.patch
diff --git a/ports/core/pkgutils/pkgutils_ignore-conflict.patch b/ports/pkgutils/pkgutils_ignore-conflict.patch
similarity index 100%
rename from ports/core/pkgutils/pkgutils_ignore-conflict.patch
rename to ports/pkgutils/pkgutils_ignore-conflict.patch
diff --git a/ports/core/pkgutils/pkgutils_remove-libtool.patch b/ports/pkgutils/pkgutils_remove-libtool.patch
similarity index 100%
rename from ports/core/pkgutils/pkgutils_remove-libtool.patch
rename to ports/pkgutils/pkgutils_remove-libtool.patch
diff --git a/ports/core/procps-ng/Pkgfile b/ports/procps-ng/Pkgfile
similarity index 100%
rename from ports/core/procps-ng/Pkgfile
rename to ports/procps-ng/Pkgfile
diff --git a/ports/core/psmisc/Pkgfile b/ports/psmisc/Pkgfile
similarity index 100%
rename from ports/core/psmisc/Pkgfile
rename to ports/psmisc/Pkgfile
diff --git a/ports/core/python3/Pkgfile b/ports/python3/Pkgfile
similarity index 100%
rename from ports/core/python3/Pkgfile
rename to ports/python3/Pkgfile
diff --git a/ports/core/readline/Pkgfile b/ports/readline/Pkgfile
similarity index 100%
rename from ports/core/readline/Pkgfile
rename to ports/readline/Pkgfile
diff --git a/ports/core/sed/Pkgfile b/ports/sed/Pkgfile
similarity index 100%
rename from ports/core/sed/Pkgfile
rename to ports/sed/Pkgfile
diff --git a/ports/core/shadow/Pkgfile b/ports/shadow/Pkgfile
similarity index 100%
rename from ports/core/shadow/Pkgfile
rename to ports/shadow/Pkgfile
diff --git a/ports/core/shadow/post-install b/ports/shadow/post-install
similarity index 100%
rename from ports/core/shadow/post-install
rename to ports/shadow/post-install
diff --git a/ports/core/sysklogd/Pkgfile b/ports/sysklogd/Pkgfile
similarity index 100%
rename from ports/core/sysklogd/Pkgfile
rename to ports/sysklogd/Pkgfile
diff --git a/ports/core/sysvinit/Pkgfile b/ports/sysvinit/Pkgfile
similarity index 100%
rename from ports/core/sysvinit/Pkgfile
rename to ports/sysvinit/Pkgfile
diff --git a/ports/core/tar/Pkgfile b/ports/tar/Pkgfile
similarity index 100%
rename from ports/core/tar/Pkgfile
rename to ports/tar/Pkgfile
diff --git a/ports/core/texinfo/Pkgfile b/ports/texinfo/Pkgfile
similarity index 100%
rename from ports/core/texinfo/Pkgfile
rename to ports/texinfo/Pkgfile
diff --git a/ports/core/tzdata/Pkgfile b/ports/tzdata/Pkgfile
similarity index 100%
rename from ports/core/tzdata/Pkgfile
rename to ports/tzdata/Pkgfile
diff --git a/ports/core/util-linux/Pkgfile b/ports/util-linux/Pkgfile
similarity index 100%
rename from ports/core/util-linux/Pkgfile
rename to ports/util-linux/Pkgfile
diff --git a/ports/core/vim/Pkgfile b/ports/vim/Pkgfile
similarity index 100%
rename from ports/core/vim/Pkgfile
rename to ports/vim/Pkgfile
diff --git a/ports/core/wget/Pkgfile b/ports/wget/Pkgfile
similarity index 100%
rename from ports/core/wget/Pkgfile
rename to ports/wget/Pkgfile
diff --git a/ports/core/wpa_supplicant/Pkgfile b/ports/wpa_supplicant/Pkgfile
similarity index 100%
rename from ports/core/wpa_supplicant/Pkgfile
rename to ports/wpa_supplicant/Pkgfile
diff --git a/ports/core/wpa_supplicant/wpa_supplicant.conf b/ports/wpa_supplicant/wpa_supplicant.conf
similarity index 100%
rename from ports/core/wpa_supplicant/wpa_supplicant.conf
rename to ports/wpa_supplicant/wpa_supplicant.conf
diff --git a/ports/core/xz/Pkgfile b/ports/xz/Pkgfile
similarity index 100%
rename from ports/core/xz/Pkgfile
rename to ports/xz/Pkgfile
diff --git a/ports/core/zlib/Pkgfile b/ports/zlib/Pkgfile
similarity index 100%
rename from ports/core/zlib/Pkgfile
rename to ports/zlib/Pkgfile