Update to 1.21

- Add LICENSE_FILE
- Add NO_ARCH
- Sort PLIST

Changes:	http://search.cpan.org/dist/UI-Dialog/Changes

4 files changed, 30 insertions, 277 deletions

diff --git a/devel/p5-UI-Dialog/Makefile b/devel/p5-UI-Dialog/Makefile
index 2a413f4603b9..bc8e1dec6af5 100644
--- a/devel/p5-UI-Dialog/Makefile
+++ b/devel/p5-UI-Dialog/Makefile
@@ -2,27 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	UI-Dialog
-PORTVERSION=	1.09
-PORTREVISION=	2
+PORTVERSION=	1.21
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KCK
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl wrapper for the various dialog applications
 
-LICENSE=	LGPL21 LGPL3
-LICENSE_COMB=	dual
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	cdialog:devel/cdialog
+BUILD_DEPENDS=	p5-File-Slurp>=0:devel/p5-File-Slurp \
+		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+RUN_DEPENDS+=	cdialog:devel/cdialog
 
 OPTIONS_DEFINE=	KDE NEWT X11 ZENITY
 
+NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 KDE_RUN_DEPENDS=	kdialog:x11/kde4-baseapps
 NEWT_RUN_DEPENDS=	whiptail:devel/newt
diff --git a/devel/p5-UI-Dialog/distinfo b/devel/p5-UI-Dialog/distinfo
index 33840fbf8d39..8e5d550e574e 100644
--- a/devel/p5-UI-Dialog/distinfo
+++ b/devel/p5-UI-Dialog/distinfo
@@ -1,2 +1,3 @@
-SHA256 (UI-Dialog-1.09-2.tar.gz) = 9b00086d1c2ccbaf01c5199e42cfedfb681109efc352cb81ce339bdd1abec4bd
-SIZE (UI-Dialog-1.09-2.tar.gz) = 91164
+TIMESTAMP = 1489234633
+SHA256 (UI-Dialog-1.21.tar.gz) = 5eff18e753b6ee5d692918782f6816daf55d122faeb9ae6103e4510dd06f752a
+SIZE (UI-Dialog-1.21.tar.gz) = 97110
diff --git a/devel/p5-UI-Dialog/files/patch-6adc44cc636c615d76297d86835e1a997681eb61 b/devel/p5-UI-Dialog/files/patch-6adc44cc636c615d76297d86835e1a997681eb61
deleted file mode 100644
index 30a3773215b4..000000000000
--- a/devel/p5-UI-Dialog/files/patch-6adc44cc636c615d76297d86835e1a997681eb61
+++ /dev/null
@@ -1,252 +0,0 @@
-From 6adc44cc636c615d76297d86835e1a997681eb61 Mon Sep 17 00:00:00 2001
-From: "Kevin C. Krinke" <kevin@krinke.ca>
-Date: Fri, 9 Oct 2015 03:53:52 -0400
-Subject: [PATCH] feature "trust-input" - Addresses CVE-2008-7315
-
-If trust-input == 1:
-  allow backticks and $() constructs
-else (default):
-  replace backticks with single-quotes and remove the $ from $()
----
- lib/UI/Dialog.pm                    |  2 ++
- lib/UI/Dialog/Backend.pm            | 35 +++++++++++++++++++++--------------
- lib/UI/Dialog/Backend/ASCII.pm      |  2 ++
- lib/UI/Dialog/Backend/CDialog.pm    |  2 ++
- lib/UI/Dialog/Backend/GDialog.pm    |  2 ++
- lib/UI/Dialog/Backend/KDialog.pm    |  3 +++
- lib/UI/Dialog/Backend/NotifySend.pm |  2 ++
- lib/UI/Dialog/Backend/Whiptail.pm   |  3 +++
- lib/UI/Dialog/Backend/XDialog.pm    |  2 ++
- lib/UI/Dialog/Backend/XOSD.pm       |  3 +++
- lib/UI/Dialog/Backend/Zenity.pm     |  2 ++
- lib/UI/Dialog/Console.pm            |  2 ++
- lib/UI/Dialog/GNOME.pm              |  2 ++
- lib/UI/Dialog/Gauged.pm             |  2 ++
- lib/UI/Dialog/KDE.pm                |  2 ++
- lib/UI/Dialog/Screen/Menu.pm        |  1 +
- 16 files changed, 53 insertions(+), 14 deletions(-)
-
-diff --git lib/UI/Dialog.pm lib/UI/Dialog.pm
-index 2e98844..021bc47 100644
---- lib/UI/Dialog.pm
-+++ lib/UI/Dialog.pm
-@@ -68,6 +68,8 @@ sub new {
-     $self->_debug("ENV->UI_DIALOG: ".($ENV{'UI_DIALOG'}||'NULL'),2);
-     unshift(@{$cfg->{'order'}},$ENV{'UI_DIALOG'}) if $ENV{'UI_DIALOG'};
- 
-+    $cfg->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     my @opts = ();
-     foreach my $opt (keys(%$cfg)) { push(@opts,$opt,$cfg->{$opt}); }
- 
-diff --git lib/UI/Dialog/Backend.pm lib/UI/Dialog/Backend.pm
-index 1416c23..27c3859 100644
---- lib/UI/Dialog/Backend.pm
-+++ lib/UI/Dialog/Backend.pm
-@@ -499,9 +499,10 @@ sub _merge_attrs {
- 					$list->[$i] = $self->_esc_text($list->[$i]);
- 				}
- 			}
--		} else {
--			$args->{'list'} = $self->_esc_text($args->{'list'});
--		}
-+    } else {
-+      # This isn't an array, how did we get here? Programmer error?
-+      $args->{'list'} = $self->_esc_text($list);
-+    }
-     }
-     $args->{'clear'} = $args->{'clearbefore'} || $args->{'clearafter'} || $args->{'autoclear'} || 0;
-     $args->{'beep'} = $args->{'beepbefore'} || $args->{'beepafter'} || $args->{'autobeep'} || 0;
-@@ -535,17 +536,23 @@ sub _esc_text {
-     my $self = $_[0];
-     my $text = $_[1];
-     unless (ref($text)) {
--		$text =~ s!\"!\\"!gm;
--		$text =~ s!\`!\\`!gm;
--		$text =~ s!\(!\(!gm;
--		$text =~ s!\)!\)!gm;
--		$text =~ s!\[!\[!gm;
--		$text =~ s!\]!\]!gm;
--		$text =~ s!\{!\{!gm;
--		$text =~ s!\}!\}!gm;
--		$text =~ s!\$!\\\$!gm;
--		$text =~ s!\>!\>!gm;
--		$text =~ s!\<!\<!gm;
-+      if ($self->{'_opts'}->{'trust-input'} != 0) {
-+        $text =~ s!`!\`!gm;
-+        $text =~ s!\$!\$!gm;
-+      } else {
-+        # untrusted input, replace ` with ' and drop the $ from $()
-+        $text =~ s!`!\'!gm;
-+        $text =~ s!\$\(!\(!gm;
-+      }
-+      $text =~ s!"!\"!gm;
-+      $text =~ s!\(!\(!gm;
-+      $text =~ s!\)!\)!gm;
-+      $text =~ s!\[!\[!gm;
-+      $text =~ s!\]!\]!gm;
-+      $text =~ s!\{!\{!gm;
-+      $text =~ s!\}!\}!gm;
-+      $text =~ s!>!\>!gm;
-+      $text =~ s!<!\<!gm;
-     }
-     return($text);
- }
-diff --git lib/UI/Dialog/Backend/ASCII.pm lib/UI/Dialog/Backend/ASCII.pm
-index 1c4f102..c780ade 100644
---- lib/UI/Dialog/Backend/ASCII.pm
-+++ lib/UI/Dialog/Backend/ASCII.pm
-@@ -78,6 +78,8 @@ sub new {
- 									$self->_find_bin('more')  );
-     $self->{'_opts'}->{'stty'} = $cfg->{'stty'} || $self->_find_bin('stty');
- 
-+    $self->{'_opts'}->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     $self->{'_state'} = {'rv'=>0};
- 
-     return($self);
-diff --git lib/UI/Dialog/Backend/CDialog.pm lib/UI/Dialog/Backend/CDialog.pm
-index 531bf96..dac98f6 100644
---- lib/UI/Dialog/Backend/CDialog.pm
-+++ lib/UI/Dialog/Backend/CDialog.pm
-@@ -100,6 +100,8 @@ sub new {
-     $self->{'_opts'}->{'yes-label'} = $cfg->{'yes-label'} || undef();
-     $self->{'_opts'}->{'no-label'} = $cfg->{'no-label'} || undef();
- 
-+    $self->{'_opts'}->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     $self->_determine_dialog_variant();
-     return($self);
- }
-diff --git lib/UI/Dialog/Backend/GDialog.pm lib/UI/Dialog/Backend/GDialog.pm
-index 87ca5c7..2022d61 100644
---- lib/UI/Dialog/Backend/GDialog.pm
-+++ lib/UI/Dialog/Backend/GDialog.pm
-@@ -71,6 +71,8 @@ sub new {
- 		croak("the gdialog binary could not be found at: ".$self->{'_opts'}->{'bin'});
-     }
- 
-+    $self->{'_opts'}->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     return($self);
- }
- 
-diff --git lib/UI/Dialog/Backend/KDialog.pm lib/UI/Dialog/Backend/KDialog.pm
-index a13a66c..fc94b7b 100644
---- lib/UI/Dialog/Backend/KDialog.pm
-+++ lib/UI/Dialog/Backend/KDialog.pm
-@@ -71,6 +71,9 @@ sub new {
-     unless (-x $self->{'_opts'}->{'bin'}) {
- 		croak("the kdialog binary could not be found at: ".$self->{'_opts'}->{'bin'});
-     }
-+
-+    $self->{'_opts'}->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     return($self);
- }
- 
-diff --git lib/UI/Dialog/Backend/Whiptail.pm lib/UI/Dialog/Backend/Whiptail.pm
-index 840f549..3f3ac56 100644
---- lib/UI/Dialog/Backend/Whiptail.pm
-+++ lib/UI/Dialog/Backend/Whiptail.pm
-@@ -72,6 +72,9 @@ sub new {
-     unless (-x $self->{'_opts'}->{'bin'}) {
- 		croak("the whiptail binary could not be found at: ".$self->{'_opts'}->{'bin'});
-     }
-+
-+    $self->{'_opts'}->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     return($self);
- }
- 
-diff --git lib/UI/Dialog/Backend/XDialog.pm lib/UI/Dialog/Backend/XDialog.pm
-index ff83ad6..87d4192 100644
---- lib/UI/Dialog/Backend/XDialog.pm
-+++ lib/UI/Dialog/Backend/XDialog.pm
-@@ -164,6 +164,8 @@ sub new {
-     $self->{'_opts'}->{'timeout'} = $cfg->{'timeout'} || 0;
-     $self->{'_opts'}->{'wait'} = $cfg->{'wait'} || 0;
- 
-+    $self->{'_opts'}->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     return($self);
- }
- 
-diff --git lib/UI/Dialog/Backend/XOSD.pm lib/UI/Dialog/Backend/XOSD.pm
-index e03a2cf..fb78573 100644
---- lib/UI/Dialog/Backend/XOSD.pm
-+++ lib/UI/Dialog/Backend/XOSD.pm
-@@ -75,6 +75,9 @@ sub new {
-     unless (-x $self->{'_opts'}->{'bin'}) {
- 		croak("the osd_cat binary could not be found at: ".$self->{'_opts'}->{'bin'});
-     }
-+
-+    $self->{'_opts'}->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     return($self);
- }
- 
-diff --git lib/UI/Dialog/Backend/Zenity.pm lib/UI/Dialog/Backend/Zenity.pm
-index 8f1a43c..f495a67 100644
---- lib/UI/Dialog/Backend/Zenity.pm
-+++ lib/UI/Dialog/Backend/Zenity.pm
-@@ -74,6 +74,8 @@ sub new {
- 		croak("the zenity binary could not be found at: ".$self->{'_opts'}->{'bin'});
-     }
- 
-+    $self->{'_opts'}->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     my $command = $self->{'_opts'}->{'bin'}." --version";
-     my $version = `$command 2>&1`;
-     chomp( $version );
-diff --git lib/UI/Dialog/Console.pm lib/UI/Dialog/Console.pm
-index 97d01f7..86b3681 100644
---- lib/UI/Dialog/Console.pm
-+++ lib/UI/Dialog/Console.pm
-@@ -57,6 +57,8 @@ sub new {
-     $self->_debug("ENV->UI_DIALOG: ".($ENV{'UI_DIALOG'}||'NULL'),2);
-     unshift(@{$cfg->{'order'}},$ENV{'UI_DIALOG'}) if $ENV{'UI_DIALOG'};
- 
-+    $cfg->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     my @opts = ();
-     foreach my $opt (keys(%$cfg)) { push(@opts,$opt,$cfg->{$opt}); }
- 
-diff --git lib/UI/Dialog/GNOME.pm lib/UI/Dialog/GNOME.pm
-index 36471ea..12e4e15 100644
---- lib/UI/Dialog/GNOME.pm
-+++ lib/UI/Dialog/GNOME.pm
-@@ -57,6 +57,8 @@ sub new {
-     $self->_debug("ENV->UI_DIALOG: ".($ENV{'UI_DIALOG'}||'NULL'),2);
-     unshift(@{$cfg->{'order'}},$ENV{'UI_DIALOG'}) if $ENV{'UI_DIALOG'};
- 
-+    $cfg->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     my @opts = ();
-     foreach my $opt (keys(%$cfg)) { push(@opts,$opt,$cfg->{$opt}); }
- 
-diff --git lib/UI/Dialog/Gauged.pm lib/UI/Dialog/Gauged.pm
-index 138d6f8..3c77cdd 100644
---- lib/UI/Dialog/Gauged.pm
-+++ lib/UI/Dialog/Gauged.pm
-@@ -68,6 +68,8 @@ sub new {
-     $self->_debug("ENV->UI_DIALOG: ".($ENV{'UI_DIALOG'}||'NULL'),2);
-     unshift(@{$cfg->{'order'}},$ENV{'UI_DIALOG'}) if $ENV{'UI_DIALOG'};
- 
-+    $cfg->{'trust-input'} = ($cfg->{'trust-input'}==1) ? 1 : 0;
-+
-     my @opts = ();
-     foreach my $opt (keys(%$cfg)) { push(@opts,$opt,$cfg->{$opt}); }
- 
-diff --git lib/UI/Dialog/Screen/Menu.pm lib/UI/Dialog/Screen/Menu.pm
-index 17b2d90..39a30dc 100644
---- lib/UI/Dialog/Screen/Menu.pm
-+++ lib/UI/Dialog/Screen/Menu.pm
-@@ -33,6 +33,7 @@ sub new {
-           PATH => (defined $args{PATH}) ? $args{PATH} : undef,
-           beepbefore => (defined $args{beepbefore}) ? $args{beepbefore} : undef,
-           beepafter => (defined $args{beepafter}) ? $args{beepafter} : undef,
-+          'trust-input' = ($args{'trust-input'}==1) ? 1 : 0;
-          );
-     }
-     unless (exists $args{menu}) {
diff --git a/devel/p5-UI-Dialog/pkg-plist b/devel/p5-UI-Dialog/pkg-plist
index e83647cd0d1c..87a254ba34f7 100644
--- a/devel/p5-UI-Dialog/pkg-plist
+++ b/devel/p5-UI-Dialog/pkg-plist
@@ -1,19 +1,3 @@
-%%PERL5_MAN3%%/UI::Dialog.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend::ASCII.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend::CDialog.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend::GDialog.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend::KDialog.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend::Nautilus.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend::Whiptail.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend::XDialog.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend::XOSD.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Backend::Zenity.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Console.3.gz
-%%PERL5_MAN3%%/UI::Dialog::GNOME.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Gauged.3.gz
-%%PERL5_MAN3%%/UI::Dialog::KDE.3.gz
-%%PERL5_MAN3%%/UI::Dialog::Screen::Menu.3.gz
 %%SITE_PERL%%/UI/Dialog.pm
 %%SITE_PERL%%/UI/Dialog.pod
 %%SITE_PERL%%/UI/Dialog/Backend.pm
@@ -44,5 +28,24 @@
 %%SITE_PERL%%/UI/Dialog/Gauged.pod
 %%SITE_PERL%%/UI/Dialog/KDE.pm
 %%SITE_PERL%%/UI/Dialog/KDE.pod
+%%SITE_PERL%%/UI/Dialog/Screen/Druid.pm
+%%SITE_PERL%%/UI/Dialog/Screen/Druid.pod
 %%SITE_PERL%%/UI/Dialog/Screen/Menu.pm
 %%SITE_PERL%%/UI/Dialog/Screen/Menu.pod
+%%PERL5_MAN3%%/UI::Dialog.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend::ASCII.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend::CDialog.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend::GDialog.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend::KDialog.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend::Nautilus.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend::Whiptail.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend::XDialog.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend::XOSD.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Backend::Zenity.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Console.3.gz
+%%PERL5_MAN3%%/UI::Dialog::GNOME.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Gauged.3.gz
+%%PERL5_MAN3%%/UI::Dialog::KDE.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Screen::Druid.3.gz
+%%PERL5_MAN3%%/UI::Dialog::Screen::Menu.3.gz