On Sun, Apr 17, 2011 at 01:35:22AM +0100, Mikolaj Kucharski wrote:
> Should Devel::Symdump by a run depends for mod_perl or shoudn't?
I think it should. See attached patch. patch-lib_Apache_Status_pm diff
is probably not really needed when run depends are corrected.
PLIST patch mitigates exit code 1 error during pkg_add when you update
mod_perl and it was never enabled via mod_perl-enable command.
Ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_perl/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- Makefile 22 Nov 2010 08:36:49 -0000 1.34
+++ Makefile 17 Apr 2011 15:03:04 -0000
@@ -4,7 +4,7 @@
DISTNAME= mod_perl-1.31
PKGNAME= ${DISTNAME}
-REVISION= 2
+REVISION= 3
CATEGORIES= www perl5
MASTER_SITES= http://perl.apache.org/dist/ \
${MASTER_SITE_PERL_CPAN:=Apache/}
@@ -24,7 +24,8 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m perl util
-RUN_DEPENDS= www/p5-libwww \
+RUN_DEPENDS= devel/p5-Devel-Symdump \
+ www/p5-libwww \
www/p5-HTML-Parser
BUILD_DEPENDS= ${RUN_DEPENDS}
Index: patches/patch-lib_Apache_Status_pm
===================================================================
RCS file: patches/patch-lib_Apache_Status_pm
diff -N patches/patch-lib_Apache_Status_pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Apache_Status_pm 17 Apr 2011 15:03:04 -0000
@@ -0,0 +1,63 @@
+
+- give an error message when Devel::Symdump is not installed
+- up to date url to CPAN
+
+$OpenBSD$
+--- lib/Apache/Status.pm.orig Sun Apr 5 20:04:50 2009
++++ lib/Apache/Status.pm Sun Apr 17 15:49:04 2011
+@@ -23,7 +23,7 @@ else {
+ $newQ ||= sub { CGI->new; };
+ }
+
+-my $CPAN_base = "http://www.perl.com/CPAN/modules/by-module";;
++my $CPAN_base = "http://search.cpan.org/dist";;
+
+ my(%status) = (
+ script => "PerlRequire'd Files",
+@@ -101,9 +101,7 @@ EOF
+ sub symdump {
+ my($r, $q, $package) = @_;
+ unless ($is_installed{"Devel::Symdump"}) {
+- return <<EOF;
+-Please install the <a href="$CPAN_base/Devel/">Devel::Symdump</a> module.
+-EOF
++ return err_msg_symdump();
+ }
+ my $meth = "new";
+ $meth = "rnew" if lc($r->dir_config("StatusRdump")) eq "on";
+@@ -234,9 +232,20 @@ sub status_myconfig {
+ ["<pre>", Config::myconfig(), "</pre>"]
+ }
+
+-sub status_inh_tree { ["<pre>", Devel::Symdump->inh_tree, "</pre>"] }
+-sub status_isa_tree { ["<pre>", Devel::Symdump->isa_tree, "</pre>"] }
++sub status_inh_tree {
++ unless ($is_installed{"Devel::Symdump"}) {
++ return [err_msg_symdump()];
++ }
++ return ["<pre>", Devel::Symdump->inh_tree, "</pre>"];
++}
+
++sub status_isa_tree {
++ unless ($is_installed{"Devel::Symdump"}) {
++ return [err_msg_symdump()];
++ }
++ return ["<pre>", Devel::Symdump->isa_tree, "</pre>"];
++}
++
+ sub status_data_dump {
+ my($r,$q) = @_;
+ my($name,$type) = (split "/", $r->uri)[-2,-1];
+@@ -631,6 +640,12 @@ sub as_HTML {
+ push @m, "</TABLE>";
+
+ return join "\n", @m, "<hr>", b_package_size_link($r, $q, $package);
++}
++
++sub err_msg_symdump {
++ return "Please install the " .
++ "<a href=\"$CPAN_base/Devel-Symdump/\">Devel::Symdump</a> " .
++ "module.";
+ }
+
+ 1;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_perl/pkg/PLIST,v
retrieving revision 1.21
diff -u -r1.21 PLIST
--- pkg/PLIST 1 Oct 2008 14:31:35 -0000 1.21
+++ pkg/PLIST 17 Apr 2011 15:03:04 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.21 2008/10/01 14:31:35 sthen Exp $
lib/${MODAPACHE_MODULE}
-@exec-update test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
-${P5ARCH}/
+@exec-update if test -f ${MODAPACHE_FINAL}; then cp -fp %D/%F
${MODAPACHE_FINAL}; else :; fi
${P5ARCH}/Apache/
${P5ARCH}/Apache.pm
${P5ARCH}/Apache/Connection.pm
@@ -44,7 +43,6 @@
${P5ARCH}/Apache/testold.pm
${P5ARCH}/Bundle/
${P5ARCH}/Bundle/Apache.pm
-${P5ARCH}/auto/
${P5ARCH}/auto/Apache/
${P5ARCH}/auto/Apache/Leak/
${P5ARCH}/auto/Apache/Leak/Leak.bs
--
best regards
q#
