Ensure that automake uses the correct version of autoconf
PR: 67228 Submitted by: Brian Candler <B.Candler@pobox.com>
This commit is contained in:
parent
bc0461adbb
commit
b0ba59875e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=110090
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.8.4
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
@ -15,9 +16,8 @@ DISTNAME= automake-${PORTVERSION}
|
||||
MAINTAINER= ade@FreeBSD.org
|
||||
COMMENT= GNU Standards-compliant Makefile generator (version 1.8)
|
||||
|
||||
BUILD_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259
|
||||
RUN_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259
|
||||
|
||||
WANT_AUTOCONF_VER=259
|
||||
WANT_AUTOCONF_RUN=yes
|
||||
BUILD_VERSION= 18
|
||||
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
|
||||
LATEST_LINK= automake${BUILD_VERSION}
|
||||
|
@ -1,10 +1,10 @@
|
||||
--- aclocal.in.orig Sat Feb 7 04:32:57 2004
|
||||
+++ aclocal.in Sun Mar 14 17:03:19 2004
|
||||
--- aclocal.in.orig Sat Apr 10 10:15:32 2004
|
||||
+++ aclocal.in Wed May 26 14:33:27 2004
|
||||
@@ -31,3 +31,3 @@
|
||||
{
|
||||
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||||
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
|
||||
unshift @INC, (split ':', $perllibdir);
|
||||
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
|
||||
@@ -47,4 +47,5 @@
|
||||
# Note also that the versioned directory is handled later.
|
||||
-$acdir = '@datadir@/aclocal';
|
||||
@ -12,6 +12,11 @@
|
||||
$default_acdir = $acdir;
|
||||
+$acdir_x11 = '%%X11BASE%%/share/aclocal';
|
||||
# contains a list of directories, one per line, to be added
|
||||
@@ -411,3 +412,3 @@
|
||||
|
||||
- my $traces = ($ENV{AUTOM4TE} || 'autom4te');
|
||||
+ my $traces = ($ENV{AUTOM4TE} || 'autom4te259');
|
||||
$traces .= " --language Autoconf-without-aclocal-m4 ";
|
||||
@@ -622,7 +623,3 @@
|
||||
|
||||
- # Search the versioned directory near the end, and then the
|
||||
|
@ -1,7 +1,12 @@
|
||||
--- automake.in.orig Sun Feb 29 09:27:07 2004
|
||||
+++ automake.in Sun Mar 14 17:04:50 2004
|
||||
--- automake.in.orig Sat Apr 10 10:15:32 2004
|
||||
+++ automake.in Wed May 26 14:34:15 2004
|
||||
@@ -33,3 +33,3 @@
|
||||
{
|
||||
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||||
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
|
||||
unshift @INC, (split ':', $perllibdir);
|
||||
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
|
||||
@@ -4440,3 +4440,3 @@
|
||||
|
||||
- my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
|
||||
+ my $traces = ($ENV{AUTOCONF} || 'autoconf259') . " ";
|
||||
|
||||
|
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.8.4
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
@ -15,9 +16,8 @@ DISTNAME= automake-${PORTVERSION}
|
||||
MAINTAINER= ade@FreeBSD.org
|
||||
COMMENT= GNU Standards-compliant Makefile generator (version 1.8)
|
||||
|
||||
BUILD_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259
|
||||
RUN_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259
|
||||
|
||||
WANT_AUTOCONF_VER=259
|
||||
WANT_AUTOCONF_RUN=yes
|
||||
BUILD_VERSION= 18
|
||||
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
|
||||
LATEST_LINK= automake${BUILD_VERSION}
|
||||
|
@ -1,10 +1,10 @@
|
||||
--- aclocal.in.orig Sat Feb 7 04:32:57 2004
|
||||
+++ aclocal.in Sun Mar 14 17:03:19 2004
|
||||
--- aclocal.in.orig Sat Apr 10 10:15:32 2004
|
||||
+++ aclocal.in Wed May 26 14:33:27 2004
|
||||
@@ -31,3 +31,3 @@
|
||||
{
|
||||
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||||
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
|
||||
unshift @INC, (split ':', $perllibdir);
|
||||
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
|
||||
@@ -47,4 +47,5 @@
|
||||
# Note also that the versioned directory is handled later.
|
||||
-$acdir = '@datadir@/aclocal';
|
||||
@ -12,6 +12,11 @@
|
||||
$default_acdir = $acdir;
|
||||
+$acdir_x11 = '%%X11BASE%%/share/aclocal';
|
||||
# contains a list of directories, one per line, to be added
|
||||
@@ -411,3 +412,3 @@
|
||||
|
||||
- my $traces = ($ENV{AUTOM4TE} || 'autom4te');
|
||||
+ my $traces = ($ENV{AUTOM4TE} || 'autom4te259');
|
||||
$traces .= " --language Autoconf-without-aclocal-m4 ";
|
||||
@@ -622,7 +623,3 @@
|
||||
|
||||
- # Search the versioned directory near the end, and then the
|
||||
|
@ -1,7 +1,12 @@
|
||||
--- automake.in.orig Sun Feb 29 09:27:07 2004
|
||||
+++ automake.in Sun Mar 14 17:04:50 2004
|
||||
--- automake.in.orig Sat Apr 10 10:15:32 2004
|
||||
+++ automake.in Wed May 26 14:34:15 2004
|
||||
@@ -33,3 +33,3 @@
|
||||
{
|
||||
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||||
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
|
||||
unshift @INC, (split ':', $perllibdir);
|
||||
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
|
||||
@@ -4440,3 +4440,3 @@
|
||||
|
||||
- my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
|
||||
+ my $traces = ($ENV{AUTOCONF} || 'autoconf259') . " ";
|
||||
|
||||
|
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.8.4
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
@ -15,9 +16,8 @@ DISTNAME= automake-${PORTVERSION}
|
||||
MAINTAINER= ade@FreeBSD.org
|
||||
COMMENT= GNU Standards-compliant Makefile generator (version 1.8)
|
||||
|
||||
BUILD_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259
|
||||
RUN_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259
|
||||
|
||||
WANT_AUTOCONF_VER=259
|
||||
WANT_AUTOCONF_RUN=yes
|
||||
BUILD_VERSION= 18
|
||||
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
|
||||
LATEST_LINK= automake${BUILD_VERSION}
|
||||
|
@ -1,10 +1,10 @@
|
||||
--- aclocal.in.orig Sat Feb 7 04:32:57 2004
|
||||
+++ aclocal.in Sun Mar 14 17:03:19 2004
|
||||
--- aclocal.in.orig Sat Apr 10 10:15:32 2004
|
||||
+++ aclocal.in Wed May 26 14:33:27 2004
|
||||
@@ -31,3 +31,3 @@
|
||||
{
|
||||
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||||
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
|
||||
unshift @INC, (split ':', $perllibdir);
|
||||
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
|
||||
@@ -47,4 +47,5 @@
|
||||
# Note also that the versioned directory is handled later.
|
||||
-$acdir = '@datadir@/aclocal';
|
||||
@ -12,6 +12,11 @@
|
||||
$default_acdir = $acdir;
|
||||
+$acdir_x11 = '%%X11BASE%%/share/aclocal';
|
||||
# contains a list of directories, one per line, to be added
|
||||
@@ -411,3 +412,3 @@
|
||||
|
||||
- my $traces = ($ENV{AUTOM4TE} || 'autom4te');
|
||||
+ my $traces = ($ENV{AUTOM4TE} || 'autom4te259');
|
||||
$traces .= " --language Autoconf-without-aclocal-m4 ";
|
||||
@@ -622,7 +623,3 @@
|
||||
|
||||
- # Search the versioned directory near the end, and then the
|
||||
|
@ -1,7 +1,12 @@
|
||||
--- automake.in.orig Sun Feb 29 09:27:07 2004
|
||||
+++ automake.in Sun Mar 14 17:04:50 2004
|
||||
--- automake.in.orig Sat Apr 10 10:15:32 2004
|
||||
+++ automake.in Wed May 26 14:34:15 2004
|
||||
@@ -33,3 +33,3 @@
|
||||
{
|
||||
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||||
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
|
||||
unshift @INC, (split ':', $perllibdir);
|
||||
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
|
||||
@@ -4440,3 +4440,3 @@
|
||||
|
||||
- my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
|
||||
+ my $traces = ($ENV{AUTOCONF} || 'autoconf259') . " ";
|
||||
|
||||
|
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.8.4
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
@ -15,9 +16,8 @@ DISTNAME= automake-${PORTVERSION}
|
||||
MAINTAINER= ade@FreeBSD.org
|
||||
COMMENT= GNU Standards-compliant Makefile generator (version 1.8)
|
||||
|
||||
BUILD_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259
|
||||
RUN_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259
|
||||
|
||||
WANT_AUTOCONF_VER=259
|
||||
WANT_AUTOCONF_RUN=yes
|
||||
BUILD_VERSION= 18
|
||||
PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
|
||||
LATEST_LINK= automake${BUILD_VERSION}
|
||||
|
@ -1,10 +1,10 @@
|
||||
--- aclocal.in.orig Sat Feb 7 04:32:57 2004
|
||||
+++ aclocal.in Sun Mar 14 17:03:19 2004
|
||||
--- aclocal.in.orig Sat Apr 10 10:15:32 2004
|
||||
+++ aclocal.in Wed May 26 14:33:27 2004
|
||||
@@ -31,3 +31,3 @@
|
||||
{
|
||||
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||||
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
|
||||
unshift @INC, (split ':', $perllibdir);
|
||||
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
|
||||
@@ -47,4 +47,5 @@
|
||||
# Note also that the versioned directory is handled later.
|
||||
-$acdir = '@datadir@/aclocal';
|
||||
@ -12,6 +12,11 @@
|
||||
$default_acdir = $acdir;
|
||||
+$acdir_x11 = '%%X11BASE%%/share/aclocal';
|
||||
# contains a list of directories, one per line, to be added
|
||||
@@ -411,3 +412,3 @@
|
||||
|
||||
- my $traces = ($ENV{AUTOM4TE} || 'autom4te');
|
||||
+ my $traces = ($ENV{AUTOM4TE} || 'autom4te259');
|
||||
$traces .= " --language Autoconf-without-aclocal-m4 ";
|
||||
@@ -622,7 +623,3 @@
|
||||
|
||||
- # Search the versioned directory near the end, and then the
|
||||
|
@ -1,7 +1,12 @@
|
||||
--- automake.in.orig Sun Feb 29 09:27:07 2004
|
||||
+++ automake.in Sun Mar 14 17:04:50 2004
|
||||
--- automake.in.orig Sat Apr 10 10:15:32 2004
|
||||
+++ automake.in Wed May 26 14:34:15 2004
|
||||
@@ -33,3 +33,3 @@
|
||||
{
|
||||
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||||
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
|
||||
unshift @INC, (split ':', $perllibdir);
|
||||
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir);
|
||||
@@ -4440,3 +4440,3 @@
|
||||
|
||||
- my $traces = ($ENV{AUTOCONF} || 'autoconf') . " ";
|
||||
+ my $traces = ($ENV{AUTOCONF} || 'autoconf259') . " ";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user