1 files changed, 22 insertions, 23 deletions
diff --git a/system/pgadmin3/pgadmin3.SlackBuild b/system/pgadmin3/pgadmin3.SlackBuild
index 7b54a6bb83..5afab6e1e6 100644
--- a/system/pgadmin3/pgadmin3.SlackBuild
+++ b/system/pgadmin3/pgadmin3.SlackBuild
@@ -1,18 +1,18 @@
 #!/bin/sh
+
 # Slackware build script for pgAdmin
 # Written by Iskar Enev (<iskar.enev[@]gmail.com>)
+# Modified by slakmagik <slakmagik@gmail.com>
 
 PRGNAM=pgadmin3
-VERSION=${VERSION:-1.10.1}
+VERSION=${VERSION:-1.12.3}
 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
@@ -22,8 +22,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCUMENTATION="BUGS CHANGELOG DEVELOPERS INSTALL LICENSE README TODO"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -38,6 +36,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCUMENTATION="BUGS CHANGELOG DEVELOPERS INSTALL LICENSE README TODO"
+
 set -e
 
 rm -rf $PKG
@@ -48,10 +48,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 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 {} \;
+  \( -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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -64,25 +64,24 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-( cd i18n
-  make install DESTDIR=$PKG
-)
+make DESTDIR=$PKG install
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+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/pixmaps/pgadmin3
-cp -a pgadmin/include/images/* $PKG/usr/share/pixmaps/pgadmin3
+# add the range of pgAdmin3 images - only one can be used in the desktop file
+# but the default might not be the one people would want
+mkdir -p $PKG/usr/share/pixmaps
+cp -a pgadmin/include/images/pgAdmin3* $PKG/usr/share/pixmaps
 
 mkdir -p  $PKG/usr/share/applications
-cp -a pkg/pgadmin3.desktop $PKG/usr/share/applications
-sed -i 's%Icon=/usr/share/pgadmin3/pgadmin3.xpm%Icon=/usr/share/pixmaps/pgadmin3/pgAdmin3.xpm%' \
-  $PKG/usr/share/applications/pgadmin3.desktop
+sed '/^Icon=/s/pgadmin3/pixmaps/' \
+  pkg/pgadmin3.desktop > $PKG/usr/share/applications/pgadmin3.desktop
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a docs/* $DOCUMENTATION $PKG/usr/doc/$PRGNAM-$VERSION
+# as with so many packages, --docdir is present but ignored
+mkdir -p $PKG/usr/doc
+ln -s ../share/pgadmin3/docs $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCUMENTATION $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install