diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2004-05-14 16:43:10 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2004-05-14 16:43:10 +0000 |
| commit | 1e4e9a3717c119e9b3ef71c88c45f11ea0fa8ffc (patch) | |
| tree | d2aa990bfc2e6de7ac313f733ff053841291518e /devel/automake14 | |
| parent | d7ebfa900bbc38a76f2695edab498f58b5dbe08d (diff) | |
| download | ports-1e4e9a3717c119e9b3ef71c88c45f11ea0fa8ffc.tar.gz ports-1e4e9a3717c119e9b3ef71c88c45f11ea0fa8ffc.zip | |
Fix missed patch, resulting in aclocal looking for itself in the wrong
place after the upgrade.
Submitted by: marcus
Notes
Notes:
svn path=/head/; revision=109145
Diffstat (limited to 'devel/automake14')
| -rw-r--r-- | devel/automake14/Makefile | 1 | ||||
| -rw-r--r-- | devel/automake14/files/patch-aclocal.in | 17 |
2 files changed, 14 insertions, 4 deletions
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile index 2c1771ed0444..1784ddab5ede 100644 --- a/devel/automake14/Makefile +++ b/devel/automake14/Makefile @@ -7,6 +7,7 @@ PORTNAME= automake PORTVERSION= 1.4.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake diff --git a/devel/automake14/files/patch-aclocal.in b/devel/automake14/files/patch-aclocal.in index 0b216ab854ed..0e2c5263bc0e 100644 --- a/devel/automake14/files/patch-aclocal.in +++ b/devel/automake14/files/patch-aclocal.in @@ -1,5 +1,5 @@ --- aclocal.in.orig Thu Jul 25 09:51:42 2002 -+++ aclocal.in Thu May 13 13:33:24 2004 ++++ aclocal.in Fri May 14 09:40:13 2004 @@ -36,3 +36,4 @@ # Note also that the versioned directory is handled later. -$acdir = "@datadir@/aclocal"; @@ -10,16 +10,25 @@ local (@dirlist) = &parse_arguments (@ARGV); +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; &scan_m4_files (@dirlist); -@@ -296,2 +298,3 @@ +@@ -200,8 +202,2 @@ + +- # Search the versioned directory near the end, and then the +- # unversioned directory last. Only do this if the user didn't +- # override acdir. +- push (@dirlist, "$acdir-$APIVERSION") +- if $acdir eq $default_acdir; +- + # By default $(datadir)/aclocal doesn't exist. We don't want to +@@ -296,2 +292,3 @@ + local (@skipinolist) = (); local ($m4dir); -@@ -301,3 +304,3 @@ +@@ -301,3 +298,3 @@ || die "aclocal: couldn't open directory \`$m4dir': $!\n"; - local ($file, $fullfile, $expr); + local ($file, $fullfile, $ino, $expr); foreach $file (sort grep (! /^\./, readdir (DIR))) -@@ -311,2 +314,8 @@ +@@ -311,2 +308,8 @@ $fullfile = $m4dir . '/' . $file; + + # Do not scan a file more than once. |