4 files changed, 84 insertions, 15 deletions

diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index a9f6c4340f72..1a6760518652 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake14
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -22,10 +23,19 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 STRIP=		# none
 
+post-patch:
+	@-${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi
+	${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake14.texi
+
 pre-configure:
 	${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
 
 post-install:
-	@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
+	@-${RM} -fr ${PREFIX}/libexec/automake14
+	@${MKDIR} ${PREFIX}/libexec/automake14
+.for i in aclocal automake
+	@${LN} -s ../../bin/${i}14 ${PREFIX}/libexec/automake14/${i}
+.endfor
+	@install-info ${PREFIX}/info/automake14.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/automake14/files/patch-aa b/devel/automake14/files/patch-aa
index a63884c48187..d6d5eb6a0656 100644
--- a/devel/automake14/files/patch-aa
+++ b/devel/automake14/files/patch-aa
@@ -1,25 +1,28 @@
---- automake.texi.orig	Sat Apr  4 04:04:07 1998
-+++ automake.texi	Wed Sep 23 23:34:15 1998
-@@ -1,6 +1,7 @@
+--- automake.texi.orig	Wed Jan  6 08:01:26 1999
++++ automake.texi	Mon Mar 18 21:44:51 2002
+@@ -1,7 +1,8 @@
  \input texinfo   @c -*-texinfo-*-
  @c %**start of header
- @setfilename automake.info
+-@setfilename automake.info
+-@settitle automake
++@setfilename automake14.info
 +@dircategory Programming & development tools
- @settitle automake
++@settitle Automake14
  @setchapternewpage off
  @c %**end of header
+ 
 @@ -9,12 +10,12 @@
  
  @dircategory GNU admin
  @direntry
 -* automake: (automake).		Making Makefile.in's
-+* Automake: (automake).		Making Makefile.in's
++* Automake14: (automake14).     Making Makefile.in's
  @end direntry
  
  @dircategory Individual utilities
  @direntry
 -* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4
-+* Aclocal: (automake)		Invoking aclocal. Generating aclocal.m4
++* Aclocal14: (automake14)	Invoking aclocal. Generating aclocal.m4
  @end direntry
  
  @ifinfo
diff --git a/devel/automake14/files/patch-ab b/devel/automake14/files/patch-ab
index 4dcfc66fcd29..d573e2e3ec8d 100644
--- a/devel/automake14/files/patch-ab
+++ b/devel/automake14/files/patch-ab
@@ -1,6 +1,50 @@
---- Makefile.in.orig	Mon May  4 10:42:08 1998
-+++ Makefile.in	Mon May  4 10:42:34 1998
-@@ -204,7 +204,7 @@
+--- Makefile.in.orig	Sun Jul 15 13:23:30 2001
++++ Makefile.in	Mon Mar 18 21:47:17 2002
+@@ -69,7 +69,7 @@
+ SUBDIRS = . m4 tests
+ 
+ bin_SCRIPTS = automake aclocal
+-info_TEXINFOS = automake.texi
++info_TEXINFOS = automake14.texi
+ 
+ amfiles = clean-hdr.am clean-kr.am clean.am comp-vars.am compile.am data-clean.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am header-vars.am header.am java-clean.am java.am kr-extra.am library.am libs-clean.am libs.am libtool.am lisp-clean.am lisp.am ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
+ 
+@@ -90,9 +90,9 @@
+ SCRIPTS =  $(bin_SCRIPTS)
+ 
+ TEXI2DVI = texi2dvi
+-INFO_DEPS = automake.info
+-DVIS = automake.dvi
+-TEXINFOS = automake.texi
++INFO_DEPS = automake14.info
++DVIS = automake14.dvi
++TEXINFOS = automake14.texi
+ DATA =  $(pkgdata_DATA) $(script_DATA)
+ 
+ DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+@@ -149,8 +149,8 @@
+ $(srcdir)/version.texi: stamp-vti
+ 	@:
+ 
+-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in
+-	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake.texi`" > vti.tmp
++$(srcdir)/stamp-vti: automake14.texi $(top_srcdir)/configure.in
++	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake14.texi`" > vti.tmp
+ 	@echo "@set EDITION $(VERSION)" >> vti.tmp
+ 	@echo "@set VERSION $(VERSION)" >> vti.tmp
+ 	@cmp -s vti.tmp $(srcdir)/version.texi \
+@@ -169,8 +169,8 @@
+ maintainer-clean-vti:
+ 	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
+ 
+-automake.info: automake.texi version.texi
+-automake.dvi: automake.texi version.texi
++automake14.info: automake14.texi version.texi
++automake14.dvi: automake14.texi version.texi
+ 
+ 
+ DVIPS = dvips
+@@ -178,7 +178,7 @@
  .texi.info:
  	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
  	cd $(srcdir) \
@@ -8,4 +52,13 @@
 +	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
  
  .texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+ 	TEXINPUTS=.:$$TEXINPUTS \
+@@ -269,7 +269,7 @@
+ 	done
+ 
+ mostlyclean-aminfo:
+-	-rm -f automake.aux automake.cp automake.cps automake.dvi automake.fn \
++	-rm -f automake.aux automake.cp automake.cps automake14.dvi automake.fn \
+ 	  automake.fns automake.ky automake.kys automake.ps \
+ 	  automake.log automake.pg automake.toc automake.tp \
+ 	  automake.tps automake.vr automake.vrs automake.op automake.tr \
diff --git a/devel/automake14/pkg-plist b/devel/automake14/pkg-plist
index 98ccc3b9697c..b8b53c15a539 100644
--- a/devel/automake14/pkg-plist
+++ b/devel/automake14/pkg-plist
@@ -1,8 +1,10 @@
 bin/aclocal14
 bin/automake14
-@unexec install-info --delete %D/info/automake.info %D/info/dir
-info/automake.info
-@exec install-info %D/info/automake.info %D/info/dir
+@unexec install-info --delete %D/info/automake14.info %D/info/dir
+info/automake14.info
+@exec install-info %D/info/automake14.info %D/info/dir
+libexec/automake14/aclocal
+libexec/automake14/automake
 share/automake14/aclocal/ccstdc.m4
 share/automake14/aclocal/cond.m4
 share/automake14/aclocal/dmalloc.m4
@@ -77,6 +79,7 @@ share/automake14/automake/texi-vers.am
 share/automake14/automake/texinfo.tex
 share/automake14/automake/texinfos.am
 share/automake14/automake/ylwrap
+@dirrm libexec/automake14
 @dirrm share/automake14/aclocal
 @dirrm share/automake14/automake
 @dirrm share/automake14