5 files changed, 61 insertions, 88 deletions
diff --git a/office/freemind/README b/office/freemind/README
index 174595c73cf1..a197374d2eb4 100644
--- a/office/freemind/README
+++ b/office/freemind/README
@@ -1,8 +1 @@
-FreeMind - Free mind-mapping software written in Java.
-
-Can you use it for the following purposes:
- * Keeping track of projects, including subtasks, state of subtasks
-   and time recording.
- * Essay writing and brainstorming, using colors to show which essays
-   are open, completed, not yet started etc.
- * And much more.
+FreeMind is a premier free mind-mapping software written in Java.
+\ No newline at end of file
diff --git a/office/freemind/freemind.SlackBuild b/office/freemind/freemind.SlackBuild
index 21cb07095138..139b2ef3882e 100644
--- a/office/freemind/freemind.SlackBuild
+++ b/office/freemind/freemind.SlackBuild
@@ -1,95 +1,71 @@
-#!/bin/sh
+#!/bin/bash
 
-# Slackware build script for freemind 
+# Slackware build script for freemind
 
-# Copyright (c) 2008, Dhaby Xiloj <slack.dhabyx@gmail.com>
+# Copyright 2009  BrunoRusso, Sao Paulo, Brazil
 # All rights reserved.
-# Thanks to Vincent Batts for mimetype file idea.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# 1.- Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-# 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.
-
-# This script is just a binary repackaging.
-
+# 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.
+
+# Modified by Robby Workman to include some things that were done in the old
+# build for 12.2 (that one had apparently been abandoned and thus Bruno
+# rewrote it, unaware that one had already existed).
 
 PRGNAM=freemind
 VERSION=${VERSION:-0.8.1}
-ARCH=i586      # Leave this alone.
+ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRC_VERSION=$(echo $VERSION | tr . _)
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-VERSIONPKG=$(echo $VERSION | tr . _)
-
-DOCS="license"
-DELFILES="freemind.bat Freemind.exe"
-
 set -e
 
-rm -rf $PKG
+rm -rf $PKG $TMP/$PRGNAM
 mkdir -p $TMP $PKG/opt/$PRGNAM $OUTPUT
-cd $PKG/opt/$PRGNAM
-unzip $CWD/$PRGNAM-bin-max-$VERSIONPKG.zip
+cd $TMP
+unzip $CWD/freemind-bin-max-$SRC_VERSION.zip -d $PKG/opt/$PRGNAM
 
-# Remove unnecessary files
-rm $DELFILES
-
-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 {} \;
-
-# Add a script to run freemind in /usr/bin
+# Make a symlink in /usr/bin
 mkdir -p $PKG/usr/bin
 cat << EOF > $PKG/usr/bin/$PRGNAM
 #!/bin/sh
 cd /opt/freemind
 ./freemind.sh
 EOF
-chmod 0755 $PKG/opt/$PRGNAM/freemind.sh
-chmod 0755 $PKG/usr/bin/$PRGNAM
+chmod 0755 $PKG/opt/freemind $PKG/opt/freemind/*.sh $PKG/usr/bin/freemind
 
-# Add freemind to KDE/GNOME/XFCE menu and install an icon for theme and mimetype
-install -D -m 0644 $CWD/$PRGNAM.desktop \
-  $PKG/usr/share/applications/$PRGNAM.desktop
-install -D -m 0644 $CWD/freemind.png \
-  $PKG/usr/share/pixmaps/$PRGNAM.png
-install -D -m 0644 $CWD/$PRGNAM.xml \
-  $PKG/usr/share/mime/packages/$PRGNAM.xml
-
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-# Add docs
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $PKG/opt/$PRGNAM
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Install desktop file, icon, and mimetype files
+mkdir -p $PKG/usr/share/{applications,pixmaps,mime/packages}
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+cat $CWD/freemind.png > $PKG/usr/share/pixmaps/$PRGNAM.png
+cat $CWD/$PRGNAM.xml > $PKG/usr/share/mime/packages/$PRGNAM.xml
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+chown -R root:root .
+chmod -R a-s,u+rw,go+r-w .
+/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/freemind/freemind.desktop b/office/freemind/freemind.desktop
index 075053b03e3b..dd1a5ddbfebb 100644
--- a/office/freemind/freemind.desktop
+++ b/office/freemind/freemind.desktop
@@ -1,11 +1,13 @@
 [Desktop Entry]
-Encoding=UTF-8
-Type=Application
+Version=1.0
 Exec=freemind
+TryExec=freemind
+Icon=freemind
+Terminal=false
 Name=FreeMind
 GenericName=FreeMind
 Comment=Mind Mapping Tool
-Icon=freemind
-StartupNotify=true
+Categories=Office;
+Type=Application
 MimeType=application/x-freemind;
-Categories=Qt;KDE;GNOME;Application;Office;
+StartupNotify=true
diff --git a/office/freemind/freemind.info b/office/freemind/freemind.info
index ae31b1d825af..d73f6cbd6522 100644
--- a/office/freemind/freemind.info
+++ b/office/freemind/freemind.info
@@ -1,8 +1,10 @@
 PRGNAM="freemind"
 VERSION="0.8.1"
-HOMEPAGE="http://freemind.sourceforge.net"
+HOMEPAGE="http://freemind.sourceforge.net/wiki/index.php/Main_Page"
 DOWNLOAD="http://downloads.sourceforge.net/freemind/freemind-bin-max-0_8_1.zip"
 MD5SUM="e6078a7116e3dca610817c3c60db4cbf"
-MAINTAINER="Dhaby Xiloj"
-EMAIL="slack.dhabyx@gmail.com"
-APPROVED="dsomero"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Bruno T. Russo (BrunoRusso)"
+EMAIL="contato@brunorusso.eti.br"
+APPROVED="rworkman"
diff --git a/office/freemind/slack-desc b/office/freemind/slack-desc
index 2b8ae0abb425..66f2919280cd 100644
--- a/office/freemind/slack-desc
+++ b/office/freemind/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-freemind: FreeMind  (Free mind-mapping software written in Java)
+freemind: freemind (free mind-mapping)
+freemind:
+freemind: FreeMind is a premier free mind-mapping software written in Java.
+freemind: The recent development has hopefully turned it into high  
+freemind: productivity tool. We are proud that the operation and navigation of
+freemind: FreeMind is faster than that of MindManager because of one-click 
+freemind: "fold / unfold" and "follow link" operations.
+freemind:
+freemind: http://freemind.sourceforge.net/wiki/index.php/Main_Page
 freemind:
-freemind: Can you use it for the following purposes:
-freemind: * Keeping track of projects, including subtasks, state of
-freemind:   subtasks and time recording.
-freemind: * Essay writing and brainstorming, using colors to show which essays
-freemind:   are open, completed, not yet started etc.
-freemind: * And much more.
-freemind: 
-freemind: Homepage: http://freemind.sourceforge.net
 freemind: