Wed Aug 23 17:54:34 2017 UTC ()
chat/inspircd{,12}: Fix build with perl>=5.26.0.

Perl 5.26.0 removed "." from @INC, so add it back to the scripts
used to configure the software.  The scripts are only called from
the top-level directory, so adding 'use lib ".";' is sufficient.


(jlam)
diff -r1.17 -r1.18 pkgsrc/chat/inspircd/distinfo
diff -r1.5 -r1.6 pkgsrc/chat/inspircd/patches/patch-ac
diff -r1.7 -r1.8 pkgsrc/chat/inspircd12/distinfo
diff -r1.3 -r1.4 pkgsrc/chat/inspircd12/patches/patch-ac
diff -r0 -r1.1 pkgsrc/chat/inspircd12/patches/patch-modulemanager
cvs diff -r1.17 -r1.18 pkgsrc/chat/inspircd/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/inspircd/Attic/distinfo 2015/11/03 01:20:20 1.17
+++ pkgsrc/chat/inspircd/Attic/distinfo 2017/08/23 17:54:34 1.18
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.17 2015/11/03 01:20:20 agc Exp $ 1$NetBSD: distinfo,v 1.18 2017/08/23 17:54:34 jlam Exp $
2 2
3SHA1 (InspIRCd-1.1.23.tar.bz2) = 0def2426fa60cb32a2514e64196c04f37fa67e5e 3SHA1 (InspIRCd-1.1.23.tar.bz2) = 0def2426fa60cb32a2514e64196c04f37fa67e5e
4RMD160 (InspIRCd-1.1.23.tar.bz2) = 122ae3c269af0af3f8362f17eae29767d6c314d4 4RMD160 (InspIRCd-1.1.23.tar.bz2) = 122ae3c269af0af3f8362f17eae29767d6c314d4
5SHA512 (InspIRCd-1.1.23.tar.bz2) = 578c12eca0607b90752137d4766fb38c5e9e27c0c7c913244418c2fe297f5e286be2fd3c8844fe8b4cfcf6e1112b0abf52715d62597957976f8e319b501ceb9a 5SHA512 (InspIRCd-1.1.23.tar.bz2) = 578c12eca0607b90752137d4766fb38c5e9e27c0c7c913244418c2fe297f5e286be2fd3c8844fe8b4cfcf6e1112b0abf52715d62597957976f8e319b501ceb9a
6Size (InspIRCd-1.1.23.tar.bz2) = 505853 bytes 6Size (InspIRCd-1.1.23.tar.bz2) = 505853 bytes
7SHA1 (patch-aa) = d62675b6ace79ba5c0c0c4db2b4f9454346170c3 7SHA1 (patch-aa) = d62675b6ace79ba5c0c0c4db2b4f9454346170c3
8SHA1 (patch-ab) = c0921dda70348839c286315a3fa0244828d5116a 8SHA1 (patch-ab) = c0921dda70348839c286315a3fa0244828d5116a
9SHA1 (patch-ac) = 266c8d6015923d890748d4157f7e5aff87da5df1 9SHA1 (patch-ac) = 9e8fd6d4862ac1f913ee016c955fac0b53d132db
10SHA1 (patch-ad) = d35df392a574728f6c61c4107bb3d2ce1e11568a 10SHA1 (patch-ad) = d35df392a574728f6c61c4107bb3d2ce1e11568a
cvs diff -r1.5 -r1.6 pkgsrc/chat/inspircd/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/chat/inspircd/patches/Attic/patch-ac 2008/06/14 14:30:23 1.5
+++ pkgsrc/chat/inspircd/patches/Attic/patch-ac 2017/08/23 17:54:34 1.6
@@ -1,15 +1,23 @@ @@ -1,15 +1,23 @@
1$NetBSD: patch-ac,v 1.5 2008/06/14 14:30:23 adrianp Exp $ 1$NetBSD: patch-ac,v 1.6 2017/08/23 17:54:34 jlam Exp $
2 2
3--- configure.orig 2008-05-11 01:19:59.000000000 +0100 3--- configure.orig 2009-07-30 11:28:57.000000000 +0000
4+++ configure 4+++ configure
5@@ -232,8 +231,8 @@ $config{EXTRA_DIR} = ""; # 5@@ -18,6 +18,7 @@ use Cwd;
 6 use Getopt::Long;
 7
 8 # Utility functions for our buildsystem
 9+use lib ".";
 10 use make::utilities;
 11 use make::configure;
 12 use make::gnutlscert;
 13@@ -233,8 +234,8 @@ $config{EXTRA_DIR} = ""; #
6 if ($config{OSNAME} =~ /darwin/i) 14 if ($config{OSNAME} =~ /darwin/i)
7 { 15 {
8 $config{IS_DARWIN} = "YES"; 16 $config{IS_DARWIN} = "YES";
9- $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. 17- $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX.
10- $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target. 18- $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target.
11+# $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. 19+# $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX.
12+# $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target. 20+# $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target.
13 $config{EXTRA_DIR} = " launchd_dir"; # Is OSX specific path. 21 $config{EXTRA_DIR} = " launchd_dir"; # Is OSX specific path.
14 } 22 }
15 $config{CC} = "g++"; # C++ compiler 23 $config{CC} = "g++"; # C++ compiler
cvs diff -r1.7 -r1.8 pkgsrc/chat/inspircd12/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/inspircd12/Attic/distinfo 2015/11/03 01:20:20 1.7
+++ pkgsrc/chat/inspircd12/Attic/distinfo 2017/08/23 17:54:34 1.8
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.7 2015/11/03 01:20:20 agc Exp $ 1$NetBSD: distinfo,v 1.8 2017/08/23 17:54:34 jlam Exp $
2 2
3SHA1 (InspIRCd-1.2.0.tar.bz2) = 2973dc7e83dc2334c18e7fcd6d95a22da44b256e 3SHA1 (InspIRCd-1.2.0.tar.bz2) = 2973dc7e83dc2334c18e7fcd6d95a22da44b256e
4RMD160 (InspIRCd-1.2.0.tar.bz2) = 1f74336bf5e30b89e0baa306c22f0b37fbf339bd 4RMD160 (InspIRCd-1.2.0.tar.bz2) = 1f74336bf5e30b89e0baa306c22f0b37fbf339bd
5SHA512 (InspIRCd-1.2.0.tar.bz2) = 7629e233f60f97187c86a60f882235585393e681ec0370dd3681c098512d9d88ab44068fc3bfefad905a6b8f95129cce9d588568cfc0be5157b5cdb06170e773 5SHA512 (InspIRCd-1.2.0.tar.bz2) = 7629e233f60f97187c86a60f882235585393e681ec0370dd3681c098512d9d88ab44068fc3bfefad905a6b8f95129cce9d588568cfc0be5157b5cdb06170e773
6Size (InspIRCd-1.2.0.tar.bz2) = 635384 bytes 6Size (InspIRCd-1.2.0.tar.bz2) = 635384 bytes
7SHA1 (patch-aa) = 16c092692872173dede40925be51c4a391491a03 7SHA1 (patch-aa) = 16c092692872173dede40925be51c4a391491a03
8SHA1 (patch-ab) = 9548488202c5c6dd725c3eba28921961b67dd15b 8SHA1 (patch-ab) = 9548488202c5c6dd725c3eba28921961b67dd15b
9SHA1 (patch-ac) = af385c0640ca7101afb8aefbeea3860b3f3bb970 9SHA1 (patch-ac) = e318fa75bcb31c07b3d72906449e420a9020706c
10SHA1 (patch-ad) = 8dd2a589ab639d9d4ecfc4477aa5fb3f613761e7 10SHA1 (patch-ad) = 8dd2a589ab639d9d4ecfc4477aa5fb3f613761e7
 11SHA1 (patch-modulemanager) = 48f182267337552887f4290dee18c61cf1bd2079
cvs diff -r1.3 -r1.4 pkgsrc/chat/inspircd12/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/chat/inspircd12/patches/Attic/patch-ac 2009/08/29 22:42:46 1.3
+++ pkgsrc/chat/inspircd12/patches/Attic/patch-ac 2017/08/23 17:54:34 1.4
@@ -1,24 +1,32 @@ @@ -1,24 +1,32 @@
1$NetBSD: patch-ac,v 1.3 2009/08/29 22:42:46 adrianp Exp $ 1$NetBSD: patch-ac,v 1.4 2017/08/23 17:54:34 jlam Exp $
2 2
3--- configure.orig 2009-08-21 17:33:04.000000000 +0100 3--- configure.orig 2009-08-21 16:33:04.000000000 +0000
4+++ configure 4+++ configure
5@@ -320,8 +320,8 @@ $config{EXTRA_DIR} = ""; # Is emp 5@@ -31,6 +31,7 @@ use Cwd;
 6 use Getopt::Long;
 7
 8 # Utility functions for our buildsystem
 9+use lib ".";
 10 use make::utilities;
 11 use make::configure;
 12 use make::gnutlscert;
 13@@ -320,8 +321,8 @@ $config{EXTRA_DIR} = ""; # Is emp
6 if ($config{OSNAME} =~ /darwin/i) 14 if ($config{OSNAME} =~ /darwin/i)
7 { 15 {
8 $config{IS_DARWIN} = "YES"; 16 $config{IS_DARWIN} = "YES";
9- $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. 17- $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX.
10- $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target. 18- $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target.
11+# $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX. 19+# $config{STARTSCRIPT} = "org.inspircd.plist"; # start script for OSX.
12+# $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target. 20+# $config{DESTINATION} = "LAUNCHDPATH"; # Is OSX target.
13 $config{EXTRA_DIR} = " launchd_dir"; # Is OSX specific path. 21 $config{EXTRA_DIR} = " launchd_dir"; # Is OSX specific path.
14 } 22 }
15 $config{CC} = "g++"; # C++ compiler 23 $config{CC} = "g++"; # C++ compiler
16@@ -874,7 +874,7 @@ if (($config{USE_OPENSSL} eq "y") && ($c 24@@ -874,7 +875,7 @@ if (($config{USE_OPENSSL} eq "y") && ($c
17 our $failed = 0; 25 our $failed = 0;
18  26
19 $config{CERTGEN} ||= 'y'; 27 $config{CERTGEN} ||= 'y';
20-yesno('CERTGEN',"Would you like generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y")); 28-yesno('CERTGEN',"Would you like generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y"));
21+#yesno('CERTGEN',"Would you like generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y")); 29+#yesno('CERTGEN',"Would you like generate SSL certificates now?") if ($interactive && ($config{USE_GNUTLS} eq "y" || $config{USE_OPENSSL} eq "y"));
22  30
23 if ($config{USE_GNUTLS} eq "y") { 31 if ($config{USE_GNUTLS} eq "y") {
24 unless (-r "src/modules/m_ssl_gnutls.cpp") { 32 unless (-r "src/modules/m_ssl_gnutls.cpp") {
File Added: pkgsrc/chat/inspircd12/patches/Attic/patch-modulemanager
$NetBSD: patch-modulemanager,v 1.1 2017/08/23 17:54:34 jlam Exp $

--- modulemanager.orig	2009-08-14 19:45:30.000000000 +0000
+++ modulemanager
@@ -3,6 +3,7 @@ use strict;
 use warnings FATAL => qw(all);
 use LWP::Simple;
 
+use lib ".";
 use make::configure;
 
 our @modlist;