diff options
| author | mef <mef> | 2013-06-16 00:56:44 +0000 |
|---|---|---|
| committer | mef <mef> | 2013-06-16 00:56:44 +0000 |
| commit | d95bd1772d6b2bd0f370665704d740935a82f14d (patch) | |
| tree | 58fc81d5545c454c25e79a56a56a8c0850af9ff6 /mail | |
| parent | fa084864dfb9c0afe12b37f12b59dfa57663ca66 (diff) | |
| download | pkgsrc-d95bd1772d6b2bd0f370665704d740935a82f14d.tar.gz | |
Fix problems with recent perl as:
Can't locate getopt.pl in @INC (@INC contains:...
by adding two patches.
patches/patch-agent_test_TEST
patches/patch-bin_perload
See the thread starting with:
| To: tech-pkg@NetBSD.org
| Subject: broken packages for 2013q2
| From: David Holland <dholland-pkgtech@NetBSD.org>
| Date: Wed, 12 Jun 2013 04:02:11 +0000
or
http://mail-index.netbsd.org/tech-pkg/2013/06/12/msg011548.html
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mailagent/distinfo | 4 | ||||
| -rw-r--r-- | mail/mailagent/patches/patch-agent_test_TEST | 20 | ||||
| -rw-r--r-- | mail/mailagent/patches/patch-bin_perload | 23 |
3 files changed, 46 insertions, 1 deletions
diff --git a/mail/mailagent/distinfo b/mail/mailagent/distinfo index 82e73e83220..8d88a560fc8 100644 --- a/mail/mailagent/distinfo +++ b/mail/mailagent/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2013/06/15 06:09:37 obache Exp $ +$NetBSD: distinfo,v 1.7 2013/06/16 00:56:44 mef Exp $ SHA1 (mailagent-3.0.73.tar.gz) = c8a0329d79c98cb25bb53c79f06fcd63df58c418 RMD160 (mailagent-3.0.73.tar.gz) = 70b2804fdd0602a20cb5a9f3391d460f47972570 @@ -17,4 +17,6 @@ SHA1 (patch-agent_mailhelp.SH) = 0868f72362df49d169a5b45a226befb731cb0d49 SHA1 (patch-agent_maillist.SH) = 811a179309462561202761e01eec56d3251417c2 SHA1 (patch-agent_mailpatch.SH) = f25433d766c4acc8d7ffd41697cd217b82bb3cba SHA1 (patch-agent_package.SH) = 166319557ec0d6de3667e58010d10800e96da9dd +SHA1 (patch-agent_test_TEST) = e9e16b500920dc2508c9b5874b1775f4efacfe41 +SHA1 (patch-bin_perload) = dfbd8e8e20c6f0ce91df0d1ee091ce0ff52b7219 SHA1 (patch-agent_pl_utmp_utmp__ph.c) = 1b07456aced48e12ede4cf5d87e4060e34064f1e diff --git a/mail/mailagent/patches/patch-agent_test_TEST b/mail/mailagent/patches/patch-agent_test_TEST new file mode 100644 index 00000000000..c7ec22ce2c8 --- /dev/null +++ b/mail/mailagent/patches/patch-agent_test_TEST @@ -0,0 +1,20 @@ +$NetBSD: patch-agent_test_TEST,v 1.1 2013/06/16 00:56:44 mef Exp $ + +Can't locate getopt.pl in @INC (@INC contains: +... +at ./TEST line 57. + *** Error code 2 + +--- agent/test/TEST.orig 2001-03-18 03:31:28.000000000 +0900 ++++ agent/test/TEST 2013-06-15 12:21:11.000000000 +0900 +@@ -54,8 +54,8 @@ $ENV{'LOCKEXT'} = $cfsh'd_flexfnam eq 'd + $failed = 0; + $how_many = 0; + +-require 'getopt.pl'; +-&Getopt; ++use Getopt::Std; ++getopt(); + + $mailagent = 'mailagent'; # Default program (dataloaded version) + $mailagent = 'magent' if $opt_n; # Use non-dataloaded version diff --git a/mail/mailagent/patches/patch-bin_perload b/mail/mailagent/patches/patch-bin_perload new file mode 100644 index 00000000000..6045a55386f --- /dev/null +++ b/mail/mailagent/patches/patch-bin_perload @@ -0,0 +1,23 @@ +$NetBSD: patch-bin_perload,v 1.1 2013/06/16 00:56:44 mef Exp $ + +Extracting agent/magent (with variable substitutions) +perl ../bin/perload -o magent > mailagent +$* is no longer supported at ../bin/perload line 463. +Can't locate getopt.pl in @INC (@INC contains: +.... +.) at ../bin/perload line 40. + *** Error code 2 + +--- bin/perload.orig 2001-03-18 03:31:36.000000000 +0900 ++++ bin/perload 2013-06-15 12:18:17.000000000 +0900 +@@ -37,8 +37,8 @@ $current_package = 'main'; # Current pa + $init_emitted = 0; # True when dataloading stamp was emitted + $in_function = 0; + +-require 'getopt.pl'; +-&Getopt; ++use Getopt::Std; ++getopt(); + + while (<>) { + if ($. == 1 && /^(:|#).*perl/) { # Invocation stub |