libraries/perl-tk: Updated for version 804.029.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

6 files changed, 50 insertions, 98 deletions

diff --git a/libraries/perl-tk/README b/libraries/perl-tk/README
index 29c48f6dfce3..d78338991fdd 100644
--- a/libraries/perl-tk/README
+++ b/libraries/perl-tk/README
@@ -1,7 +1,8 @@
 perl-tk (Tk graphical interface for Perl)
 
-Perl/Tk is an extension for writing Perl programs with a Graphical User (GUI) 
-on both Unix and Windows 95/NT.  Tk was originally developed as an extension 
-to the Tcl language, for use with the X Window System on Unix. With its port 
-to Perl, Tk gives Perl programmers the same control over a graphical desktop 
-that Tcl programmers have taken for granted.
+Perl/Tk is an extension for writing Perl programs with a GUI.
+
+Tk was originally developed as an extension to the Tcl language
+for use with the X Window System on Unix.  With its port to perl,
+Tk gives Perl programmers the same control over the graphical
+desktop that Tcl programmers have taken for granted.
diff --git a/libraries/perl-tk/perl-tk-804.028.diff b/libraries/perl-tk/perl-tk-804.028.diff
deleted file mode 100644
index a559dfaacfcc..000000000000
--- a/libraries/perl-tk/perl-tk-804.028.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -rupN Tk-804.028.org/TextList/reindex.pl Tk-804.028.new/TextList/reindex.pl
---- Tk-804.028.org/TextList/reindex.pl	2007-05-05 15:38:18.000000000 -0300
-+++ Tk-804.028.new/TextList/reindex.pl	2009-11-11 18:46:31.000000000 -0200
-@@ -1,4 +1,4 @@
--#!/bin/perl
-+#!/usr/bin/perl
- 
- use lib qw(/home1/gbartels/textlist);
- use Tk;
-diff -rupN Tk-804.028.org/Tk/FBox.pm Tk-804.028.new/Tk/FBox.pm
---- Tk-804.028.org/Tk/FBox.pm	2007-05-05 15:37:56.000000000 -0300
-+++ Tk-804.028.new/Tk/FBox.pm	2009-11-11 18:46:48.000000000 -0200
-@@ -906,7 +906,7 @@ sub Done {
- 	if ($w->cget('-multiple')) {
- 	    $selectFilePath = [];
- 	    for my $f (@{ $w->{'selectFile'} }) {
--		push @$selectFilePath, JoinFile($w->_get_select_Path, $f);
-+		push @$selectFilePath, JoinFile($w->_get_select_path, $f);
- 	    }
- 	} else {
- 	    $selectFilePath = JoinFile($w->_get_select_path,
-diff -rupN Tk-804.028.org/pTk/Tcl-pTk Tk-804.028.new/pTk/Tcl-pTk
---- Tk-804.028.org/pTk/Tcl-pTk	2007-05-05 15:39:02.000000000 -0300
-+++ Tk-804.028.new/pTk/Tcl-pTk	2009-11-11 18:48:58.000000000 -0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- use open IO => ':bytes'; # Avoid UTF-8 issues with some perl5.8.0 (RedHat)
- use Carp;
- my $verbose = 0;
-diff -rupN Tk-804.028.org/pTk/mTk/generic/tk.h Tk-804.028.new/pTk/mTk/generic/tk.h
---- Tk-804.028.org/pTk/mTk/generic/tk.h	2007-05-05 15:41:02.000000000 -0300
-+++ Tk-804.028.new/pTk/mTk/generic/tk.h	2009-11-11 18:49:56.000000000 -0200
-@@ -677,17 +677,15 @@ typedef struct Tk_GeomMgr {
-  *
-  *---------------------------------------------------------------------------
-  */
--#define VirtualEvent        (LASTEvent)
--#define ActivateNotify      (LASTEvent + 1)
--#define DeactivateNotify    (LASTEvent + 2)
--#define MouseWheelEvent     (LASTEvent + 3)
--#define TK_LASTEVENT        (LASTEvent + 4)
-+#define VirtualEvent        (MappingNotify + 1)
-+#define ActivateNotify      (MappingNotify + 2)
-+#define DeactivateNotify    (MappingNotify + 3)
-+#define MouseWheelEvent     (MappingNotify + 4)
-+#define TK_LASTEVENT        (MappingNotify + 5)
- 
- #define MouseWheelMask      (1L << 28)
--
- #define ActivateMask        (1L << 29)
- #define VirtualEventMask    (1L << 30)
--#define TK_LASTEVENT        (LASTEvent + 4)
- 
- 
- /*
-diff -rupN Tk-804.028.org/pTk/mkVFunc Tk-804.028.new/pTk/mkVFunc
---- Tk-804.028.org/pTk/mkVFunc	2007-05-05 15:38:59.000000000 -0300
-+++ Tk-804.028.new/pTk/mkVFunc	2009-11-11 18:49:14.000000000 -0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl -w
- use strict;
- 
- 
diff --git a/libraries/perl-tk/perl-tk-804.029.diff b/libraries/perl-tk/perl-tk-804.029.diff
new file mode 100644
index 000000000000..0aab9659ed7d
--- /dev/null
+++ b/libraries/perl-tk/perl-tk-804.029.diff
@@ -0,0 +1,27 @@
+diff -ru Tk-804.029.org//TextList/reindex.pl Tk-804.029/TextList/reindex.pl
+--- Tk-804.029.org//TextList/reindex.pl	2007-02-10 05:54:45.000000000 -0300
++++ Tk-804.029/TextList/reindex.pl	2010-08-05 13:53:36.447371174 -0300
+@@ -1,4 +1,4 @@
+-#!/bin/perl
++#!/usr/bin/perl
+ 
+ use lib qw(/home1/gbartels/textlist);
+ use Tk;
+diff -ru Tk-804.029.org//pTk/Tcl-pTk Tk-804.029/pTk/Tcl-pTk
+--- Tk-804.029.org//pTk/Tcl-pTk	2007-02-10 05:55:23.000000000 -0300
++++ Tk-804.029/pTk/Tcl-pTk	2010-08-05 13:54:06.527369253 -0300
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use open IO => ':bytes'; # Avoid UTF-8 issues with some perl5.8.0 (RedHat)
+ use Carp;
+ my $verbose = 0;
+diff -ru Tk-804.029.org//pTk/mkVFunc Tk-804.029/pTk/mkVFunc
+--- Tk-804.029.org//pTk/mkVFunc	2008-11-04 20:06:50.000000000 -0200
++++ Tk-804.029/pTk/mkVFunc	2010-08-05 13:54:20.074244152 -0300
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -w
++#!/usr/bin/perl -w
+ use strict;
+ 
+ 
diff --git a/libraries/perl-tk/perl-tk.SlackBuild b/libraries/perl-tk/perl-tk.SlackBuild
index 72caff28b3cd..11b9d93e12a7 100644
--- a/libraries/perl-tk/perl-tk.SlackBuild
+++ b/libraries/perl-tk/perl-tk.SlackBuild
@@ -3,19 +3,16 @@
 # Slackware build script for perl-tk (Tk)
 
 # Written by Pablo Santamaria (pablosantamaria@gmail.com)
-# Thanks to Robby Workman for suggestions to improve this script.
 
 PRGNAM=perl-tk
-VERSION=${VERSION:-804.028}
+VERSION=${VERSION:-804.029}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -39,7 +36,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -54,33 +51,27 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Apply a bunch of patches
+# Apply a few patches
 patch -p1 < $CWD/$PRGNAM-$VERSION.diff
 
-# XFT=1 (font manager) support, which gives perl-tk programs the ability to 
+# XFT=1 (font manager) support, which gives perl-tk programs the ability to
 # use all fonts accessible from XFT and antialiasing.
-perl Makefile.PL XFT=1 INSTALLDIRS=vendor
+perl Makefile.PL \
+     XFT=1 \
+     INSTALLDIRS=vendor \
+     INSTALLVENDORMAN1DIR=/usr/man/man1 \
+     INSTALLVENDORMAN3DIR=/usr/man/man3 \
 make OPTIMIZE="$SLKCFLAGS"
 make install  DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Relocate man pages
-if [ -d $PKG/usr/share/man ] ; then
-    mkdir -p $PKG/usr/man
-    ( cd $PKG/usr/share
-      mv man ..
-      rmdir $PKG/usr/share )
-fi
-
-# 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
 )
 
-# Remove perlocal.pod, .packlist and .bs from $PKG
 ( cd $PKG
     find . -name perllocal.pod \
         -o -name ".packlist" \
@@ -88,10 +79,8 @@ fi
         | xargs rm -f
 )
 
-# Remove empty directories
-find $PKG -depth -type d -empty -exec rm -rf {} \;
+find $PKG -depth -type d -empty -delete || true
 
-# Copy program documentation into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING Change.log Changes Funcs.doc INSTALL PPM-HowTo README \
     README.linux ToDo VERSIONS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/libraries/perl-tk/perl-tk.info b/libraries/perl-tk/perl-tk.info
index 3499870687d3..d0955ac0b398 100644
--- a/libraries/perl-tk/perl-tk.info
+++ b/libraries/perl-tk/perl-tk.info
@@ -1,10 +1,10 @@
 PRGNAM="perl-tk"
-VERSION="804.028"
-HOMEPAGE="http://search.cpan.org/~srezic/Tk-804.028/"
-DOWNLOAD="http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/Tk-804.028.tar.gz"
-MD5SUM="7153c1c411b0dd005a0660179e5c5900"
+VERSION="804.029"
+HOMEPAGE="http://search.cpan.org/~srezic/Tk-804.029/"
+DOWNLOAD="http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/Tk-804.029.tar.gz"
+MD5SUM="f4aebe6fcdb309a8480514f2ccf8117c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Pablo Santamaria"
 EMAIL="pablosantamaria@gmail.com"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"
diff --git a/libraries/perl-tk/slack-desc b/libraries/perl-tk/slack-desc
index 61f7aedd106f..907091f1b876 100644
--- a/libraries/perl-tk/slack-desc
+++ b/libraries/perl-tk/slack-desc
@@ -10,9 +10,9 @@ perl-tk: perl-tk (Tk graphical interface for Perl)
 perl-tk:
 perl-tk: Perl/Tk is an extension for writing Perl programs with a GUI.
 perl-tk:
-perl-tk: Tk was originally developed as an extension to the Tcl language 
+perl-tk: Tk was originally developed as an extension to the Tcl language
 perl-tk: for use with the X Window System on Unix.  With its port to perl,
-perl-tk: Tk gives Perl programmers the same control over the graphical 
+perl-tk: Tk gives Perl programmers the same control over the graphical
 perl-tk: desktop that Tcl programmers have taken for granted.
 perl-tk:
 perl-tk: