4 files changed, 40 insertions, 49 deletions
diff --git a/perl/perl-MusicBrainz-DiscID/README b/perl/perl-MusicBrainz-DiscID/README
index 1b22bbd65d..f0689ddac7 100644
--- a/perl/perl-MusicBrainz-DiscID/README
+++ b/perl/perl-MusicBrainz-DiscID/README
@@ -1,4 +1,5 @@
-MusicBrainz::DiscID is a Perl module -- described by its author as "a class 
-to calculate a MusicBrainz DiscID from an audio CD in the drive. The coding 
-style is slightly different to the C interface to libdiscid, because it makes 
-use of perl's Object Oriented functionality."
+MusicBrainz::DiscID is an interface to the libdiscid library,
+which calculates a MusicBrainz disc ID from an audio CD in the
+CD-ROM drive.
+
+abcde can use MusicBrainz::DiscID to calculate disc IDs.
diff --git a/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.SlackBuild b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.SlackBuild
index 4a033ec319..10a3dc29c0 100644
--- a/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.SlackBuild
+++ b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.SlackBuild
@@ -2,29 +2,25 @@
 
 # Slackware build script for perl-MusicBrainz-DiscID
 
+# All rights reserved
 # Copyright 2012-15 Glenn Becker <glenn.becker@gmail.com>
-# All rights reserved.
+# Copyright 2016 Andreas Voegele <andreas@andreasvoegele.com>
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
 #
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 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.
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 PRGNAM=perl-MusicBrainz-DiscID
 VERSION=${VERSION:-0.03}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
@@ -66,22 +62,21 @@ 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 {} \;
-
-patch -p1 < $CWD/pod-encoding.patch
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 perl Build.PL \
-  prefix=/usr \
-  installdirs=vendor \
-  destdir=$PKG
+  --installdirs vendor \
+  --config installvendorman1dir=/usr/man/man1 \
+  --config installvendorman3dir=/usr/man/man3
 ./Build
-./Build test
-./Build install \
-  --install_path bindoc=/usr/man/man1 \
-  --install_path libdoc=/usr/man/man3
+
+# The test suite fails if Test::Pod is installed.
+# See https://rt.cpan.org/Public/Bug/Display.html?id=85212.
+#./Build test
+./Build install --destdir $PKG
 
 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
@@ -91,9 +86,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-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info
index bce35b176e..8cfbfd507f 100644
--- a/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info
+++ b/perl/perl-MusicBrainz-DiscID/perl-MusicBrainz-DiscID.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.cpan.org/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz
 MD5SUM="4b775f38604f15fd20298d5b443d6900"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="perl-Test-Pod"
-MAINTAINER="Glenn Becker"
-EMAIL="glenn.becker@gmail.com"
+REQUIRES=""
+MAINTAINER="Andreas Voegele"
+EMAIL="andreas@andreasvoegele.com"
diff --git a/perl/perl-MusicBrainz-DiscID/slack-desc b/perl/perl-MusicBrainz-DiscID/slack-desc
index d8533175c2..de6adfc837 100644
--- a/perl/perl-MusicBrainz-DiscID/slack-desc
+++ b/perl/perl-MusicBrainz-DiscID/slack-desc
@@ -6,17 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                        |-----handy-ruler------------------------------------------------------|
-perl-MusicBrainz-DiscID: perl-MusicBrainz-DiscID (MusicBrainz::DiscID)
-perl-MusicBrainz-DiscID:
-perl-MusicBrainz-DiscID: MusicBrainz::DiscID is a class to calculate a MusicBrainz DiscID
-perl-MusicBrainz-DiscID: from an audio CD in the drive. The coding style is slightly different
-perl-MusicBrainz-DiscID: to the C interface to libdiscid, because it makes use of perl's
-perl-MusicBrainz-DiscID: Object Oriented functionality.
-perl-MusicBrainz-DiscID:
-perl-MusicBrainz-DiscID: http://search.cpan.org/~njh/MusicBrainz-DiscID-0.03/
-perl-MusicBrainz-DiscID:
-perl-MusicBrainz-DiscID:
+perl-MusicBrainz-DiscID: perl-MusicBrainz-DiscID (calculate a disc ID from an audio CD)
 perl-MusicBrainz-DiscID:
+perl-MusicBrainz-DiscID: MusicBrainz::DiscID is an interface to the libdiscid library,
+perl-MusicBrainz-DiscID: which calculates a MusicBrainz disc ID from an audio CD in the
+perl-MusicBrainz-DiscID: CD-ROM drive.
 perl-MusicBrainz-DiscID:
+perl-MusicBrainz-DiscID: abcde can use MusicBrainz::DiscID to calculate disc IDs.
 perl-MusicBrainz-DiscID:
+perl-MusicBrainz-DiscID: For more info, visit: https://musicbrainz.org/ and
+perl-MusicBrainz-DiscID: https://metacpan.org/release/MusicBrainz-DiscID
 perl-MusicBrainz-DiscID: