From 102fc6f99f6393cc3f58631fb0f7c840eb5c88a7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.eu>
Date: Wed, 24 May 2017 20:02:46 +0200
Subject: [PATCH] xbps-src: portability fixes

---
 common/xbps-src/shutils/chroot.sh | 2 +-
 xbps-src                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index 2f578143bbb..5f06138a8d7 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -148,7 +148,7 @@ chroot_sync_repos() {
     if [ -n "$XBPS_CROSS_BUILD" ]; then
         # Copy host keys to the target rootdir.
         mkdir -p $XBPS_MASTERDIR/$XBPS_CROSS_BASE/var/db/xbps/keys
-        cp -a $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \
+        cp $XBPS_MASTERDIR/var/db/xbps/keys/*.plist \
             $XBPS_MASTERDIR/$XBPS_CROSS_BASE/var/db/xbps/keys
         # Make sure to sync index for remote repositories.
         if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then
diff --git a/xbps-src b/xbps-src
index bc200b9fc34..5532ecc4e6f 100755
--- a/xbps-src
+++ b/xbps-src
@@ -415,7 +415,7 @@ XBPS_OPTIONS=
 XBPS_OPTSTRING="a:CEfgGhH:Ij:Lm:No:r:tV"
 
 # Preprocess arguments in order to allow options before and after XBPS_TARGET.
-eval set -- $(getopt -- "$XBPS_OPTSTRING" "$@");
+eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
 
 while getopts "$XBPS_OPTSTRING" opt; do
     case $opt in
@@ -425,12 +425,12 @@ while getopts "$XBPS_OPTSTRING" opt; do
         f) readonly XBPS_BUILD_FORCEMODE=1; XBPS_OPTIONS+=" -f";;
         G) readonly XBPS_USE_GIT_REVS=1; XBPS_OPTIONS+=" -G";;
         g) readonly XBPS_DEBUG_PKGS=1; XBPS_OPTIONS+=" -g";;
-        H) readonly XBPS_HOSTDIR="$(readlink -m $OPTARG 2>/dev/null)"; XBPS_OPTIONS+=" -H $XBPS_HOSTDIR";;
+        H) readonly XBPS_HOSTDIR="$(readlink -f $OPTARG 2>/dev/null)"; XBPS_OPTIONS+=" -H $XBPS_HOSTDIR";;
         h) usage && exit 0;;
         I) readonly XBPS_SKIP_DEPS=1; XBPS_OPTIONS+=" -I";;
         j) export XBPS_MAKEJOBS="$OPTARG"; XBPS_OPTIONS+=" -j $OPTARG";;
         L) export NOCOLORS=1; XBPS_OPTIONS+=" -L";;
-        m) readonly XBPS_MASTERDIR=$(readlink -m $OPTARG 2>/dev/null); XBPS_OPTIONS+=" -m $XBPS_MASTERDIR";;
+        m) readonly XBPS_MASTERDIR=$(readlink -f $OPTARG 2>/dev/null); XBPS_OPTIONS+=" -m $XBPS_MASTERDIR";;
         N) readonly XBPS_SKIP_REMOTEREPOS=1; XBPS_OPTIONS+=" -N";;
         o) readonly XBPS_PKG_OPTIONS="$OPTARG"; XBPS_OPTIONS+=" -o $OPTARG";;
         r) readonly XBPS_ALT_REPOSITORY="$OPTARG"; XBPS_OPTIONS+=" -r $OPTARG";;