7 files changed, 42 insertions, 47 deletions
diff --git a/development/teagtk/README b/development/tea/README
index 0a3751cf23d1..295cd2cf9a69 100644
--- a/development/teagtk/README
+++ b/development/tea/README
@@ -1,4 +1,2 @@
 TEA is the text text editor for UNIX-like systems and Windows. With an 
 ultimate small size, TEA provides you hundreds of functions.
-
-This requires gtksourceview.
diff --git a/development/tea/doinst.sh b/development/tea/doinst.sh
new file mode 100644
index 000000000000..5fb28930db0b
--- /dev/null
+++ b/development/tea/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/development/teagtk/slack-desc b/development/tea/slack-desc
index de6df625f87d..9912a081213b 100644
--- a/development/teagtk/slack-desc
+++ b/development/tea/slack-desc
@@ -5,15 +5,15 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-       |-----handy-ruler------------------------------------------------------|
-teagtk: teagtk (text editor)
-teagtk: 
-teagtk: TEA is the text text editor for UNIX-like systems and Windows. With
-teagtk: an ultimate small size TEA provides you hundreds of functions.
-teagtk:
-teagtk: http://tea-editor.sourceforge.net/index.html
-teagtk:
-teagtk:
-teagtk:
-teagtk:
-teagtk:
+   |-----handy-ruler------------------------------------------------------|
+tea: tea (text editor)
+tea:
+tea: TEA is the text text editor for UNIX-like systems and Windows. With
+tea: an ultimate small size TEA provides you hundreds of functions.
+tea:
+tea: http://tea-editor.sourceforge.net/index.html
+tea:
+tea:
+tea:
+tea:
+tea:
diff --git a/development/teagtk/teagtk.SlackBuild b/development/tea/tea.SlackBuild
index 38ac383447a5..79444ce236a6 100644
--- a/development/teagtk/teagtk.SlackBuild
+++ b/development/tea/tea.SlackBuild
@@ -1,19 +1,17 @@
 #!/bin/sh
 
-# Slackware build script for teagtk
+# Slackware build script for tea
 # Written by Nai (bluedbs@gmail.com)
 
-PRGNAM=teagtk
-VERSION=${VERSION:-17.6.6}
+PRGNAM=tea
+VERSION=${VERSION:-30.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -52,36 +50,31 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
  
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+qmake \
+  "PREFIX=/usr/bin" \
+  "QMAKE_CXXFLAGS+=$SLKCFLAGS" \
+  "QMAKE_CFLAGS+=$SLKCFLAGS"
 
 make
-make install DESTDIR=$PKG
+make install INSTALL_ROOT=$PKG
 
 find $PKG | xargs 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/share/{applications,pixmaps}
-cat $CWD/teagtk.desktop > $PKG/usr/share/applications/teagtk.desktop
-cp -f pixmaps/tea_icon_v2.png $PKG/usr/share/pixmaps
+cat $CWD/tea.desktop > $PKG/usr/share/applications/tea.desktop
+cp -f icons/tea_icon_v2.png $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL \
-  doc/* NEWS README TODO \
+  AUTHORS COPYING ChangeLog \
+  manuals/* NEWS README TODO \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/teagtk/teagtk.desktop b/development/tea/tea.desktop
index 8f4f43c019c2..4497cd209d5f 100644
--- a/development/teagtk/teagtk.desktop
+++ b/development/tea/tea.desktop
@@ -1,9 +1,10 @@
+
 [Desktop Entry]
 Type=Application
-Name=teagtk
+Name=tea
 Comment=Text Editor
 Icon=tea_icon_v2
-Exec=teagtk
+Exec=tea
 Terminal=false
-Categories=Utility;TextEditor;GTK;
+Categories=Utility;TextEditor;
 StartupNotify=true
diff --git a/development/tea/tea.info b/development/tea/tea.info
new file mode 100644
index 000000000000..93e0359d8c2f
--- /dev/null
+++ b/development/tea/tea.info
@@ -0,0 +1,10 @@
+PRGNAM="tea"
+VERSION="30.0.0"
+HOMEPAGE="http://tea-editor.sourceforge.net/index.html"
+DOWNLOAD="http://sourceforge.net/projects/tea-editor/files/tea-editor/30.0.0/tea-30.0.0.tar.bz2"
+MD5SUM="07508b4972403fc7c3a72169700e6157"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Nai"
+EMAIL="bluedbs@gmail.com"
+APPROVED="Niels Horn"
diff --git a/development/teagtk/teagtk.info b/development/teagtk/teagtk.info
deleted file mode 100644
index 4aa691cbb275..000000000000
--- a/development/teagtk/teagtk.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="teagtk"
-VERSION="17.6.6"
-HOMEPAGE="http://tea-editor.sourceforge.net/index.html"
-DOWNLOAD="http://downloads.sourceforge.net/tea-editor/teagtk-17.6.6.tar.bz2"
-MD5SUM="f4950e7ba6f494a7a999e5b337f04d12"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-MAINTAINER="Nai"
-EMAIL="bluedbs@gmail.com"
-APPROVED="rworkman"