Update from version 6.30 to 6.44. Update discussed in general terms with jlam@. Pkgsrc changes: o Some of our changes appear to have been adopted upstream, so patch-aa is gone and other diffs are reduced in size. o We don't install or tweak perllocal.pod, so comment out the testing of it being installed in the selftests. Upstream changes: 6.44 Thu Feb 28 16:06:04 PST 2008 Bug Fixes * Updated bundled ExtUtils::Install to 1.45 which should fix some Cygwin issues. [rt.cpan.org 33291] 6.43_01 Tue Jan 1 16:06:47 PST 2008 Bug Fixes * Change the "is this really a Perl core library directory" checks to look for strict instead of Exporter. Now that Exporter is on CPAN it can wind up in site_perl. * split_command() will now set aside a little more space for macro expansion. This should help on systems with cramped command line lengths. Specifically, Pugs on Win32. [rt.cpan.org 20145] Installation * MakeMaker would not install if the installed MakeMaker was too old, like on 5.6.1. The installation process was still using the installed MakeMaker in a few places. This has been fixed. [rt.cpan.org 24746] OS X * "make dist" will no longer bundle up resource fork files (._foo). [rt.cpan.org 29525] Docs * The documentation of VERSION_FROM was recommending vstrings (1.2.3) which have never worked right. * The documentation for the accepted values of LICENSE moved to Module::Build::API. [rt.cpan.org 32020] Tests * The compilation test was testing the installed modules, not the about-to-be-installed. * xs.t would fail if ExtUtils::CBuilder was not installed. Misc * Cleanups brought to you by no more 5.5 compatibility! * MakeMaker is now perlcritic clean at severity level 5... except the really silly ones. * DIE use vars DIE! * Added some resources to the META.yml 6.42 Fri Dec 7 17:00:14 PST 2007 Bug Fixes - 6.33 moved PREREQ_FATAL to happen after CONFIGURE. This meant if your CONFIGURE use a prereq it would fail and no PREREQ_FATAL message would be displayed. - Put the "nicetext" functionality back, VMS needs it to deal with other people's custom make. But rename it to the more accurate maketext_filter(), test it and fix a bug where it would stop processing if it saw a macro declaration. 6.40 Thu Dec 6 03:00:47 PST 2007 Bug Fixes - Remove the dubious nicetext() Makefile formatting hack to account for a lack of space between the target and colon needed on VMS. This interfered with META.yml creation on VMS and possibly other output. - Fix the remaining targets which don't have a space between the target and the colon. 6.38 Wed Nov 28 16:01:12 PST 2007 Releasing 6.37_03 as 6.38. 6.37_03 Mon Nov 26 14:15:34 PST 2007 Tests - parse_version.t had wrong test count when version.pm isn't installed. - Fixed some warnings in the XS module we're using for testing. - "our $VERSION" test in parse_version.t was never running - Quoting uses of 1.2.3 style versions in parse_version.t to protect older perls. Portability - Moved the minimum required version up to 5.6.0. 6.37_02 Sun Nov 25 23:33:14 PST 2007 Test Improvements - Added a test for a basic XS build. Bug Fixes - A refactoring in 6.37_01 broke XS compilation. 6.37_01 Sun Nov 25 17:05:53 PST 2007 Improvements - Upgraded the META.yml to version 1.3 of the spec (which really doesn't change anything). Thanks bdfoy. - MakeMaker now always includes the required 'author' field in the META.yml even if it's undef to comply with the META.yml spec. - Updated ExtUtils-Install to latest version (1.44) - Unified the version numbers of all modules. Test Fixes - cd() test on VMS used non-native paths. [bleadperl 31534] - Removed uses of "no_plan" in tests to remain compatible with old versions of Test::Harness. - writemakefile_args.t had the wrong test count if version.pm isn't installed. Bug Fixes - $VERSION detection code would be confused by "sub version" [rt.cpan.org 30747] - LINKTYPE=static will now be propagated to child builds. [bleadperl 31761] Portability Fixes - Add "dragonfly" to the list of BSDish operating systems - BSD detection code would not pick up bsdos or internix - Fix detection of shared libperl on NetBSD [bleadperl 31526] 6.36 Tue Jul 3 01:06:40 PDT 2007 Test Fixes - version.pm prior to 0.7203 caused Foo->VERSION to reformat $Foo::VERSION. This caused prereq.t to fail. 6.35 Sun Jul 1 20:53:38 PDT 2007 New Features * MakeMaker will now try to "use version" before parsing $VERSION. This allows "$VERSION = qv(1.2.3)" to work. Test Fixes - writemakefile_args.t now works with older versions of version.pm 6.34 Sat Jun 30 11:06:54 CDT 2007 Test Fixes - Accidentally hard coded the version of strict.pm [rt.cpan.org 27838]diff -r1.5 -r1.6 pkgsrc/devel/p5-ExtUtils-MakeMaker/Makefile
(he)
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.5 2008/06/20 01:09:15 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.6 2008/07/26 19:11:53 he Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= ExtUtils-MakeMaker-6.30 | 4 | DISTNAME= ExtUtils-MakeMaker-6.44 | |
5 | PKGNAME= p5-${DISTNAME} | 5 | PKGNAME= p5-${DISTNAME} | |
6 | PKGREVISION= 1 | |||
7 | CATEGORIES= devel perl5 | 6 | CATEGORIES= devel perl5 | |
8 | MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/M/MS/MSCHWERN/} | 7 | MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/M/MS/MSCHWERN/} | |
9 | 8 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://search.cpan.org/dist/ExtUtils-MakeMaker/ | |||
11 | COMMENT= Write a Makefile for an extension module from a Makefile.PL | 11 | COMMENT= Write a Makefile for an extension module from a Makefile.PL | |
12 | 12 | |||
13 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 13 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
14 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 15 | |||
16 | PERL5_PACKLIST= auto/ExtUtils/MakeMaker/.packlist | 16 | PERL5_PACKLIST= auto/ExtUtils/MakeMaker/.packlist | |
17 | 17 | |||
18 | .include "../../lang/perl5/module.mk" | 18 | .include "../../lang/perl5/module.mk" | |
19 | .include "../../mk/bsd.pkg.mk" | 19 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.2 2006/04/10 18:24:34 jlam Exp $ | 1 | $NetBSD: distinfo,v 1.3 2008/07/26 19:11:53 he Exp $ | |
2 | 2 | |||
3 | SHA1 (ExtUtils-MakeMaker-6.30.tar.gz) = 6845b52970a35ef7cfddce8b2a9fc23b0a2b3812 | 3 | SHA1 (ExtUtils-MakeMaker-6.44.tar.gz) = f39d691d041a56b57cb5c25a67392896b36ee6d6 | |
4 | RMD160 (ExtUtils-MakeMaker-6.30.tar.gz) = 3cf6d412e1fb10bd7a432216a860df4e5d1d862d | 4 | RMD160 (ExtUtils-MakeMaker-6.44.tar.gz) = 049723924027dfe32ddf9d34d1022020a7b642b6 | |
5 | Size (ExtUtils-MakeMaker-6.30.tar.gz) = 219796 bytes | 5 | Size (ExtUtils-MakeMaker-6.44.tar.gz) = 244065 bytes | |
6 | SHA1 (patch-aa) = 0fc10ce8e19cb0e8e717cbd23d756c42c77ed1b7 | 6 | SHA1 (patch-ab) = 269b92cf309651f3ad6702b8ab3de0b8c13813df | |
7 | SHA1 (patch-ab) = 44ece83764cdbb06a8d3e1f4725ebf2a51050f67 | 7 | SHA1 (patch-ac) = 90bdd7186c4243458fa1b6c2dae239646848ac37 | |
8 | SHA1 (patch-ac) = a53b5fb16fb196b8d2b0bcbcc7bb177ae68b0f72 | 8 | SHA1 (patch-ad) = 3544c7d0b22475372d27dfcdc87bd9fd7cecd052 |
@@ -1,57 +1,22 @@ | @@ -1,57 +1,22 @@ | |||
1 | $NetBSD: patch-ab,v 1.1 2006/04/10 18:24:34 jlam Exp $ | 1 | $NetBSD: patch-ab,v 1.2 2008/07/26 19:11:54 he Exp $ | |
2 | 2 | |||
3 | --- lib/ExtUtils/MM_Unix.pm.orig 2005-05-20 19:05:33.000000000 -0400 | 3 | --- lib/ExtUtils/MM_Unix.pm.orig 2008-02-29 01:06:28.000000000 +0100 | |
4 | +++ lib/ExtUtils/MM_Unix.pm | 4 | +++ lib/ExtUtils/MM_Unix.pm | |
5 | @@ -12,8 +12,8 @@ use DirHandle; | 5 | @@ -931,7 +931,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ | |
6 | ||||
7 | use vars qw($VERSION @ISA | |||
8 | $Is_OS2 $Is_VMS $Is_Win32 $Is_Dos | |||
9 | - $Is_OSF $Is_IRIX $Is_NetBSD $Is_BSD | |||
10 | - $Is_SunOS4 $Is_Solaris $Is_SunOS $Is_Interix | |||
11 | + $Is_OSF $Is_IRIX $Is_BSD | |||
12 | + $Is_SunOS4 $Is_Solaris $Is_SunOS | |||
13 | $Verbose %pm | |||
14 | %Config_Override | |||
15 | ); | |||
16 | @@ -32,13 +32,11 @@ BEGIN { | |||
17 | $Is_VMS = $^O eq 'VMS'; | |||
18 | $Is_OSF = $^O eq 'dec_osf'; | |||
19 | $Is_IRIX = $^O eq 'irix'; | |||
20 | - $Is_NetBSD = $^O eq 'netbsd'; | |||
21 | - $Is_Interix = $^O eq 'interix'; | |||
22 | $Is_SunOS4 = $^O eq 'sunos'; | |||
23 | $Is_Solaris = $^O eq 'solaris'; | |||
24 | $Is_SunOS = $Is_SunOS4 || $Is_Solaris; | |||
25 | $Is_BSD = $^O =~ /^(?:free|net|open)bsd$/ or | |||
26 | - $^O eq 'bsdos' or $^O eq 'interix'; | |||
27 | + $^O eq 'bsdos' or $^O eq 'dragonfly' or $^O eq 'interix'; | |||
28 | } | |||
29 | ||||
30 | BEGIN { | |||
31 | @@ -928,7 +926,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ | |||
32 | 6 | |||
33 | my $libs = '$(LDLOADLIBS)'; | 7 | my $libs = '$(LDLOADLIBS)'; | |
34 | 8 | |||
35 | - if (($Is_NetBSD || $Is_Interix) && $Config{'useshrplib'}) { | 9 | - if (($Is{NetBSD} || $Is{Interix}) && $Config{'useshrplib'} eq 'true') { | |
36 | + if ($Is_BSD && $Config{'useshrplib'}) { | 10 | + if ($Is{BSD} && $Config{'useshrplib'} eq 'true') { | |
37 | # Use nothing on static perl platforms, and to the flags needed | 11 | # Use nothing on static perl platforms, and to the flags needed | |
38 | # to link against the shared libperl library on shared perl | 12 | # to link against the shared libperl library on shared perl | |
39 | # platforms. We peek at lddlflags to see if we need -Wl,-R | 13 | # platforms. We peek at lddlflags to see if we need -Wl,-R | |
40 | @@ -2074,7 +2072,7 @@ pure_site_install :: | 14 | @@ -2119,7 +2119,7 @@ pure_perl_install :: | |
41 | $(INST_LIB) $(DESTINSTALLSITELIB) \ | 15 | $(INST_LIB) $(DESTINSTALLPRIVLIB) \ | |
42 | $(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \ | 16 | $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \ | |
43 | $(INST_BIN) $(DESTINSTALLSITEBIN) \ | 17 | $(INST_BIN) $(DESTINSTALLBIN) \ | |
44 | - $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \ | 18 | - $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \ | |
45 | + $(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \ | 19 | + $(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \ | |
46 | $(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \ | 20 | $(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \ | |
47 | $(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR) | 21 | $(INST_MAN3DIR) $(DESTINSTALLMAN3DIR) | |
48 | $(NOECHO) $(WARN_IF_OLD_PACKLIST) \ | 22 | $(NOECHO) $(WARN_IF_OLD_PACKLIST) \ | |
49 | @@ -2087,7 +2085,7 @@ pure_vendor_install :: | |||
50 | $(INST_LIB) $(DESTINSTALLVENDORLIB) \ | |||
51 | $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \ | |||
52 | $(INST_BIN) $(DESTINSTALLVENDORBIN) \ | |||
53 | - $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \ | |||
54 | + $(INST_SCRIPT) $(DESTINSTALLVENDORSCRIPT) \ | |||
55 | $(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \ | |||
56 | $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) | |||
57 |
@@ -1,46 +1,13 @@ | @@ -1,46 +1,13 @@ | |||
1 | $NetBSD: patch-ac,v 1.1 2006/04/10 18:24:34 jlam Exp $ | 1 | $NetBSD: patch-ac,v 1.2 2008/07/26 19:11:54 he Exp $ | |
2 | 2 | |||
3 | --- lib/ExtUtils/MakeMaker.pm.orig 2005-05-20 19:08:36.000000000 -0400 | 3 | --- lib/ExtUtils/MakeMaker.pm.orig 2008-02-29 01:06:55.000000000 +0100 | |
4 | +++ lib/ExtUtils/MakeMaker.pm | 4 | +++ lib/ExtUtils/MakeMaker.pm | |
5 | @@ -222,7 +222,7 @@ sub full_setup { | 5 | @@ -1660,7 +1660,7 @@ If set to 'none', no man pages will be i | |
6 | INSTALLMAN1DIR INSTALLMAN3DIR | 6 | =item INSTALLVENDORSCRIPT | |
7 | INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR | |||
8 | INSTALLVENDORMAN1DIR INSTALLVENDORMAN3DIR | |||
9 | - INSTALLSCRIPT | |||
10 | + INSTALLSCRIPT INSTALLSITESCRIPT INSTALLVENDORSCRIPT | |||
11 | PERL_LIB PERL_ARCHLIB | |||
12 | SITELIBEXP SITEARCHEXP | |||
13 | ||||
14 | @@ -1545,7 +1545,7 @@ Defaults to $Config{installprivlib}. | |||
15 | =item INSTALLSCRIPT | |||
16 | 7 | |||
17 | Used by 'make install' which copies files from INST_SCRIPT to this | 8 | Used by 'make install' which copies files from INST_SCRIPT to this | |
18 | -directory. | 9 | -directory if INSTALLDIRS is set to is set to vendor. | |
19 | +directory if INSTALLDIRS is set to perl. | |||
20 | ||||
21 | =item INSTALLSITEARCH | |||
22 | ||||
23 | @@ -1572,6 +1572,11 @@ $(SITEPREFIX)/man/man$(MAN*EXT). | |||
24 | ||||
25 | If set to 'none', no man pages will be installed. | |||
26 | ||||
27 | +=item INSTALLSITESCRIPT | |||
28 | + | |||
29 | +Used by 'make install' which copies files from INST_SCRIPT to this | |||
30 | +directory if INSTALLDIRS is set to site (default). | |||
31 | + | |||
32 | =item INSTALLVENDORARCH | |||
33 | ||||
34 | Used by 'make install', which copies files from INST_ARCHLIB to this | |||
35 | @@ -1596,6 +1601,11 @@ INSTALLDIRS=vendor. Defaults to $(VENDO | |||
36 | ||||
37 | If set to 'none', no man pages will be installed. | |||
38 | ||||
39 | +=item INSTALLVENDORSCRIPT | |||
40 | + | |||
41 | +Used by 'make install' which copies files from INST_SCRIPT to this | |||
42 | +directory if INSTALLDIRS is set to vendor. | 10 | +directory if INSTALLDIRS is set to vendor. | |
43 | + | 11 | ||
44 | =item INST_ARCHLIB | 12 | =item INST_ARCHLIB | |
45 | 13 | |||
46 | Same as INST_LIB for architecture dependent files. |
$NetBSD: patch-ad,v 1.1 2008/07/26 19:11:54 he Exp $
Perl in pkgsrc doesn't install or tweak perllocal.pod, so comment
out that test.
--- t/INSTALL_BASE.t.orig 2008-07-24 09:05:26.000000000 +0200
+++ t/INSTALL_BASE.t
@@ -16,7 +16,7 @@ use strict;
use File::Path;
use Config;
-use Test::More tests => 21;
+use Test::More tests => 19;
use MakeMaker::Test::Utils;
use MakeMaker::Test::Setup::BFD;
@@ -59,7 +59,7 @@ my @installed_files =
('../dummy-install/lib/perl5/Big/Dummy.pm',
'../dummy-install/lib/perl5/Big/Liar.pm',
'../dummy-install/bin/program',
- "../dummy-install/lib/perl5/$Config{archname}/perllocal.pod",
+# "../dummy-install/lib/perl5/$Config{archname}/perllocal.pod",
"../dummy-install/lib/perl5/$Config{archname}/auto/Big/Dummy/.packlist"
);