Hi,
the attached patches update p5-Package-Stash, p5-Package-Stash-XS,
p5-namespace-clean, p5-namespace-autoclean and also p5-Class-MOP. A lot
of Perl modules depend on recent versions of these modules.
The ports have to be updated together. p5-namespace-autoclean depends on
p5-namespace-clean >= 0.20. p5-namespace-clean depends on
p5-Package-Stash >= 0.23. p5-Package-Stash 0.33 utilises
p5-Package-Stash-XS if installed.
One of p5-Class-MOP's tests needs to be updated since a message changed
in Package::Stash. Furthermore, p5-Task-Weaken is only a build
dependency and BUILD_DEPENDS doesn't have to be set to RUN_DEPENDS.
USE_GROFF was removed from all five ports.
No maintainer feedback for two weeks. The ports are available at
L<https://github.com/jasperla/openbsd-wip/tree/master/devel>. See the
UPDATE files in the Git repository for the changelogs.
Tested on i386 and amd64.
--
Regards,
Andreas
diff --git a/devel/p5-Package-Stash/Makefile b/devel/p5-Package-Stash/Makefile
index 182a3e7..e8ce20b 100644
--- a/devel/p5-Package-Stash/Makefile
+++ b/devel/p5-Package-Stash/Makefile
@@ -3,10 +3,8 @@
COMMENT= routines for manipulating stashes
MODULES= cpan
-DISTNAME= Package-Stash-0.05
-REVISION= 0
+DISTNAME= Package-Stash-0.33
CATEGORIES= devel
-USE_GROFF = Yes
MAINTAINER= Jim Razmus II <[email protected]>
@@ -16,6 +14,10 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-REGRESS_DEPENDS= devel/p5-Test-Exception
+RUN_DEPENDS = devel/p5-Dist-CheckConflicts \
+ devel/p5-Package-DeprecationManager
+
+REGRESS_DEPENDS = devel/p5-Test-Fatal \
+ devel/p5-Test-Requires
.include <bsd.port.mk>
diff --git a/devel/p5-Package-Stash/distinfo b/devel/p5-Package-Stash/distinfo
index 25d2c8a..6138abf 100644
--- a/devel/p5-Package-Stash/distinfo
+++ b/devel/p5-Package-Stash/distinfo
@@ -1,5 +1,5 @@
-MD5 (Package-Stash-0.05.tar.gz) = 17OFesofIrLaBs/NMSPL7w==
-RMD160 (Package-Stash-0.05.tar.gz) = TUoduL7GOvE6idTRtJjPj/rGyqw=
-SHA1 (Package-Stash-0.05.tar.gz) = OEOPduPMFLJa+zuy6bPKxt6p92M=
-SHA256 (Package-Stash-0.05.tar.gz) =
5yRZg67ugURM/frSIki3HwdEIp+qFgUHhGiqXSWeGXY=
-SIZE (Package-Stash-0.05.tar.gz) = 17023
+MD5 (Package-Stash-0.33.tar.gz) = /h9u+g29RvhSCQO0NvGF8Q==
+RMD160 (Package-Stash-0.33.tar.gz) = /MyL9B9zpfkvDnHDfSzW19jp0/I=
+SHA1 (Package-Stash-0.33.tar.gz) = m+sQKiFMEwfZ2UgIYZfzN7TN/mQ=
+SHA256 (Package-Stash-0.33.tar.gz) =
9l/YFdUVBv/EgCU/3tZ8BNMow2B8Q0HHu3pb9nAWpVU=
+SIZE (Package-Stash-0.33.tar.gz) = 29841
diff --git a/devel/p5-Package-Stash/pkg/PLIST b/devel/p5-Package-Stash/pkg/PLIST
index f400b5b..ccc76ac 100644
--- a/devel/p5-Package-Stash/pkg/PLIST
+++ b/devel/p5-Package-Stash/pkg/PLIST
@@ -1,4 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/06/29 13:56:06 jim Exp $
-${P5SITE}/Package/
+bin/package-stash-conflicts
+${P5SITE}/Package/Stash/
${P5SITE}/Package/Stash.pm
+${P5SITE}/Package/Stash/Conflicts.pm
+${P5SITE}/Package/Stash/PP.pm
@man man/man3p/Package::Stash.3p
+@man man/man3p/Package::Stash::PP.3p
diff --git a/devel/p5-Package-Stash-XS/Makefile
b/devel/p5-Package-Stash-XS/Makefile
index a2ba375..605d013 100644
--- a/devel/p5-Package-Stash-XS/Makefile
+++ b/devel/p5-Package-Stash-XS/Makefile
@@ -4,7 +4,7 @@ COMMENT = faster and more correct implementation of
Package::Stash
SHARED_ONLY = Yes
MODULES = cpan
-DISTNAME = Package-Stash-XS-0.22
+DISTNAME = Package-Stash-XS-0.25
CATEGORIES = devel
# Perl
diff --git a/devel/p5-Package-Stash-XS/distinfo
b/devel/p5-Package-Stash-XS/distinfo
index 6a45dd4..1f99280 100644
--- a/devel/p5-Package-Stash-XS/distinfo
+++ b/devel/p5-Package-Stash-XS/distinfo
@@ -1,5 +1,5 @@
-MD5 (Package-Stash-XS-0.22.tar.gz) = DHT6p5IBXl4+uFKxDJ4dcg==
-RMD160 (Package-Stash-XS-0.22.tar.gz) = Bh2fOb33mpNYJbqbyUmm74lbjFA=
-SHA1 (Package-Stash-XS-0.22.tar.gz) = JZIUsrUG+S7pNqW3zSv3hog1OXM=
-SHA256 (Package-Stash-XS-0.22.tar.gz) =
9pyXJ2s+APNxDbOD4L1PXcrOw3YCZNCSf0CcgM6pKOw=
-SIZE (Package-Stash-XS-0.22.tar.gz) = 65842
+MD5 (Package-Stash-XS-0.25.tar.gz) = UuzhiELEbaj7ekoU3qkQqw==
+RMD160 (Package-Stash-XS-0.25.tar.gz) = Mq+Zz635DybnkUedoy9lqIK4QJE=
+SHA1 (Package-Stash-XS-0.25.tar.gz) = 5LExwDeSEIqHKJKJvJq3XqVVwuE=
+SHA256 (Package-Stash-XS-0.25.tar.gz) =
c5xYENaaKDRrNYhuczWIlTjRRJ8TZWFkINjpExqshcQ=
+SIZE (Package-Stash-XS-0.25.tar.gz) = 67155
diff --git a/devel/p5-Class-MOP/Makefile b/devel/p5-Class-MOP/Makefile
index 390893f..1849639 100644
--- a/devel/p5-Class-MOP/Makefile
+++ b/devel/p5-Class-MOP/Makefile
@@ -6,8 +6,8 @@ COMMENT= meta object protocol for perl 5
MODULES= cpan
DISTNAME= Class-MOP-1.12
+REVISION= 0
CATEGORIES= devel
-USE_GROFF = Yes
# perl
PERMIT_PACKAGE_CDROM= Yes
@@ -15,14 +15,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-BUILD_DEPENDS= ${RUN_DEPENDS}
+BUILD_DEPENDS= devel/p5-Task-Weaken
+
RUN_DEPENDS= devel/p5-Devel-GlobalDestruction \
devel/p5-List-MoreUtils \
devel/p5-MRO-Compat \
devel/p5-Package-DeprecationManager \
devel/p5-Package-Stash \
devel/p5-Sub-Name>=0.04 \
- devel/p5-Task-Weaken \
devel/p5-Try-Tiny>=0.07
REGRESS_DEPENDS=devel/p5-Test-Fatal \
diff --git
a/devel/p5-Class-MOP/patches/patch-t_016_class_errors_and_edge_cases_t
b/devel/p5-Class-MOP/patches/patch-t_016_class_errors_and_edge_cases_t
new file mode 100644
index 0000000..9b028a8
--- /dev/null
+++ b/devel/p5-Class-MOP/patches/patch-t_016_class_errors_and_edge_cases_t
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- t/016_class_errors_and_edge_cases.t.orig Mon Jan 3 17:46:36 2011
++++ t/016_class_errors_and_edge_cases.t Mon Oct 24 20:48:39 2011
+@@ -50,7 +50,7 @@ use Class::MOP;
+
+ like( exception {
+ Class::MOP::Class->create('+++');
+- }, qr/^creation of \+\+\+ failed/, '... create requires a valid
package_name parameter' );
++ }, qr/^\+\+\+ is not a module name/, '... create requires a valid
package_name parameter' );
+
+ }
+
diff --git a/devel/p5-namespace-clean/Makefile
b/devel/p5-namespace-clean/Makefile
index c9ecc15..f6e6b7a 100644
--- a/devel/p5-namespace-clean/Makefile
+++ b/devel/p5-namespace-clean/Makefile
@@ -3,10 +3,8 @@
COMMENT = keep imports and functions out of your namespace
MODULES = cpan
-DISTNAME = namespace-clean-0.18
-REVISION = 0
+DISTNAME = namespace-clean-0.21
CATEGORIES = devel
-USE_GROFF = Yes
MAINTAINER = Simon Bertrang <[email protected]>
@@ -17,9 +15,8 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
RUN_DEPENDS = devel/p5-B-Hooks-EndOfScope>=0.07 \
- devel/p5-Package-Stash \
+ devel/p5-Package-Stash>=0.23 \
devel/p5-Sub-Identify \
devel/p5-Sub-Name
-BUILD_DEPENDS = ${RUN_DEPENDS}
.include <bsd.port.mk>
diff --git a/devel/p5-namespace-clean/distinfo
b/devel/p5-namespace-clean/distinfo
index 8a45a07..9ad3378 100644
--- a/devel/p5-namespace-clean/distinfo
+++ b/devel/p5-namespace-clean/distinfo
@@ -1,5 +1,5 @@
-MD5 (namespace-clean-0.18.tar.gz) = qWSst3MkxoahENOLcwKoeQ==
-RMD160 (namespace-clean-0.18.tar.gz) = gPRdVgU41WN8CrLSB6Ani6+q5/U=
-SHA1 (namespace-clean-0.18.tar.gz) = lxGpLey1NDyTb0rdK4gJOTdRufY=
-SHA256 (namespace-clean-0.18.tar.gz) =
kmk88Cjfg+J54vpYatdV05J7M9X1V+p7G2bCBA9YTMc=
-SIZE (namespace-clean-0.18.tar.gz) = 17063
+MD5 (namespace-clean-0.21.tar.gz) = 6r+I7sP1lSxLuHRhtp/R2A==
+RMD160 (namespace-clean-0.21.tar.gz) = pCTPNLQ9biTors6PyVvvpm+y3bI=
+SHA1 (namespace-clean-0.21.tar.gz) = OIQSQYFEuaP/kJkngB065rAm8qQ=
+SHA256 (namespace-clean-0.21.tar.gz) =
sWBpvJJh+MnyvVQflgduCWH6RCTOKZ2sDJxVI6GOWDY=
+SIZE (namespace-clean-0.21.tar.gz) = 11809
diff --git a/devel/p5-namespace-autoclean/Makefile
b/devel/p5-namespace-autoclean/Makefile
index 3c3e95b..8500b9b 100644
--- a/devel/p5-namespace-autoclean/Makefile
+++ b/devel/p5-namespace-autoclean/Makefile
@@ -3,10 +3,8 @@
COMMENT = keep imports out of your namespace
MODULES = cpan
-DISTNAME = namespace-autoclean-0.09
-REVISION = 0
+DISTNAME = namespace-autoclean-0.13
CATEGORIES = devel
-USE_GROFF = Yes
MAINTAINER = Cesare Gargano <[email protected]>
@@ -18,8 +16,9 @@ PERMIT_DISTFILES_FTP = Yes
RUN_DEPENDS = devel/p5-B-Hooks-EndOfScope \
devel/p5-Class-MOP \
- devel/p5-namespace-clean
+ devel/p5-namespace-clean>=0.20
-REGRESS_DEPENDS = devel/p5-Moose
+REGRESS_DEPENDS = devel/p5-Moose \
+ devel/p5-Sub-Name
.include <bsd.port.mk>
diff --git a/devel/p5-namespace-autoclean/distinfo
b/devel/p5-namespace-autoclean/distinfo
index 154cd47..3c6d373 100644
--- a/devel/p5-namespace-autoclean/distinfo
+++ b/devel/p5-namespace-autoclean/distinfo
@@ -1,5 +1,5 @@
-MD5 (namespace-autoclean-0.09.tar.gz) = eSQetJKc327s1uXMTB7y+A==
-RMD160 (namespace-autoclean-0.09.tar.gz) = NDAY12b4JCmkfuyaWNybT0OWDrs=
-SHA1 (namespace-autoclean-0.09.tar.gz) = /woR7/51wKjeZBjl+K0Y/Cgk6X4=
-SHA256 (namespace-autoclean-0.09.tar.gz) =
hzDhWhDlmB5BfQb6NpDNVNW8hFNl4q80hxNEhpVbMok=
-SIZE (namespace-autoclean-0.09.tar.gz) = 10993
+MD5 (namespace-autoclean-0.13.tar.gz) = 7FUntCDsRdP5MMY0XsI5Jg==
+RMD160 (namespace-autoclean-0.13.tar.gz) = w+jll5rDquUgI2svMo+kTDUG0QY=
+SHA1 (namespace-autoclean-0.13.tar.gz) = hagvwK3mPdRtQ4lopMGow48rFy8=
+SHA256 (namespace-autoclean-0.13.tar.gz) =
BNRwhlQBa/wVewd54fkzYrOPekvMs2MbBknRn1yao/A=
+SIZE (namespace-autoclean-0.13.tar.gz) = 12954
