Hackery after repo-copies from devel/autoconf and devel/automake

respectively to make these true versioned ports

6 files changed, 135 insertions, 167 deletions

diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index 53ee118..bcaef55 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -7,20 +7,24 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 
 MAINTAINER=	ade@FreeBSD.org
-COMMENT=	GNU Standards-compliant Makefile generator
+COMMENT=	GNU Standards-compliant Makefile generator (version 1.5)
 
-LATEST_LINK=	automake
+BUILD_VERSION=	15
+PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
+LATEST_LINK=	automake${BUILD_VERSION}
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL5}
-USE_PERL5=	yes
-
-STRIP=		# none
+CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_REINPLACE=	yes
 
 .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 pre-everything::
@@ -32,10 +36,12 @@ pre-everything::
 	@${FALSE}
 .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
 
-pre-configure:
-	${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
-
-post-install:
-	@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir
+post-patch:
+	@(cd ${WRKSRC} && \
+		${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' Makefile.in \
+	)
 
 .include <bsd.port.mk>
diff --git a/devel/automake15/files/patch-aclocal.in b/devel/automake15/files/patch-aclocal.in
deleted file mode 100644
index 3cd7734..0000000
--- a/devel/automake15/files/patch-aclocal.in
+++ /dev/null
@@ -1,48 +0,0 @@
---- aclocal.in.orig	Sun Sep  9 11:31:39 2001
-+++ aclocal.in	Sun Sep  9 11:37:54 2001
-@@ -34,6 +34,8 @@
- # Note that this isn't pkgdatadir, but a separate directory.
- $acdir = "@datadir@/aclocal";
- 
-+$acdir_x11 = '%%X11BASE%%/share/aclocal';
-+
- # Some globals.
- 
- # Exit status.
-@@ -115,6 +117,9 @@
- 
- 
- local (@dirlist) = &parse_arguments (@ARGV);
-+
-+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
-+
- &scan_m4_files (@dirlist);
- &scan_configure;
- if (! $exit_status)
-@@ -299,11 +304,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);
- 	foreach $file (sort grep (! /^\./, readdir (DIR)))
- 	{
-@@ -314,6 +321,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/automake15/files/patch-automake.texi b/devel/automake15/files/patch-automake.texi
index a63884c..76b6221 100644
--- a/devel/automake15/files/patch-automake.texi
+++ b/devel/automake15/files/patch-automake.texi
@@ -1,25 +1,20 @@
---- automake.texi.orig	Sat Apr  4 04:04:07 1998
-+++ automake.texi	Wed Sep 23 23:34:15 1998
-@@ -1,6 +1,7 @@
- \input texinfo   @c -*-texinfo-*-
+--- automake.texi.orig	Wed Aug 22 22:40:36 2001
++++ automake.texi	Wed Feb 11 00:51:59 2004
+@@ -2,4 +2,5 @@
  @c %**start of header
- @setfilename automake.info
+-@setfilename automake.info
+-@settitle automake
++@setfilename automake15.info
 +@dircategory Programming & development tools
- @settitle automake
++@settitle Automake15
  @setchapternewpage off
- @c %**end of header
-@@ -9,12 +10,12 @@
- 
- @dircategory GNU admin
+@@ -11,3 +12,3 @@
  @direntry
 -* automake: (automake).		Making Makefile.in's
-+* Automake: (automake).		Making Makefile.in's
++* Automake15: (automake15).		Making Makefile.in's
  @end direntry
- 
- @dircategory Individual utilities
+@@ -16,3 +17,3 @@
  @direntry
 -* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4
-+* Aclocal: (automake)		Invoking aclocal. Generating aclocal.m4
++* aclocal15: (automake15)Invoking aclocal.          Generating aclocal.m4
  @end direntry
- 
- @ifinfo
diff --git a/devel/automake15/files/patch-configure b/devel/automake15/files/patch-configure
new file mode 100644
index 0000000..8161cf8
--- /dev/null
+++ b/devel/automake15/files/patch-configure
@@ -0,0 +1,7 @@
+--- configure.orig	Wed Aug 22 22:49:52 2001
++++ configure	Wed Feb 11 01:01:24 2004
+@@ -795,3 +795,3 @@
+ # Define the identity of the package.
+-PACKAGE=automake
++PACKAGE=automake15
+ VERSION=1.5
diff --git a/devel/automake15/files/patch-m4::Makefile.in b/devel/automake15/files/patch-m4::Makefile.in
new file mode 100644
index 0000000..0c0642b
--- /dev/null
+++ b/devel/automake15/files/patch-m4::Makefile.in
@@ -0,0 +1,7 @@
+--- m4/Makefile.in.orig	Wed Aug 22 22:49:56 2001
++++ m4/Makefile.in	Wed Feb 11 01:05:11 2004
+@@ -70,3 +70,3 @@
+ 
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(datadir)/aclocal15
+ m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
diff --git a/devel/automake15/pkg-plist b/devel/automake15/pkg-plist
index dfd228f..f32c3bc 100644
--- a/devel/automake15/pkg-plist
+++ b/devel/automake15/pkg-plist
@@ -1,93 +1,94 @@
-bin/aclocal
-bin/automake
-@unexec install-info --delete %D/info/automake.info %D/info/dir
-info/automake.info
-@exec install-info %D/info/automake.info %D/info/dir
-share/aclocal/as.m4
-share/aclocal/auxdir.m4
-share/aclocal/ccstdc.m4
-share/aclocal/cond.m4
-share/aclocal/depend.m4
-share/aclocal/depout.m4
-share/aclocal/dmalloc.m4
-share/aclocal/error.m4
-share/aclocal/gcj.m4
-share/aclocal/header.m4
-share/aclocal/init.m4
-share/aclocal/install-sh.m4
-share/aclocal/lex.m4
-share/aclocal/lispdir.m4
-share/aclocal/maintainer.m4
-share/aclocal/make.m4
-share/aclocal/minuso.m4
-share/aclocal/missing.m4
-share/aclocal/multi.m4
-share/aclocal/obstack.m4
-share/aclocal/protos.m4
-share/aclocal/ptrdiff.m4
-share/aclocal/python.m4
-share/aclocal/regex.m4
-share/aclocal/sanity.m4
-share/aclocal/strip.m4
-share/aclocal/strtod.m4
-share/aclocal/termios.m4
-share/aclocal/winsz.m4
-share/automake/Automake/Struct.pm
-share/automake/COPYING
-share/automake/INSTALL
-share/automake/acinstall
-share/automake/am/ansi2knr.am
-share/automake/am/check.am
-share/automake/am/clean-hdr.am
-share/automake/am/clean.am
-share/automake/am/compile.am
-share/automake/am/configure.am
-share/automake/am/data.am
-share/automake/am/dejagnu.am
-share/automake/am/depend.am
-share/automake/am/depend2.am
-share/automake/am/distdir.am
-share/automake/am/footer.am
-share/automake/am/header-vars.am
-share/automake/am/header.am
-share/automake/am/install.am
-share/automake/am/java.am
-share/automake/am/lang-compile.am
-share/automake/am/lex.am
-share/automake/am/library.am
-share/automake/am/libs.am
-share/automake/am/libtool.am
-share/automake/am/lisp.am
-share/automake/am/ltlib.am
-share/automake/am/ltlibrary.am
-share/automake/am/mans-vars.am
-share/automake/am/mans.am
-share/automake/am/multilib.am
-share/automake/am/program.am
-share/automake/am/progs.am
-share/automake/am/python.am
-share/automake/am/remake-hdr.am
-share/automake/am/scripts.am
-share/automake/am/subdirs.am
-share/automake/am/tags.am
-share/automake/am/texi-vers.am
-share/automake/am/texibuild.am
-share/automake/am/texinfos.am
-share/automake/am/yacc.am
-share/automake/ansi2knr.1
-share/automake/ansi2knr.c
-share/automake/compile
-share/automake/config.guess
-share/automake/config.sub
-share/automake/depcomp
-share/automake/elisp-comp
-share/automake/install-sh
-share/automake/mdate-sh
-share/automake/missing
-share/automake/mkinstalldirs
-share/automake/py-compile
-share/automake/texinfo.tex
-share/automake/ylwrap
-@dirrm share/automake/am
-@dirrm share/automake/Automake
-@dirrm share/automake
+bin/aclocal%%BUILD_VERSION%%
+bin/automake%%BUILD_VERSION%%
+@unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir
+info/automake%%BUILD_VERSION%%.info
+@exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir
+share/aclocal%%BUILD_VERSION%%/as.m4
+share/aclocal%%BUILD_VERSION%%/auxdir.m4
+share/aclocal%%BUILD_VERSION%%/ccstdc.m4
+share/aclocal%%BUILD_VERSION%%/cond.m4
+share/aclocal%%BUILD_VERSION%%/depend.m4
+share/aclocal%%BUILD_VERSION%%/depout.m4
+share/aclocal%%BUILD_VERSION%%/dmalloc.m4
+share/aclocal%%BUILD_VERSION%%/error.m4
+share/aclocal%%BUILD_VERSION%%/gcj.m4
+share/aclocal%%BUILD_VERSION%%/header.m4
+share/aclocal%%BUILD_VERSION%%/init.m4
+share/aclocal%%BUILD_VERSION%%/install-sh.m4
+share/aclocal%%BUILD_VERSION%%/lex.m4
+share/aclocal%%BUILD_VERSION%%/lispdir.m4
+share/aclocal%%BUILD_VERSION%%/maintainer.m4
+share/aclocal%%BUILD_VERSION%%/make.m4
+share/aclocal%%BUILD_VERSION%%/minuso.m4
+share/aclocal%%BUILD_VERSION%%/missing.m4
+share/aclocal%%BUILD_VERSION%%/multi.m4
+share/aclocal%%BUILD_VERSION%%/obstack.m4
+share/aclocal%%BUILD_VERSION%%/protos.m4
+share/aclocal%%BUILD_VERSION%%/ptrdiff.m4
+share/aclocal%%BUILD_VERSION%%/python.m4
+share/aclocal%%BUILD_VERSION%%/regex.m4
+share/aclocal%%BUILD_VERSION%%/sanity.m4
+share/aclocal%%BUILD_VERSION%%/strip.m4
+share/aclocal%%BUILD_VERSION%%/strtod.m4
+share/aclocal%%BUILD_VERSION%%/termios.m4
+share/aclocal%%BUILD_VERSION%%/winsz.m4
+share/automake%%BUILD_VERSION%%/Automake/Struct.pm
+share/automake%%BUILD_VERSION%%/COPYING
+share/automake%%BUILD_VERSION%%/INSTALL
+share/automake%%BUILD_VERSION%%/acinstall
+share/automake%%BUILD_VERSION%%/am/ansi2knr.am
+share/automake%%BUILD_VERSION%%/am/check.am
+share/automake%%BUILD_VERSION%%/am/clean-hdr.am
+share/automake%%BUILD_VERSION%%/am/clean.am
+share/automake%%BUILD_VERSION%%/am/compile.am
+share/automake%%BUILD_VERSION%%/am/configure.am
+share/automake%%BUILD_VERSION%%/am/data.am
+share/automake%%BUILD_VERSION%%/am/dejagnu.am
+share/automake%%BUILD_VERSION%%/am/depend.am
+share/automake%%BUILD_VERSION%%/am/depend2.am
+share/automake%%BUILD_VERSION%%/am/distdir.am
+share/automake%%BUILD_VERSION%%/am/footer.am
+share/automake%%BUILD_VERSION%%/am/header-vars.am
+share/automake%%BUILD_VERSION%%/am/header.am
+share/automake%%BUILD_VERSION%%/am/install.am
+share/automake%%BUILD_VERSION%%/am/java.am
+share/automake%%BUILD_VERSION%%/am/lang-compile.am
+share/automake%%BUILD_VERSION%%/am/lex.am
+share/automake%%BUILD_VERSION%%/am/library.am
+share/automake%%BUILD_VERSION%%/am/libs.am
+share/automake%%BUILD_VERSION%%/am/libtool.am
+share/automake%%BUILD_VERSION%%/am/lisp.am
+share/automake%%BUILD_VERSION%%/am/ltlib.am
+share/automake%%BUILD_VERSION%%/am/ltlibrary.am
+share/automake%%BUILD_VERSION%%/am/mans-vars.am
+share/automake%%BUILD_VERSION%%/am/mans.am
+share/automake%%BUILD_VERSION%%/am/multilib.am
+share/automake%%BUILD_VERSION%%/am/program.am
+share/automake%%BUILD_VERSION%%/am/progs.am
+share/automake%%BUILD_VERSION%%/am/python.am
+share/automake%%BUILD_VERSION%%/am/remake-hdr.am
+share/automake%%BUILD_VERSION%%/am/scripts.am
+share/automake%%BUILD_VERSION%%/am/subdirs.am
+share/automake%%BUILD_VERSION%%/am/tags.am
+share/automake%%BUILD_VERSION%%/am/texi-vers.am
+share/automake%%BUILD_VERSION%%/am/texibuild.am
+share/automake%%BUILD_VERSION%%/am/texinfos.am
+share/automake%%BUILD_VERSION%%/am/yacc.am
+share/automake%%BUILD_VERSION%%/ansi2knr.1
+share/automake%%BUILD_VERSION%%/ansi2knr.c
+share/automake%%BUILD_VERSION%%/compile
+share/automake%%BUILD_VERSION%%/config.guess
+share/automake%%BUILD_VERSION%%/config.sub
+share/automake%%BUILD_VERSION%%/depcomp
+share/automake%%BUILD_VERSION%%/elisp-comp
+share/automake%%BUILD_VERSION%%/install-sh
+share/automake%%BUILD_VERSION%%/mdate-sh
+share/automake%%BUILD_VERSION%%/missing
+share/automake%%BUILD_VERSION%%/mkinstalldirs
+share/automake%%BUILD_VERSION%%/py-compile
+share/automake%%BUILD_VERSION%%/texinfo.tex
+share/automake%%BUILD_VERSION%%/ylwrap
+@dirrm share/aclocal%%BUILD_VERSION%%
+@dirrm share/automake%%BUILD_VERSION%%/Automake
+@dirrm share/automake%%BUILD_VERSION%%/am
+@dirrm share/automake%%BUILD_VERSION%%