development/poedit: Updated for version 1.4.2

5 files changed, 25 insertions, 18 deletions

diff --git a/development/poedit/README b/development/poedit/README
index 17431f5164..f0fd9799df 100644
--- a/development/poedit/README
+++ b/development/poedit/README
@@ -1,8 +1,6 @@
-Poedit is cross-platform gettext catalogs (.po files) editor.
-It is built with wxWidgets toolkit and can run on any platform
-supported by it.
-It aims to provide more convenient approach to editing catalogs
-than launching vi and editing the file by hand.
-It also has support for spellchecking (gtkspell/aspell).
+Poedit is cross-platform gettext catalogs (.po files) editor. 
+It aims to provide more convenient approach to editing catalogs than 
+launching vi and editing the file by hand.  It also has support for 
+spellchecking (gtkspell/aspell).
 
-Requires: wxGTK available at SlackBuilds.org.
+This requires wxGTK.
diff --git a/development/poedit/doinst.sh b/development/poedit/doinst.sh
index 0acbacff73..1f8ff67ded 100644
--- a/development/poedit/doinst.sh
+++ b/development/poedit/doinst.sh
@@ -1,7 +1,10 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-    /usr/bin/update-desktop-database -q usr/share/applications
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
-if [ -x /usr/bin/update-mime-database ]; then
-    /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
 fi
+
diff --git a/development/poedit/poedit.SlackBuild b/development/poedit/poedit.SlackBuild
index 1a35209222..42936537ca 100644
--- a/development/poedit/poedit.SlackBuild
+++ b/development/poedit/poedit.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for poedit
-#
+
 # Copyright 2008  Niklas "Nille" Åkerström
 # All rights reserved.
 #
@@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -59,6 +62,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux \
 
@@ -71,13 +75,13 @@ make install-strip DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS COPYING NEWS README TODO\
+cp -a AUTHORS COPYING 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/poedit/poedit.info b/development/poedit/poedit.info
index c62748f9de..6ad96b5e71 100644
--- a/development/poedit/poedit.info
+++ b/development/poedit/poedit.info
@@ -3,6 +3,8 @@ VERSION="1.4.2"
 HOMEPAGE="http://www.poedit.net"
 DOWNLOAD="http://downloads.sourceforge.net/poedit/poedit-1.4.2.tar.gz"
 MD5SUM="5aca5ed4c8c81e0f10efb20ac3a191ac"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Niklas 'Nille' Åkerström"
 EMAIL="nille.kungen[AT]gmail.com"
 APPROVED="dsomero"
diff --git a/development/poedit/slack-desc b/development/poedit/slack-desc
index 2718c9abb6..8bfd3a540b 100644
--- a/development/poedit/slack-desc
+++ b/development/poedit/slack-desc
@@ -8,12 +8,12 @@
 poedit: Poedit (cross-platform gettext catalogs editor) 
 poedit:
 poedit: Poedit is an cross-platform gettext catalogs (.po files) editor.
-poedit: It is built with wxWidgets toolkit and can run on any platform
-poedit: supported by it.
+poedit:
 poedit: It aims to provide more convenient approach to editing catalogs
 poedit: than launching vi and editing the file by hand.
+poedit:
 poedit: It also has support for spellchecking (gtkspell).
-poedit: 
-poedit:            Homepage: http://www.poedit.net
+poedit:
+poedit: Homepage: http://www.poedit.net
 poedit:
 poedit: