2 files changed, 38 insertions, 30 deletions
diff --git a/perl/perl-Mail-SPF/perl-Mail-SPF.SlackBuild b/perl/perl-Mail-SPF/perl-Mail-SPF.SlackBuild
index e5e5b3126d..ebf7dca8ae 100644
--- a/perl/perl-Mail-SPF/perl-Mail-SPF.SlackBuild
+++ b/perl/perl-Mail-SPF/perl-Mail-SPF.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware Package Build Script for perl module: Mail::SPF
 # Home Page http://search.cpan.org/dist/Mail-SPF/
 
-# Copyright (c) 2008-2010, 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 
@@ -26,11 +27,11 @@
 #
 # Modified by the SlackBuilds.org project.
 
-SRCNAM=Mail-SPF-v2.007
-PRGNAM=perl-Mail-SPF
-VERSION=2.007
+SRCNAM=Mail-SPF
+PRGNAM=perl-$SRCNAM
+VERSION=${VERSION:-2.8.0}
 TAG=${TAG:-_SBo}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -65,11 +66,11 @@ else
   LIBDIRSUFFIX=""
 fi
 
-rm -fr $TMP/$SRCNAM-$VERSION $PKG
+rm -fr $TMP/$SRCNAM-v$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$SRCNAM.tar.gz
-cd $TMP/$SRCNAM
+tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz
+cd $TMP/$SRCNAM-v$VERSION
 chown -R root.root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -77,30 +78,37 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-perl Build.PL \
-  prefix=/usr \
-  installdirs=vendor \
-  destdir=$PKG
-./Build
-./Build test
-./Build install \
-  --install_path bindoc=/usr/man/man1 \
-  --install_path libdoc=/usr/man/man3
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-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 $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
+CFLAGS="$SLKCFLAGS" \
+perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor \
+  INSTALLVENDORMAN1DIR=/usr/man/man1 INSTALLVENDORMAN3DIR=/usr/man/man3
 
-find $PKG -depth -type d -empty -delete || true
+make
+make install DESTDIR=$PKG
 
+### putting essential docs
 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
+)
+
+# Remove empty directories
+find $PKG -depth -type d -empty -exec rm -rf {} \;
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# move man pages
+#mv $PKG/usr/share/man $PKG/usr
+
+( 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
+) 
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/perl/perl-Mail-SPF/perl-Mail-SPF.info b/perl/perl-Mail-SPF/perl-Mail-SPF.info
index f1c70b52f9..16133d0dcf 100644
--- a/perl/perl-Mail-SPF/perl-Mail-SPF.info
+++ b/perl/perl-Mail-SPF/perl-Mail-SPF.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-Mail-SPF"
-VERSION="2.007"
+VERSION="2.8.0"
 HOMEPAGE="http://search.cpan.org/dist/Mail-SPF/"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v2.007.tar.gz"
-MD5SUM="67dccdc91e3264679a0e17d493d3cc30"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/J/JM/JMEHNLE/mail-spf/Mail-SPF-v2.8.0.tar.gz"
+MD5SUM="4f5bbd59058da680bfd9ff18e31489b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"