network/xdman: Updated for version 2016.6.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

7 files changed, 31 insertions, 29 deletions

diff --git a/network/xdman/README b/network/xdman/README
index 9b9d54f598..6bb3cd254e 100644
--- a/network/xdman/README
+++ b/network/xdman/README
@@ -12,8 +12,6 @@ On Mozilla Firefox, simply drag and drop file ~/xdm-helper/xdmff.xpi.
 
 For other browsers, go to Tools/Browser Integration.
 
-On this version, Java (openjdk,jdk, etc) is not a dependency!
-
 Some features present in Xtreme Download Manager are:
 
  * Superfast speed;
@@ -21,3 +19,5 @@ Some features present in Xtreme Download Manager are:
  * Supports any browser;
  * Runs on any Operating system;
  * Free, No-Adware and Open source.
+
+Note: p7zip is build-time dependency, not runtime dependency.
diff --git a/network/xdman/slack-desc b/network/xdman/slack-desc
index 0e2dd609d0..476649fcb3 100644
--- a/network/xdman/slack-desc
+++ b/network/xdman/slack-desc
@@ -12,7 +12,7 @@ xdman: Xtreme Download Manager is a powerful tool to increase download speed
 xdman: up-to 500%, save videos from video sharing sites and integration
 xdman: with ANY browser.
 xdman:
-xdman: Home page: http://xdman.sourceforge.net/index.html
+xdman: Home page: http://xdman.sourceforge.net/
 xdman:
 xdman:
 xdman:
diff --git a/network/xdman/xdman b/network/xdman/xdman
index 343ae12155..7958054e1a 100644
--- a/network/xdman/xdman
+++ b/network/xdman/xdman
@@ -1,3 +1,5 @@
 #!/bin/bash
-DIR="/usr/share/xdman"
-$DIR/jre/bin/java -jar $DIR/xdm.jar
+if [ $EUID -eq 0 ];then
+	echo "It's not recomended to run XDM  as root, as it can cause problems"
+fi
+java -Dsun.java2d.xrender=false -jar /opt/xdman/xdman.jar
diff --git a/network/xdman/xdman.SlackBuild b/network/xdman/xdman.SlackBuild
index 331e4ce1c0..e9d9c8b45c 100644
--- a/network/xdman/xdman.SlackBuild
+++ b/network/xdman/xdman.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for xdman.
 #
-# Copyright 2015 Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2015-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xdman
-VERSION=${VERSION:-5.0.47}
+VERSION=${VERSION:-2016.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,8 +56,7 @@ fi
 
 set -e
 
-SRCNAM="xdm"
-SUFFIX="jre"
+SRCNAM=${SRCNAM:-xdm-setup}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -65,9 +64,9 @@ rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
 
 if [ "$ARCH" = "i586" ]; then
-   tar xvf $CWD/$SRCNAM-$SUFFIX-32bit.tar.xz
+   tar xvf $CWD/$SRCNAM-x86.tar.xz
 elif [ "$ARCH" = "x86_64" ]; then
-   tar xvf $CWD/$SRCNAM-$SUFFIX-64bit.tar.xz
+   tar xvf $CWD/$SRCNAM-x64.tar.xz
 fi
 
 mv $SRCNAM $PRGNAM-$VERSION
@@ -79,17 +78,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-install -d $PKG/usr/bin
-install -D -m755 $CWD/xdman $PKG/usr/bin/xdman
-install -d $PKG/usr/share/{applications,pixmaps,$PRGNAM}
+7z x install.sh
+install -d -m755 $PKG/opt/xdman
+install -D -m644 xdman.jar $PKG/opt/xdman/xdman.jar
+install -D -m775 $CWD/xdman $PKG/opt/xdman
 install -D -m644 $CWD/xdman.desktop $PKG/usr/share/applications/xdman.desktop
-install -D -m644 icon.png $PKG/usr/share/pixmaps/xdman.png
-cp -a jre xdm.jar $PKG/usr/share/$PRGNAM
+install -D -m644 $CWD/xdman.png $PKG/usr/share/pixmaps/xdman.png
 
 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/doc/$PRGNAM-$VERSION
+cp -a readme.txt $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM-SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/xdman/xdman.desktop b/network/xdman/xdman.desktop
index b2b3b32554..036cd180f7 100644
--- a/network/xdman/xdman.desktop
+++ b/network/xdman/xdman.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
+Encoding=UTF-8
+Version=1.0
 Type=Application
-Name=Xdman
-GenericName=Xtreme Download Manager
-Comment=Powerfull download accelarator and video downloader
-Icon=/usr/share/pixmaps/xdman.png
-Exec=xdman
-TryExec=xdman
 Terminal=false
+Exec="/opt/xdman/xdman"
+Name=Xtreme Download Manager
+Comment=Powerfull download accelarator and video downloader
 Categories=Network;
+Icon=xdman
diff --git a/network/xdman/xdman.info b/network/xdman/xdman.info
index 39c677149a..cf9815a6ba 100644
--- a/network/xdman/xdman.info
+++ b/network/xdman/xdman.info
@@ -1,10 +1,10 @@
 PRGNAM="xdman"
-VERSION="5.0.47"
-HOMEPAGE="http://xdman.sourceforge.net/index.html"
-DOWNLOAD="http://sourceforge.net/projects/xdman/files/xdm-jre-32bit.tar.xz"
-MD5SUM="1db7d588dddc7f6e4c7a4f1d4a8e73e3"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/xdman/files/xdm-jre-64bit.tar.xz"
-MD5SUM_x86_64="00096f8c8a50f93c9f4d02687474e9b0"
-REQUIRES=""
+VERSION="2016.6.2"
+HOMEPAGE="http://xdman.sourceforge.net/"
+DOWNLOAD="https://sourceforge.net/projects/xdman/files/xdm-setup-x86.tar.xz"
+MD5SUM="cc78f0f5d8f132d87d9bb7ad4c1fe6f7"
+DOWNLOAD_x86_64="https://sourceforge.net/projects/xdman/files/xdm-setup-x64.tar.xz"
+MD5SUM_x86_64="0403c2a750be035b1c03cd232f0054fb"
+REQUIRES="jdk p7zip"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
diff --git a/network/xdman/xdman.png b/network/xdman/xdman.png
new file mode 100644
index 0000000000..ce22180115
--- /dev/null
+++ b/network/xdman/xdman.png