4 files changed, 38 insertions, 24 deletions
diff --git a/perl/perl-Cache-FastMmap/README b/perl/perl-Cache-FastMmap/README
index 149bcae0a20fc..d80f2296d49c3 100644
--- a/perl/perl-Cache-FastMmap/README
+++ b/perl/perl-Cache-FastMmap/README
@@ -1,4 +1,5 @@
 Cache::FastMmap perl modules uses an mmap'ed file to act as a
 shared memory interprocess cache.
 
-perl-Cache-FastMmap package is required for policyd v2 (cluebringer).
+perl-Cache-FastMmap package is required for policyd v2
+(cluebringer).
diff --git a/perl/perl-Cache-FastMmap/perl-Cache-FastMmap.SlackBuild b/perl/perl-Cache-FastMmap/perl-Cache-FastMmap.SlackBuild
index 10c0b7482f246..d556e4514d562 100644
--- a/perl/perl-Cache-FastMmap/perl-Cache-FastMmap.SlackBuild
+++ b/perl/perl-Cache-FastMmap/perl-Cache-FastMmap.SlackBuild
@@ -3,8 +3,8 @@
 # Slackware Package Build Script for perl modules: Cache::FastMmap
 # Home Page http://search.cpan.org/dist/Cache-FastMmap/
 
-# Copyright (c) 2008-2011, Nishant Limbachia, Hoffman Estates, IL, USA
-# <nishant _AT_ mnspace _DOT_ net>
+# Copyright (c) 2008-2012, Nishant Limbachia, Hoffman Estates, IL, USA
+# (nishant _AT_ mnspace _DOT_ net)
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,16 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Modified by the SlackBuilds.org project.
 
-SRCNAM=Cache-FastMmap
-PRGNAM=perl-$SRCNAM
-VERSION=${VERSION:-1.39}
+PRGNAM=perl-Cache-FastMmap
+VERSION=${VERSION:-1.40}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=$(echo $PRGNAM | cut -f2- -d-)
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -48,12 +51,25 @@ set -e
 
 DOCS="Changes README"
 
+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"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
 rm -fr $TMP/$SRCNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xzvf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $TMP/$SRCNAM-$VERSION
-
 chown -R root.root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -61,7 +77,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+CFLAGS="$SLKCFLAGS" \
 perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3
+
 make
 make install DESTDIR=$PKG
 
@@ -70,21 +88,16 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Remove perlocal.pod and .packlist from $PKG
-( cd $PKG
-  find . -name "perllocal.pod" -o -name ".packlist"  -o -name "*.bs"  | xargs rm -f
-)
-
 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 -depth -type d -empty -exec rm -rf {} \;
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# find and compress man pages
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+
+# Remove empty directories
+find $PKG -depth -type d -empty -exec rm -rf {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/perl/perl-Cache-FastMmap/perl-Cache-FastMmap.info b/perl/perl-Cache-FastMmap/perl-Cache-FastMmap.info
index 19307b0d2dae9..ea9922bc6ac7f 100644
--- a/perl/perl-Cache-FastMmap/perl-Cache-FastMmap.info
+++ b/perl/perl-Cache-FastMmap/perl-Cache-FastMmap.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Cache-FastMmap"
-VERSION="1.39"
+VERSION="1.40"
 HOMEPAGE="http://search.cpan.org/dist/Cache-FastMmap/"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/R/RO/ROBM/Cache-FastMmap-1.39.tar.gz"
-MD5SUM="988a3aa2d9c0dd96bb39c68d7330618b"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/R/RO/ROBM/Cache-FastMmap-1.40.tar.gz"
+MD5SUM="e0929ba556c629a43f5d65a2b6cb9a2f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"
diff --git a/perl/perl-Cache-FastMmap/slack-desc b/perl/perl-Cache-FastMmap/slack-desc
index d3037620d9463..19434635dc69b 100644
--- a/perl/perl-Cache-FastMmap/slack-desc
+++ b/perl/perl-Cache-FastMmap/slack-desc
@@ -8,11 +8,11 @@
                    |-----handy-ruler------------------------------------------------------|
 perl-Cache-FastMmap: perl-Cache-FastMmap (Cache::FastMmap)
 perl-Cache-FastMmap:
+perl-Cache-FastMmap:
 perl-Cache-FastMmap: Cache::FastMmap perl module uses an mmap'ed file to act
 perl-Cache-FastMmap: as a shared memory interprocess cache.
 perl-Cache-FastMmap:
 perl-Cache-FastMmap:
-perl-Cache-FastMmap:
 perl-Cache-FastMmap: Homepage: http://search.cpan.org/dist/Cache-FastMmap/
 perl-Cache-FastMmap:
 perl-Cache-FastMmap: