New upstream version 0.211

9 files changed, 177 insertions, 97 deletions

diff --git a/Changes b/Changes
index f5df456..d393357 100644
--- a/Changes
+++ b/Changes
@@ -1,63 +1,73 @@
 Revision history for Perl extension Term::Size.
 
-0.209 2018-08-21  Term-Size
-
-    - Tweak documentation
-    - Promote to a stable release
-
-0.208 2018-08-20  Term-Size ( TRIAL VERSION )
-
-    - use PerlIO instead of FILE* RT#38594
-    - On error, Term::Size functions now return undef
-      in scalar context, or an empty list on list context
-      RT#76292
-
-0.207 2008-08-16  Term-Size
-        - the original code for retrieving terminal size
-          via XS ioctl is back -- and this dist
-          is again Unix-centric
-        - use Term::Size::Any for platform independency
-
-0.205 2008-02-27  Term-Size-Unix
-        - disabled prototypes in XS code - too misleading
-          to be useful
-        - borrowed rewritten test from Term::Size::Any
-          (which should fix most test failures)
-        - NOTE: this distribution will disappear soon,
-          merging back to the original Term-Size dist
-
-0.204 2006-09-13  Term-Size-Unix
-        - included license in Makefile.PL
-
-0.203 2006-05-21  Term-Size-Unix
-	- moved sources from Term-Size to this distribution
-	- bug fixed: &pixels always used fd 0 rather than fileno(f)
-	- added test scripts "t/00_use.t" and "t/99_pod.t"
-
-0.203 2006-05-21  Term-Size
-	- bug fixed: &pixels always used fd 0 rather than fileno(f)
-	- experimental support for Win32 was introduced by
-	  adding a dependency on Term::Size::Win32
-	- added test scripts "t/00_use.t" and "t/99_pod.t"
-	- the XS code moved to distribution Term::Size::Unix -
-	  this module is now a thin skin to call the appropriate
-	  module Term::Size::Unix or Term::Size::Win32
-
-0.202 2006-05-19  Term-Size
-	- inserted a note to say this is an UNOFFICIAL distribution
-
-0.201 2006-05-18  Term-Size
-	- 'test.pl' rewritten with Test::More and renamed to 't/01_basic.t'
-	- an initializer is now used when creating a struct winsize
-	  to avoid what looks like a bug on Cygwin: ioctl(., TIOCGWINSZ, .)
-	  does not set ws_xpixel and ws_ypixel fields, leaving them untouched.
-	  If they contained garbage, they kept the garbage
-	- attempt to restore AIX compatibility according to suggestion
-	  in CPAN RT #11539 (by jydawg [at] xs4all.nl): "termios.h" 
-	  is not where Unix thinks it should
-
-0.2 1997-05-13  Term-Size
-	- support filehandle arguments
-
-0.1 1997-04-23  Term-Size
-	- original version
+0.211     2021-01-14 Term-Size
+
+   - Promote to a stable release
+
+0.210     2021-01-07 Term-Size ( TRIAL VERSION )
+
+   - Attempt to fix build at DragonFly BSD: include <termios.h> (like for AIX) rather than
+     <sys/termios.h>
+   - Rewrite Makefile.PL
+
+0.209     2018-08-21 Term-Size
+
+   - Tweak documentation
+   - Promote to a stable release
+
+0.208     2018-08-20 Term-Size ( TRIAL VERSION )
+
+   - use PerlIO instead of FILE* RT#38594
+   - On error, Term::Size functions now return undef in scalar context, or an empty list on
+     list context RT#76292
+
+0.207     2008-08-16 Term-Size
+
+   - the original code for retrieving terminal size via XS ioctl is back -- and this dist is
+     again Unix-centric
+   - use Term::Size::Any for platform independency
+
+0.205     2008-02-27 Term-Size-Unix
+
+   - disabled prototypes in XS code - too misleading to be useful
+   - borrowed rewritten test from Term::Size::Any (which should fix most test failures)
+   - NOTE: this distribution will disappear soon, merging back to the original Term-Size dist
+
+0.204     2006-09-13 Term-Size-Unix
+
+   - included license in Makefile.PL
+
+0.203.2   2006-05-21 Term-Size-Unix
+
+   - moved sources from Term-Size to this distribution
+   - bug fixed: &pixels always used fd 0 rather than fileno(f)
+   - added test scripts "t/00_use.t" and "t/99_pod.t"
+
+0.203.1   2006-05-21 Term-Size
+
+   - bug fixed: &pixels always used fd 0 rather than fileno(f)
+   - experimental support for Win32 was introduced by adding a dependency on Term::Size::Win32
+   - added test scripts "t/00_use.t" and "t/99_pod.t"
+   - the XS code moved to distribution Term::Size::Unix - this module is now a thin skin to
+     call the appropriate module Term::Size::Unix or Term::Size::Win32
+
+0.202     2006-05-19 Term-Size
+
+   - inserted a note to say this is an UNOFFICIAL distribution
+
+0.201     2006-05-18 Term-Size
+
+   - 'test.pl' rewritten with Test::More and renamed to 't/01_basic.t'
+   - an initializer is now used when creating a struct winsize to avoid what looks like a bug
+     on Cygwin: ioctl(., TIOCGWINSZ, .) does not set ws_xpixel and ws_ypixel fields, leaving
+     them untouched. If they contained garbage, they kept the garbage
+   - attempt to restore AIX compatibility according to suggestion in CPAN RT #11539 (by jydawg
+     [at] xs4all.nl): "termios.h"  is not where Unix thinks it should
+
+0.2       1997-05-13 Term-Size
+
+   - support filehandle arguments
+
+0.1       1997-04-23 Term-Size
+
+   - original version
diff --git a/Copyright b/Copyright
deleted file mode 100644
index 3ba5c5e..0000000
--- a/Copyright
+++ /dev/null
@@ -1,7 +0,0 @@
-The files in this directory are Copyright 1997-05-13, Tim Goodwin.
-
-You may redistribute them under the same terms as Perl itself.
-
-Tim Goodwin
-<tim@uunet.pipex.com>
-1997-05-13
diff --git a/MANIFEST b/MANIFEST
index d0d3e75..374b407 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,3 @@
-Copyright
 Changes
 MANIFEST
 Makefile.PL
diff --git a/META.json b/META.json
index 0173a4d..4bd75cf 100644
--- a/META.json
+++ b/META.json
@@ -1,16 +1,17 @@
 {
-   "abstract" : "Retrieve terminal size (Unix version)",
+   "abstract" : "Retrieve terminal size on Unix",
    "author" : [
-      "unknown"
+      "Tim Goodwin <tim@uunet.pipex.com>",
+      "Adriano Ferreira <ferreira@cpan.org>"
    ],
-   "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001",
+   "dynamic_config" : 0,
+   "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
    "license" : [
       "perl_5"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : "2"
+      "version" : 2
    },
    "name" : "Term-Size",
    "no_index" : {
@@ -30,12 +31,36 @@
             "ExtUtils::MakeMaker" : "0"
          }
       },
+      "develop" : {
+         "requires" : {
+            "Test::Pod" : "1.18"
+         }
+      },
       "runtime" : {
          "requires" : {
+            "DynaLoader" : "0",
+            "Exporter" : "0",
+            "strict" : "0",
+            "vars" : "0"
+         }
+      },
+      "test" : {
+         "requires" : {
             "Test::More" : "0"
          }
       }
    },
    "release_status" : "stable",
-   "version" : "0.209"
+   "resources" : {
+      "bugtracker" : {
+         "web" : "https://github.com/aferreira/cpan-Term-Size/issues"
+      },
+      "repository" : {
+         "type" : "git",
+         "url" : "git://github.com/aferreira/cpan-Term-Size.git",
+         "web" : "https://github.com/aferreira/cpan-Term-Size"
+      }
+   },
+   "version" : "0.211",
+   "x_serialization_backend" : "JSON::PP version 4.02"
 }
diff --git a/META.yml b/META.yml
index 315ecfe..0884bf3 100644
--- a/META.yml
+++ b/META.yml
@@ -1,13 +1,15 @@
 ---
-abstract: 'Retrieve terminal size (Unix version)'
+abstract: 'Retrieve terminal size on Unix'
 author:
-  - unknown
+  - 'Tim Goodwin <tim@uunet.pipex.com>'
+  - 'Adriano Ferreira <ferreira@cpan.org>'
 build_requires:
   ExtUtils::MakeMaker: '0'
+  Test::More: '0'
 configure_requires:
   ExtUtils::MakeMaker: '0'
-dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001'
+dynamic_config: 0
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -18,5 +20,12 @@ no_index:
     - t
     - inc
 requires:
-  Test::More: '0'
-version: '0.209'
+  DynaLoader: '0'
+  Exporter: '0'
+  strict: '0'
+  vars: '0'
+resources:
+  bugtracker: https://github.com/aferreira/cpan-Term-Size/issues
+  repository: git://github.com/aferreira/cpan-Term-Size.git
+version: '0.211'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/Makefile.PL b/Makefile.PL
index 99c374f..7b5cb52 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -6,17 +6,56 @@ my $EUMM_VERSION = eval $ExtUtils::MakeMaker::VERSION;
 
 die q{OS unsupported\n} if $^O =~ /MSWin/i;
 
-WriteMakefile(
-	'NAME'          => 'Term::Size',
-	'VERSION_FROM'  => 'Size.pm',
-	'PREREQ_PM'     => {
-		'Test::More'            => 0, # build
-	}, 
-	($] >= 5.005 ? (
-		'ABSTRACT_FROM' => 'Size.pm',
-	) : ()),
-        ($EUMM_VERSION >= 6.30_01 ? (
-	        LICENSE => 'perl', # needs EEUU > 6.30_01
-        ) : ()),
+my %META = (
+    'dynamic_config' => 0,
+    'meta-spec'      => { version => 2 },
+    'prereqs'        => {
+        develop => {
+            requires => {    # author tests
+                'Test::Pod' => '1.18',
+            }
+        },
+    },
+    'resources' => {
+        repository => {
+            type => 'git',
+            url  => 'git://github.com/aferreira/cpan-Term-Size.git',
+            web  => 'https://github.com/aferreira/cpan-Term-Size'
+        },
+        bugtracker => {
+            web => 'https://github.com/aferreira/cpan-Term-Size/issues',
+        },
+    },
+);
 
+WriteMakefile(
+    NAME   => 'Term::Size',
+    AUTHOR => [
+        'Tim Goodwin <tim@uunet.pipex.com>',
+        'Adriano Ferreira <ferreira@cpan.org>'
+    ],
+    VERSION_FROM  => 'Size.pm',
+($] >= 5.005 ? (
+    ABSTRACT_FROM => 'Size.pm',
+) : ()),
+($EUMM_VERSION >= 6.3001 ? (
+    LICENSE       => 'perl',
+) : ()),
+($EUMM_VERSION >= 6.4501 ? (
+    META_MERGE    => \%META,
+) : ()),
+($EUMM_VERSION >= 6.6303 ? (
+    TEST_REQUIRES => {
+        'Test::More' => 0,
+    },
+) : ()),
+    PREREQ_PM => {
+        'strict'     => 0,
+        'DynaLoader' => 0,
+        'Exporter'   => 0,
+        'vars'       => 0,
+($EUMM_VERSION < 6.6303 ? (
+        'Test::More' => 0,    # test
+) : ()),
+    },
 );
diff --git a/README b/README
index 01a7042..afab265 100644
--- a/README
+++ b/README
@@ -1,4 +1,3 @@
-This is alpha release 0.2 of Term::Size.
 
 Term::Size is a Perl module which provides a straightforward way to get
 the size of the terminal (or window) on which a script is running.
diff --git a/Size.pm b/Size.pm
index dcf4690..ef25837 100644
--- a/Size.pm
+++ b/Size.pm
@@ -9,7 +9,7 @@ use Exporter ();
 @ISA = qw(Exporter DynaLoader);
 @EXPORT_OK = qw(chars pixels);
 
-$VERSION = '0.209';
+$VERSION = '0.211';
 
 bootstrap Term::Size $VERSION;
 
@@ -19,7 +19,7 @@ bootstrap Term::Size $VERSION;
 
 =head1 NAME
 
-Term::Size - Retrieve terminal size (Unix version)
+Term::Size - Retrieve terminal size on Unix
 
 =head1 SYNOPSIS
 
@@ -104,4 +104,10 @@ Tim Goodwin, <tim@uunet.pipex.com>, 1997-04-23.
 
 Adriano Ferreira, <ferreira@cpan.org>, 2006-05-19.
 
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 1997-05-13 by Tim Goodwin.
+
+You may redistribute them under the same terms as Perl itself.
+
 =cut
diff --git a/Size.xs b/Size.xs
index b368f1b..ca15743 100644
--- a/Size.xs
+++ b/Size.xs
@@ -6,7 +6,7 @@ extern "C" {
 #include "perl.h"
 #include "XSUB.h"
 
-#ifndef _AIX
+#if !defined(_AIX) && !defined(__DragonFly__)
 #include <sys/termios.h>
 #else
 #include <termios.h>