Added git submodules to sources list in PKGBUILD.

Added all git submodules to the sources list in the PKGBUILD
as recommended by users and AUR wiki best practices.

Replaced msg2 commands with echo commands
Performed misc cleanup in PKGBUILD file.

2 files changed, 434 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47e14e2d4a85..19b7a7aad1f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = darling-git
-	pkgdesc = A Darwin/OS X emulation layer for Linux
-	pkgver = r2420.9f31032f
+	pkgdesc = Darwin/macOS emulation layer for Linux
+	pkgver = r2532.c690cac7
 	pkgrel = 1
 	url = http://www.darlinghq.org
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = darling-git
 	makedepends = git
 	makedepends = cmake
 	makedepends = clang
+	makedepends = dkms
 	makedepends = bison
 	makedepends = flex
 	makedepends = binutils>=2.28
@@ -38,21 +39,202 @@ pkgbase = darling-git
 	depends = gawk
 	depends = libunwind
 	options = !buildflags
-	source = git+https://github.com/darlinghq/darling.git
 	source = dkms.conf
-	md5sums = SKIP
+	source = git+https://github.com/darlinghq/darling.git
+	source = git+https://github.com/darlinghq/darling-DSTools.git
+	source = git+https://github.com/darlinghq/darling-DirectoryService.git
+	source = git+https://github.com/darlinghq/darling-Heimdal.git
+	source = git+https://github.com/darlinghq/darling-iokituser.git
+	source = git+https://github.com/darlinghq/darling-IONetworkingFamily.git
+	source = git+https://github.com/darlinghq/darling-iostoragefamily.git
+	source = git+https://github.com/darlinghq/darling-JavaScriptCore.git
+	source = git+https://github.com/darlinghq/darling-SecurityTokend.git
+	source = git+https://github.com/darlinghq/darling-SmartCardServices.git
+	source = git+https://github.com/darlinghq/darling-TextEdit.git
+	source = git+https://github.com/darlinghq/darling-WTF.git
+	source = git+https://github.com/darlinghq/darling-WebCore.git
+	source = git+https://github.com/darlinghq/darling-adv_cmds.git
+	source = git+https://github.com/darlinghq/darling-apr.git
+	source = git+https://github.com/darlinghq/darling-awk.git
+	source = git+https://github.com/darlinghq/darling-bash.git
+	source = git+https://github.com/darlinghq/darling-basic_cmds.git
+	source = git+https://github.com/darlinghq/darling-bc.git
+	source = git+https://github.com/darlinghq/darling-bind9.git
+	source = git+https://github.com/darlinghq/darling-bmalloc.git
+	source = git+https://github.com/darlinghq/darling-bsm.git
+	source = git+https://github.com/darlinghq/darling-bzip2.git
+	source = git+https://github.com/darlinghq/darling-cctools.git
+	source = git+https://github.com/darlinghq/cctools-port.git
+	source = git+https://github.com/darlinghq/darling-cfnetwork.git
+	source = git+https://github.com/darlinghq/darling-cocotron.git
+	source = git+https://github.com/darlinghq/darling-commoncrypto.git
+	source = git+https://github.com/darlinghq/darling-compiler-rt.git
+	source = git+https://github.com/darlinghq/darling-configd.git
+	source = git+https://github.com/darlinghq/darling-corecrypto.git
+	source = git+https://github.com/darlinghq/darling-corefoundation.git
+	source = git+https://github.com/darlinghq/darling-coretls.git
+	source = git+https://github.com/darlinghq/darling-crontabs.git
+	source = git+https://github.com/darlinghq/darling-curl.git
+	source = git+https://github.com/darlinghq/darling-dmg.git
+	source = git+https://github.com/darlinghq/darling-doc_cmds.git
+	source = git+https://github.com/darlinghq/darling-dtrace.git
+	source = git+https://github.com/darlinghq/darling-expat.git
+	source = git+https://github.com/darlinghq/darling-file.git
+	source = git+https://github.com/darlinghq/darling-file_cmds.git
+	source = git+https://github.com/darlinghq/darling-files.git
+	source = git+https://github.com/darlinghq/darling-foundation.git
+	source = git+https://github.com/darlinghq/darling-gnudiff.git
+	source = git+https://github.com/darlinghq/darling-gnutar.git
+	source = git+https://github.com/darlinghq/darling-gpatch.git
+	source = git+https://github.com/darlinghq/darling-grep.git
+	source = git+https://github.com/darlinghq/darling-groff.git
+	source = git+https://github.com/darlinghq/darling-icu.git
+	source = git+https://github.com/darlinghq/darling-installer.git
+	source = git+https://github.com/darlinghq/darling-less.git
+	source = git+https://github.com/darlinghq/darling-libarchive.git
+	source = git+https://github.com/darlinghq/darling-libauto.git
+	source = git+https://github.com/darlinghq/darling-libclosure.git
+	source = git+https://github.com/darlinghq/darling-libcxx.git
+	source = git+https://github.com/darlinghq/darling-libcxxabi.git
+	source = git+https://github.com/darlinghq/darling-libdispatch.git
+	source = git+https://github.com/darlinghq/darling-libkqueue.git
+	source = git+https://github.com/darlinghq/darling-liblzma.git
+	source = git+https://github.com/darlinghq/darling-libplatform.git
+	source = git+https://github.com/darlinghq/darling-libpthread.git
+	source = git+https://github.com/darlinghq/darling-libtelnet.git
+	source = git+https://github.com/darlinghq/darling-libxml2.git
+	source = git+https://github.com/darlinghq/darling-libxpc.git
+	source = git+https://github.com/darlinghq/darling-libxslt.git
+	source = git+https://github.com/darlinghq/darling-mail_cmds.git
+	source = git+https://github.com/darlinghq/darling-man.git
+	source = git+https://github.com/darlinghq/darling-misc_cmds.git
+	source = git+https://github.com/darlinghq/darling-nano.git
+	source = git+https://github.com/darlinghq/darling-network_cmds.git
+	source = git+https://github.com/darlinghq/darling-objc4.git
+	source = git+https://github.com/darlinghq/darling-openpam.git
+	source = git+https://github.com/darlinghq/darling-openssh.git
+	source = git+https://github.com/darlinghq/darling-openssl.git
+	source = git+https://github.com/darlinghq/darling-openssl_certificates.git
+	source = git+https://github.com/darlinghq/darling-patch_cmds.git
+	source = git+https://github.com/darlinghq/darling-pcre.git
+	source = git+https://github.com/darlinghq/darling-perl.git
+	source = git+https://github.com/darlinghq/darling-python.git
+	source = git+https://github.com/darlinghq/darling-python_modules.git
+	source = git+https://github.com/darlinghq/darling-remote_cmds.git
+	source = git+https://github.com/darlinghq/darling-ruby.git
+	source = git+https://github.com/darlinghq/darling-screen.git
+	source = git+https://github.com/darlinghq/darling-security.git
+	source = git+https://github.com/darlinghq/darling-shell_cmds.git
+	source = git+https://github.com/darlinghq/darling-sqlite.git
+	source = git+https://github.com/darlinghq/darling-syslog.git
+	source = git+https://github.com/darlinghq/darling-system_cmds.git
+	source = git+https://github.com/darlinghq/darling-tcsh.git
+	source = git+https://github.com/darlinghq/darling-text_cmds.git
+	source = git+https://github.com/darlinghq/darling-top.git
+	source = git+https://github.com/darlinghq/darling-vim.git
+	source = git+https://github.com/darlinghq/xcbuild.git
+	source = git+https://github.com/darlinghq/darling-zip.git
+	source = git+https://github.com/darlinghq/darling-zlib.git
+	source = git+https://github.com/darlinghq/darling-zsh.git
+	source = git+https://github.com/darlinghq/darling-newlkm.git
 	md5sums = d6d3b392245a45c6fb5f82037bfdbd19
-	depends_x86_64 = lib32-clang
-	depends_x86_64 = lib32-bzip2
-	depends_x86_64 = lib32-systemd
-	depends_x86_64 = lib32-libxslt
-	depends_x86_64 = libpng
-	depends_x86_64 = cairo
-	depends_x86_64 = libtiff
-	depends_x86_64 = glu
-	depends_x86_64 = libbsd
-	depends_x86_64 = python2
-	makedepends_x86_64 = gcc-multilib
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = darling-git
 	install = darling-git.install
diff --git a/PKGBUILD b/PKGBUILD
index a582b56f7754..6f6fc5a563e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,52 +4,261 @@
 _gitname=darling
 pkgbase=$_gitname-git
 pkgname=('darling-git' 'darling-mach-dkms-git')
-pkgver=r2420.9f31032f
+pkgver=r2532.c690cac7
 pkgrel=1
-pkgdesc="A Darwin/OS X emulation layer for Linux"
-arch=('x86_64') # Can only be built on x86_64 systems
+pkgdesc="Darwin/macOS emulation layer for Linux"
+arch=('x86_64')
 url="http://www.darlinghq.org"
 license=('GPL3')
 groups=('darling-git')
 depends=('xz' 'fuse' 'libxml2' 'icu' 'openssl' 'bzip2' 'zlib' 'libsystemd'
 	'wget' 'curl' 'sqlite' 'ruby' 'sed' 'libarchive' 'file' 'python' 'gawk' 'libunwind') # namcap complains about them
-depends_x86_64=('lib32-clang' 'lib32-bzip2' 'lib32-systemd' 'lib32-libxslt' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2')
-makedepends=('git' 'cmake' 'clang' 'bison' 'flex' 'binutils>=2.28' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2' 'linux-headers')
-makedepends_x86_64=('gcc-multilib')
-source=('git+https://github.com/darlinghq/darling.git'
-	'dkms.conf')
-md5sums=('SKIP'
-         'd6d3b392245a45c6fb5f82037bfdbd19')
+_depends_x86_64=('lib32-clang' 'lib32-bzip2' 'lib32-systemd' 'lib32-libxslt' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2')
+makedepends=('git' 'cmake' 'clang' 'dkms' 'bison' 'flex' 'binutils>=2.28' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2' 'linux-headers')
+_make_depends_x86_64=('gcc-multilib')
+
+# Darling git repo and all submodules.
+source=('dkms.conf'
+        'git+https://github.com/darlinghq/darling.git'
+        'git+https://github.com/darlinghq/darling-DSTools.git'
+        'git+https://github.com/darlinghq/darling-DirectoryService.git'
+        'git+https://github.com/darlinghq/darling-Heimdal.git'
+        'git+https://github.com/darlinghq/darling-iokituser.git'
+        'git+https://github.com/darlinghq/darling-IONetworkingFamily.git'
+        'git+https://github.com/darlinghq/darling-iostoragefamily.git'
+        'git+https://github.com/darlinghq/darling-JavaScriptCore.git'
+        'git+https://github.com/darlinghq/darling-SecurityTokend.git'
+        'git+https://github.com/darlinghq/darling-SmartCardServices.git'
+        'git+https://github.com/darlinghq/darling-TextEdit.git'
+        'git+https://github.com/darlinghq/darling-WTF.git'
+        'git+https://github.com/darlinghq/darling-WebCore.git'
+        'git+https://github.com/darlinghq/darling-adv_cmds.git'
+        'git+https://github.com/darlinghq/darling-apr.git'
+        'git+https://github.com/darlinghq/darling-awk.git'
+        'git+https://github.com/darlinghq/darling-bash.git'
+        'git+https://github.com/darlinghq/darling-basic_cmds.git'
+        'git+https://github.com/darlinghq/darling-bc.git'
+        'git+https://github.com/darlinghq/darling-bind9.git'
+        'git+https://github.com/darlinghq/darling-bmalloc.git'
+        'git+https://github.com/darlinghq/darling-bsm.git'
+        'git+https://github.com/darlinghq/darling-bzip2.git'
+        'git+https://github.com/darlinghq/darling-cctools.git'
+        'git+https://github.com/darlinghq/cctools-port.git'
+        'git+https://github.com/darlinghq/darling-cfnetwork.git'
+        'git+https://github.com/darlinghq/darling-cocotron.git'
+        'git+https://github.com/darlinghq/darling-commoncrypto.git'
+        'git+https://github.com/darlinghq/darling-compiler-rt.git'
+        'git+https://github.com/darlinghq/darling-configd.git'
+        'git+https://github.com/darlinghq/darling-corecrypto.git'
+        'git+https://github.com/darlinghq/darling-corefoundation.git'
+        'git+https://github.com/darlinghq/darling-coretls.git'
+        'git+https://github.com/darlinghq/darling-crontabs.git'
+        'git+https://github.com/darlinghq/darling-curl.git'
+        'git+https://github.com/darlinghq/darling-dmg.git'
+        'git+https://github.com/darlinghq/darling-doc_cmds.git'
+        'git+https://github.com/darlinghq/darling-dtrace.git'
+        'git+https://github.com/darlinghq/darling-expat.git'
+        'git+https://github.com/darlinghq/darling-file.git'
+        'git+https://github.com/darlinghq/darling-file_cmds.git'
+        'git+https://github.com/darlinghq/darling-files.git'
+        'git+https://github.com/darlinghq/darling-foundation.git'
+        'git+https://github.com/darlinghq/darling-gnudiff.git'
+        'git+https://github.com/darlinghq/darling-gnutar.git'
+        'git+https://github.com/darlinghq/darling-gpatch.git'
+        'git+https://github.com/darlinghq/darling-grep.git'
+        'git+https://github.com/darlinghq/darling-groff.git'
+        'git+https://github.com/darlinghq/darling-icu.git'
+        'git+https://github.com/darlinghq/darling-installer.git'
+        'git+https://github.com/darlinghq/darling-less.git'
+        'git+https://github.com/darlinghq/darling-libarchive.git'
+        'git+https://github.com/darlinghq/darling-libauto.git'
+        'git+https://github.com/darlinghq/darling-libclosure.git'
+        'git+https://github.com/darlinghq/darling-libcxx.git'
+        'git+https://github.com/darlinghq/darling-libcxxabi.git'
+        'git+https://github.com/darlinghq/darling-libdispatch.git'
+        'git+https://github.com/darlinghq/darling-libkqueue.git'
+        'git+https://github.com/darlinghq/darling-liblzma.git'
+        'git+https://github.com/darlinghq/darling-libplatform.git'
+        'git+https://github.com/darlinghq/darling-libpthread.git'
+        'git+https://github.com/darlinghq/darling-libtelnet.git'
+        'git+https://github.com/darlinghq/darling-libxml2.git'
+        'git+https://github.com/darlinghq/darling-libxpc.git'
+        'git+https://github.com/darlinghq/darling-libxslt.git'
+        'git+https://github.com/darlinghq/darling-mail_cmds.git'
+        'git+https://github.com/darlinghq/darling-man.git'
+        'git+https://github.com/darlinghq/darling-misc_cmds.git'
+        'git+https://github.com/darlinghq/darling-nano.git'
+        'git+https://github.com/darlinghq/darling-network_cmds.git'
+        'git+https://github.com/darlinghq/darling-objc4.git'
+        'git+https://github.com/darlinghq/darling-openpam.git'
+        'git+https://github.com/darlinghq/darling-openssh.git'
+        'git+https://github.com/darlinghq/darling-openssl.git'
+        'git+https://github.com/darlinghq/darling-openssl_certificates.git'
+        'git+https://github.com/darlinghq/darling-patch_cmds.git'
+        'git+https://github.com/darlinghq/darling-pcre.git'
+        'git+https://github.com/darlinghq/darling-perl.git'
+        'git+https://github.com/darlinghq/darling-python.git'
+        'git+https://github.com/darlinghq/darling-python_modules.git'
+        'git+https://github.com/darlinghq/darling-remote_cmds.git'
+        'git+https://github.com/darlinghq/darling-ruby.git'
+        'git+https://github.com/darlinghq/darling-screen.git'
+        'git+https://github.com/darlinghq/darling-security.git'
+        'git+https://github.com/darlinghq/darling-shell_cmds.git'
+        'git+https://github.com/darlinghq/darling-sqlite.git'
+        'git+https://github.com/darlinghq/darling-syslog.git'
+        'git+https://github.com/darlinghq/darling-system_cmds.git'
+        'git+https://github.com/darlinghq/darling-tcsh.git'
+        'git+https://github.com/darlinghq/darling-text_cmds.git'
+        'git+https://github.com/darlinghq/darling-top.git'
+        'git+https://github.com/darlinghq/darling-vim.git'
+        'git+https://github.com/darlinghq/xcbuild.git'
+        'git+https://github.com/darlinghq/darling-zip.git'
+        'git+https://github.com/darlinghq/darling-zlib.git'
+        'git+https://github.com/darlinghq/darling-zsh.git'
+        'git+https://github.com/darlinghq/darling-newlkm.git')
+
+# We skip md5 on all git repos
+md5sums=('d6d3b392245a45c6fb5f82037bfdbd19'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
+          'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 options=('!buildflags')
 
 pkgver() {
 	cd "$srcdir/$_gitname"
+
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
 	cd "$srcdir/$_gitname"
 
-	msg2 "Initialize git submodules..."
-	sed -i 's|url = ../|url = https://github.com/darlinghq/|g' .gitmodules
-	git submodule update --init --recursive
+	echo "Initialize git submodules."
+	git submodule init
+
+  echo "Updating git submodule paths."
+	git config submodule.src/external/DSTools.url "$srcdir/darling-DSTools"
+  git config submodule.src/external/DirectoryService.url "$srcdir/darling-DirectoryService"
+  git config submodule.src/external/Heimdal.url "$srcdir/darling-Heimdal"
+  git config submodule.src/external/IOKitUser.url "$srcdir/darling-iokituser"
+  git config submodule.src/external/IONetworkingFamily.url "$srcdir/darling-IONetworkingFamily"
+  git config submodule.src/external/IOStorageFamily.url "$srcdir/darling-iostoragefamily"
+  git config submodule.src/external/JavaScriptCore.url "$srcdir/darling-JavaScriptCore"
+  git config submodule.src/external/SecurityTokend.url "$srcdir/darling-SecurityTokend"
+  git config submodule.src/external/SmartCardServices.url "$srcdir/darling-SmartCardServices"
+  git config submodule.src/external/TextEdit.url "$srcdir/darling-TextEdit"
+  git config submodule.src/external/WTF.url "$srcdir/darling-WTF"
+  git config submodule.src/external/WebCore.url "$srcdir/darling-WebCore"
+  git config submodule.src/external/adv_cmds.url "$srcdir/darling-adv_cmds"
+  git config submodule.src/external/apr.url "$srcdir/darling-apr"
+  git config submodule.src/external/awk.url "$srcdir/darling-awk"
+  git config submodule.src/external/bash.url "$srcdir/darling-bash"
+  git config submodule.src/external/basic_cmds.url "$srcdir/darling-basic_cmds"
+  git config submodule.src/external/bc.url "$srcdir/darling-bc"
+  git config submodule.src/external/bind9.url "$srcdir/darling-bind9"
+  git config submodule.src/external/bmalloc.url "$srcdir/darling-bmalloc"
+  git config submodule.src/external/bsm.url "$srcdir/darling-bsm"
+  git config submodule.src/external/bzip2.url "$srcdir/darling-bzip2"
+  git config submodule.src/external/cctools.url "$srcdir/darling-cctools"
+  git config submodule.src/external/cctools-port.url "$srcdir/cctools-port"
+  git config submodule.src/external/cfnetwork.url "$srcdir/darling-cfnetwork"
+  git config submodule.src/external/cocotron.url "$srcdir/darling-cocotron"
+  git config submodule.src/external/commoncrypto.url "$srcdir/darling-commoncrypto"
+  git config submodule.src/external/compiler-rt.url "$srcdir/darling-compiler-rt"
+  git config submodule.src/external/configd.url "$srcdir/darling-configd"
+  git config submodule.src/external/corecrypto.url "$srcdir/darling-corecrypto"
+  git config submodule.src/external/corefoundation.url "$srcdir/darling-corefoundation"
+  git config submodule.src/external/coretls.url "$srcdir/darling-coretls"
+  git config submodule.src/external/crontabs.url "$srcdir/darling-crontabs"
+  git config submodule.src/external/curl.url "$srcdir/darling-curl"
+  git config submodule.src/external/darling-dmg.url "$srcdir/darling-dmg"
+  git config submodule.src/external/doc_cmds.url "$srcdir/darling-doc_cmds"
+  git config submodule.src/external/dtrace.url "$srcdir/darling-dtrace"
+  git config submodule.src/external/expat.url "$srcdir/darling-expat"
+  git config submodule.src/external/file.url "$srcdir/darling-file"
+  git config submodule.src/external/file_cmds.url "$srcdir/darling-file_cmds"
+  git config submodule.src/external/files.url "$srcdir/darling-files"
+  git config submodule.src/external/foundation.url "$srcdir/darling-foundation"
+  git config submodule.src/external/gnudiff.url "$srcdir/darling-gnudiff"
+  git config submodule.src/external/gnutar.url "$srcdir/darling-gnutar"
+  git config submodule.src/external/gpatch.url "$srcdir/darling-gpatch"
+  git config submodule.src/external/grep.url "$srcdir/darling-grep"
+  git config submodule.src/external/groff.url "$srcdir/darling-groff"
+  git config submodule.src/external/icu.url "$srcdir/darling-icu"
+  git config submodule.src/external/installer.url "$srcdir/darling-installer"
+  git config submodule.src/external/less.url "$srcdir/darling-less"
+  git config submodule.src/external/libarchive.url "$srcdir/darling-libarchive"
+  git config submodule.src/external/libauto.url "$srcdir/darling-libauto"
+  git config submodule.src/external/libclosure.url "$srcdir/darling-libclosure"
+  git config submodule.src/external/libcxx.url "$srcdir/darling-libcxx"
+  git config submodule.src/external/libcxxabi.url "$srcdir/darling-libcxxabi"
+  git config submodule.src/external/libdispatch.url "$srcdir/darling-libdispatch"
+  git config submodule.src/external/libkqueue.url "$srcdir/darling-libkqueue"
+  git config submodule.src/external/liblzma.url "$srcdir/darling-liblzma"
+  git config submodule.src/external/libplatform.url "$srcdir/darling-libplatform"
+  git config submodule.src/external/libpthread.url "$srcdir/darling-libpthread"
+  git config submodule.src/external/libtelnet.url "$srcdir/darling-libtelnet"
+  git config submodule.src/external/libxml2.url "$srcdir/darling-libxml2"
+  git config submodule.src/external/libxpc.url "$srcdir/darling-libxpc"
+  git config submodule.src/external/libxslt.url "$srcdir/darling-libxslt"
+  git config submodule.src/external/mail_cmds.url "$srcdir/darling-mail_cmds"
+  git config submodule.src/external/man.url "$srcdir/darling-man"
+  git config submodule.src/external/misc_cmds.url "$srcdir/darling-misc_cmds"
+  git config submodule.src/external/nano.url "$srcdir/darling-nano"
+  git config submodule.src/external/network_cmds.url "$srcdir/darling-network_cmds"
+  git config submodule.src/external/objc4.url "$srcdir/darling-objc4"
+  git config submodule.src/external/openpam.url "$srcdir/darling-openpam"
+  git config submodule.src/external/openssh.url "$srcdir/darling-openssh"
+  git config submodule.src/external/openssl.url "$srcdir/darling-openssl"
+  git config submodule.src/external/openssl_certificates.url "$srcdir/darling-openssl_certificates"
+  git config submodule.src/external/patch_cmds.url "$srcdir/darling-patch_cmds"
+  git config submodule.src/external/pcre.url "$srcdir/darling-pcre"
+  git config submodule.src/external/perl.url "$srcdir/darling-perl"
+  git config submodule.src/external/python.url "$srcdir/darling-python"
+  git config submodule.src/external/python_modules.url "$srcdir/darling-python_modules"
+  git config submodule.src/external/remote_cmds.url "$srcdir/darling-remote_cmds"
+  git config submodule.src/external/ruby.url "$srcdir/darling-ruby"
+  git config submodule.src/external/screen.url "$srcdir/darling-screen"
+  git config submodule.src/external/security.url "$srcdir/darling-security"
+  git config submodule.src/external/shell_cmds.url "$srcdir/darling-shell_cmds"
+  git config submodule.src/external/sqlite.url "$srcdir/darling-sqlite"
+  git config submodule.src/external/syslog.url "$srcdir/darling-syslog"
+  git config submodule.src/external/system_cmds.url "$srcdir/darling-system_cmds"
+  git config submodule.src/external/tcsh.url "$srcdir/darling-tcsh"
+  git config submodule.src/external/text_cmds.url "$srcdir/darling-text_cmds"
+  git config submodule.src/external/top.url "$srcdir/darling-top"
+  git config submodule.src/external/vim.url "$srcdir/darling-vim"
+  git config submodule.src/external/xcbuild.url "$srcdir/xcbuild"
+  git config submodule.src/external/zip.url "$srcdir/darling-zip"
+  git config submodule.src/external/zlib.url "$srcdir/darling-zlib"
+  git config submodule.src/external/zsh.url "$srcdir/darling-zsh"
+  git config submodule.src/lkm.url "$srcdir/darling-newlkm"
 
-	#msg2 "Forbid libexec use..."
-	#sed -i 's|${CMAKE_INSTALL_PREFIX}/libexec/darling|${CMAKE_INSTALL_PREFIX}/share/darling/prefix|g' src/darling-config.h.in
-	#find . -name CMakeLists.txt -exec sed -i 's|libexec/darling|${CMAKE_INSTALL_PREFIX}/share/darling/prefix|g' {} \;
+  echo "Updating git submodules"
+  git submodule update
 
-	msg2 "Make build directory..."
+	echo "Creating build directory."
 	mkdir -pv "build"
 }
 
 build() {
-	cd "$srcdir/$_gitname/build"
-	msg2 "Run 'cmake'..."
+  cd "$srcdir/$_gitname/build"
+
+	echo "Running cmake."
 	cmake .. -DCMAKE_INSTALL_PREFIX=/usr
-	msg2 "Run 'make'..."
-	make -j$(nproc)
-	msg2 "Run 'make lkm'..."
-	make lkm -j$(nproc)
+
+	echo "Running make."
+	make -j$(getconf _NPROCESSORS_ONLN)
+
+	echo "Run 'make lkm'..."
+	make lkm -j$(getconf _NPROCESSORS_ONLN)
 }
 
 package_darling-git() {
@@ -70,14 +279,15 @@ package_darling-mach-dkms-git() {
 	_srcdest="$pkgdir/usr/src/darling-mach-$pkgver"
 	_srcinstalldest="/usr/src/darling-mach-$pkgver"
 
-	msg2 "Install module sources for DKMS..."
+	echo "Install module sources for DKMS."
 	install -dm755 $(dirname "$_srcdest")
 	cp -r "$srcdir/$_gitname/src/lkm"       "$_srcdest"
 	cp -r "$srcdir/$_gitname/build/src/lkm" "$_srcdest/migdir"
-    # Copy missing header rtsig.h
-    cp "$srcdir/$_gitname/build/src/startup/rtsig.h" "$_srcdest/include"
+  
+  # Copy missing header rtsig.h
+  cp "$srcdir/$_gitname/build/src/startup/rtsig.h" "$_srcdest/include"
 
-	msg2 "Set configuration for DKMS..."
+	echo "Set configuration for DKMS..."
 	install -Dm644 "$srcdir/dkms.conf"      "$_srcdest"
 	sed -i "s|@PKGVER@|$pkgver|g"           "$_srcdest/dkms.conf"
 	sed -i "s|@SRCDEST@|$_srcinstalldest|g"        "$_srcdest/dkms.conf"