7 files changed, 224 insertions, 4 deletions

diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
index babd4fff2357..843f405b9ba5 100644
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.7.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -18,13 +19,13 @@ COMMENT=	GNU automake generates input files for GNU autoconf
 BUILD_DEPENDS=	autoconf257:${PORTSDIR}/devel/autoconf257
 RUN_DEPENDS=	autoconf257:${PORTSDIR}/devel/autoconf257
 
-BUILD_VERSION=	-1.7
+BUILD_VERSION=	17
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 LATEST_LINK=	automake${BUILD_VERSION}
 USE_BZIP2=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	AUTOCONF=autoconf257 AUTOHEADER=autoheader257
+CONFIGURE_ENV=	AUTOCONF=autoconf257 AUTOHEADER=autoheader257 MAKEINFO=makeinfo
 CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
@@ -44,7 +45,7 @@ post-patch:
 		${RM} -f *.info && \
 		${MV} automake.texi automake${BUILD_VERSION}.texi && \
 		${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \
-		${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g ; \
-					s,^.+ install-exec-hook$$,,' Makefile.in)
+		${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g' Makefile.in \
+	)
 
 .include <bsd.port.mk>
diff --git a/devel/automake17/files/patch-Makefile.in b/devel/automake17/files/patch-Makefile.in
new file mode 100644
index 000000000000..0a0b0eaade6a
--- /dev/null
+++ b/devel/automake17/files/patch-Makefile.in
@@ -0,0 +1,69 @@
+--- Makefile.in.orig	Sun May 18 07:21:29 2003
++++ Makefile.in	Sun Jun 29 04:06:13 2003
+@@ -40,2 +40,3 @@
+ APIVERSION = @APIVERSION@
++APIPVERSION = @APIPVERSION@
+ AUTOCONF = @AUTOCONF@
+@@ -99,3 +100,3 @@
+ bin_SCRIPTS = automake aclocal
+-info_TEXINFOS = automake.texi
++info_TEXINFOS = automake${APIPVERSION}.texi
+ 
+@@ -110,3 +111,3 @@
+ 
+-TAGS_DEPENDENCIES = automake.texi
++TAGS_DEPENDENCIES = automake${APIPVERSION}.texi
+ 
+@@ -121,2 +122,3 @@
+ 	    -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
++	    -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \
+ 	    -e 's,[@]SHELL[@],$(SHELL),g'
+@@ -143,3 +145,3 @@
+ am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
+-INFO_DEPS = automake.info
++INFO_DEPS = automake${APIPVERSION}.info
+ DVIS = automake.dvi
+@@ -147,3 +149,3 @@
+ PSS = automake.ps
+-TEXINFOS = automake.texi
++TEXINFOS = automake${APIPVERSION}.texi
+ 
+@@ -202,3 +204,3 @@
+ 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
++	 --no-split -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+@@ -213,9 +215,10 @@
+ 	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
+-automake.info: automake.texi version.texi
+-automake.dvi: automake.texi version.texi
+-automake.pdf: automake.texi version.texi
++
++automake${APIPVERSION}.info: automake${APIPVERSION}.texi version.texi
++automake${APIPVERSION}.dvi: automake${APIPVERSION}.texi version.texi
++automake${APIPVERSION}.pdf: automake${APIPVERSION}.texi version.texi
+ version.texi:  stamp-vti
+-stamp-vti: automake.texi $(top_srcdir)/configure
+-	@(dir=.; test -f ./automake.texi || dir=$(srcdir); \
+-	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \
++stamp-vti: automake${APIPVERSION}.texi $(top_srcdir)/configure
++	@(dir=.; test -f ./automake${APIPVERSION}.texi || dir=$(srcdir); \
++	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.texi`; \
+ 	echo "@set UPDATED $$1 $$2 $$3"; \
+@@ -678,16 +681,4 @@
+ 	@$(POST_INSTALL)
+-	@for p in $(bin_SCRIPTS); do \
+-	  f="`echo $$p|sed '$(transform)'`"; \
+-	  fv="$$f-$(APIVERSION)"; \
+-	  rm -f $(DESTDIR)$(bindir)/$$fv; \
+-	  echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \
+-	  $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \
+-	done
+ 
+ uninstall-hook:
+-	@for p in $(bin_SCRIPTS); do \
+-	  f="`echo $$p|sed '$(transform)'`"; \
+-	  fv="$$f-$(APIVERSION)"; \
+-	  rm -f $(DESTDIR)$(bindir)/$$fv; \
+-	done
+ 
diff --git a/devel/automake17/files/patch-aclocal.in b/devel/automake17/files/patch-aclocal.in
new file mode 100644
index 000000000000..0740a6dda4f9
--- /dev/null
+++ b/devel/automake17/files/patch-aclocal.in
@@ -0,0 +1,63 @@
+--- aclocal.in.orig	Sat Oct 12 23:14:57 2002
++++ aclocal.in	Thu Feb 13 14:57:16 2003
+@@ -29,7 +29,7 @@
+ 
+ BEGIN
+ {
+-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
+   unshift @INC, $perllibdir;
+ }
+ 
+@@ -42,8 +42,9 @@
+ $PACKAGE = '@PACKAGE@';
+ # Note that this isn't pkgdatadir, but a separate directory.
+ # Note also that the versioned directory is handled later.
+-$acdir = '@datadir@/aclocal';
++$acdir = '@datadir@/aclocal@APIPVERSION@';
+ $default_acdir = $acdir;
++$acdir_x11 = '%%X11BASE%%/share/aclocal';
+ # contains a list of directories, one per line, to be added
+ # to the dirlist in addition to $acdir, as if -I had been
+ # added to the command line.  If acdir has been redirected,
+@@ -188,11 +189,7 @@
+     $default_dirlist="$acdir/dirlist"
+ 	if $acdir ne $default_acdir;
+ 
+-    # 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;
++    unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
+ 
+     # By default $(datadir)/aclocal doesn't exist.  We don't want to
+     # get an error in the case where we are searching the default
+@@ -290,12 +287,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);
++	local ($file, $fullfile, $ino);
+ 	foreach $file (sort grep (! /^\./, readdir (DIR)))
+ 	{
+ 	    # Only examine .m4 files.
+@@ -305,6 +303,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);
diff --git a/devel/automake17/files/patch-automake.in b/devel/automake17/files/patch-automake.in
new file mode 100644
index 000000000000..f9500dbe28a3
--- /dev/null
+++ b/devel/automake17/files/patch-automake.in
@@ -0,0 +1,20 @@
+--- automake.in.orig	Wed Oct 16 20:33:56 2002
++++ automake.in	Thu Feb 13 14:05:50 2003
+@@ -31,7 +31,7 @@
+ 
+ BEGIN
+ {
+-  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
++  my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@';
+   unshift @INC, $perllibdir;
+ }
+ 
+@@ -126,7 +126,7 @@
+ # VERSION as string so that eg version 0.30 will print correctly.
+ my $VERSION = '@VERSION@';
+ my $PACKAGE = '@PACKAGE@';
+-my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
++my $libdir = '@datadir@/@PACKAGE@@APIPVERSION@';
+ 
+ # Some regular expressions.  One reason to put them here is that it
+ # makes indentation work better in Emacs.
diff --git a/devel/automake17/files/patch-automake.texi b/devel/automake17/files/patch-automake.texi
new file mode 100644
index 000000000000..cce4740d30ae
--- /dev/null
+++ b/devel/automake17/files/patch-automake.texi
@@ -0,0 +1,28 @@
+--- 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
+-@settitle automake
++@setfilename automake17.info
++@dircategory Programming & development tools
++@settitle Automake17
+ @setchapternewpage off
+ @c %**end of header
+ 
+@@ -9,12 +10,12 @@
+ 
+ @dircategory GNU admin
+ @direntry
+-* automake: (automake).		Making Makefile.in's
++* Automake17: (automake17).     Making Makefile.in's
+ @end direntry
+ 
+ @dircategory Individual utilities
+ @direntry
+-* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4
++* Aclocal17: (automake17)	Invoking aclocal. Generating aclocal.m4
+ @end direntry
+ 
+ @ifinfo
diff --git a/devel/automake17/files/patch-configure b/devel/automake17/files/patch-configure
new file mode 100644
index 000000000000..0e40d3c05ac7
--- /dev/null
+++ b/devel/automake17/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Sun May 18 07:22:17 2003
++++ configure	Sun Jun 29 03:35:27 2003
+@@ -275,3 +275,3 @@
+ ac_unique_file="automake.in"
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot APIPVERSION APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+@@ -1622,2 +1622,3 @@
+ APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'`
++APIPVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\)\.\([0-9]*[a-z]*\).*$/\1\2/'`
+ 
+@@ -1625,3 +1626,3 @@
+ # A versioned directory, defined here for convenience.
+-pkgvdatadir="\${datadir}/automake-${APIVERSION}"
++pkgvdatadir="\${datadir}/automake${APIPVERSION}"
+ 
+@@ -2460,2 +2461,3 @@
+ s,@APIVERSION@,$APIVERSION,;t t
++s,@APIPVERSION@,$APIPVERSION,;t t
+ s,@pkgvdatadir@,$pkgvdatadir,;t t
diff --git a/devel/automake17/files/patch-m4-Makefile.in b/devel/automake17/files/patch-m4-Makefile.in
new file mode 100644
index 000000000000..4c336333e5e1
--- /dev/null
+++ b/devel/automake17/files/patch-m4-Makefile.in
@@ -0,0 +1,19 @@
+--- m4/Makefile.in.orig	Wed Oct 16 20:14:23 2002
++++ m4/Makefile.in	Thu Feb 13 13:14:39 2003
+@@ -38,6 +38,7 @@
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+ APIVERSION = @APIVERSION@
++APIPVERSION = @APIPVERSION@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+@@ -92,7 +93,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-m4datadir = $(datadir)/aclocal-$(APIVERSION)
++m4datadir = $(datadir)/aclocal$(APIPVERSION)
+ 
+ dist_m4data_DATA = \
+ as.m4 \