office/Ted: Updated for version 2.22.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

1 files changed, 19 insertions, 25 deletions

diff --git a/office/Ted/Ted.SlackBuild b/office/Ted/Ted.SlackBuild
index 8941db6600..18d5267cc3 100644
--- a/office/Ted/Ted.SlackBuild
+++ b/office/Ted/Ted.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh 
+#!/bin/sh
 
 # Slackware build script for Ted
 # and edited by Hannes Worst <hannesworst@gmail.com>.
 # Copyright by Hannes Worst
 #--
-# Last edited: 30-dec-2009
+# Last edited: 01-05-2012
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
@@ -24,9 +24,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Very heavily edited by the SlackBuilds.org project.  --michiel
+# DocSectProperies Bug-fix provided bij Mark de Does, developer of Ted
 
 PRGNAM=Ted
-VERSION=${VERSION:-2.21}
+VERSION=${VERSION:-2.22}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,14 +47,14 @@ OUTPUT=${OUTPUT:-/tmp}
 TOOLKIT=${TOOLKIT:-GTK}
 SRCNAM=$(echo $PRGNAM | tr T t)
 
-if [ "$ARCH" = "i486" ]; then 
-   SLKCFLAGS="-O2 -march=i486 -mtune=i686" 
+if [ "$ARCH" = "i486" ]; then
+   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
    LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then 
-   SLKCFLAGS="-O2 -march=i686 -mtune=i686" 
+elif [ "$ARCH" = "i686" ]; then
+   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
    LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then 
-   SLKCFLAGS="-O2 -fPIC" 
+elif [ "$ARCH" = "x86_64" ]; then
+   SLKCFLAGS="-O2 -fPIC"
    LIBDIRSUFFIX="64"
 fi
 
@@ -64,6 +65,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.src.tar.gz
+cp $CWD/docSectProperties.c $PRGNAM-$VERSION/docBase/docSectProperties.c
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -72,9 +74,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Correct libpng error
-patch -p0 < $CWD/ted-2.21-libpng15.patch
-
 # Let's edit Ted's Makefile, so this allows us to package Ted quite properly without
 # actually having to need /usr/local/.
 sed -i 's#./configure#./configure --prefix=/usr/share#g' $TMP/$PRGNAM-$VERSION/Makefile
@@ -92,31 +91,26 @@ make package.shared DESTDIR=$PKG CONFIGURE_OPTIONS="--with-$TOOLKIT \
   --prefix=/usr/share/$PRGNAM  --bindir=/usr/bin \
   --build=$ARCH-slackware-linux"
 
-mkdir -p $PKG/usr/share
-tar -xvf $TMP/$PRGNAM-$VERSION/${SRCNAM}Package/$SRCNAM-$VERSION-linux-$ARCH.tar.gz -C $PKG/usr/share/
-mv $PKG/usr/share/bin $PKG/usr/
-
-mkdir -p $PKG/usr/man/man1
-mv $PKG/usr/share/$PRGNAM/{rtf2pdf,rtf2ps,$PRGNAM}.1 $PKG/usr/man/man1
+mkdir -p $PKG/usr/
+tar -xvf $TMP/$PRGNAM-$VERSION/${SRCNAM}Package/$SRCNAM-$VERSION-linux-*$LIBDIRSUFFIX.tar.gz -C $PKG/usr/
+mv $PKG/usr/Ted $PKG/usr/share
 mv $PKG/usr/share/$PRGNAM/{rtf2pdf,rtf2ps}.sh $PKG/usr/bin/
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 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/man/man1
+mv $PKG/usr/share/$PRGNAM/{rtf2pdf,rtf2ps,$PRGNAM}.1 $PKG/usr/man/man1
 find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $PKG/usr/share/$PRGNAM/$PRGNAM.ad.sample > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.ad.sample
+cat $PKG/usr/share/$PRGNAM/config/$PRGNAM.ad.sample > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.ad.sample
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/applications
-mv $PKG/usr/share/$PRGNAM/varia/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
-sed -i 's#/local/#/share/#' $PKG/usr/share/applications/$PRGNAM.desktop
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh >  $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}