3 files changed, 22 insertions, 29 deletions
diff --git a/graphics/SweetHome3D/SweetHome3D.SlackBuild b/graphics/SweetHome3D/SweetHome3D.SlackBuild
index 9ad1aa9f4db2..28bc911fdd2e 100644
--- a/graphics/SweetHome3D/SweetHome3D.SlackBuild
+++ b/graphics/SweetHome3D/SweetHome3D.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SweetHome3D
-VERSION=${VERSION:-3.2}
+VERSION=${VERSION:-3.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,34 +69,27 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Copy executable file
 mkdir -p $PKG/usr/bin
 cp -a SweetHome3D $PKG/usr/bin
 
-# Fix path for java and libs of SweetHome3D
-sed -i "s/\"\$PROGRAM_DIR\"\/jre1.6.0_24\/bin\/java/\/usr\/lib${LIBDIRSUFFIX}\/java\/bin\/java/g" $PKG/usr/bin/$PRGNAM
-sed -i "s/\"\$PROGRAM_DIR\"\/jre1.6.0_24\/lib/\/usr\/lib${LIBDIRSUFFIX}\/java\/lib/g" $PKG/usr/bin/$PRGNAM
-sed -i "s/\"\$PROGRAM_DIR\"\/lib/\/usr\/lib${LIBDIRSUFFIX}\/$PRGNAM/g" $PKG/usr/bin/$PRGNAM
+sed -i $PKG/usr/bin/SweetHome3D \
+  -e "s,\"\$PROGRAM_DIR\"/jre1.6.0_37/bin/java,/usr/lib${LIBDIRSUFFIX}/java/bin/java,g" \
+  -e "s,\"\$PROGRAM_DIR\"/jre1.6.0_37/lib,/usr/lib${LIBDIRSUFFIX}/java/jre/lib,g" \
+  -e "s,\"\$PROGRAM_DIR\"/lib,/usr/share/$PRGNAM,g"
 
-# Copy libraries of program
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
-cp -a lib/* $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM
+mkdir -p $PKG/usr/share/$PRGNAM
+cp -a lib/* $PKG/usr/share/$PRGNAM
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Install icons
-mkdir -p $PKG/usr/share/pixmaps
-cat $CWD/SweetHome3D.png > $PKG/usr/share/pixmaps/SweetHome3D.png
-mkdir -p $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat $CWD/SweetHome3D.desktop > $PKG/usr/share/applications/SweetHome3D.desktop
+cat $CWD/SweetHome3D.png > $PKG/usr/share/pixmaps/SweetHome3D.png
 
-# Copy documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING.TXT LICENSE.TXT \
-  THIRDPARTY-LICENSE-*.TXT \
-  THIRDPARTY-LICENSE-JMF.HTML \
+  COPYING.TXT LICENSE.TXT THIRDPARTY-LICENSE-*.TXT THIRDPARTY-LICENSE-JMF.HTML \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/SweetHome3D/SweetHome3D.info b/graphics/SweetHome3D/SweetHome3D.info
index 754342a132d6..773e2ab00dc1 100644
--- a/graphics/SweetHome3D/SweetHome3D.info
+++ b/graphics/SweetHome3D/SweetHome3D.info
@@ -1,10 +1,10 @@
 PRGNAM="SweetHome3D"
-VERSION="3.2"
+VERSION="3.7"
 HOMEPAGE="http://www.sweethome3d.com/"
-DOWNLOAD="http://downloads.sourceforge.net/project/sweethome3d/SweetHome3D/SweetHome3D-3.2/SweetHome3D-3.2-linux-x86.tgz"
-MD5SUM="27f4d59ee9026a4c009abaf014d931a6"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/project/sweethome3d/SweetHome3D/SweetHome3D-3.2/SweetHome3D-3.2-linux-x64.tgz"
-MD5SUM_x86_64="0a7283e132d8f5de01a264b2172772e8"
+DOWNLOAD="http://downloads.sourceforge.net/project/sweethome3d/SweetHome3D/SweetHome3D-3.7/SweetHome3D-3.7-linux-x86.tgz"
+MD5SUM="cfc2ff64872efd12f50aa2e1369086bd"
+DOWNLOAD_x86_64="http://downloads.sourceforge.net/project/sweethome3d/SweetHome3D/SweetHome3D-3.7/SweetHome3D-3.7-linux-x64.tgz"
+MD5SUM_x86_64="635c60ae9f86d44b0472f3f48522502b"
 REQUIRES="jdk"
-MAINTAINER="Giovanne Castro"
-EMAIL="giovannefc@ig.com.br"
+MAINTAINER="Edward W. Koenig"
+EMAIL="kingbeowulf@gmail.com"
diff --git a/graphics/SweetHome3D/slack-desc b/graphics/SweetHome3D/slack-desc
index 0be4f5663f7d..a769e6a6e07a 100644
--- a/graphics/SweetHome3D/slack-desc
+++ b/graphics/SweetHome3D/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
 SweetHome3D: SweetHome3D (free interior design for 2D/3D plan house)