1 files changed, 15 insertions, 19 deletions
diff --git a/network/phpmyadmin/phpmyadmin.SlackBuild b/network/phpmyadmin/phpmyadmin.SlackBuild
index dada6c7a29..1bb6ce873e 100644
--- a/network/phpmyadmin/phpmyadmin.SlackBuild
+++ b/network/phpmyadmin/phpmyadmin.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for phpmyadmin
 # Home Page http://www.phpmyadmin.net/
 
-# Copyright (c) 2009, Nishant Limbachia (nishant@mnspace.net)
+# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant@mnspace.net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is 
@@ -27,8 +27,8 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=phpmyadmin
-VERSION=3.2.0
-ARCH=noarch
+VERSION=3.2.5
+ARCH="noarch"	 # hardcode ARCH
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,29 +55,25 @@ mv $SRCNAM $TMP/$PRGNAM-$VERSION
 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 -o -perm 755 \) \
+ -exec chmod 750 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 -o -perm 644 \) \
+ -exec chmod 640 {} \;
 
 mkdir -p $PKG/$DOCROOT
-cp -a $TMP/$PRGNAM-$VERSION $PKG/$DOCROOT
+cp -a $TMP/$PRGNAM-$VERSION $PKG/$DOCROOT/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
-  for docfile in \
-    CREDITS ChangeLog Documentation.html Documentation.txt INSTALL \
-    LICENSE README README.VENDOR RELEASE-DATE-$VERSION TODO ; 
-   do ln -s ../../..${DOCROOT}/$PRGNAM-$VERSION/$docfile . ;
-  done
-)
-  
+cp -a \
+  Documentation* INSTALL LICENSE README* CREDITS TODO ChangeLog \
+    $PKG/usr/doc/$PRGNAM-$VERSION
+
 # Change ownership and perms and create a link.
-chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT/$PRGNAM-$VERSION
-( cd $PKG/$DOCROOT; ln -sf phpmyadmin-$VERSION phpmyadmin )
+chown -R $PHPUSER:$PHPGROUP $PKG/$DOCROOT/$PRGNAM
+chmod 0750 $PKG/$DOCROOT/$PRGNAM
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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}