3 files changed, 31 insertions, 6 deletions
diff --git a/network/PaleMoon/PaleMoon.SlackBuild b/network/PaleMoon/PaleMoon.SlackBuild
index 614a156911..d561b8bfc7 100644
--- a/network/PaleMoon/PaleMoon.SlackBuild
+++ b/network/PaleMoon/PaleMoon.SlackBuild
@@ -89,11 +89,11 @@ tar xvf $CWD/autoconf-2.13.tar.xz
 cd autoconf-2.13
 zcat $CWD/autoconf-2.13-consolidated_fixes-1.patch.gz | patch -p1 --verbose
 chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Build a temporary copy of autoconf-2.13 only to be used to compile
 # Pale Moon, since it somewhat inexplicably requires this ancient version:
@@ -135,6 +135,11 @@ if [ "$LIBDIRSUFFIX" = "64" ]; then
     xpcom/io/nsAppFileLocationProvider.cpp
 fi
 
+# Apply this patch so that PaleMoon will, not only compile with versions of sed earler
+# than 4.3, but also, compile with versions of sed 4.3 and later.
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850972
+patch -p1 < $CWD/icu.m4-adding-extra-bracket-to-not-confuse-grep.patch
+
 export MOZBUILD_STATE_PATH="$TMP/Pale-Moon-${VERSION}_Release/moz.build"
 export MOZCONFIG="$TMP/Pale-Moon-${VERSION}_Release/.mozconfig"
 export MOZILLA_OFFICIAL=1
@@ -200,7 +205,11 @@ rm -rf usr/lib${LIBDIRSUFFIX}/palemoon-devel-$VERSION
 # however, appear to fail on Slackware.
 rm -f usr/lib${LIBDIRSUFFIX}/palemoon-$VERSION/palemoon-bin
 
-ln -s /usr/lib${LIBDIRSUFFIX}/palemoon-$VERSION/palemoon usr/bin/palemoon-$VERSION
+# Append a version suffix to the binary, if we desire to install this version of
+# PaleMoon along side any other version of PaleMoon.
+if [ "$APPEND_VERSION_SUFFIX" = "yes" ]; then
+       mv usr/bin/palemoon usr/bin/palemoon-$VERSION
+fi
 
 # Use system provided Hunspell, if desired.
 if [ "${USE_SYSTEM_HUNSPELL}" = "yes" ]; then
diff --git a/network/PaleMoon/README b/network/PaleMoon/README
index db14f25919..2caaa793dc 100644
--- a/network/PaleMoon/README
+++ b/network/PaleMoon/README
@@ -21,6 +21,11 @@ Slackware style, in a manner that conforms to official Pale Moon Linux
 releases; while, at the same time, providing useful and easy ways to deviate
 if desired.
 
+To package this version of Pale Moon for installation along side any other version of
+Pale Moon, (such as the before mentioned version known here as "palemoon") pass the
+script the parameter:
+APPEND_VERSION_SUFFIX=yes
+
 See http://docs.slackware.com/howtos:software:palemoon for additional
 tips and help resources.
 
diff --git a/network/PaleMoon/icu.m4-adding-extra-bracket-to-not-confuse-grep.patch b/network/PaleMoon/icu.m4-adding-extra-bracket-to-not-confuse-grep.patch
new file mode 100644
index 0000000000..078cf87237
--- /dev/null
+++ b/network/PaleMoon/icu.m4-adding-extra-bracket-to-not-confuse-grep.patch
@@ -0,0 +1,11 @@
+--- a/build/autoconf/icu.m4	2017-01-14 00:12:01.423712928 -0800
++++ b/build/autoconf/icu.m4	2017-01-14 00:17:50.332821372 -0800
+@@ -73,7 +73,7 @@
+         fi
+     fi
+ 
+-    version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
++    version=`sed -n 's/^[[[:space:]]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+     if test x"$version" = x; then
+        AC_MSG_ERROR([cannot determine icu version number from uvernum.h header file $lineno])
+     fi