The following ports can't be built with autoconf-2.5{4,6,7} and Perl
5.28 due to the removal of '.' in @INC:
- games/zangband
- security/steghide
- x11/xtraceroute
What that diff is doing is simply bringing back '.' in @INC in
autoconf-2.5{4,6,7} .
These 3 ports have been tested with Perl 5.24 and 5.28 - they build
without issues. We have no ports depending on autoconf-2.56, so i've
build games/zangband with it.
Any comment or feedback welcome :)
Charlène.
Index: 2.54/Makefile
===================================================================
RCS file: /cvs/ports/devel/autoconf/2.54/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- 2.54/Makefile 29 Jun 2016 16:14:39 -0000 1.14
+++ 2.54/Makefile 10 Feb 2019 21:21:08 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.14 2016/06/29 16:14:39 espie Exp $
VERSION = 2.54
-REVISION = 5
+REVISION = 6
BUILD_DEPENDS = devel/help2man
Index: 2.54/patches/patch-bin_autom4te_in
===================================================================
RCS file: /cvs/ports/devel/autoconf/2.54/patches/patch-bin_autom4te_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-bin_autom4te_in
--- 2.54/patches/patch-bin_autom4te_in 22 Jul 2004 05:50:07 -0000 1.2
+++ 2.54/patches/patch-bin_autom4te_in 10 Feb 2019 21:21:08 -0000
@@ -1,7 +1,16 @@
$OpenBSD: patch-bin_autom4te_in,v 1.2 2004/07/22 05:50:07 espie Exp $
---- bin/autom4te.in.orig Mon Sep 2 14:59:43 2002
-+++ bin/autom4te.in Thu Jul 22 07:19:02 2004
-@@ -277,16 +277,8 @@ my $freeze = 0;
+Index: bin/autom4te.in
+--- bin/autom4te.in.orig
++++ bin/autom4te.in
+@@ -28,6 +28,7 @@ BEGIN
+ {
+ my $datadir = ($ENV{'autom4te_perllibdir'} || '@datadir@');
+ unshift @INC, "$datadir";
++ push @INC, '.';
+ }
+
+ ## --------- ##
+@@ -277,16 +278,8 @@ my $freeze = 0;
# $M4.
my $m4 = $ENV{"M4"} || '@M4@';
@@ -19,7 +28,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
# @M4_BUILTIN -- M4 builtins and a useful comment.
my @m4_builtin = `echo dumpdef | $m4 2>&1 >/dev/null`;
map { s/:.*//;s/\W// } @m4_builtin;
-@@ -605,11 +597,11 @@ sub handle_m4 ($@)
+@@ -605,11 +598,11 @@ sub handle_m4 ($@)
# We don't output directly to the cache files, to avoid problems
# when we are interrupted (that leaves corrupted files).
xsystem ("$m4"
@@ -36,7 +45,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. " @ARGV"
. ' </dev/null'
. " >$ocache" . $req->id . "t");
-@@ -1048,8 +1040,7 @@ sub freeze ($)
+@@ -1048,8 +1041,7 @@ sub freeze ($)
# When processing the file with diversion disabled, there must be no
# output but comments and empty lines.
my $result = xqx ("$m4"
@@ -46,7 +55,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. ' --define=divert'
. " @ARGV"
. ' </dev/null');
-@@ -1064,8 +1055,7 @@ sub freeze ($)
+@@ -1064,8 +1056,7 @@ sub freeze ($)
# If freezing produces output, something went wrong: a bad `divert',
# or an improper paren etc.
xsystem ("$m4"
Index: 2.56/Makefile
===================================================================
RCS file: /cvs/ports/devel/autoconf/2.56/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- 2.56/Makefile 29 Jun 2016 16:14:39 -0000 1.13
+++ 2.56/Makefile 10 Feb 2019 21:21:08 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.13 2016/06/29 16:14:39 espie Exp $
VERSION = 2.56
-REVISION = 4
+REVISION = 5
BUILD_DEPENDS = devel/help2man
Index: 2.56/patches/patch-bin_autom4te_in
===================================================================
RCS file: /cvs/ports/devel/autoconf/2.56/patches/patch-bin_autom4te_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-bin_autom4te_in
--- 2.56/patches/patch-bin_autom4te_in 22 Jul 2004 05:50:07 -0000 1.2
+++ 2.56/patches/patch-bin_autom4te_in 10 Feb 2019 21:21:08 -0000
@@ -1,7 +1,16 @@
$OpenBSD: patch-bin_autom4te_in,v 1.2 2004/07/22 05:50:07 espie Exp $
---- bin/autom4te.in.orig Thu Oct 31 09:37:05 2002
-+++ bin/autom4te.in Thu Jul 22 07:19:19 2004
-@@ -276,16 +276,8 @@ my $freeze = 0;
+Index: bin/autom4te.in
+--- bin/autom4te.in.orig
++++ bin/autom4te.in
+@@ -28,6 +28,7 @@ BEGIN
+ {
+ my $datadir = ($ENV{'autom4te_perllibdir'} || '@datadir@');
+ unshift @INC, "$datadir";
++ push @INC, '.';
+ }
+
+ ## --------- ##
+@@ -276,16 +277,8 @@ my $freeze = 0;
# $M4.
my $m4 = $ENV{"M4"} || '@M4@';
@@ -19,7 +28,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
# @M4_BUILTIN -- M4 builtins and a useful comment.
my @m4_builtin = `echo dumpdef | $m4 2>&1 >/dev/null`;
map { s/:.*//;s/\W// } @m4_builtin;
-@@ -660,12 +652,11 @@ sub handle_m4 ($@)
+@@ -660,12 +653,11 @@ sub handle_m4 ($@)
# We don't output directly to the cache files, to avoid problems
# when we are interrupted (that leaves corrupted files).
xsystem ("$m4"
@@ -37,7 +46,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. " " . files_to_options (@ARGV)
. ' </dev/null'
. " >$ocache" . $req->id . "t");
-@@ -1116,8 +1107,7 @@ sub freeze ($)
+@@ -1116,8 +1108,7 @@ sub freeze ($)
# When processing the file with diversion disabled, there must be no
# output but comments and empty lines.
my $result = xqx ("$m4"
@@ -47,7 +56,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. ' --define=divert'
. " " . files_to_options (@ARGV)
. ' </dev/null');
-@@ -1130,8 +1120,7 @@ sub freeze ($)
+@@ -1130,8 +1121,7 @@ sub freeze ($)
# If freezing produces output, something went wrong: a bad `divert',
# or an improper paren etc.
xsystem ("$m4"
@@ -57,7 +66,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. " --freeze-state=$output"
. " " . files_to_options (@ARGV)
. ' </dev/null');
-@@ -1144,7 +1133,7 @@ sub freeze ($)
+@@ -1144,7 +1134,7 @@ sub freeze ($)
mktmpdir ('am4t');
load_configuration ($ENV{'AUTOM4TE_CFG'} || "$datadir/autom4te.cfg");
load_configuration ("$ENV{'HOME'}/.autom4te.cfg")
Index: 2.57/Makefile
===================================================================
RCS file: /cvs/ports/devel/autoconf/2.57/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- 2.57/Makefile 29 Jun 2016 16:14:39 -0000 1.13
+++ 2.57/Makefile 10 Feb 2019 21:21:09 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.13 2016/06/29 16:14:39 espie Exp $
VERSION = 2.57
-REVISION = 4
+REVISION = 5
BUILD_DEPENDS = devel/help2man
Index: 2.57/patches/patch-bin_autom4te_in
===================================================================
RCS file: /cvs/ports/devel/autoconf/2.57/patches/patch-bin_autom4te_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-bin_autom4te_in
--- 2.57/patches/patch-bin_autom4te_in 22 Jul 2004 05:50:07 -0000 1.2
+++ 2.57/patches/patch-bin_autom4te_in 10 Feb 2019 21:21:09 -0000
@@ -1,7 +1,16 @@
$OpenBSD: patch-bin_autom4te_in,v 1.2 2004/07/22 05:50:07 espie Exp $
---- bin/autom4te.in.orig Tue Dec 3 09:20:16 2002
-+++ bin/autom4te.in Thu Jul 22 07:19:33 2004
-@@ -276,16 +276,8 @@ my $freeze = 0;
+Index: bin/autom4te.in
+--- bin/autom4te.in.orig
++++ bin/autom4te.in
+@@ -28,6 +28,7 @@ BEGIN
+ {
+ my $datadir = ($ENV{'autom4te_perllibdir'} || '@datadir@');
+ unshift @INC, "$datadir";
++ push @INC, '.';
+ }
+
+ ## --------- ##
+@@ -276,16 +277,8 @@ my $freeze = 0;
# $M4.
my $m4 = $ENV{"M4"} || '@M4@';
@@ -19,7 +28,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
# @M4_BUILTIN -- M4 builtins and a useful comment.
my @m4_builtin = `echo dumpdef | $m4 2>&1 >/dev/null`;
map { s/:.*//;s/\W// } @m4_builtin;
-@@ -660,12 +652,11 @@ sub handle_m4 ($@)
+@@ -660,12 +653,11 @@ sub handle_m4 ($@)
# We don't output directly to the cache files, to avoid problems
# when we are interrupted (that leaves corrupted files).
xsystem ("$m4"
@@ -37,7 +46,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. " " . files_to_options (@ARGV)
. ' </dev/null'
. " >$ocache" . $req->id . "t");
-@@ -1117,8 +1108,7 @@ sub freeze ($)
+@@ -1117,8 +1109,7 @@ sub freeze ($)
# When processing the file with diversion disabled, there must be no
# output but comments and empty lines.
my $result = xqx ("$m4"
@@ -47,7 +56,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. ' --define=divert'
. " " . files_to_options (@ARGV)
. ' </dev/null');
-@@ -1131,8 +1121,7 @@ sub freeze ($)
+@@ -1131,8 +1122,7 @@ sub freeze ($)
# If freezing produces output, something went wrong: a bad `divert',
# or an improper paren etc.
xsystem ("$m4"
@@ -57,7 +66,7 @@ $OpenBSD: patch-bin_autom4te_in,v 1.2 20
. " --freeze-state=$output"
. " " . files_to_options (@ARGV)
. ' </dev/null');
-@@ -1145,7 +1134,7 @@ sub freeze ($)
+@@ -1145,7 +1135,7 @@ sub freeze ($)
mktmpdir ('am4t');
load_configuration ($ENV{'AUTOM4TE_CFG'} || "$datadir/autom4te.cfg");
load_configuration ("$ENV{'HOME'}/.autom4te.cfg")
