7 files changed, 98 insertions, 65 deletions
diff --git a/office/xmind/README b/office/xmind/README
index 1d4b14405941..47c8c85f37e1 100644
--- a/office/xmind/README
+++ b/office/xmind/README
@@ -1,3 +1,14 @@
 XMind (Open Source Brainstorming and Mind Mapping Software)
 
-This script will repackage the debian binary.
+XMind is an open source project that contributes to building a
+cutting-edge brainstorming/mind-mapping facility, focused on both
+usability and extendability. It helps people in capturing ideas into
+visually self-organized charts and sharing them for collaboration and
+communication. Currently supporting mind maps, fishbone diagrams, tree
+diagrams, org-charts, logic charts, and even spreadsheets. Often used
+for knowledge management, meeting minutes, task management, and GTD.
+
+With its feature of open-source (except some professional features),
+XMind makes it possible for you to integrate the software into your
+product, store data into XMind files, or even build your own mind
+mapping software based on XMind.
diff --git a/office/xmind/doinst.sh b/office/xmind/doinst.sh
index 9a8ded3c6034..5fb28930db0b 100644
--- a/office/xmind/doinst.sh
+++ b/office/xmind/doinst.sh
@@ -1,7 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
diff --git a/office/xmind/slack-desc b/office/xmind/slack-desc
index a48c6295119e..bae5d6d91702 100644
--- a/office/xmind/slack-desc
+++ b/office/xmind/slack-desc
@@ -9,11 +9,11 @@
 xmind: xmind (brainstorming and mind mapping tool)
 xmind:
 xmind: XMind is an open source brainstorming and mind mapping software tool
-xmind: developed by XMind Ltd. As of version 3.2.0, it is crippleware, that
-xmind: is a freeware version of a full program, with a significant number of
+xmind: developed by XMind Ltd. As of version 8, it is crippleware, that is
+xmind: a freeware version of a full program, with a significant number of
 xmind: features advertised, but not available until a paid upgrade is made.
-xmind: The program is intended to assist users in capturing ideas, organizing
-xmind: various charts, and share them with collaboration.
+xmind: The program is intended to assist users in capturing ideas,
+xmind: organizing various charts, and share them with collaboration.
 xmind:
-xmind: http://www.xmind.net/
+xmind: Homepage: http://www.xmind.net/
 xmind:
diff --git a/office/xmind/xmind.SlackBuild b/office/xmind/xmind.SlackBuild
index dcdea51a1c30..a8a2e12135ac 100644
--- a/office/xmind/xmind.SlackBuild
+++ b/office/xmind/xmind.SlackBuild
@@ -1,87 +1,105 @@
 #!/bin/sh
-#
-# Slackware build script for XMind
 
-# Copyright 2011 Vegard Haugland, Kristiansand, Norway
+# Slackware build script for XMind
+# Copyright 2017 Panagiotis Nikolaou, Culver City, CA
 # All rights reserved.
 #
-# Based on Slackware build script for Google Chrome, by Erik Hanson.
-#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# updated by Andre Barboza <bmg.andre@gmail.com>
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xmind
-VERSION=${VERSION:-3.5.1}
-PKGVERSION=3.5.1.201411201906
+VERSION=${VERSION:-8update2}
+SRCVERSION=${SRCVERSION:-8-update2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-case "$(uname -m)" in
-  i?86) DEBARCH="i386" ; LIBDIRSUFFIX="" ; ARCH=i386 ;;
-  x86_64) DEBARCH="amd64" ; LIBDIRSUFFIX="64" ; ARCH=x86_64 ;;
-  *) echo "Package for $(uname -m) architecture is not available." ; exit 1 ;;
-esac
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    *) ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -eu
+set -e
 
 rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $PKG
-ar p $CWD/xmind-linux-${PKGVERSION}_${DEBARCH}.deb data.tar.gz | gunzip -d | tar xv
-
-# Move from /usr/local/xmind to /opt/xmind
-mkdir -p $PKG/opt
-mv $PKG/usr/lib/xmind/ $PKG/opt/
+mkdir -p $TMP $PKG/opt/$PRGNAM $OUTPUT
+cd $PKG/opt/$PRGNAM
 
-# Create launch script
-mkdir -p $PKG/usr/bin
-cat > $PKG/usr/bin/XMind << XMIND
-#!/bin/sh
-/opt/xmind/XMind
-XMIND
-chmod +x $PKG/usr/bin/XMind
+unzip $CWD/$PRGNAM-$SRCVERSION-linux.zip
 
-# Modify executable in xmind.desktop
-sed -i 's#/usr/local/#/opt/#' $PKG/usr/share/applications/xmind.desktop
+if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
+  rm -rf $PKG/opt/$PRGNAM/XMind_amd64
+  SRCARCH="_i386"
+elif [ "$ARCH" = "x86_64" ]; then
+  rm -rf $PKG/opt/$PRGNAM/XMind_i386
+  SRCARCH="_amd64"
+else
+  echo "$ARCH is not supported..."
+  exit 1
+fi
 
 chown -R root:root .
+find . -type d -exec chmod 755 {} \;
 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 {} \;
 
-chmod 0755 $PKG # Put this back.
+# Remove unused
+rm setup.sh
+
+# Change data and configuration stuff location to user's home instead of /opt
+sed -e "s|./configuration|@user.home/.xmind/configuration|" \
+    -e "s|../workspace|@user.home/.xmind/workspace|" \
+    -i XMind$SRCARCH/XMind.ini
+
+# Add a wrapper to run xmind from /usr/bin
+# and copy configuration out of /opt to user's home
+mkdir -p $PKG/usr/bin
+cat << EOF > $PKG/usr/bin/$PRGNAM
+#!/bin/sh
+if [ ! -f ~/.xmind/configuration/config.ini ] && [ -f /opt/xmind/XMind$SRCARCH/configuration/config.ini ]; then
+  mkdir -p ~/.xmind/configuration
+  cp -r /opt/xmind/XMind$SRCARCH/configuration/* ~/.xmind/configuration/
+fi
+exec /opt/xmind/XMind$SRCARCH/XMind $@
+EOF
+chmod 0755 $PKG/usr/bin/$PRGNAM
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/share/applications
+install -D -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/usr/share/pixmaps
+install -D -m 0644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/lib/xmindnet/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/lib/xmindnet/
+mv *.html *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mv $PKG/usr/share/man $PKG/usr/
-rm -rf $PKG/usr/lib/
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/office/xmind/xmind.desktop b/office/xmind/xmind.desktop
new file mode 100644
index 000000000000..34b702d569cb
--- /dev/null
+++ b/office/xmind/xmind.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Exec=xmind
+Name=XMind
+GenericName=Data Mining Tool
+Icon=xmind
+StartupNotify=true
+Categories=Office;
diff --git a/office/xmind/xmind.info b/office/xmind/xmind.info
index 0bf114328449..d17e29a86c6e 100644
--- a/office/xmind/xmind.info
+++ b/office/xmind/xmind.info
@@ -1,10 +1,10 @@
 PRGNAM="xmind"
-VERSION="3.5.1"
-HOMEPAGE="http://www.xmind.net/"
-DOWNLOAD="https://ftp.mirrorservice.org/sites/download.salixos.org/i486/extra-14.2/source/office/xmind/xmind-linux-3.5.1.201411201906_i386.deb"
-MD5SUM="71e6334967f6ec8a8e3ab643eba1a783"
-DOWNLOAD_x86_64="https://ftp.mirrorservice.org/sites/download.salixos.org/x86_64/extra-14.2/source/office/xmind/xmind-linux-3.5.1.201411201906_amd64.deb"
-MD5SUM_x86_64="de438124b307ba9fd726c24ba7b7e53f"
+VERSION="8update2"
+HOMEPAGE="https://www.xmind.net/"
+DOWNLOAD="http://dl2.xmind.net/xmind-downloads/xmind-8-update2-linux.zip"
+MD5SUM="b66e47fc662927b653d26f5e54355698"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES="jdk"
-MAINTAINER="Andre Barboza"
-EMAIL="bmg.andre@gmail.com"
+MAINTAINER="Panagiotis Nikolaou"
+EMAIL="hostmaster@slackonly.com"
diff --git a/office/xmind/xmind.png b/office/xmind/xmind.png
new file mode 100644
index 000000000000..31c9f880427a
--- /dev/null
+++ b/office/xmind/xmind.png