Update to 1.9.2, use INFO, and other minor cleanups.

12 files changed, 69 insertions, 60 deletions

diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 1ca95c071ae4..db816b2595fa 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	automake18
+# New ports collection makefile for:	automake19
 # Date created:		15 Feb 2003
 # Whom:			Udo Schweigert
 #
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.9.1
+PORTVERSION=	1.9.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -27,6 +27,7 @@ CONFIGURE_ENV=	AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo
 CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
+INFO=		automake${BUILD_VERSION}
 
 post-patch:
 	@(cd ${WRKSRC}/doc && \
@@ -38,14 +39,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in
 
 pre-install:
-	${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
-	${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
-	${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
-	${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
+	@${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
 
 post-install:
 .for i in aclocal automake
-	${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
+	@${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
 		${PREFIX}/libexec/automake${BUILD_VERSION}/${i}
 .endfor
 
diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo
index 7e2cec4ac78f..f3516fc3c3c1 100644
--- a/devel/automake110/distinfo
+++ b/devel/automake110/distinfo
@@ -1,2 +1,2 @@
-MD5 (automake-1.9.1.tar.bz2) = 65143af82931c2c4d703d3a17c1c9d15
-SIZE (automake-1.9.1.tar.bz2) = 697785
+MD5 (automake-1.9.2.tar.bz2) = b5799f983d0a062ec59810f6b289cd27
+SIZE (automake-1.9.2.tar.bz2) = 731007
diff --git a/devel/automake110/files/patch-doc::automake.texi b/devel/automake110/files/patch-doc::automake.texi
index 6e64f1e4ea50..a29474dadf45 100644
--- a/devel/automake110/files/patch-doc::automake.texi
+++ b/devel/automake110/files/patch-doc::automake.texi
@@ -1,5 +1,5 @@
---- doc/automake.texi.orig	Sun Feb 15 10:01:40 2004
-+++ doc/automake.texi	Sun Mar 14 17:13:45 2004
+--- doc/automake.texi.orig	Sun Sep 19 21:28:46 2004
++++ doc/automake.texi	Thu Oct 14 20:38:54 2004
 @@ -2,4 +2,4 @@
  @c %**start of header
 -@setfilename automake.info
@@ -7,13 +7,18 @@
 +@setfilename automake19.info
 +@settitle automake19
  @setchapternewpage off
-@@ -36,3 +36,3 @@
+@@ -36,8 +36,3 @@
  @direntry
 -* automake: (automake).		Making Makefile.in's.
-+* automake19: (automake19).		Making Makefile.in's.
- @end direntry
-@@ -41,3 +41,3 @@
- @direntry
+-@end direntry
+-
+-@dircategory Individual utilities
+-@direntry
 -* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-+* aclocal19: (automake19)Invoking aclocal.          Generating aclocal.m4.
++* automake19: (automake19).		Making Makefile.in's.
  @end direntry
+@@ -8915,3 +8910,3 @@
+ @multitable {8888-88-88} {8.8-p8} {8888} {888} {8888} {8888 (88)} {8888 (88)} {888} {888}
+-@headitem Date   @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
++@item Date   @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
+ @item 1994-09-19 @tab CVS    @tab  141 @tab     @tab      @tab  299 (24) @tab           @tab     @tab
diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist
index 3f1b1facfe98..c2a9c06f7644 100644
--- a/devel/automake110/pkg-plist
+++ b/devel/automake110/pkg-plist
@@ -1,8 +1,5 @@
 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
 libexec/automake%%BUILD_VERSION%%/aclocal
 libexec/automake%%BUILD_VERSION%%/automake
 share/aclocal%%BUILD_VERSION%%/amversion.m4
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 1ca95c071ae4..db816b2595fa 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	automake18
+# New ports collection makefile for:	automake19
 # Date created:		15 Feb 2003
 # Whom:			Udo Schweigert
 #
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.9.1
+PORTVERSION=	1.9.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -27,6 +27,7 @@ CONFIGURE_ENV=	AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo
 CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
+INFO=		automake${BUILD_VERSION}
 
 post-patch:
 	@(cd ${WRKSRC}/doc && \
@@ -38,14 +39,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in
 
 pre-install:
-	${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
-	${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
-	${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
-	${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
+	@${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
 
 post-install:
 .for i in aclocal automake
-	${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
+	@${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
 		${PREFIX}/libexec/automake${BUILD_VERSION}/${i}
 .endfor
 
diff --git a/devel/automake19/distinfo b/devel/automake19/distinfo
index 7e2cec4ac78f..f3516fc3c3c1 100644
--- a/devel/automake19/distinfo
+++ b/devel/automake19/distinfo
@@ -1,2 +1,2 @@
-MD5 (automake-1.9.1.tar.bz2) = 65143af82931c2c4d703d3a17c1c9d15
-SIZE (automake-1.9.1.tar.bz2) = 697785
+MD5 (automake-1.9.2.tar.bz2) = b5799f983d0a062ec59810f6b289cd27
+SIZE (automake-1.9.2.tar.bz2) = 731007
diff --git a/devel/automake19/files/patch-doc::automake.texi b/devel/automake19/files/patch-doc::automake.texi
index 6e64f1e4ea50..a29474dadf45 100644
--- a/devel/automake19/files/patch-doc::automake.texi
+++ b/devel/automake19/files/patch-doc::automake.texi
@@ -1,5 +1,5 @@
---- doc/automake.texi.orig	Sun Feb 15 10:01:40 2004
-+++ doc/automake.texi	Sun Mar 14 17:13:45 2004
+--- doc/automake.texi.orig	Sun Sep 19 21:28:46 2004
++++ doc/automake.texi	Thu Oct 14 20:38:54 2004
 @@ -2,4 +2,4 @@
  @c %**start of header
 -@setfilename automake.info
@@ -7,13 +7,18 @@
 +@setfilename automake19.info
 +@settitle automake19
  @setchapternewpage off
-@@ -36,3 +36,3 @@
+@@ -36,8 +36,3 @@
  @direntry
 -* automake: (automake).		Making Makefile.in's.
-+* automake19: (automake19).		Making Makefile.in's.
- @end direntry
-@@ -41,3 +41,3 @@
- @direntry
+-@end direntry
+-
+-@dircategory Individual utilities
+-@direntry
 -* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-+* aclocal19: (automake19)Invoking aclocal.          Generating aclocal.m4.
++* automake19: (automake19).		Making Makefile.in's.
  @end direntry
+@@ -8915,3 +8910,3 @@
+ @multitable {8888-88-88} {8.8-p8} {8888} {888} {8888} {8888 (88)} {8888 (88)} {888} {888}
+-@headitem Date   @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
++@item Date   @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
+ @item 1994-09-19 @tab CVS    @tab  141 @tab     @tab      @tab  299 (24) @tab           @tab     @tab
diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist
index 3f1b1facfe98..c2a9c06f7644 100644
--- a/devel/automake19/pkg-plist
+++ b/devel/automake19/pkg-plist
@@ -1,8 +1,5 @@
 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
 libexec/automake%%BUILD_VERSION%%/aclocal
 libexec/automake%%BUILD_VERSION%%/automake
 share/aclocal%%BUILD_VERSION%%/amversion.m4
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 1ca95c071ae4..db816b2595fa 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	automake18
+# New ports collection makefile for:	automake19
 # Date created:		15 Feb 2003
 # Whom:			Udo Schweigert
 #
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automake
-PORTVERSION=	1.9.1
+PORTVERSION=	1.9.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
@@ -27,6 +27,7 @@ CONFIGURE_ENV=	AUTOCONF=autoconf259 AUTOHEADER=autoheader259 MAKEINFO=makeinfo
 CONFIGURE_ARGS=	--program-suffix=${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
+INFO=		automake${BUILD_VERSION}
 
 post-patch:
 	@(cd ${WRKSRC}/doc && \
@@ -38,14 +39,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/aclocal.in
 
 pre-install:
-	${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
-	${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
-	${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
-	${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
+	@${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION}
+	@${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION}
 
 post-install:
 .for i in aclocal automake
-	${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
+	@${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \
 		${PREFIX}/libexec/automake${BUILD_VERSION}/${i}
 .endfor
 
diff --git a/devel/gnu-automake/distinfo b/devel/gnu-automake/distinfo
index 7e2cec4ac78f..f3516fc3c3c1 100644
--- a/devel/gnu-automake/distinfo
+++ b/devel/gnu-automake/distinfo
@@ -1,2 +1,2 @@
-MD5 (automake-1.9.1.tar.bz2) = 65143af82931c2c4d703d3a17c1c9d15
-SIZE (automake-1.9.1.tar.bz2) = 697785
+MD5 (automake-1.9.2.tar.bz2) = b5799f983d0a062ec59810f6b289cd27
+SIZE (automake-1.9.2.tar.bz2) = 731007
diff --git a/devel/gnu-automake/files/patch-doc::automake.texi b/devel/gnu-automake/files/patch-doc::automake.texi
index 6e64f1e4ea50..a29474dadf45 100644
--- a/devel/gnu-automake/files/patch-doc::automake.texi
+++ b/devel/gnu-automake/files/patch-doc::automake.texi
@@ -1,5 +1,5 @@
---- doc/automake.texi.orig	Sun Feb 15 10:01:40 2004
-+++ doc/automake.texi	Sun Mar 14 17:13:45 2004
+--- doc/automake.texi.orig	Sun Sep 19 21:28:46 2004
++++ doc/automake.texi	Thu Oct 14 20:38:54 2004
 @@ -2,4 +2,4 @@
  @c %**start of header
 -@setfilename automake.info
@@ -7,13 +7,18 @@
 +@setfilename automake19.info
 +@settitle automake19
  @setchapternewpage off
-@@ -36,3 +36,3 @@
+@@ -36,8 +36,3 @@
  @direntry
 -* automake: (automake).		Making Makefile.in's.
-+* automake19: (automake19).		Making Makefile.in's.
- @end direntry
-@@ -41,3 +41,3 @@
- @direntry
+-@end direntry
+-
+-@dircategory Individual utilities
+-@direntry
 -* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
-+* aclocal19: (automake19)Invoking aclocal.          Generating aclocal.m4.
++* automake19: (automake19).		Making Makefile.in's.
  @end direntry
+@@ -8915,3 +8910,3 @@
+ @multitable {8888-88-88} {8.8-p8} {8888} {888} {8888} {8888 (88)} {8888 (88)} {888} {888}
+-@headitem Date   @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
++@item Date   @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t
+ @item 1994-09-19 @tab CVS    @tab  141 @tab     @tab      @tab  299 (24) @tab           @tab     @tab
diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist
index 3f1b1facfe98..c2a9c06f7644 100644
--- a/devel/gnu-automake/pkg-plist
+++ b/devel/gnu-automake/pkg-plist
@@ -1,8 +1,5 @@
 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
 libexec/automake%%BUILD_VERSION%%/aclocal
 libexec/automake%%BUILD_VERSION%%/automake
 share/aclocal%%BUILD_VERSION%%/amversion.m4