Date: Sat, 5 Aug 2006 15:32:37 +0200 (CEST) From: Lars Thegler <lth@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: leeym@FreeBSD.org Subject: ports/101404: [PATCH] devel/p5-File-HomeDir: Fix build on perl 5.005_03 Message-ID: <20060805133237.BD4953F43@dask.thegler.dk> Resent-Message-ID: <200608051340.k75DeGoo050027@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101404
>Category: ports
>Synopsis: [PATCH] devel/p5-File-HomeDir: Fix build on perl 5.005_03
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 05 13:40:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Lars Thegler
>Release: FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD dask.thegler.dk 4.11-STABLE FreeBSD 4.11-STABLE #6: Thu Dec 30 14:06:09 CET 2004
>Description:
Fix build on perl 5.005_03. These changes (and others) are present in developer release 0.60_2.
Added file(s):
- files/500503-patch-inc__Module__Install.pm
- files/500503-patch-inc__Module__Install__Makefile.pm
Port maintainer (leeym@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- p5-File-HomeDir-0.58.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/p5-File-HomeDir/Makefile,v
retrieving revision 1.8
diff -u -u -r1.8 Makefile
--- Makefile 11 May 2006 01:33:56 -0000 1.8
+++ Makefile 5 Aug 2006 13:29:09 -0000
@@ -26,7 +26,7 @@
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500600
-IGNORE= needs perl 5.6.0 or above
+EXTRA_PATCHES= ${PATCHDIR}/500503-*
.endif
.include <bsd.port.post.mk>
Index: files/500503-patch-inc__Module__Install.pm
===================================================================
RCS file: files/500503-patch-inc__Module__Install.pm
diff -N files/500503-patch-inc__Module__Install.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/500503-patch-inc__Module__Install.pm 5 Aug 2006 13:29:09 -0000
@@ -0,0 +1,11 @@
+--- ./inc/Module/Install.pm.orig Sat Aug 5 15:05:20 2006
++++ ./inc/Module/Install.pm Sat Aug 5 15:05:52 2006
+@@ -116,7 +116,7 @@
+ my %seen;
+ foreach my $obj ( @exts ) {
+ while (my ($method, $glob) = each %{ref($obj) . '::'}) {
+- next unless exists &{ref($obj).'::'.$method};
++ next unless $obj->can($method);
+ next if $method =~ /^_/;
+ next if $method eq uc($method);
+ $seen{$method}++;
Index: files/500503-patch-inc__Module__Install__Makefile.pm
===================================================================
RCS file: files/500503-patch-inc__Module__Install__Makefile.pm
diff -N files/500503-patch-inc__Module__Install__Makefile.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/500503-patch-inc__Module__Install__Makefile.pm 5 Aug 2006 13:29:09 -0000
@@ -0,0 +1,12 @@
+--- ./inc/Module/Install/Makefile.pm.orig Sat Aug 5 15:05:30 2006
++++ ./inc/Module/Install/Makefile.pm Sat Aug 5 15:05:52 2006
+@@ -175,6 +175,9 @@
+ $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
+ #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
+
++ # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
++ $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
++
+ # XXX - This is currently unused; not sure if it breaks other MM-users
+ # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
+
--- p5-File-HomeDir-0.58.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060805133237.BD4953F43>