Radix cross Linux

Radix Linux distribution for embedded systems.

637 Commits   4 Branches   3 Tags
author: Andrey V.Kosteltsev <kx@radix.pro> 2016-07-19 15:06:39 +0000 committer: Andrey V.Kosteltsev <kx@radix.pro> 2016-07-19 15:06:39 +0000 commit: ff5865e03ff832042353a19204df6d325a77c26a parent: 420d9f5856991c509aafce4467ae3d687bf002b4
Commit Summary:
fixed: pkg intersection; radix-setup leaving existed FS; .INSTALL scripts pre_remove(info) functions.
Diffstat:
72 files changed, 144 insertions, 118 deletions
diff --git a/app/enscript/1.6.6/enscript-pkg-install.sh b/app/enscript/1.6.6/enscript-pkg-install.sh
index 500c3d477..634f8a9f4 100755
--- a/app/enscript/1.6.6/enscript-pkg-install.sh
+++ b/app/enscript/1.6.6/enscript-pkg-install.sh
@@ -54,7 +54,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/enscript.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/enscript.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/fastjar/0.98/fastjar-pkg-install.sh b/app/fastjar/0.98/fastjar-pkg-install.sh
index 7115c586b..413076b19 100755
--- a/app/fastjar/0.98/fastjar-pkg-install.sh
+++ b/app/fastjar/0.98/fastjar-pkg-install.sh
@@ -59,7 +59,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/fastjar.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/fastjar.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/gawk/4.1.1/gawk-pkg-install.sh b/app/gawk/4.1.1/gawk-pkg-install.sh
index 83bc195df..3761d6e4e 100755
--- a/app/gawk/4.1.1/gawk-pkg-install.sh
+++ b/app/gawk/4.1.1/gawk-pkg-install.sh
@@ -60,8 +60,8 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gawk.info.gz     --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/gawkinet.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gawk.info.gz     --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gawkinet.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/gettext/0.18.3.2-tools/gettext-tools-pkg-install.sh b/app/gettext/0.18.3.2-tools/gettext-tools-pkg-install.sh
index 0478cb0b7..4d7d527f4 100755
--- a/app/gettext/0.18.3.2-tools/gettext-tools-pkg-install.sh
+++ b/app/gettext/0.18.3.2-tools/gettext-tools-pkg-install.sh
@@ -95,7 +95,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gettext.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gettext.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/gettext/0.18.3.2/gettext-pkg-install.sh b/app/gettext/0.18.3.2/gettext-pkg-install.sh
index 615645493..4a6bdf0fe 100755
--- a/app/gettext/0.18.3.2/gettext-pkg-install.sh
+++ b/app/gettext/0.18.3.2/gettext-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/autosprintf.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/autosprintf.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/gettext/0.19.7-tools/gettext-tools-pkg-install.sh b/app/gettext/0.19.7-tools/gettext-tools-pkg-install.sh
index 0478cb0b7..4d7d527f4 100755
--- a/app/gettext/0.19.7-tools/gettext-tools-pkg-install.sh
+++ b/app/gettext/0.19.7-tools/gettext-tools-pkg-install.sh
@@ -95,7 +95,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gettext.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gettext.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/gettext/0.19.7/gettext-pkg-install.sh b/app/gettext/0.19.7/gettext-pkg-install.sh
index 615645493..4a6bdf0fe 100755
--- a/app/gettext/0.19.7/gettext-pkg-install.sh
+++ b/app/gettext/0.19.7/gettext-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/autosprintf.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/autosprintf.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/gpm/1.20.7/gpm-pkg-install.sh b/app/gpm/1.20.7/gpm-pkg-install.sh
index 143ae6f10..23a9b6a4e 100755
--- a/app/gpm/1.20.7/gpm-pkg-install.sh
+++ b/app/gpm/1.20.7/gpm-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gpm.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gpm.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/grep/2.18/grep-pkg-install.sh b/app/grep/2.18/grep-pkg-install.sh
index a3a73231c..cbbcef930 100755
--- a/app/grep/2.18/grep-pkg-install.sh
+++ b/app/grep/2.18/grep-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/grep.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/grep.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/gzip/1.6/gzip-pkg-install.sh b/app/gzip/1.6/gzip-pkg-install.sh
index 27a13bad4..4a7c86997 100755
--- a/app/gzip/1.6/gzip-pkg-install.sh
+++ b/app/gzip/1.6/gzip-pkg-install.sh
@@ -62,7 +62,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gzip.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gzip.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/mtools/4.0.18/mtools-pkg-install.sh b/app/mtools/4.0.18/mtools-pkg-install.sh
index 75b47df52..8166a2bdc 100755
--- a/app/mtools/4.0.18/mtools-pkg-install.sh
+++ b/app/mtools/4.0.18/mtools-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/mtools.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/mtools.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/sharutils/4.15.2/sharutils-pkg-install.sh b/app/sharutils/4.15.2/sharutils-pkg-install.sh
index 005622e77..d7db4eab1 100755
--- a/app/sharutils/4.15.2/sharutils-pkg-install.sh
+++ b/app/sharutils/4.15.2/sharutils-pkg-install.sh
@@ -59,7 +59,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/sharutils.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/sharutils.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/texinfo/5.2/texinfo-pkg-install.sh b/app/texinfo/5.2/texinfo-pkg-install.sh
index 9470d8780..5bc25427c 100755
--- a/app/texinfo/5.2/texinfo-pkg-install.sh
+++ b/app/texinfo/5.2/texinfo-pkg-install.sh
@@ -74,9 +74,9 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/texinfo.info.gz --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/info-stnd.info.gz --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/info.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/texinfo.info.gz   --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/info-stnd.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/info.info.gz      --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/app/which/2.20/which-pkg-install.sh b/app/which/2.20/which-pkg-install.sh
index 2e0972229..dacc99de5 100755
--- a/app/which/2.20/which-pkg-install.sh
+++ b/app/which/2.20/which-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/which.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/which.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/base/install-tools/sbin/radix-setup.in b/base/install-tools/sbin/radix-setup.in
index 7a24a704c..8a62f8141 100644
--- a/base/install-tools/sbin/radix-setup.in
+++ b/base/install-tools/sbin/radix-setup.in
@@ -1419,10 +1419,11 @@ EOF
 --backtitle "\Z7Radix\Zn \Z1Pro\Zn\Z7, Ltd.\Zn" \\
 --title " \Z0\ZbSelect File System for \ZB\Zn \Z1\Zb$prname\ZB\Zn " \\
 --menu "\\n\\
-Please select the type of filesystem to use for the specified device. \\
+Please select the type of filesystem to use for the specified device\\n\\
+or hit <\Z1\ZbC\ZB\Zn\Zbancel\ZB> to leave existed filesystem. \\
 \\n\\n\\
 Here are descriptions of the available filesystems:\\
-" 14 74 4 \\
+" 15 74 4 \\
 EOF
 
     if [ ! "$EXT2" = "" ]; then
@@ -1470,6 +1471,25 @@ EOF
       #
       ################################################################
 
+      ################################################################
+      # Set Mount Point:
+      #
+      if [ "$boot_image_has_been_written" == "yes" ] ; then
+        if [ "$mpoint" != "/" -a "$mpoint" != "/bootfs" ] ; then
+          set_mount_point
+        fi
+      else
+        set_mount_point
+      fi
+      #
+      ################################################################
+    else
+      ################################################################
+      # Leave existed file system:
+      #
+      set_recomended_fstype "$prname" "$fstype"
+      #
+      ################################################################
       ################################################################
       # Set Mount Point:
       #
diff --git a/dev/autoconf-archive/2014.02.28/autoconf-archive-pkg-install.sh b/dev/autoconf-archive/2014.02.28/autoconf-archive-pkg-install.sh
index ad62ad2dc..8b0c46c16 100755
--- a/dev/autoconf-archive/2014.02.28/autoconf-archive-pkg-install.sh
+++ b/dev/autoconf-archive/2014.02.28/autoconf-archive-pkg-install.sh
@@ -54,7 +54,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/autoconf-archive.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/autoconf-archive.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/autoconf/2.69/autoconf-pkg-install.sh b/dev/autoconf/2.69/autoconf-pkg-install.sh
index a10121cce..6c2a91fa0 100755
--- a/dev/autoconf/2.69/autoconf-pkg-install.sh
+++ b/dev/autoconf/2.69/autoconf-pkg-install.sh
@@ -83,8 +83,8 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/standards.info.gz --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/autoconf.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/standards.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/autoconf.info.gz  --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/automake/1.11.5/automake-pkg-install.sh b/dev/automake/1.11.5/automake-pkg-install.sh
index a97e08013..6b3bc57a0 100755
--- a/dev/automake/1.11.5/automake-pkg-install.sh
+++ b/dev/automake/1.11.5/automake-pkg-install.sh
@@ -59,7 +59,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/automake.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/automake.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/automake/1.12.6/automake-pkg-install.sh b/dev/automake/1.12.6/automake-pkg-install.sh
index a97e08013..6b3bc57a0 100755
--- a/dev/automake/1.12.6/automake-pkg-install.sh
+++ b/dev/automake/1.12.6/automake-pkg-install.sh
@@ -59,7 +59,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/automake.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/automake.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/automake/1.14/automake-pkg-install.sh b/dev/automake/1.14/automake-pkg-install.sh
index a97e08013..6b3bc57a0 100755
--- a/dev/automake/1.14/automake-pkg-install.sh
+++ b/dev/automake/1.14/automake-pkg-install.sh
@@ -59,7 +59,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/automake.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/automake.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/binutils/2.25.1/binutils-pkg-install.sh b/dev/binutils/2.25.1/binutils-pkg-install.sh
index 3a56a07e1..0d9ecb12b 100755
--- a/dev/binutils/2.25.1/binutils-pkg-install.sh
+++ b/dev/binutils/2.25.1/binutils-pkg-install.sh
@@ -94,11 +94,11 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/as.info.gz       --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/bfd.info.gz      --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/binutils.info.gz --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/gprof.info.gz    --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/ld.info.gz       --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/as.info.gz       --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/bfd.info.gz      --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/binutils.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gprof.info.gz    --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/ld.info.gz       --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/binutils/2.26/binutils-pkg-install.sh b/dev/binutils/2.26/binutils-pkg-install.sh
index 3a56a07e1..0d9ecb12b 100755
--- a/dev/binutils/2.26/binutils-pkg-install.sh
+++ b/dev/binutils/2.26/binutils-pkg-install.sh
@@ -94,11 +94,11 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/as.info.gz       --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/bfd.info.gz      --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/binutils.info.gz --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/gprof.info.gz    --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/ld.info.gz       --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/as.info.gz       --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/bfd.info.gz      --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/binutils.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gprof.info.gz    --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/ld.info.gz       --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/bison/3.0.4/bison-pkg-install.sh b/dev/bison/3.0.4/bison-pkg-install.sh
index bbe13f82e..20e41466d 100755
--- a/dev/bison/3.0.4/bison-pkg-install.sh
+++ b/dev/bison/3.0.4/bison-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/bison.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/bison.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/check/0.10.0/check-pkg-install.sh b/dev/check/0.10.0/check-pkg-install.sh
index 6ebb12898..8d5cee116 100755
--- a/dev/check/0.10.0/check-pkg-install.sh
+++ b/dev/check/0.10.0/check-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/check.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/check.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/flex/2.6.0/flex-pkg-install.sh b/dev/flex/2.6.0/flex-pkg-install.sh
index b4b44c998..93e5bb4e1 100755
--- a/dev/flex/2.6.0/flex-pkg-install.sh
+++ b/dev/flex/2.6.0/flex-pkg-install.sh
@@ -54,7 +54,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/flex.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/flex.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/gcc-java/5.3.0/gcc-java-pkg-install.sh b/dev/gcc-java/5.3.0/gcc-java-pkg-install.sh
index b6048b460..6785dc1de 100755
--- a/dev/gcc-java/5.3.0/gcc-java-pkg-install.sh
+++ b/dev/gcc-java/5.3.0/gcc-java-pkg-install.sh
@@ -73,7 +73,7 @@ pre_remove() {
 # arg 1:  the old package version
 post_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gcj.info.gz --dir-file=usr/share/info/dir 2>/dev/null
+    install-info --delete --info-file=usr/share/info/gcj.info.gz --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
   fi
 }
 
diff --git a/dev/gcc/5.3.0/gcc-pkg-install.sh b/dev/gcc/5.3.0/gcc-pkg-install.sh
index b4d4c687b..2814e95c8 100755
--- a/dev/gcc/5.3.0/gcc-pkg-install.sh
+++ b/dev/gcc/5.3.0/gcc-pkg-install.sh
@@ -94,20 +94,20 @@ pre_remove() {
 # arg 1:  the old package version
 post_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/cpp.info.gz          --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/cppinternals.info.gz --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/gcc.info.gz          --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/gccgo.info.gz        --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/gccinstall.info.gz   --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/gccint.info.gz       --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/gfortran.info.gz     --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/gnat-style.info.gz   --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/gnat_rm.info.gz      --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/gnat_ugn.info.gz     --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/libgomp.info.gz      --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/libiberty.info.gz    --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/libitm.info.gz       --dir-file=usr/share/info/dir 2>/dev/null
-    install-info --delete --info-file=usr/share/info/libquadmath.info.gz  --dir-file=usr/share/info/dir 2>/dev/null
+    install-info --delete --info-file=usr/share/info/cpp.info.gz          --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/cppinternals.info.gz --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gcc.info.gz          --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gccgo.info.gz        --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gccinstall.info.gz   --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gccint.info.gz       --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gfortran.info.gz     --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gnat-style.info.gz   --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gnat_rm.info.gz      --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gnat_ugn.info.gz     --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/libgomp.info.gz      --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/libiberty.info.gz    --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/libitm.info.gz       --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/libquadmath.info.gz  --dir-file=usr/share/info/dir 2>/dev/null || /bin/true
   fi
 }
 
diff --git a/dev/gperf/3.0.4/gperf-pkg-install.sh b/dev/gperf/3.0.4/gperf-pkg-install.sh
index 4107bb170..027a7ddf0 100755
--- a/dev/gperf/3.0.4/gperf-pkg-install.sh
+++ b/dev/gperf/3.0.4/gperf-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gperf.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gperf.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/guile/2.0.11/guile-pkg-install.sh b/dev/guile/2.0.11/guile-pkg-install.sh
index f76af2ad3..edadffda0 100755
--- a/dev/guile/2.0.11/guile-pkg-install.sh
+++ b/dev/guile/2.0.11/guile-pkg-install.sh
@@ -55,8 +55,8 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/guile.info.gz --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/r5rs.info.gz  --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/guile.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/r5rs.info.gz  --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/m4/1.4.17/m4-pkg-install.sh b/dev/m4/1.4.17/m4-pkg-install.sh
index 14cc9159b..043a94b21 100755
--- a/dev/m4/1.4.17/m4-pkg-install.sh
+++ b/dev/m4/1.4.17/m4-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/m4.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/m4.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/make/3.82/make-pkg-install.sh b/dev/make/3.82/make-pkg-install.sh
index ce5933d73..667ea5cce 100755
--- a/dev/make/3.82/make-pkg-install.sh
+++ b/dev/make/3.82/make-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/make.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/make.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/make/4.0/make-pkg-install.sh b/dev/make/4.0/make-pkg-install.sh
index ce5933d73..667ea5cce 100755
--- a/dev/make/4.0/make-pkg-install.sh
+++ b/dev/make/4.0/make-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/make.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/make.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/dev/python-modules/pip2/8.1.1/Makefile b/dev/python-modules/pip2/8.1.1/Makefile
index e91692d5e..7fac8dc51 100644
--- a/dev/python-modules/pip2/8.1.1/Makefile
+++ b/dev/python-modules/pip2/8.1.1/Makefile
@@ -33,6 +33,7 @@ tar_gz_archive     = $(SRC_PACKAGE_PATH)/packages/d/python-modules/pip/pip-$(ver
 SRC_ARCHIVE        = $(tar_gz_archive)
 SRC_DIR            = $(TARGET_BUILD_DIR)/pip-$(version)
 src_dir_name       = pip-$(version)
+doc_dir_name       = pip2-$(version)
 src_done           = $(TARGET_BUILD_DIR)/.source_done
 
 PATCHES = PATCHES
@@ -107,17 +108,17 @@ $(install_target): $(build_target)
 	   rm -f pip ; ln -sf pip2 pip ; \
 	 )
 	# ======= Install Documentation =======
-	@mkdir -p $(PIP2_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(PIP2_PKG)/usr/doc/$(doc_dir_name)
 	@cp -a $(SRC_DIR)/AUTHORS.txt $(SRC_DIR)/LICENSE.txt \
-	       $(PIP2_PKG)/usr/doc/$(src_dir_name)
-	@mkdir -p $(PIP2_PKG)/usr/share/doc/$(src_dir_name)
+	       $(PIP2_PKG)/usr/doc/$(doc_dir_name)
+	@mkdir -p $(PIP2_PKG)/usr/share/doc/$(doc_dir_name)
 	@( cd $(SRC_DIR) ; \
 	   cp -a AUTHORS.txt LICENSE.txt \
-	         $(PIP2_PKG)/usr/share/doc/$(src_dir_name) ; \
+	         $(PIP2_PKG)/usr/share/doc/$(doc_dir_name) ; \
 	 )
 	@( cd $(SRC_DIR) ; \
 	   if [ -r CHANGES.txt ]; then \
-	     DOCSDIR=`echo $(PIP2_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     DOCSDIR=`echo $(PIP2_PKG)/usr/share/doc/$(doc_dir_name)` ; \
 	     cat CHANGES.txt | head -n 1000 > $$DOCSDIR/CHANGES.txt ; \
 	     touch -r CHANGES.txt $$DOCSDIR/CHANGES.txt ; \
 	   fi \
diff --git a/dev/python-modules/pip3/8.1.1/Makefile b/dev/python-modules/pip3/8.1.1/Makefile
index bc87dd78f..8d9cf70b5 100644
--- a/dev/python-modules/pip3/8.1.1/Makefile
+++ b/dev/python-modules/pip3/8.1.1/Makefile
@@ -33,6 +33,7 @@ tar_gz_archive     = $(SRC_PACKAGE_PATH)/packages/d/python-modules/pip/pip-$(ver
 SRC_ARCHIVE        = $(tar_gz_archive)
 SRC_DIR            = $(TARGET_BUILD_DIR)/pip-$(version)
 src_dir_name       = pip-$(version)
+doc_dir_name       = pip3-$(version)
 src_done           = $(TARGET_BUILD_DIR)/.source_done
 
 PATCHES = PATCHES
@@ -109,17 +110,17 @@ $(install_target): $(build_target)
 	   sed -i "s,$(BUILDSYSTEM),,g" pip3 pip3.5 ; \
 	 )
 	# ======= Install Documentation =======
-	@mkdir -p $(PIP3_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(PIP3_PKG)/usr/doc/$(doc_dir_name)
 	@cp -a $(SRC_DIR)/AUTHORS.txt $(SRC_DIR)/LICENSE.txt \
-	       $(PIP3_PKG)/usr/doc/$(src_dir_name)
-	@mkdir -p $(PIP3_PKG)/usr/share/doc/$(src_dir_name)
+	       $(PIP3_PKG)/usr/doc/$(doc_dir_name)
+	@mkdir -p $(PIP3_PKG)/usr/share/doc/$(doc_dir_name)
 	@( cd $(SRC_DIR) ; \
 	   cp -a AUTHORS.txt LICENSE.txt \
-	         $(PIP3_PKG)/usr/share/doc/$(src_dir_name) ; \
+	         $(PIP3_PKG)/usr/share/doc/$(doc_dir_name) ; \
 	 )
 	@( cd $(SRC_DIR) ; \
 	   if [ -r CHANGES.txt ]; then \
-	     DOCSDIR=`echo $(PIP3_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     DOCSDIR=`echo $(PIP3_PKG)/usr/share/doc/$(doc_dir_name)` ; \
 	     cat CHANGES.txt | head -n 1000 > $$DOCSDIR/CHANGES.txt ; \
 	     touch -r CHANGES.txt $$DOCSDIR/CHANGES.txt ; \
 	   fi \
diff --git a/dev/python-modules/setuptools2/20.10.1/Makefile b/dev/python-modules/setuptools2/20.10.1/Makefile
index e829ca873..6ff4f4e5e 100644
--- a/dev/python-modules/setuptools2/20.10.1/Makefile
+++ b/dev/python-modules/setuptools2/20.10.1/Makefile
@@ -33,6 +33,7 @@ tar_gz_archive     = $(SRC_PACKAGE_PATH)/packages/d/python-modules/setuptools/se
 SRC_ARCHIVE        = $(tar_gz_archive)
 SRC_DIR            = $(TARGET_BUILD_DIR)/setuptools-$(version)
 src_dir_name       = setuptools-$(version)
+doc_dir_name       = setuptools2-$(version)
 src_done           = $(TARGET_BUILD_DIR)/.source_done
 
 PATCHES = PATCHES
@@ -117,18 +118,18 @@ $(install_target): $(build_target)
 	   rm -f easy_install ; ln -sf easy_install-2.7 easy_install ; \
 	 )
 	# ======= Install Documentation =======
-	@mkdir -p $(SETUPTOOLS2_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(SETUPTOOLS2_PKG)/usr/doc/$(doc_dir_name)
 	@cp -a $(license) \
-	       $(SETUPTOOLS2_PKG)/usr/doc/$(src_dir_name)
-	@mkdir -p $(SETUPTOOLS2_PKG)/usr/share/doc/$(src_dir_name)
+	       $(SETUPTOOLS2_PKG)/usr/doc/$(doc_dir_name)
+	@mkdir -p $(SETUPTOOLS2_PKG)/usr/share/doc/$(doc_dir_name)
 	@( cd $(SRC_DIR) ; \
 	   chmod a-x README.rst ; \
 	   cp -a $(license) README.rst docs/*.txt \
-	         $(SETUPTOOLS2_PKG)/usr/share/doc/$(src_dir_name) ; \
+	         $(SETUPTOOLS2_PKG)/usr/share/doc/$(doc_dir_name) ; \
 	 )
 	@( cd $(SRC_DIR) ; \
 	   if [ -r CHANGES.rst ]; then \
-	     DOCSDIR=`echo $(SETUPTOOLS2_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     DOCSDIR=`echo $(SETUPTOOLS2_PKG)/usr/share/doc/$(doc_dir_name)` ; \
 	     cat CHANGES.rst | head -n 1000 > $$DOCSDIR/CHANGES.rst ; \
 	     touch -r CHANGES.rst $$DOCSDIR/CHANGES.rst ; \
 	   fi \
diff --git a/dev/python-modules/setuptools3/20.10.1/Makefile b/dev/python-modules/setuptools3/20.10.1/Makefile
index fe5cda6d9..fb3b160dd 100644
--- a/dev/python-modules/setuptools3/20.10.1/Makefile
+++ b/dev/python-modules/setuptools3/20.10.1/Makefile
@@ -33,6 +33,7 @@ tar_gz_archive     = $(SRC_PACKAGE_PATH)/packages/d/python-modules/setuptools/se
 SRC_ARCHIVE        = $(tar_gz_archive)
 SRC_DIR            = $(TARGET_BUILD_DIR)/setuptools-$(version)
 src_dir_name       = setuptools-$(version)
+doc_dir_name       = setuptools3-$(version)
 src_done           = $(TARGET_BUILD_DIR)/.source_done
 
 PATCHES = PATCHES
@@ -117,18 +118,18 @@ $(install_target): $(build_target)
 	   sed -i "s,$(BUILDSYSTEM),,g" easy_install-3.5 ; \
 	 )
 	# ======= Install Documentation =======
-	@mkdir -p $(SETUPTOOLS3_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(SETUPTOOLS3_PKG)/usr/doc/$(doc_dir_name)
 	@cp -a $(license) \
-	       $(SETUPTOOLS3_PKG)/usr/doc/$(src_dir_name)
-	@mkdir -p $(SETUPTOOLS3_PKG)/usr/share/doc/$(src_dir_name)
+	       $(SETUPTOOLS3_PKG)/usr/doc/$(doc_dir_name)
+	@mkdir -p $(SETUPTOOLS3_PKG)/usr/share/doc/$(doc_dir_name)
 	@( cd $(SRC_DIR) ; \
 	   chmod a-x README.rst ; \
 	   cp -a $(license) README.rst docs/*.txt \
-	         $(SETUPTOOLS3_PKG)/usr/share/doc/$(src_dir_name) ; \
+	         $(SETUPTOOLS3_PKG)/usr/share/doc/$(doc_dir_name) ; \
 	 )
 	@( cd $(SRC_DIR) ; \
 	   if [ -r CHANGES.rst ]; then \
-	     DOCSDIR=`echo $(SETUPTOOLS3_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     DOCSDIR=`echo $(SETUPTOOLS3_PKG)/usr/share/doc/$(doc_dir_name)` ; \
 	     cat CHANGES.rst | head -n 1000 > $$DOCSDIR/CHANGES.rst ; \
 	     touch -r CHANGES.rst $$DOCSDIR/CHANGES.rst ; \
 	   fi \
diff --git a/libs/aalib/1.4.0/aalib-pkg-install.sh b/libs/aalib/1.4.0/aalib-pkg-install.sh
index d6dda9767..9cbf53e19 100755
--- a/libs/aalib/1.4.0/aalib-pkg-install.sh
+++ b/libs/aalib/1.4.0/aalib-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/aalib.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/aalib.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/aspell/0.60.6.1/aspell-pkg-install.sh b/libs/aspell/0.60.6.1/aspell-pkg-install.sh
index 9d4bb93b5..8f5238a29 100755
--- a/libs/aspell/0.60.6.1/aspell-pkg-install.sh
+++ b/libs/aspell/0.60.6.1/aspell-pkg-install.sh
@@ -55,8 +55,8 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/aspell.info.gz     --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/aspell-dev.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/aspell.info.gz     --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/aspell-dev.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/gdbm/1.11/gdbm-pkg-install.sh b/libs/gdbm/1.11/gdbm-pkg-install.sh
index 8ccb41e30..debed15ac 100755
--- a/libs/gdbm/1.11/gdbm-pkg-install.sh
+++ b/libs/gdbm/1.11/gdbm-pkg-install.sh
@@ -55,7 +55,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gdbm.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gdbm.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/glibc/2.21/glibc-pkg-install.sh b/libs/glibc/2.21/glibc-pkg-install.sh
index 394b94ad0..0f10dc0fb 100755
--- a/libs/glibc/2.21/glibc-pkg-install.sh
+++ b/libs/glibc/2.21/glibc-pkg-install.sh
@@ -1749,7 +1749,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/libc.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/libc.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/glibc/2.22/glibc-pkg-install.sh b/libs/glibc/2.22/glibc-pkg-install.sh
index fad572ee1..623d9d049 100755
--- a/libs/glibc/2.22/glibc-pkg-install.sh
+++ b/libs/glibc/2.22/glibc-pkg-install.sh
@@ -1752,7 +1752,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/libc.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/libc.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/glibc/2.23/glibc-pkg-install.sh b/libs/glibc/2.23/glibc-pkg-install.sh
index bf2fd6251..bb22d783c 100755
--- a/libs/glibc/2.23/glibc-pkg-install.sh
+++ b/libs/glibc/2.23/glibc-pkg-install.sh
@@ -1754,7 +1754,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/libc.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/libc.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/gmp/6.1.0/gmp-pkg-install.sh b/libs/gmp/6.1.0/gmp-pkg-install.sh
index d0289a770..a64e98e7c 100755
--- a/libs/gmp/6.1.0/gmp-pkg-install.sh
+++ b/libs/gmp/6.1.0/gmp-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gmp.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gmp.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/libffi/3.0.13/libffi-pkg-install.sh b/libs/libffi/3.0.13/libffi-pkg-install.sh
index d53c38c28..0c8bece8f 100755
--- a/libs/libffi/3.0.13/libffi-pkg-install.sh
+++ b/libs/libffi/3.0.13/libffi-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/libffi.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/libffi.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/libffi/3.2.1/libffi-pkg-install.sh b/libs/libffi/3.2.1/libffi-pkg-install.sh
index d53c38c28..0c8bece8f 100755
--- a/libs/libffi/3.2.1/libffi-pkg-install.sh
+++ b/libs/libffi/3.2.1/libffi-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/libffi.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/libffi.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/libtasn1/4.7/libtasn1-pkg-install.sh b/libs/libtasn1/4.7/libtasn1-pkg-install.sh
index 9f8c27990..e518ac790 100755
--- a/libs/libtasn1/4.7/libtasn1-pkg-install.sh
+++ b/libs/libtasn1/4.7/libtasn1-pkg-install.sh
@@ -54,7 +54,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/libtasn1.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/libtasn1.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/libtermcap/1.2.3/libtermcap-pkg-install.sh b/libs/libtermcap/1.2.3/libtermcap-pkg-install.sh
index 919f5de83..8ea72d083 100755
--- a/libs/libtermcap/1.2.3/libtermcap-pkg-install.sh
+++ b/libs/libtermcap/1.2.3/libtermcap-pkg-install.sh
@@ -47,7 +47,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/termcap.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/termcap.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/mpc/1.0.3/mpc-pkg-install.sh b/libs/mpc/1.0.3/mpc-pkg-install.sh
index 85b7c01ae..195b68b79 100755
--- a/libs/mpc/1.0.3/mpc-pkg-install.sh
+++ b/libs/mpc/1.0.3/mpc-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/mpc.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/mpc.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/mpfr/3.1.3/mpfr-pkg-install.sh b/libs/mpfr/3.1.3/mpfr-pkg-install.sh
index 39f56d9b8..ce57033ad 100755
--- a/libs/mpfr/3.1.3/mpfr-pkg-install.sh
+++ b/libs/mpfr/3.1.3/mpfr-pkg-install.sh
@@ -54,7 +54,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/mpfr.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/mpfr.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/libs/readline/6.3/readline-pkg-install.sh b/libs/readline/6.3/readline-pkg-install.sh
index 946e6590b..7cba51b9b 100755
--- a/libs/readline/6.3/readline-pkg-install.sh
+++ b/libs/readline/6.3/readline-pkg-install.sh
@@ -57,9 +57,9 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/history.info.gz   --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/readline.info.gz  --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/rluserman.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/history.info.gz   --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/readline.info.gz  --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/rluserman.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/dirmngr/1.1.1/dirmngr-pkg-install.sh b/net/dirmngr/1.1.1/dirmngr-pkg-install.sh
index e4d5d9c93..c60f216b2 100755
--- a/net/dirmngr/1.1.1/dirmngr-pkg-install.sh
+++ b/net/dirmngr/1.1.1/dirmngr-pkg-install.sh
@@ -54,7 +54,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/dirmngr.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/dirmngr.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/gnupg/1.4.18/gnupg-pkg-install.sh b/net/gnupg/1.4.18/gnupg-pkg-install.sh
index 508525b3d..67b2a5465 100755
--- a/net/gnupg/1.4.18/gnupg-pkg-install.sh
+++ b/net/gnupg/1.4.18/gnupg-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gnupg1.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gnupg1.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/gnupg/1.4.20/gnupg-pkg-install.sh b/net/gnupg/1.4.20/gnupg-pkg-install.sh
index 1c467394c..9a482b036 100755
--- a/net/gnupg/1.4.20/gnupg-pkg-install.sh
+++ b/net/gnupg/1.4.20/gnupg-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gnupg1.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gnupg1.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/gnupg2/2.0.26/gnupg2-pkg-install.sh b/net/gnupg2/2.0.26/gnupg2-pkg-install.sh
index 604c5b78f..ec1316852 100755
--- a/net/gnupg2/2.0.26/gnupg2-pkg-install.sh
+++ b/net/gnupg2/2.0.26/gnupg2-pkg-install.sh
@@ -55,7 +55,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gnupg.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gnupg.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/gnupg2/2.0.29/gnupg2-pkg-install.sh b/net/gnupg2/2.0.29/gnupg2-pkg-install.sh
index 604c5b78f..ec1316852 100755
--- a/net/gnupg2/2.0.29/gnupg2-pkg-install.sh
+++ b/net/gnupg2/2.0.29/gnupg2-pkg-install.sh
@@ -55,7 +55,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gnupg.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gnupg.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/gnupg2/2.1.12/Makefile b/net/gnupg2/2.1.12/Makefile
index bbbd7e377..fbada2ffd 100644
--- a/net/gnupg2/2.1.12/Makefile
+++ b/net/gnupg2/2.1.12/Makefile
@@ -146,6 +146,8 @@ $(install_target): $(build_target)
 	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
 	# ======= Create directory for global gpg.conf =======
 	@mkdir -p $(GNUPG_PKG)/etc/gnupg
+	# ======= Remove dirmngr-client manual page=======
+	@rm -f $(GNUPG_PKG)/usr/share/man/man1/dirmngr-client.1
 	# ======= Install Documentation =======
 	@cd $(build_dir)/doc && $(BUILD_ENVIRONMENT) $(MAKE) gnupg.html
 	@rm -f $(GNUPG_PKG)/usr/share/info/dir
diff --git a/net/gnupg2/2.1.12/gnupg2-pkg-install.sh b/net/gnupg2/2.1.12/gnupg2-pkg-install.sh
index 5ac82ee68..4c7a8b952 100755
--- a/net/gnupg2/2.1.12/gnupg2-pkg-install.sh
+++ b/net/gnupg2/2.1.12/gnupg2-pkg-install.sh
@@ -57,7 +57,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gnupg.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gnupg.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/gnutls/3.4.8/gnutls-pkg-install.sh b/net/gnutls/3.4.8/gnutls-pkg-install.sh
index 3155434b4..e8eb33e94 100755
--- a/net/gnutls/3.4.8/gnutls-pkg-install.sh
+++ b/net/gnutls/3.4.8/gnutls-pkg-install.sh
@@ -70,8 +70,8 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gnutls.info.gz       --dir-file=usr/share/info/dir 2> /dev/null
-    install-info --delete --info-file=usr/share/info/gnutls-guile.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gnutls.info.gz       --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
+    install-info --delete --info-file=usr/share/info/gnutls-guile.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/gpgme/1.5.1/gpgme-pkg-install.sh b/net/gpgme/1.5.1/gpgme-pkg-install.sh
index b666b19a5..614a00df8 100755
--- a/net/gpgme/1.5.1/gpgme-pkg-install.sh
+++ b/net/gpgme/1.5.1/gpgme-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gpgme.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gpgme.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/gpgme/1.6.0/gpgme-pkg-install.sh b/net/gpgme/1.6.0/gpgme-pkg-install.sh
index a71273a52..c6053243c 100755
--- a/net/gpgme/1.6.0/gpgme-pkg-install.sh
+++ b/net/gpgme/1.6.0/gpgme-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gpgme.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gpgme.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/libassuan/2.1.2/libassuan-pkg-install.sh b/net/libassuan/2.1.2/libassuan-pkg-install.sh
index 6c9b332b9..5478172c7 100755
--- a/net/libassuan/2.1.2/libassuan-pkg-install.sh
+++ b/net/libassuan/2.1.2/libassuan-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/assuan.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/assuan.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/libassuan/2.4.2/libassuan-pkg-install.sh b/net/libassuan/2.4.2/libassuan-pkg-install.sh
index 6c9b332b9..5478172c7 100755
--- a/net/libassuan/2.4.2/libassuan-pkg-install.sh
+++ b/net/libassuan/2.4.2/libassuan-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/assuan.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/assuan.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/libgcrypt/1.6.2/libgcrypt-pkg-install.sh b/net/libgcrypt/1.6.2/libgcrypt-pkg-install.sh
index 318d4f15d..abaae1fd1 100755
--- a/net/libgcrypt/1.6.2/libgcrypt-pkg-install.sh
+++ b/net/libgcrypt/1.6.2/libgcrypt-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gcrypt.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gcrypt.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/libgcrypt/1.6.4/libgcrypt-pkg-install.sh b/net/libgcrypt/1.6.4/libgcrypt-pkg-install.sh
index 318d4f15d..abaae1fd1 100755
--- a/net/libgcrypt/1.6.4/libgcrypt-pkg-install.sh
+++ b/net/libgcrypt/1.6.4/libgcrypt-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gcrypt.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gcrypt.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/libgcrypt/1.7.0/libgcrypt-pkg-install.sh b/net/libgcrypt/1.7.0/libgcrypt-pkg-install.sh
index 318d4f15d..abaae1fd1 100755
--- a/net/libgcrypt/1.7.0/libgcrypt-pkg-install.sh
+++ b/net/libgcrypt/1.7.0/libgcrypt-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/gcrypt.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/gcrypt.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/libksba/1.3.1/libksba-pkg-install.sh b/net/libksba/1.3.1/libksba-pkg-install.sh
index a7b1763fb..9144315d7 100755
--- a/net/libksba/1.3.1/libksba-pkg-install.sh
+++ b/net/libksba/1.3.1/libksba-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/ksba.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/ksba.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/libksba/1.3.3/libksba-pkg-install.sh b/net/libksba/1.3.3/libksba-pkg-install.sh
index a7b1763fb..9144315d7 100755
--- a/net/libksba/1.3.3/libksba-pkg-install.sh
+++ b/net/libksba/1.3.3/libksba-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/ksba.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/ksba.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/nettle/3.2/nettle-pkg-install.sh b/net/nettle/3.2/nettle-pkg-install.sh
index 06ef26814..aa99aa0ef 100755
--- a/net/nettle/3.2/nettle-pkg-install.sh
+++ b/net/nettle/3.2/nettle-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/nettle.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/nettle.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/pinentry/0.8.4/pinentry-pkg-install.sh b/net/pinentry/0.8.4/pinentry-pkg-install.sh
index 6054344a3..beeb031b0 100755
--- a/net/pinentry/0.8.4/pinentry-pkg-install.sh
+++ b/net/pinentry/0.8.4/pinentry-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/pinentry.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/pinentry.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/pinentry/0.9.7/pinentry-pkg-install.sh b/net/pinentry/0.9.7/pinentry-pkg-install.sh
index 6054344a3..beeb031b0 100755
--- a/net/pinentry/0.9.7/pinentry-pkg-install.sh
+++ b/net/pinentry/0.9.7/pinentry-pkg-install.sh
@@ -53,7 +53,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/pinentry.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/pinentry.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/wget/1.15/wget-pkg-install.sh b/net/wget/1.15/wget-pkg-install.sh
index 53edbb1e6..402da3285 100755
--- a/net/wget/1.15/wget-pkg-install.sh
+++ b/net/wget/1.15/wget-pkg-install.sh
@@ -54,7 +54,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/wget.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/wget.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }
 
diff --git a/net/wget/1.16/wget-pkg-install.sh b/net/wget/1.16/wget-pkg-install.sh
index 53edbb1e6..402da3285 100755
--- a/net/wget/1.16/wget-pkg-install.sh
+++ b/net/wget/1.16/wget-pkg-install.sh
@@ -54,7 +54,7 @@ post_update() {
 # arg 1:  the old package version
 pre_remove() {
   if [ -x /usr/bin/install-info ] ; then
-    install-info --delete --info-file=usr/share/info/wget.info.gz --dir-file=usr/share/info/dir 2> /dev/null
+    install-info --delete --info-file=usr/share/info/wget.info.gz --dir-file=usr/share/info/dir 2> /dev/null || /bin/true
   fi
 }