5 files changed, 17 insertions, 60 deletions

diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 44a21f50d7ea..2de3fced43c3 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	Date-Manip
-PORTVERSION=	6.20
-PORTREVISION=	1
+PORTVERSION=	6.22
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SBECK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	swills@FreeBSD.org
@@ -22,6 +22,7 @@ PERL_CONFIGURE=	YES
 MAN3=	Date::Manip.3 Date::Manip::Base.3 Date::Manip::Calc.3 \
 	Date::Manip::Changes5.3 Date::Manip::Changes5to6.3 \
 	Date::Manip::Changes6.3 Date::Manip::Config.3 \
+	Date::Manip::ConfigFile.3 \
 	Date::Manip::DM5.3 Date::Manip::DM5abbrevs.3 \
 	Date::Manip::DM6.3 Date::Manip::Date.3 \
 	Date::Manip::Delta.3 Date::Manip::Examples.3 \
diff --git a/devel/p5-Date-Manip/distinfo b/devel/p5-Date-Manip/distinfo
index 5615fb3461ae..59c579aadbd8 100644
--- a/devel/p5-Date-Manip/distinfo
+++ b/devel/p5-Date-Manip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Date-Manip-6.20.tar.gz) = 7b462627b2801f3c80827306b73218012b6a3c4c32e2b9ad0ede3a76f5c4bff0
-SIZE (Date-Manip-6.20.tar.gz) = 1392946
+SHA256 (Date-Manip-6.22.tar.gz) = 774e0815e0be7cc8e0359ba0574654325b8ae4c36f67abaf27d18d06a2d6f525
+SIZE (Date-Manip-6.22.tar.gz) = 1413857
diff --git a/devel/p5-Date-Manip/extramanpages.mk b/devel/p5-Date-Manip/extramanpages.mk
index 7ec2eed87dce..c6f7ac7e84dd 100644
--- a/devel/p5-Date-Manip/extramanpages.mk
+++ b/devel/p5-Date-Manip/extramanpages.mk
@@ -6,6 +6,7 @@ MAN3+=	Date::Manip::Lang::catalan.3 \
 	Date::Manip::Lang::german.3 \
 	Date::Manip::Lang::index.3 \
 	Date::Manip::Lang::italian.3 \
+	Date::Manip::Lang::norwegian.3 \
 	Date::Manip::Lang::polish.3 \
 	Date::Manip::Lang::portugue.3 \
 	Date::Manip::Lang::romanian.3 \
@@ -494,6 +495,7 @@ MAN3+=	Date::Manip::Lang::catalan.3 \
 	Date::Manip::Offset::off478.3 \
 	Date::Manip::Offset::off479.3 \
 	Date::Manip::Offset::off480.3 \
+	Date::Manip::Offset::off481.3 \
 	Date::Manip::TZ::a00.3 \
 	Date::Manip::TZ::afabid00.3 \
 	Date::Manip::TZ::afaccr00.3 \
@@ -559,6 +561,7 @@ MAN3+=	Date::Manip::Lang::catalan.3 \
 	Date::Manip::TZ::ambarb00.3 \
 	Date::Manip::TZ::ambele00.3 \
 	Date::Manip::TZ::ambeli00.3 \
+	Date::Manip::TZ::ambeul00.3 \
 	Date::Manip::TZ::amblan00.3 \
 	Date::Manip::TZ::amboa_00.3 \
 	Date::Manip::TZ::ambogo00.3 \
diff --git a/devel/p5-Date-Manip/pkg-descr b/devel/p5-Date-Manip/pkg-descr
index 5770b6138319..ad8c1e79cbc7 100644
--- a/devel/p5-Date-Manip/pkg-descr
+++ b/devel/p5-Date-Manip/pkg-descr
@@ -1,57 +1,6 @@
-       This is a set of routines designed to make any common
-       date/time manipulation easy to do.  Operations such as
-       comparing two times, calculating a time a given amount of
-       time from another, or parsing international times are all
-       easily done.
+Date::Manip is a series of modules designed to make any common date/time
+operation easy to do. Operations such as comparing two times, calculating a
+time a given amount of time from another, or parsing international times are
+all easily done.
 
-       Date::Manip deals only with the Gregorian calendar (the
-       one currently in use).  The Julian calendar defined leap
-       years as every 4th year.  The Gregorian calendar improved
-       this by making every 100th year NOT a leap year, unless it
-       was also the 400th year.  The Gregorian calendar has been
-       extrapolated back to the year 1000 AD and forward to the
-       year 9999 AD.  Note that in historical context, the Julian
-       calendar was in use until 1582 when the Gregorian calendar
-       was adopted by the Catholic church.  Protestant countries
-       did not accept it until later; Germany and Netherlands in
-       1698, British Empire in 1752, Russia in 1918.  Note that
-       the Gregorian calendar is itself imperfect.  Each year is
-       on average 26 seconds too long, which means that every
-       3,323 years, a day should be removed from the calendar.
-       No attempt is made to correct for that.
-
-       Date::Manip is therefore not equipped to truly deal with
-       historical dates, but should be able to perform
-       (virtually) any operation dealing with a modern time and
-       date.
-
-       Among other things, Date::Manip allow you to:
-
-       1.  Enter a date and be able to choose any format
-           convenient
-
-       2.  Compare two dates, entered in widely different formats
-           to determine which is earlier
-
-       3.  Extract any information you want from ANY date using a
-           format string similar to the Unix date command
-
-       4.  Determine the amount of time between two dates
-
-       5.  Add a time offset to a date to get a second date (i.e.
-           determine the date 132 days ago or 2 years and 3 months
-           after Jan 2, 1992)
-
-       6.  Work with dates with dates using international formats
-           (foreign month names, 12-10-95 referring to October rather than
-           December, etc.).
-
-       Each of these tasks is trivial (one or two lines at most)
-       with this package.
-
-       Although the word date is used extensively here, it is
-       actually somewhat misleading.  Date::Manip works with the
-       full date AND time (year, month, day, hour, minute,
-       second).
-
-WWW: http://www.cise.ufl.edu/~sbeck/
+WWW: http://search.cpan.org/dist/Date-Manip/
diff --git a/devel/p5-Date-Manip/pkg-plist b/devel/p5-Date-Manip/pkg-plist
index 84826a1f1ce3..284691b06953 100644
--- a/devel/p5-Date-Manip/pkg-plist
+++ b/devel/p5-Date-Manip/pkg-plist
@@ -6,6 +6,7 @@
 %%SITE_PERL%%/Date/Manip/Lang/german.pm
 %%SITE_PERL%%/Date/Manip/Lang/index.pm
 %%SITE_PERL%%/Date/Manip/Lang/italian.pm
+%%SITE_PERL%%/Date/Manip/Lang/norwegian.pm
 %%SITE_PERL%%/Date/Manip/Lang/polish.pm
 %%SITE_PERL%%/Date/Manip/Lang/portugue.pm
 %%SITE_PERL%%/Date/Manip/Lang/romanian.pm
@@ -494,6 +495,7 @@
 %%SITE_PERL%%/Date/Manip/Offset/off478.pm
 %%SITE_PERL%%/Date/Manip/Offset/off479.pm
 %%SITE_PERL%%/Date/Manip/Offset/off480.pm
+%%SITE_PERL%%/Date/Manip/Offset/off481.pm
 %%SITE_PERL%%/Date/Manip/TZ/a00.pm
 %%SITE_PERL%%/Date/Manip/TZ/afabid00.pm
 %%SITE_PERL%%/Date/Manip/TZ/afaccr00.pm
@@ -559,6 +561,7 @@
 %%SITE_PERL%%/Date/Manip/TZ/ambarb00.pm
 %%SITE_PERL%%/Date/Manip/TZ/ambele00.pm
 %%SITE_PERL%%/Date/Manip/TZ/ambeli00.pm
+%%SITE_PERL%%/Date/Manip/TZ/ambeul00.pm
 %%SITE_PERL%%/Date/Manip/TZ/amblan00.pm
 %%SITE_PERL%%/Date/Manip/TZ/amboa_00.pm
 %%SITE_PERL%%/Date/Manip/TZ/ambogo00.pm
@@ -947,6 +950,7 @@
 %%SITE_PERL%%/Date/Manip/Changes5to6.pod
 %%SITE_PERL%%/Date/Manip/Changes6.pod
 %%SITE_PERL%%/Date/Manip/Config.pod
+%%SITE_PERL%%/Date/Manip/ConfigFile.pod
 %%SITE_PERL%%/Date/Manip/DM5.pm
 %%SITE_PERL%%/Date/Manip/DM5.pod
 %%SITE_PERL%%/Date/Manip/DM6.pm