From 18192520371336951bb78b2c2beb199bcfa7dc9a Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Tue, 11 Feb 2014 10:34:09 +0100 Subject: perl/perl-Test-Harness: Avoid overlap with Slackware's perl package. Signed-off-by: Matteo Bernardini --- perl/perl-Test-Harness/perl-Test-Harness.SlackBuild | 20 ++++++++++++-------- perl/perl-Test-Harness/perl-Test-Harness.info | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/perl/perl-Test-Harness/perl-Test-Harness.SlackBuild b/perl/perl-Test-Harness/perl-Test-Harness.SlackBuild index a25f500f4a..a567d1124a 100644 --- a/perl/perl-Test-Harness/perl-Test-Harness.SlackBuild +++ b/perl/perl-Test-Harness/perl-Test-Harness.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for perl-Test-Harness -# Copyright 2013 Willy Sudiarto Raharjo +# Copyright 2013-2014 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=perl-Test-Harness VERSION=${VERSION:-3.30} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} SRCNAM="$(printf $PRGNAM | cut -d- -f2-)" @@ -66,8 +66,8 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; @@ -82,7 +82,13 @@ make install DESTDIR=$PKG 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 -mv $PKG/usr/share/man/man1 $PKG/usr/man/ +# preserve Env stuff and delete anything else conflicting with Slackware's Perl package +mkdir -p tmp/TAP/Harness tmp/man/man3 +mv $PKG/usr/share/perl5/vendor_perl/TAP/Harness/Env.pm tmp/TAP/Harness +mv $PKG/usr/man/man3/TAP::Harness::Env.3 tmp/man/man3 +rm -rf $PKG/usr/bin/prove $PKG/usr/share/man $PKG/usr/man $PKG/usr/share/perl5/vendor_perl/* +mv tmp/TAP $PKG/usr/share/perl5/vendor_perl/ +mv tmp/man $PKG/usr/ 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 @@ -92,9 +98,7 @@ find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f find $PKG -depth -type d -empty -delete || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - Changes README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changes README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/perl/perl-Test-Harness/perl-Test-Harness.info b/perl/perl-Test-Harness/perl-Test-Harness.info index eac982a011..121dfe1d52 100644 --- a/perl/perl-Test-Harness/perl-Test-Harness.info +++ b/perl/perl-Test-Harness/perl-Test-Harness.info @@ -1,6 +1,6 @@ PRGNAM="perl-Test-Harness" VERSION="3.30" -HOMEPAGE="http://search.cpan.org/~leont/Test-Harness-3.30/" +HOMEPAGE="http://search.cpan.org/~leont/Test-Harness/" DOWNLOAD="http://search.cpan.org/CPAN/authors/id/L/LE/LEONT/Test-Harness-3.30.tar.gz" MD5SUM="c1ff25da5dfdf77adea13dc3465638dd" DOWNLOAD_x86_64="" -- cgit v1.2.3-65-gdbad