Unbreak automake/aclocal from my changes this morning. My test case wasn't

thorough enough. PORTREVISION bump to force the change out (my judgement).

3 files changed, 21 insertions, 11 deletions

diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 54ba94b4ddf0..e1cc403cc7cd 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	automake14
 PORTVERSION=	1.4.5
-PORTREVISION=	3
+PORTREVISION=	4
 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 34596cc08909..db7a741b0216 100644
--- a/devel/automake14/files/patch-aclocal.in
+++ b/devel/automake14/files/patch-aclocal.in
@@ -1,17 +1,16 @@
-
-$FreeBSD: /tmp/pcvs/ports/devel/automake14/files/Attic/patch-aclocal.in,v 1.1 2002-10-13 12:54:48 alane Exp $
-
---- aclocal.in.orig	Sun Jul 15 13:52:18 2001
-+++ aclocal.in	Sat Aug 11 12:28:32 2001
-@@ -34,6 +34,8 @@
+--- aclocal.in.orig	Sun Jul 15 06:52:18 2001
++++ aclocal.in	Sun Oct 13 19:58:58 2002
+@@ -32,7 +32,9 @@
+ $PACKAGE = "@PACKAGE@";
+ $prefix = "@prefix@";
  # Note that this isn't pkgdatadir, but a separate directory.
- $acdir = "@datadir@/aclocal";
- 
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
+-$acdir = "@datadir@/aclocal";
++$acdir = "@datadir@/aclocal14";
 +
++$acdir_x11 = '%%X11BASE%%/share/aclocal14';
+ 
  # Some globals.
  
- # Exit status.
 @@ -106,6 +108,9 @@
  
  
diff --git a/devel/automake14/files/patch-automake.in b/devel/automake14/files/patch-automake.in
new file mode 100644
index 000000000000..c0f0cc2a513f
--- /dev/null
+++ b/devel/automake14/files/patch-automake.in
@@ -0,0 +1,11 @@
+--- automake.in.orig	Sun Jul 15 12:47:28 2001
++++ automake.in	Sun Oct 13 19:59:10 2002
+@@ -32,7 +32,7 @@
+ $VERSION = "@VERSION@";
+ $PACKAGE = "@PACKAGE@";
+ $prefix = "@prefix@";
+-$am_dir = "@datadir@/@PACKAGE@";
++$am_dir = "@datadir@/@PACKAGE@14";
+ $TAR = "@TAR@";
+ 
+ # String constants.