Index: head/devel/automake14/Makefile
===================================================================
--- head/devel/automake14/Makefile	(revision 67993)
+++ head/devel/automake14/Makefile	(revision 67994)
@@ -1,54 +1,54 @@
 # New ports collection makefile for:	automake
 # Date created:		15 March 1997
 # Whom:			FUJIMOTO Kensaku <fujimoto@oscar.elec.waseda.ac.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	automake14
 PORTVERSION=	1.4.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 DISTNAME=	automake-1.4-p5
 
 MAINTAINER=	ports@geeksrus.net
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL5}
 CONFIGURE_ARGS=	--program-suffix=14
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
 STRIP=		# none
 
 .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 pre-everything:
 	@${ECHO} ===========================================================
 	@${ECHO} "You have 'USE_AUTOMAKE' or 'USE_AUTOMAKE_VER' variables"
 	@${ECHO} "defined either in environment or in make(1) arguments."
 	@${ECHO} "Please undefine them and try again."
 	@${ECHO} ===========================================================
 	@${FALSE}
 .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 
 post-patch:
 	@${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake14.texi
 	@${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi >/dev/null 2>&1 || true
 
 pre-configure:
 	@${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \
 		${WRKSRC}/aclocal.in
 
 post-install:
 	@-${RM} -fr ${DESTDIR}${PREFIX}/libexec/automake14
 	@${MKDIR} ${DESTDIR}${PREFIX}/libexec/automake14
 .for i in aclocal automake
 	@${LN} -s ../../bin/${i}14 \
 		${DESTDIR}${PREFIX}/libexec/automake14/${i}
 .endfor
 	@install-info ${DESTDIR}${PREFIX}/info/automake14.info \
 		${DESTDIR}${PREFIX}/info/dir
 
 .include <bsd.port.mk>

Property changes on: head/devel/automake14/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.28
\ No newline at end of property
+1.29
\ No newline at end of property
Index: head/devel/automake14/files/patch-aclocal.in
===================================================================
--- head/devel/automake14/files/patch-aclocal.in	(revision 67993)
+++ head/devel/automake14/files/patch-aclocal.in	(revision 67994)
@@ -1,61 +1,60 @@
-
-$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 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
 +
 +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
 +
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
 @@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
 +    local (@skipinolist) = ();
      local ($m4dir);
      foreach $m4dir (@dirlist)
      {
  	opendir (DIR, $m4dir)
  	    || die "aclocal: couldn't open directory \`$m4dir': $!\n";
 -	local ($file, $fullfile, $expr);
 +	local ($file, $fullfile, $ino, $expr);
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
 @@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
 +
 +	    # Do not scan a file more than once.
 +	    $ino = (stat($fullfile))[1];
 +	    next if grep($ino eq $_, @skipinolist);
 +	    push @skipinolist, $ino;
 +
  	    $file_contents{$fullfile} = &scan_file ($fullfile);
  	}
  	closedir (DIR);
 @@ -400,7 +412,7 @@
  	    elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
  	    {
  		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
 -		$exit_status = 1;
 +		# $exit_status = 1;
  	    }
  	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
  	}

Property changes on: head/devel/automake14/files/patch-aclocal.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/devel/automake14/files/patch-automake.in
===================================================================
--- head/devel/automake14/files/patch-automake.in	(nonexistent)
+++ head/devel/automake14/files/patch-automake.in	(revision 67994)
@@ -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.

Property changes on: head/devel/automake14/files/patch-automake.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property