4 files changed, 22 insertions, 31 deletions
diff --git a/network/phpmyadmin/README b/network/phpmyadmin/README
index 944f22ca37..94a2e36d07 100644
--- a/network/phpmyadmin/README
+++ b/network/phpmyadmin/README
@@ -5,9 +5,6 @@ are supported by the user interface (managing databases, tables, fields,
 relations, indexes, users, permissions, etc), while you still have the
 ability to directly execute any SQL statement.
 
-It is recommended to use libmcrypt and mcrypt packages with phpmyadmin to
-speed up database access considerably.
-
 By default, there is only a sample config file included with the package.
 You can either copy that file and edit it according to your taste or you
 can do a graphical setup.  Both processes are detailed in the docs.
@@ -15,8 +12,4 @@ can do a graphical setup.  Both processes are detailed in the docs.
 You can override DOCROOT, PHPUSER, and PHPGROUP at build time.
 They default to DOCROOT=/var/www/htdocs, PHPUSER=root, PHPGROUP=apache.
 
-ADDITIONAL NOTE:
-You may also have to recompile PHP to include support for mcrypt.  Without this
-you may see warnings about mcrypt extension in phpmyadmin.  Please see the 
-link below on recompiling PHP with mcrypt support. (info and link provided by 
-Joel Adamson):  http://slackwiki.org/Recompile_php_with_mcrypt
+For configuration help, you can visit: http://wiki.phpmyadmin.net/pma/Config
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}
diff --git a/network/phpmyadmin/phpmyadmin.info b/network/phpmyadmin/phpmyadmin.info
index 790e024ee1..23e54d0c44 100644
--- a/network/phpmyadmin/phpmyadmin.info
+++ b/network/phpmyadmin/phpmyadmin.info
@@ -1,8 +1,10 @@
 PRGNAM="phpmyadmin"
-VERSION="3.2.0"
+VERSION="3.2.5"
 HOMEPAGE="http://www.phpmyadmin.net/home_page/index.php"
-DOWNLOAD="http://downloads.sourceforge.net/phpmyadmin/phpMyAdmin-3.2.0-all-languages.tar.bz2"
-MD5SUM="54d398c505e36164edded0131df35f3f"
+DOWNLOAD="http://downloads.sourceforge.net/phpmyadmin/phpMyAdmin-3.2.5-all-languages.tar.bz2"
+MD5SUM="6083ea867a152f58f5c332d0c9b92ac1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
 APPROVED="rworkman"
diff --git a/network/phpmyadmin/slack-desc b/network/phpmyadmin/slack-desc
index 189edfd2e7..f36880028d 100644
--- a/network/phpmyadmin/slack-desc
+++ b/network/phpmyadmin/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-          |-----handy-ruler---------------------------------------------------|
+          |-----handy-ruler------------------------------------------------|
 phpmyadmin: phpmyadmin (MySQL administration over the web)
 phpmyadmin:
 phpmyadmin: phpMyAdmin is a free software tool written in PHP intended