git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1693 370017ae-e619-0410-ac65-c121f96126d4

1 files changed, 19 insertions, 13 deletions

diff --git a/app/office/dia/dia.SlackBuild b/app/office/dia/dia.SlackBuild
index 3be9fd80..a46954db 100755
--- a/app/office/dia/dia.SlackBuild
+++ b/app/office/dia/dia.SlackBuild
@@ -14,9 +14,9 @@
 #  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
-# slackbuild for dia, by Silvio Rhatto - rhatto at riseup.net
-# requires: Null
-# tested: dia-0.96
+# slackbuild for dia, by Silvio Rhatto
+# requires:  
+# tested: dia-0.96.1
 #
 
 # Look for slackbuildrc
@@ -31,7 +31,7 @@ CWD="$(pwd)"
 SRC_NAME="dia"
 PKG_NAME="dia"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.96}
+SRC_VERSION=${VERSION:=0.96.1}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -39,9 +39,9 @@ TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
-PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
+PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
-NUMJOBS=${NUMJOBS:=""}
+NUMJOBS=${NUMJOBS:="-j4"}
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR="$PREFIX/lib"
@@ -66,26 +66,28 @@ ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
 
 # Clean up any leftovers of previous builds
-rm -rf "$PKG_SRC" 2> /dev/null
+rm -rf "$PKG_WORK" 2> /dev/null
 rm -rf "$PKG" 2> /dev/null
 
 # Create directories if necessary
 mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
 mkdir -p "$PKG" || exit $ERROR_MKDIR
 mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="ftp://ftp.gnome.org/pub/gnome/sources/dia/0.96/$SRC"
+SUB_VERSION=`echo $PKG_VERSION | sed 's/\(^[0-9]\+\.[0-9]\+\)\..*$/\1/'`
+URL="http://ftp.gnome.org/pub/gnome/sources/$PKG_NAME/$SUB_VERSION/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
-
 # Untar
-cd "$TMP"
+cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -111,7 +113,11 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL
 # Install documentation
 DOCS="AUTHORS COPYING ChangeLog MAINTAINERS NEWS README RELEASE-PROCESS THANKS TODO"
 mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
-cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
 
 # Add package description (slack-desc)
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
@@ -124,7 +130,7 @@ cat << EODESC > "$PKG/install/slack-desc"
 # customary to leave one space after the ':'.
 
    |-----handy-ruler----------------------------------------------------------|
-dia: dia
+dia: dia by Slack.Sarava
 dia:
 dia: Dia is a program for creating diagrams of all kinds. The current
 dia: version can do UML class diagrams, Entity-Relationship modeling,
@@ -143,5 +149,5 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ]; then
-  rm -rf "$PKG_SRC" "$PKG"
+  rm -rf "$PKG_WORK" "$PKG"
 fi