diff options
| author | ade <ade@FreeBSD.org> | 2004-05-27 05:38:21 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2004-05-27 05:38:21 +0800 |
| commit | b924d1993226b39fcce69f1f7ba496138f48ce98 (patch) | |
| tree | 0572e7c6e4c302f24d07b157f37bea8a93a78db8 /devel/automake18 | |
| parent | f78887a87c5e02d2035a312b1a015d9fa5e5b6b4 (diff) | |
| download | freebsd-ports-gnome-b924d1993226b39fcce69f1f7ba496138f48ce98.tar.gz freebsd-ports-gnome-b924d1993226b39fcce69f1f7ba496138f48ce98.tar.zst freebsd-ports-gnome-b924d1993226b39fcce69f1f7ba496138f48ce98.zip | |
Ensure that automake uses the correct version of autoconf
PR: 67228
Submitted by: Brian Candler <B.Candler@pobox.com>
Diffstat (limited to 'devel/automake18')
| -rw-r--r-- | devel/automake18/Makefile | 6 | ||||
| -rw-r--r-- | devel/automake18/files/patch-aclocal.in | 11 | ||||
| -rw-r--r-- | devel/automake18/files/patch-automake.in | 11 |
3 files changed, 19 insertions, 9 deletions
diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile index 972dde41df26..d9ed35de1c5e 100644 --- a/devel/automake18/Makefile +++ b/devel/automake18/Makefile @@ -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} diff --git a/devel/automake18/files/patch-aclocal.in b/devel/automake18/files/patch-aclocal.in index 214fcda58d8b..0745a4e187a7 100644 --- a/devel/automake18/files/patch-aclocal.in +++ b/devel/automake18/files/patch-aclocal.in @@ -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 diff --git a/devel/automake18/files/patch-automake.in b/devel/automake18/files/patch-automake.in index 3c9d43806bbe..de0b9c2f2026 100644 --- a/devel/automake18/files/patch-automake.in +++ b/devel/automake18/files/patch-automake.in @@ -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') . " "; + |