diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2004-03-15 01:25:58 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2004-03-15 01:25:58 +0000 |
| commit | eb6f3e503bf30274af29b25408c297050b6a45f2 (patch) | |
| tree | 2c22c0ec6419158394d35fc992f63d844a003d75 | |
| parent | e1e04277317d39eab347fc15885de14d5e4dcfe2 (diff) | |
| download | ports-eb6f3e503bf30274af29b25408c297050b6a45f2.tar.gz ports-eb6f3e503bf30274af29b25408c297050b6a45f2.zip | |
Notes
87 files changed, 702 insertions, 946 deletions
diff --git a/devel/Makefile b/devel/Makefile index 4c232626b4e9..1458e8615fe8 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -58,11 +58,13 @@ SUBDIR += autoconf SUBDIR += autoconf213 SUBDIR += autoconf257 + SUBDIR += autoconf259 SUBDIR += autodia SUBDIR += autogen SUBDIR += automake SUBDIR += automake14 SUBDIR += automake17 + SUBDIR += automake18 SUBDIR += avarice SUBDIR += avltree SUBDIR += avr-binutils diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile index 1e8db5b5260e..b2e5c1a61332 100644 --- a/devel/autoconf259/Makefile +++ b/devel/autoconf259/Makefile @@ -6,21 +6,20 @@ # PORTNAME= autoconf -PORTVERSION= 2.57 -PORTREVISION= 1 +PORTVERSION= 2.59 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf DISTNAME= autoconf-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms (version 2.57) +COMMENT= Automatically configure source code on many Un*x platforms (version 2.59) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 -BUILD_VERSION= 257 +BUILD_VERSION= 259 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= autoconf${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/autoconf259/distinfo b/devel/autoconf259/distinfo index 330fc36a42de..5da53db8ed4a 100644 --- a/devel/autoconf259/distinfo +++ b/devel/autoconf259/distinfo @@ -1 +1,2 @@ -MD5 (autoconf-2.57.tar.bz2) = 407ea53787ce13f5ca427e9a51e05bc2 +MD5 (autoconf-2.59.tar.bz2) = 1ee40f7a676b3cfdc0e3f7cd81551b5f +SIZE (autoconf-2.59.tar.bz2) = 925073 diff --git a/devel/autoconf259/files/patch-autoconf.texi b/devel/autoconf259/files/patch-autoconf.texi index 50e1e8e7acab..5454129a2eb6 100644 --- a/devel/autoconf259/files/patch-autoconf.texi +++ b/devel/autoconf259/files/patch-autoconf.texi @@ -1,23 +1,15 @@ ---- doc/autoconf.texi.orig Tue Dec 3 07:16:32 2002 -+++ doc/autoconf.texi Sun Jun 1 19:17:51 2003 -@@ -1,9 +1,9 @@ - \input texinfo @c -*-texinfo-*- - @comment ======================================================== +--- doc/autoconf.texi.orig Wed Nov 5 02:38:29 2003 ++++ doc/autoconf.texi Sun Mar 14 16:46:41 2004 +@@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf257.info ++@setfilename autoconf259.info @include version.texi -@settitle Autoconf -+@settitle Autoconf257 ++@settitle Autoconf259 @setchapternewpage odd - @setcontentsaftertitlepage - @finalout -@@ -97,7 +97,7 @@ - - @dircategory GNU programming tools +@@ -212,3 +212,3 @@ @direntry --* Autoconf: (autoconf). Create source code configuration scripts -+* Autoconf257: (autoconf257). Create source code configuration scripts +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf259: (autoconf259). Create source code configuration scripts. @end direntry - - @dircategory Individual utilities diff --git a/devel/autoconf259/files/patch-configure b/devel/autoconf259/files/patch-configure new file mode 100644 index 000000000000..bc622f2b52b1 --- /dev/null +++ b/devel/autoconf259/files/patch-configure @@ -0,0 +1,7 @@ +--- configure.orig Thu Nov 6 01:33:28 2003 ++++ configure Sun Mar 14 16:53:34 2004 +@@ -1536,3 +1536,3 @@ + # Define the identity of the package. +- PACKAGE='autoconf' ++ PACKAGE='autoconf259' + VERSION='2.59' diff --git a/devel/autoconf259/files/patch-standards.texi b/devel/autoconf259/files/patch-standards.texi index 51c669fafb1b..9d6134950668 100644 --- a/devel/autoconf259/files/patch-standards.texi +++ b/devel/autoconf259/files/patch-standards.texi @@ -1,19 +1,12 @@ ---- doc/standards.texi.orig Sun Jun 1 18:52:56 2003 -+++ doc/standards.texi Sun Jun 1 18:54:00 2003 -@@ -1,6 +1,6 @@ - \input texinfo @c -*-texinfo-*- +--- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 ++++ doc/standards.texi Sun Mar 14 16:47:41 2004 +@@ -2,3 +2,3 @@ @c %**start of header -@setfilename standards.info -+@setfilename standards257.info ++@setfilename standards259.info @settitle GNU Coding Standards - @c This date is automagically updated when you save this file: - @set lastupdate November 23, 2002 -@@ -8,7 +8,7 @@ - - @dircategory GNU organization +@@ -10,3 +10,3 @@ @direntry -* Standards: (standards). GNU coding standards. -+* Standards257: (standards257). GNU coding standards. ++* Standards259: (standards259). GNU coding standards. @end direntry - - @c @setchapternewpage odd diff --git a/devel/autoconf259/pkg-plist b/devel/autoconf259/pkg-plist index 26f1b36ec1cc..c672876e59c4 100644 --- a/devel/autoconf259/pkg-plist +++ b/devel/autoconf259/pkg-plist @@ -11,7 +11,13 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Channels.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Configure_ac.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/FileUtils.pm share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Request.pm share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm share/autoconf%%BUILD_VERSION%%/INSTALL diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile index 1e8db5b5260e..b2e5c1a61332 100644 --- a/devel/autoconf26/Makefile +++ b/devel/autoconf26/Makefile @@ -6,21 +6,20 @@ # PORTNAME= autoconf -PORTVERSION= 2.57 -PORTREVISION= 1 +PORTVERSION= 2.59 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf DISTNAME= autoconf-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms (version 2.57) +COMMENT= Automatically configure source code on many Un*x platforms (version 2.59) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 -BUILD_VERSION= 257 +BUILD_VERSION= 259 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= autoconf${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/autoconf26/distinfo b/devel/autoconf26/distinfo index 330fc36a42de..5da53db8ed4a 100644 --- a/devel/autoconf26/distinfo +++ b/devel/autoconf26/distinfo @@ -1 +1,2 @@ -MD5 (autoconf-2.57.tar.bz2) = 407ea53787ce13f5ca427e9a51e05bc2 +MD5 (autoconf-2.59.tar.bz2) = 1ee40f7a676b3cfdc0e3f7cd81551b5f +SIZE (autoconf-2.59.tar.bz2) = 925073 diff --git a/devel/autoconf26/files/patch-autoconf.texi b/devel/autoconf26/files/patch-autoconf.texi index 50e1e8e7acab..5454129a2eb6 100644 --- a/devel/autoconf26/files/patch-autoconf.texi +++ b/devel/autoconf26/files/patch-autoconf.texi @@ -1,23 +1,15 @@ ---- doc/autoconf.texi.orig Tue Dec 3 07:16:32 2002 -+++ doc/autoconf.texi Sun Jun 1 19:17:51 2003 -@@ -1,9 +1,9 @@ - \input texinfo @c -*-texinfo-*- - @comment ======================================================== +--- doc/autoconf.texi.orig Wed Nov 5 02:38:29 2003 ++++ doc/autoconf.texi Sun Mar 14 16:46:41 2004 +@@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf257.info ++@setfilename autoconf259.info @include version.texi -@settitle Autoconf -+@settitle Autoconf257 ++@settitle Autoconf259 @setchapternewpage odd - @setcontentsaftertitlepage - @finalout -@@ -97,7 +97,7 @@ - - @dircategory GNU programming tools +@@ -212,3 +212,3 @@ @direntry --* Autoconf: (autoconf). Create source code configuration scripts -+* Autoconf257: (autoconf257). Create source code configuration scripts +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf259: (autoconf259). Create source code configuration scripts. @end direntry - - @dircategory Individual utilities diff --git a/devel/autoconf26/files/patch-configure b/devel/autoconf26/files/patch-configure new file mode 100644 index 000000000000..bc622f2b52b1 --- /dev/null +++ b/devel/autoconf26/files/patch-configure @@ -0,0 +1,7 @@ +--- configure.orig Thu Nov 6 01:33:28 2003 ++++ configure Sun Mar 14 16:53:34 2004 +@@ -1536,3 +1536,3 @@ + # Define the identity of the package. +- PACKAGE='autoconf' ++ PACKAGE='autoconf259' + VERSION='2.59' diff --git a/devel/autoconf26/files/patch-standards.texi b/devel/autoconf26/files/patch-standards.texi index 51c669fafb1b..9d6134950668 100644 --- a/devel/autoconf26/files/patch-standards.texi +++ b/devel/autoconf26/files/patch-standards.texi @@ -1,19 +1,12 @@ ---- doc/standards.texi.orig Sun Jun 1 18:52:56 2003 -+++ doc/standards.texi Sun Jun 1 18:54:00 2003 -@@ -1,6 +1,6 @@ - \input texinfo @c -*-texinfo-*- +--- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 ++++ doc/standards.texi Sun Mar 14 16:47:41 2004 +@@ -2,3 +2,3 @@ @c %**start of header -@setfilename standards.info -+@setfilename standards257.info ++@setfilename standards259.info @settitle GNU Coding Standards - @c This date is automagically updated when you save this file: - @set lastupdate November 23, 2002 -@@ -8,7 +8,7 @@ - - @dircategory GNU organization +@@ -10,3 +10,3 @@ @direntry -* Standards: (standards). GNU coding standards. -+* Standards257: (standards257). GNU coding standards. ++* Standards259: (standards259). GNU coding standards. @end direntry - - @c @setchapternewpage odd diff --git a/devel/autoconf26/pkg-plist b/devel/autoconf26/pkg-plist index 26f1b36ec1cc..c672876e59c4 100644 --- a/devel/autoconf26/pkg-plist +++ b/devel/autoconf26/pkg-plist @@ -11,7 +11,13 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Channels.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Configure_ac.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/FileUtils.pm share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Request.pm share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm share/autoconf%%BUILD_VERSION%%/INSTALL diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile index 1e8db5b5260e..b2e5c1a61332 100644 --- a/devel/autoconf261/Makefile +++ b/devel/autoconf261/Makefile @@ -6,21 +6,20 @@ # PORTNAME= autoconf -PORTVERSION= 2.57 -PORTREVISION= 1 +PORTVERSION= 2.59 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf DISTNAME= autoconf-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms (version 2.57) +COMMENT= Automatically configure source code on many Un*x platforms (version 2.59) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 -BUILD_VERSION= 257 +BUILD_VERSION= 259 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= autoconf${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/autoconf261/distinfo b/devel/autoconf261/distinfo index 330fc36a42de..5da53db8ed4a 100644 --- a/devel/autoconf261/distinfo +++ b/devel/autoconf261/distinfo @@ -1 +1,2 @@ -MD5 (autoconf-2.57.tar.bz2) = 407ea53787ce13f5ca427e9a51e05bc2 +MD5 (autoconf-2.59.tar.bz2) = 1ee40f7a676b3cfdc0e3f7cd81551b5f +SIZE (autoconf-2.59.tar.bz2) = 925073 diff --git a/devel/autoconf261/files/patch-autoconf.texi b/devel/autoconf261/files/patch-autoconf.texi index 50e1e8e7acab..5454129a2eb6 100644 --- a/devel/autoconf261/files/patch-autoconf.texi +++ b/devel/autoconf261/files/patch-autoconf.texi @@ -1,23 +1,15 @@ ---- doc/autoconf.texi.orig Tue Dec 3 07:16:32 2002 -+++ doc/autoconf.texi Sun Jun 1 19:17:51 2003 -@@ -1,9 +1,9 @@ - \input texinfo @c -*-texinfo-*- - @comment ======================================================== +--- doc/autoconf.texi.orig Wed Nov 5 02:38:29 2003 ++++ doc/autoconf.texi Sun Mar 14 16:46:41 2004 +@@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf257.info ++@setfilename autoconf259.info @include version.texi -@settitle Autoconf -+@settitle Autoconf257 ++@settitle Autoconf259 @setchapternewpage odd - @setcontentsaftertitlepage - @finalout -@@ -97,7 +97,7 @@ - - @dircategory GNU programming tools +@@ -212,3 +212,3 @@ @direntry --* Autoconf: (autoconf). Create source code configuration scripts -+* Autoconf257: (autoconf257). Create source code configuration scripts +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf259: (autoconf259). Create source code configuration scripts. @end direntry - - @dircategory Individual utilities diff --git a/devel/autoconf261/files/patch-configure b/devel/autoconf261/files/patch-configure new file mode 100644 index 000000000000..bc622f2b52b1 --- /dev/null +++ b/devel/autoconf261/files/patch-configure @@ -0,0 +1,7 @@ +--- configure.orig Thu Nov 6 01:33:28 2003 ++++ configure Sun Mar 14 16:53:34 2004 +@@ -1536,3 +1536,3 @@ + # Define the identity of the package. +- PACKAGE='autoconf' ++ PACKAGE='autoconf259' + VERSION='2.59' diff --git a/devel/autoconf261/files/patch-standards.texi b/devel/autoconf261/files/patch-standards.texi index 51c669fafb1b..9d6134950668 100644 --- a/devel/autoconf261/files/patch-standards.texi +++ b/devel/autoconf261/files/patch-standards.texi @@ -1,19 +1,12 @@ ---- doc/standards.texi.orig Sun Jun 1 18:52:56 2003 -+++ doc/standards.texi Sun Jun 1 18:54:00 2003 -@@ -1,6 +1,6 @@ - \input texinfo @c -*-texinfo-*- +--- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 ++++ doc/standards.texi Sun Mar 14 16:47:41 2004 +@@ -2,3 +2,3 @@ @c %**start of header -@setfilename standards.info -+@setfilename standards257.info ++@setfilename standards259.info @settitle GNU Coding Standards - @c This date is automagically updated when you save this file: - @set lastupdate November 23, 2002 -@@ -8,7 +8,7 @@ - - @dircategory GNU organization +@@ -10,3 +10,3 @@ @direntry -* Standards: (standards). GNU coding standards. -+* Standards257: (standards257). GNU coding standards. ++* Standards259: (standards259). GNU coding standards. @end direntry - - @c @setchapternewpage odd diff --git a/devel/autoconf261/pkg-plist b/devel/autoconf261/pkg-plist index 26f1b36ec1cc..c672876e59c4 100644 --- a/devel/autoconf261/pkg-plist +++ b/devel/autoconf261/pkg-plist @@ -11,7 +11,13 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Channels.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Configure_ac.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/FileUtils.pm share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Request.pm share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm share/autoconf%%BUILD_VERSION%%/INSTALL diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile index 1e8db5b5260e..b2e5c1a61332 100644 --- a/devel/autoconf262/Makefile +++ b/devel/autoconf262/Makefile @@ -6,21 +6,20 @@ # PORTNAME= autoconf -PORTVERSION= 2.57 -PORTREVISION= 1 +PORTVERSION= 2.59 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf DISTNAME= autoconf-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms (version 2.57) +COMMENT= Automatically configure source code on many Un*x platforms (version 2.59) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 -BUILD_VERSION= 257 +BUILD_VERSION= 259 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= autoconf${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/autoconf262/distinfo b/devel/autoconf262/distinfo index 330fc36a42de..5da53db8ed4a 100644 --- a/devel/autoconf262/distinfo +++ b/devel/autoconf262/distinfo @@ -1 +1,2 @@ -MD5 (autoconf-2.57.tar.bz2) = 407ea53787ce13f5ca427e9a51e05bc2 +MD5 (autoconf-2.59.tar.bz2) = 1ee40f7a676b3cfdc0e3f7cd81551b5f +SIZE (autoconf-2.59.tar.bz2) = 925073 diff --git a/devel/autoconf262/files/patch-autoconf.texi b/devel/autoconf262/files/patch-autoconf.texi index 50e1e8e7acab..5454129a2eb6 100644 --- a/devel/autoconf262/files/patch-autoconf.texi +++ b/devel/autoconf262/files/patch-autoconf.texi @@ -1,23 +1,15 @@ ---- doc/autoconf.texi.orig Tue Dec 3 07:16:32 2002 -+++ doc/autoconf.texi Sun Jun 1 19:17:51 2003 -@@ -1,9 +1,9 @@ - \input texinfo @c -*-texinfo-*- - @comment ======================================================== +--- doc/autoconf.texi.orig Wed Nov 5 02:38:29 2003 ++++ doc/autoconf.texi Sun Mar 14 16:46:41 2004 +@@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf257.info ++@setfilename autoconf259.info @include version.texi -@settitle Autoconf -+@settitle Autoconf257 ++@settitle Autoconf259 @setchapternewpage odd - @setcontentsaftertitlepage - @finalout -@@ -97,7 +97,7 @@ - - @dircategory GNU programming tools +@@ -212,3 +212,3 @@ @direntry --* Autoconf: (autoconf). Create source code configuration scripts -+* Autoconf257: (autoconf257). Create source code configuration scripts +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf259: (autoconf259). Create source code configuration scripts. @end direntry - - @dircategory Individual utilities diff --git a/devel/autoconf262/files/patch-configure b/devel/autoconf262/files/patch-configure new file mode 100644 index 000000000000..bc622f2b52b1 --- /dev/null +++ b/devel/autoconf262/files/patch-configure @@ -0,0 +1,7 @@ +--- configure.orig Thu Nov 6 01:33:28 2003 ++++ configure Sun Mar 14 16:53:34 2004 +@@ -1536,3 +1536,3 @@ + # Define the identity of the package. +- PACKAGE='autoconf' ++ PACKAGE='autoconf259' + VERSION='2.59' diff --git a/devel/autoconf262/files/patch-standards.texi b/devel/autoconf262/files/patch-standards.texi index 51c669fafb1b..9d6134950668 100644 --- a/devel/autoconf262/files/patch-standards.texi +++ b/devel/autoconf262/files/patch-standards.texi @@ -1,19 +1,12 @@ ---- doc/standards.texi.orig Sun Jun 1 18:52:56 2003 -+++ doc/standards.texi Sun Jun 1 18:54:00 2003 -@@ -1,6 +1,6 @@ - \input texinfo @c -*-texinfo-*- +--- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 ++++ doc/standards.texi Sun Mar 14 16:47:41 2004 +@@ -2,3 +2,3 @@ @c %**start of header -@setfilename standards.info -+@setfilename standards257.info ++@setfilename standards259.info @settitle GNU Coding Standards - @c This date is automagically updated when you save this file: - @set lastupdate November 23, 2002 -@@ -8,7 +8,7 @@ - - @dircategory GNU organization +@@ -10,3 +10,3 @@ @direntry -* Standards: (standards). GNU coding standards. -+* Standards257: (standards257). GNU coding standards. ++* Standards259: (standards259). GNU coding standards. @end direntry - - @c @setchapternewpage odd diff --git a/devel/autoconf262/pkg-plist b/devel/autoconf262/pkg-plist index 26f1b36ec1cc..c672876e59c4 100644 --- a/devel/autoconf262/pkg-plist +++ b/devel/autoconf262/pkg-plist @@ -11,7 +11,13 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Channels.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Configure_ac.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/FileUtils.pm share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Request.pm share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm share/autoconf%%BUILD_VERSION%%/INSTALL diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile index 1e8db5b5260e..b2e5c1a61332 100644 --- a/devel/autoconf267/Makefile +++ b/devel/autoconf267/Makefile @@ -6,21 +6,20 @@ # PORTNAME= autoconf -PORTVERSION= 2.57 -PORTREVISION= 1 +PORTVERSION= 2.59 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf DISTNAME= autoconf-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms (version 2.57) +COMMENT= Automatically configure source code on many Un*x platforms (version 2.59) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 -BUILD_VERSION= 257 +BUILD_VERSION= 259 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= autoconf${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/autoconf267/distinfo b/devel/autoconf267/distinfo index 330fc36a42de..5da53db8ed4a 100644 --- a/devel/autoconf267/distinfo +++ b/devel/autoconf267/distinfo @@ -1 +1,2 @@ -MD5 (autoconf-2.57.tar.bz2) = 407ea53787ce13f5ca427e9a51e05bc2 +MD5 (autoconf-2.59.tar.bz2) = 1ee40f7a676b3cfdc0e3f7cd81551b5f +SIZE (autoconf-2.59.tar.bz2) = 925073 diff --git a/devel/autoconf267/files/patch-autoconf.texi b/devel/autoconf267/files/patch-autoconf.texi index 50e1e8e7acab..5454129a2eb6 100644 --- a/devel/autoconf267/files/patch-autoconf.texi +++ b/devel/autoconf267/files/patch-autoconf.texi @@ -1,23 +1,15 @@ ---- doc/autoconf.texi.orig Tue Dec 3 07:16:32 2002 -+++ doc/autoconf.texi Sun Jun 1 19:17:51 2003 -@@ -1,9 +1,9 @@ - \input texinfo @c -*-texinfo-*- - @comment ======================================================== +--- doc/autoconf.texi.orig Wed Nov 5 02:38:29 2003 ++++ doc/autoconf.texi Sun Mar 14 16:46:41 2004 +@@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf257.info ++@setfilename autoconf259.info @include version.texi -@settitle Autoconf -+@settitle Autoconf257 ++@settitle Autoconf259 @setchapternewpage odd - @setcontentsaftertitlepage - @finalout -@@ -97,7 +97,7 @@ - - @dircategory GNU programming tools +@@ -212,3 +212,3 @@ @direntry --* Autoconf: (autoconf). Create source code configuration scripts -+* Autoconf257: (autoconf257). Create source code configuration scripts +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf259: (autoconf259). Create source code configuration scripts. @end direntry - - @dircategory Individual utilities diff --git a/devel/autoconf267/files/patch-configure b/devel/autoconf267/files/patch-configure new file mode 100644 index 000000000000..bc622f2b52b1 --- /dev/null +++ b/devel/autoconf267/files/patch-configure @@ -0,0 +1,7 @@ +--- configure.orig Thu Nov 6 01:33:28 2003 ++++ configure Sun Mar 14 16:53:34 2004 +@@ -1536,3 +1536,3 @@ + # Define the identity of the package. +- PACKAGE='autoconf' ++ PACKAGE='autoconf259' + VERSION='2.59' diff --git a/devel/autoconf267/files/patch-standards.texi b/devel/autoconf267/files/patch-standards.texi index 51c669fafb1b..9d6134950668 100644 --- a/devel/autoconf267/files/patch-standards.texi +++ b/devel/autoconf267/files/patch-standards.texi @@ -1,19 +1,12 @@ ---- doc/standards.texi.orig Sun Jun 1 18:52:56 2003 -+++ doc/standards.texi Sun Jun 1 18:54:00 2003 -@@ -1,6 +1,6 @@ - \input texinfo @c -*-texinfo-*- +--- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 ++++ doc/standards.texi Sun Mar 14 16:47:41 2004 +@@ -2,3 +2,3 @@ @c %**start of header -@setfilename standards.info -+@setfilename standards257.info ++@setfilename standards259.info @settitle GNU Coding Standards - @c This date is automagically updated when you save this file: - @set lastupdate November 23, 2002 -@@ -8,7 +8,7 @@ - - @dircategory GNU organization +@@ -10,3 +10,3 @@ @direntry -* Standards: (standards). GNU coding standards. -+* Standards257: (standards257). GNU coding standards. ++* Standards259: (standards259). GNU coding standards. @end direntry - - @c @setchapternewpage odd diff --git a/devel/autoconf267/pkg-plist b/devel/autoconf267/pkg-plist index 26f1b36ec1cc..c672876e59c4 100644 --- a/devel/autoconf267/pkg-plist +++ b/devel/autoconf267/pkg-plist @@ -11,7 +11,13 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Channels.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Configure_ac.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/FileUtils.pm share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Request.pm share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm share/autoconf%%BUILD_VERSION%%/INSTALL diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile index 1e8db5b5260e..b2e5c1a61332 100644 --- a/devel/autoconf268/Makefile +++ b/devel/autoconf268/Makefile @@ -6,21 +6,20 @@ # PORTNAME= autoconf -PORTVERSION= 2.57 -PORTREVISION= 1 +PORTVERSION= 2.59 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf DISTNAME= autoconf-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms (version 2.57) +COMMENT= Automatically configure source code on many Un*x platforms (version 2.59) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 -BUILD_VERSION= 257 +BUILD_VERSION= 259 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= autoconf${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/autoconf268/distinfo b/devel/autoconf268/distinfo index 330fc36a42de..5da53db8ed4a 100644 --- a/devel/autoconf268/distinfo +++ b/devel/autoconf268/distinfo @@ -1 +1,2 @@ -MD5 (autoconf-2.57.tar.bz2) = 407ea53787ce13f5ca427e9a51e05bc2 +MD5 (autoconf-2.59.tar.bz2) = 1ee40f7a676b3cfdc0e3f7cd81551b5f +SIZE (autoconf-2.59.tar.bz2) = 925073 diff --git a/devel/autoconf268/files/patch-autoconf.texi b/devel/autoconf268/files/patch-autoconf.texi index 50e1e8e7acab..5454129a2eb6 100644 --- a/devel/autoconf268/files/patch-autoconf.texi +++ b/devel/autoconf268/files/patch-autoconf.texi @@ -1,23 +1,15 @@ ---- doc/autoconf.texi.orig Tue Dec 3 07:16:32 2002 -+++ doc/autoconf.texi Sun Jun 1 19:17:51 2003 -@@ -1,9 +1,9 @@ - \input texinfo @c -*-texinfo-*- - @comment ======================================================== +--- doc/autoconf.texi.orig Wed Nov 5 02:38:29 2003 ++++ doc/autoconf.texi Sun Mar 14 16:46:41 2004 +@@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf257.info ++@setfilename autoconf259.info @include version.texi -@settitle Autoconf -+@settitle Autoconf257 ++@settitle Autoconf259 @setchapternewpage odd - @setcontentsaftertitlepage - @finalout -@@ -97,7 +97,7 @@ - - @dircategory GNU programming tools +@@ -212,3 +212,3 @@ @direntry --* Autoconf: (autoconf). Create source code configuration scripts -+* Autoconf257: (autoconf257). Create source code configuration scripts +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf259: (autoconf259). Create source code configuration scripts. @end direntry - - @dircategory Individual utilities diff --git a/devel/autoconf268/files/patch-configure b/devel/autoconf268/files/patch-configure new file mode 100644 index 000000000000..bc622f2b52b1 --- /dev/null +++ b/devel/autoconf268/files/patch-configure @@ -0,0 +1,7 @@ +--- configure.orig Thu Nov 6 01:33:28 2003 ++++ configure Sun Mar 14 16:53:34 2004 +@@ -1536,3 +1536,3 @@ + # Define the identity of the package. +- PACKAGE='autoconf' ++ PACKAGE='autoconf259' + VERSION='2.59' diff --git a/devel/autoconf268/files/patch-standards.texi b/devel/autoconf268/files/patch-standards.texi index 51c669fafb1b..9d6134950668 100644 --- a/devel/autoconf268/files/patch-standards.texi +++ b/devel/autoconf268/files/patch-standards.texi @@ -1,19 +1,12 @@ ---- doc/standards.texi.orig Sun Jun 1 18:52:56 2003 -+++ doc/standards.texi Sun Jun 1 18:54:00 2003 -@@ -1,6 +1,6 @@ - \input texinfo @c -*-texinfo-*- +--- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 ++++ doc/standards.texi Sun Mar 14 16:47:41 2004 +@@ -2,3 +2,3 @@ @c %**start of header -@setfilename standards.info -+@setfilename standards257.info ++@setfilename standards259.info @settitle GNU Coding Standards - @c This date is automagically updated when you save this file: - @set lastupdate November 23, 2002 -@@ -8,7 +8,7 @@ - - @dircategory GNU organization +@@ -10,3 +10,3 @@ @direntry -* Standards: (standards). GNU coding standards. -+* Standards257: (standards257). GNU coding standards. ++* Standards259: (standards259). GNU coding standards. @end direntry - - @c @setchapternewpage odd diff --git a/devel/autoconf268/pkg-plist b/devel/autoconf268/pkg-plist index 26f1b36ec1cc..c672876e59c4 100644 --- a/devel/autoconf268/pkg-plist +++ b/devel/autoconf268/pkg-plist @@ -11,7 +11,13 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Channels.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Configure_ac.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/FileUtils.pm share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Request.pm share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm share/autoconf%%BUILD_VERSION%%/INSTALL diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile index cf51948e4ae5..db69f70a4678 100644 --- a/devel/automake110/Makefile +++ b/devel/automake110/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: automake17 +# New ports collection makefile for: automake18 # Date created: 15 Feb 2003 # Whom: Udo Schweigert # @@ -6,26 +6,25 @@ # PORTNAME= automake -PORTVERSION= 1.7.5 -PORTREVISION= 1 +PORTVERSION= 1.8.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (version 1.7) +COMMENT= GNU Standards-compliant Makefile generator (version 1.8) -BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 -RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +BUILD_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259 +RUN_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259 -BUILD_VERSION= 17 +BUILD_VERSION= 18 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 MAKEINFO=makeinfo +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 @@ -41,7 +40,7 @@ pre-everything:: .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) post-patch: - @(cd ${WRKSRC} && \ + @(cd ${WRKSRC}/doc && \ ${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 && \ diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo index e07b6fcf6a67..eb957abbf9e8 100644 --- a/devel/automake110/distinfo +++ b/devel/automake110/distinfo @@ -1 +1,2 @@ -MD5 (automake-1.7.5.tar.bz2) = 21c51ad339224c5862d5abd23121c362 +MD5 (automake-1.8.3.tar.bz2) = 5e8a685a304c0def671decdfe453a631 +SIZE (automake-1.8.3.tar.bz2) = 658156 diff --git a/devel/automake110/files/patch-Makefile.in b/devel/automake110/files/patch-Makefile.in index 0a0b0eaade6a..f24ffdd88721 100644 --- a/devel/automake110/files/patch-Makefile.in +++ b/devel/automake110/files/patch-Makefile.in @@ -1,56 +1,14 @@ ---- Makefile.in.orig Sun May 18 07:21:29 2003 -+++ Makefile.in Sun Jun 29 04:06:13 2003 -@@ -40,2 +40,3 @@ +--- Makefile.in.orig Sun Mar 7 09:04:32 2004 ++++ Makefile.in Sun Mar 14 17:07:15 2004 +@@ -82,2 +82,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 @@ +@@ -154,2 +155,3 @@ + -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ ++ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ +@@ -590,16 +592,4 @@ @$(POST_INSTALL) - @for p in $(bin_SCRIPTS); do \ - f="`echo $$p|sed '$(transform)'`"; \ diff --git a/devel/automake110/files/patch-aclocal.in b/devel/automake110/files/patch-aclocal.in index 0740a6dda4f9..214fcda58d8b 100644 --- a/devel/automake110/files/patch-aclocal.in +++ b/devel/automake110/files/patch-aclocal.in @@ -1,63 +1,23 @@ ---- aclocal.in.orig Sat Oct 12 23:14:57 2002 -+++ aclocal.in Thu Feb 13 14:57:16 2003 -@@ -29,7 +29,7 @@ - - BEGIN +--- aclocal.in.orig Sat Feb 7 04:32:57 2004 ++++ aclocal.in Sun Mar 14 17:03:19 2004 +@@ -31,3 +31,3 @@ { - 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. + unshift @INC, (split ':', $perllibdir); +@@ -47,4 +47,5 @@ # 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'); - } +@@ -622,7 +623,3 @@ -+ 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'; +- # 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/."; - $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/automake110/files/patch-automake.in b/devel/automake110/files/patch-automake.in index f9500dbe28a3..3c9d43806bbe 100644 --- a/devel/automake110/files/patch-automake.in +++ b/devel/automake110/files/patch-automake.in @@ -1,20 +1,7 @@ ---- automake.in.orig Wed Oct 16 20:33:56 2002 -+++ automake.in Thu Feb 13 14:05:50 2003 -@@ -31,7 +31,7 @@ - - BEGIN +--- automake.in.orig Sun Feb 29 09:27:07 2004 ++++ automake.in Sun Mar 14 17:04:50 2004 +@@ -33,3 +33,3 @@ { - 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. + unshift @INC, (split ':', $perllibdir); diff --git a/devel/automake110/files/patch-automake.texi b/devel/automake110/files/patch-automake.texi deleted file mode 100644 index cce4740d30ae..000000000000 --- a/devel/automake110/files/patch-automake.texi +++ /dev/null @@ -1,28 +0,0 @@ ---- 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/automake110/files/patch-configure b/devel/automake110/files/patch-configure index 0e40d3c05ac7..77000a347d5d 100644 --- a/devel/automake110/files/patch-configure +++ b/devel/automake110/files/patch-configure @@ -1,20 +1,20 @@ ---- configure.orig Sun May 18 07:22:17 2003 -+++ configure Sun Jun 29 03:35:27 2003 -@@ -275,3 +275,3 @@ +--- configure.orig Sun Mar 7 09:04:31 2004 ++++ configure Sun Mar 14 17:08:54 2004 +@@ -499,3 +499,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_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 build build_cpu build_vendor build_os 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 mkdir_p AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP 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 build build_cpu build_vendor build_os 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 mkdir_p AWK SET_MAKE am__leading_dot APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' -@@ -1622,2 +1622,3 @@ +@@ -1941,6 +1941,6 @@ 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 @@ +@@ -3130,2 +3130,3 @@ s,@APIVERSION@,$APIVERSION,;t t +s,@APIPVERSION@,$APIPVERSION,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t diff --git a/devel/automake110/files/patch-doc::Makefile.in b/devel/automake110/files/patch-doc::Makefile.in new file mode 100644 index 000000000000..b3c320a7de74 --- /dev/null +++ b/devel/automake110/files/patch-doc::Makefile.in @@ -0,0 +1,35 @@ +--- doc/Makefile.in.orig Sun Mar 7 09:04:33 2004 ++++ doc/Makefile.in Sun Mar 14 17:12:32 2004 +@@ -53,3 +53,3 @@ + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/automake.info ++INFO_DEPS = $(srcdir)/automake${APIPVERSION}.info + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +@@ -73,2 +73,3 @@ + APIVERSION = @APIVERSION@ ++APIPVERSION = @APIPVERSION@ + AUTOCONF = @AUTOCONF@ +@@ -93,3 +94,3 @@ + LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = @MAKEINFO@ --no-split + MODIFICATION_DELAY = @MODIFICATION_DELAY@ +@@ -135,3 +136,3 @@ + target_alias = @target_alias@ +-info_TEXINFOS = automake.texi ++info_TEXINFOS = automake${APIPVERSION}.texi + automake_TEXINFOS = fdl.texi +@@ -142,3 +143,3 @@ + +-TAGS_DEPENDENCIES = automake.texi ++TAGS_DEPENDENCIES = automake${APIPVERSION}.texi + all: all-am +@@ -222,5 +223,5 @@ + $(srcdir)/version.texi: $(srcdir)/stamp-vti +-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure +- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \ +- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \ ++$(srcdir)/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"; \ diff --git a/devel/automake110/files/patch-doc::automake.texi b/devel/automake110/files/patch-doc::automake.texi new file mode 100644 index 000000000000..3e2e8cd439f4 --- /dev/null +++ b/devel/automake110/files/patch-doc::automake.texi @@ -0,0 +1,19 @@ +--- doc/automake.texi.orig Sun Feb 15 10:01:40 2004 ++++ doc/automake.texi Sun Mar 14 17:13:45 2004 +@@ -2,4 +2,4 @@ + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake18.info ++@settitle automake18 + @setchapternewpage off +@@ -36,3 +36,3 @@ + @direntry +-* automake: (automake). Making Makefile.in's. ++* automake18: (automake18). Making Makefile.in's. + @end direntry +@@ -41,3 +41,3 @@ + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. ++* aclocal18: (automake18)Invoking aclocal. Generating aclocal.m4. + @end direntry diff --git a/devel/automake110/files/patch-m4-Makefile.in b/devel/automake110/files/patch-m4-Makefile.in index 4c336333e5e1..5125e696ab2c 100644 --- a/devel/automake110/files/patch-m4-Makefile.in +++ b/devel/automake110/files/patch-m4-Makefile.in @@ -1,19 +1,11 @@ ---- 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@ +--- m4/Makefile.in.orig Sun Mar 7 09:04:33 2004 ++++ m4/Makefile.in Sun Mar 14 17:09:37 2004 +@@ -60,2 +60,3 @@ APIVERSION = @APIVERSION@ +APIPVERSION = @APIPVERSION@ AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ -@@ -92,7 +93,7 @@ - sysconfdir = @sysconfdir@ +@@ -122,3 +123,3 @@ target_alias = @target_alias@ - -m4datadir = $(datadir)/aclocal-$(APIVERSION) +m4datadir = $(datadir)/aclocal$(APIPVERSION) - dist_m4data_DATA = \ - as.m4 \ diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist index a7f80f4a2792..3865ef48b0ab 100644 --- a/devel/automake110/pkg-plist +++ b/devel/automake110/pkg-plist @@ -22,6 +22,7 @@ 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%%/mkdirp.m4 share/aclocal%%BUILD_VERSION%%/multi.m4 share/aclocal%%BUILD_VERSION%%/obsol-gt.m4 share/aclocal%%BUILD_VERSION%%/obsol-lt.m4 @@ -33,9 +34,25 @@ share/aclocal%%BUILD_VERSION%%/regex.m4 share/aclocal%%BUILD_VERSION%%/runlog.m4 share/aclocal%%BUILD_VERSION%%/sanity.m4 share/aclocal%%BUILD_VERSION%%/strip.m4 +share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm share/automake%%BUILD_VERSION%%/Automake/Channels.pm +share/automake%%BUILD_VERSION%%/Automake/Condition.pm +share/automake%%BUILD_VERSION%%/Automake/Config.pm +share/automake%%BUILD_VERSION%%/Automake/Configure_ac.pm +share/automake%%BUILD_VERSION%%/Automake/DisjConditions.pm +share/automake%%BUILD_VERSION%%/Automake/FileUtils.pm share/automake%%BUILD_VERSION%%/Automake/General.pm +share/automake%%BUILD_VERSION%%/Automake/Item.pm +share/automake%%BUILD_VERSION%%/Automake/ItemDef.pm +share/automake%%BUILD_VERSION%%/Automake/Location.pm +share/automake%%BUILD_VERSION%%/Automake/Options.pm +share/automake%%BUILD_VERSION%%/Automake/Rule.pm +share/automake%%BUILD_VERSION%%/Automake/RuleDef.pm share/automake%%BUILD_VERSION%%/Automake/Struct.pm +share/automake%%BUILD_VERSION%%/Automake/VarDef.pm +share/automake%%BUILD_VERSION%%/Automake/Variable.pm +share/automake%%BUILD_VERSION%%/Automake/Version.pm +share/automake%%BUILD_VERSION%%/Automake/Wrap.pm share/automake%%BUILD_VERSION%%/Automake/XFile.pm share/automake%%BUILD_VERSION%%/COPYING share/automake%%BUILD_VERSION%%/INSTALL @@ -81,6 +98,7 @@ 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-ml.in share/automake%%BUILD_VERSION%%/config.guess share/automake%%BUILD_VERSION%%/config.sub share/automake%%BUILD_VERSION%%/depcomp @@ -90,6 +108,7 @@ 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%%/symlink-tree share/automake%%BUILD_VERSION%%/texinfo.tex share/automake%%BUILD_VERSION%%/ylwrap @dirrm share/aclocal%%BUILD_VERSION%% diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile index cf51948e4ae5..db69f70a4678 100644 --- a/devel/automake18/Makefile +++ b/devel/automake18/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: automake17 +# New ports collection makefile for: automake18 # Date created: 15 Feb 2003 # Whom: Udo Schweigert # @@ -6,26 +6,25 @@ # PORTNAME= automake -PORTVERSION= 1.7.5 -PORTREVISION= 1 +PORTVERSION= 1.8.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (version 1.7) +COMMENT= GNU Standards-compliant Makefile generator (version 1.8) -BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 -RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +BUILD_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259 +RUN_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259 -BUILD_VERSION= 17 +BUILD_VERSION= 18 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 MAKEINFO=makeinfo +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 @@ -41,7 +40,7 @@ pre-everything:: .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) post-patch: - @(cd ${WRKSRC} && \ + @(cd ${WRKSRC}/doc && \ ${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 && \ diff --git a/devel/automake18/distinfo b/devel/automake18/distinfo index e07b6fcf6a67..eb957abbf9e8 100644 --- a/devel/automake18/distinfo +++ b/devel/automake18/distinfo @@ -1 +1,2 @@ -MD5 (automake-1.7.5.tar.bz2) = 21c51ad339224c5862d5abd23121c362 +MD5 (automake-1.8.3.tar.bz2) = 5e8a685a304c0def671decdfe453a631 +SIZE (automake-1.8.3.tar.bz2) = 658156 diff --git a/devel/automake18/files/patch-Makefile.in b/devel/automake18/files/patch-Makefile.in index 0a0b0eaade6a..f24ffdd88721 100644 --- a/devel/automake18/files/patch-Makefile.in +++ b/devel/automake18/files/patch-Makefile.in @@ -1,56 +1,14 @@ ---- Makefile.in.orig Sun May 18 07:21:29 2003 -+++ Makefile.in Sun Jun 29 04:06:13 2003 -@@ -40,2 +40,3 @@ +--- Makefile.in.orig Sun Mar 7 09:04:32 2004 ++++ Makefile.in Sun Mar 14 17:07:15 2004 +@@ -82,2 +82,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 @@ +@@ -154,2 +155,3 @@ + -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ ++ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ +@@ -590,16 +592,4 @@ @$(POST_INSTALL) - @for p in $(bin_SCRIPTS); do \ - f="`echo $$p|sed '$(transform)'`"; \ diff --git a/devel/automake18/files/patch-aclocal.in b/devel/automake18/files/patch-aclocal.in index 0740a6dda4f9..214fcda58d8b 100644 --- a/devel/automake18/files/patch-aclocal.in +++ b/devel/automake18/files/patch-aclocal.in @@ -1,63 +1,23 @@ ---- aclocal.in.orig Sat Oct 12 23:14:57 2002 -+++ aclocal.in Thu Feb 13 14:57:16 2003 -@@ -29,7 +29,7 @@ - - BEGIN +--- aclocal.in.orig Sat Feb 7 04:32:57 2004 ++++ aclocal.in Sun Mar 14 17:03:19 2004 +@@ -31,3 +31,3 @@ { - 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. + unshift @INC, (split ':', $perllibdir); +@@ -47,4 +47,5 @@ # 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'); - } +@@ -622,7 +623,3 @@ -+ 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'; +- # 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/."; - $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/automake18/files/patch-automake.in b/devel/automake18/files/patch-automake.in index f9500dbe28a3..3c9d43806bbe 100644 --- a/devel/automake18/files/patch-automake.in +++ b/devel/automake18/files/patch-automake.in @@ -1,20 +1,7 @@ ---- automake.in.orig Wed Oct 16 20:33:56 2002 -+++ automake.in Thu Feb 13 14:05:50 2003 -@@ -31,7 +31,7 @@ - - BEGIN +--- automake.in.orig Sun Feb 29 09:27:07 2004 ++++ automake.in Sun Mar 14 17:04:50 2004 +@@ -33,3 +33,3 @@ { - 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. + unshift @INC, (split ':', $perllibdir); diff --git a/devel/automake18/files/patch-automake.texi b/devel/automake18/files/patch-automake.texi deleted file mode 100644 index cce4740d30ae..000000000000 --- a/devel/automake18/files/patch-automake.texi +++ /dev/null @@ -1,28 +0,0 @@ ---- 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/automake18/files/patch-configure b/devel/automake18/files/patch-configure index 0e40d3c05ac7..77000a347d5d 100644 --- a/devel/automake18/files/patch-configure +++ b/devel/automake18/files/patch-configure @@ -1,20 +1,20 @@ ---- configure.orig Sun May 18 07:22:17 2003 -+++ configure Sun Jun 29 03:35:27 2003 -@@ -275,3 +275,3 @@ +--- configure.orig Sun Mar 7 09:04:31 2004 ++++ configure Sun Mar 14 17:08:54 2004 +@@ -499,3 +499,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_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 build build_cpu build_vendor build_os 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 mkdir_p AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP 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 build build_cpu build_vendor build_os 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 mkdir_p AWK SET_MAKE am__leading_dot APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' -@@ -1622,2 +1622,3 @@ +@@ -1941,6 +1941,6 @@ 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 @@ +@@ -3130,2 +3130,3 @@ s,@APIVERSION@,$APIVERSION,;t t +s,@APIPVERSION@,$APIPVERSION,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t diff --git a/devel/automake18/files/patch-doc::Makefile.in b/devel/automake18/files/patch-doc::Makefile.in new file mode 100644 index 000000000000..b3c320a7de74 --- /dev/null +++ b/devel/automake18/files/patch-doc::Makefile.in @@ -0,0 +1,35 @@ +--- doc/Makefile.in.orig Sun Mar 7 09:04:33 2004 ++++ doc/Makefile.in Sun Mar 14 17:12:32 2004 +@@ -53,3 +53,3 @@ + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/automake.info ++INFO_DEPS = $(srcdir)/automake${APIPVERSION}.info + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +@@ -73,2 +73,3 @@ + APIVERSION = @APIVERSION@ ++APIPVERSION = @APIPVERSION@ + AUTOCONF = @AUTOCONF@ +@@ -93,3 +94,3 @@ + LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = @MAKEINFO@ --no-split + MODIFICATION_DELAY = @MODIFICATION_DELAY@ +@@ -135,3 +136,3 @@ + target_alias = @target_alias@ +-info_TEXINFOS = automake.texi ++info_TEXINFOS = automake${APIPVERSION}.texi + automake_TEXINFOS = fdl.texi +@@ -142,3 +143,3 @@ + +-TAGS_DEPENDENCIES = automake.texi ++TAGS_DEPENDENCIES = automake${APIPVERSION}.texi + all: all-am +@@ -222,5 +223,5 @@ + $(srcdir)/version.texi: $(srcdir)/stamp-vti +-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure +- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \ +- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \ ++$(srcdir)/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"; \ diff --git a/devel/automake18/files/patch-doc::automake.texi b/devel/automake18/files/patch-doc::automake.texi new file mode 100644 index 000000000000..3e2e8cd439f4 --- /dev/null +++ b/devel/automake18/files/patch-doc::automake.texi @@ -0,0 +1,19 @@ +--- doc/automake.texi.orig Sun Feb 15 10:01:40 2004 ++++ doc/automake.texi Sun Mar 14 17:13:45 2004 +@@ -2,4 +2,4 @@ + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake18.info ++@settitle automake18 + @setchapternewpage off +@@ -36,3 +36,3 @@ + @direntry +-* automake: (automake). Making Makefile.in's. ++* automake18: (automake18). Making Makefile.in's. + @end direntry +@@ -41,3 +41,3 @@ + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. ++* aclocal18: (automake18)Invoking aclocal. Generating aclocal.m4. + @end direntry diff --git a/devel/automake18/files/patch-m4-Makefile.in b/devel/automake18/files/patch-m4-Makefile.in index 4c336333e5e1..5125e696ab2c 100644 --- a/devel/automake18/files/patch-m4-Makefile.in +++ b/devel/automake18/files/patch-m4-Makefile.in @@ -1,19 +1,11 @@ ---- 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@ +--- m4/Makefile.in.orig Sun Mar 7 09:04:33 2004 ++++ m4/Makefile.in Sun Mar 14 17:09:37 2004 +@@ -60,2 +60,3 @@ APIVERSION = @APIVERSION@ +APIPVERSION = @APIPVERSION@ AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ -@@ -92,7 +93,7 @@ - sysconfdir = @sysconfdir@ +@@ -122,3 +123,3 @@ target_alias = @target_alias@ - -m4datadir = $(datadir)/aclocal-$(APIVERSION) +m4datadir = $(datadir)/aclocal$(APIPVERSION) - dist_m4data_DATA = \ - as.m4 \ diff --git a/devel/automake18/pkg-plist b/devel/automake18/pkg-plist index a7f80f4a2792..3865ef48b0ab 100644 --- a/devel/automake18/pkg-plist +++ b/devel/automake18/pkg-plist @@ -22,6 +22,7 @@ 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%%/mkdirp.m4 share/aclocal%%BUILD_VERSION%%/multi.m4 share/aclocal%%BUILD_VERSION%%/obsol-gt.m4 share/aclocal%%BUILD_VERSION%%/obsol-lt.m4 @@ -33,9 +34,25 @@ share/aclocal%%BUILD_VERSION%%/regex.m4 share/aclocal%%BUILD_VERSION%%/runlog.m4 share/aclocal%%BUILD_VERSION%%/sanity.m4 share/aclocal%%BUILD_VERSION%%/strip.m4 +share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm share/automake%%BUILD_VERSION%%/Automake/Channels.pm +share/automake%%BUILD_VERSION%%/Automake/Condition.pm +share/automake%%BUILD_VERSION%%/Automake/Config.pm +share/automake%%BUILD_VERSION%%/Automake/Configure_ac.pm +share/automake%%BUILD_VERSION%%/Automake/DisjConditions.pm +share/automake%%BUILD_VERSION%%/Automake/FileUtils.pm share/automake%%BUILD_VERSION%%/Automake/General.pm +share/automake%%BUILD_VERSION%%/Automake/Item.pm +share/automake%%BUILD_VERSION%%/Automake/ItemDef.pm +share/automake%%BUILD_VERSION%%/Automake/Location.pm +share/automake%%BUILD_VERSION%%/Automake/Options.pm +share/automake%%BUILD_VERSION%%/Automake/Rule.pm +share/automake%%BUILD_VERSION%%/Automake/RuleDef.pm share/automake%%BUILD_VERSION%%/Automake/Struct.pm +share/automake%%BUILD_VERSION%%/Automake/VarDef.pm +share/automake%%BUILD_VERSION%%/Automake/Variable.pm +share/automake%%BUILD_VERSION%%/Automake/Version.pm +share/automake%%BUILD_VERSION%%/Automake/Wrap.pm share/automake%%BUILD_VERSION%%/Automake/XFile.pm share/automake%%BUILD_VERSION%%/COPYING share/automake%%BUILD_VERSION%%/INSTALL @@ -81,6 +98,7 @@ 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-ml.in share/automake%%BUILD_VERSION%%/config.guess share/automake%%BUILD_VERSION%%/config.sub share/automake%%BUILD_VERSION%%/depcomp @@ -90,6 +108,7 @@ 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%%/symlink-tree share/automake%%BUILD_VERSION%%/texinfo.tex share/automake%%BUILD_VERSION%%/ylwrap @dirrm share/aclocal%%BUILD_VERSION%% diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index cf51948e4ae5..db69f70a4678 100644 --- a/devel/automake19/Makefile +++ b/devel/automake19/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: automake17 +# New ports collection makefile for: automake18 # Date created: 15 Feb 2003 # Whom: Udo Schweigert # @@ -6,26 +6,25 @@ # PORTNAME= automake -PORTVERSION= 1.7.5 -PORTREVISION= 1 +PORTVERSION= 1.8.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (version 1.7) +COMMENT= GNU Standards-compliant Makefile generator (version 1.8) -BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 -RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +BUILD_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259 +RUN_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259 -BUILD_VERSION= 17 +BUILD_VERSION= 18 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 MAKEINFO=makeinfo +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 @@ -41,7 +40,7 @@ pre-everything:: .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) post-patch: - @(cd ${WRKSRC} && \ + @(cd ${WRKSRC}/doc && \ ${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 && \ diff --git a/devel/automake19/distinfo b/devel/automake19/distinfo index e07b6fcf6a67..eb957abbf9e8 100644 --- a/devel/automake19/distinfo +++ b/devel/automake19/distinfo @@ -1 +1,2 @@ -MD5 (automake-1.7.5.tar.bz2) = 21c51ad339224c5862d5abd23121c362 +MD5 (automake-1.8.3.tar.bz2) = 5e8a685a304c0def671decdfe453a631 +SIZE (automake-1.8.3.tar.bz2) = 658156 diff --git a/devel/automake19/files/patch-Makefile.in b/devel/automake19/files/patch-Makefile.in index 0a0b0eaade6a..f24ffdd88721 100644 --- a/devel/automake19/files/patch-Makefile.in +++ b/devel/automake19/files/patch-Makefile.in @@ -1,56 +1,14 @@ ---- Makefile.in.orig Sun May 18 07:21:29 2003 -+++ Makefile.in Sun Jun 29 04:06:13 2003 -@@ -40,2 +40,3 @@ +--- Makefile.in.orig Sun Mar 7 09:04:32 2004 ++++ Makefile.in Sun Mar 14 17:07:15 2004 +@@ -82,2 +82,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 @@ +@@ -154,2 +155,3 @@ + -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ ++ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ +@@ -590,16 +592,4 @@ @$(POST_INSTALL) - @for p in $(bin_SCRIPTS); do \ - f="`echo $$p|sed '$(transform)'`"; \ diff --git a/devel/automake19/files/patch-aclocal.in b/devel/automake19/files/patch-aclocal.in index 0740a6dda4f9..214fcda58d8b 100644 --- a/devel/automake19/files/patch-aclocal.in +++ b/devel/automake19/files/patch-aclocal.in @@ -1,63 +1,23 @@ ---- aclocal.in.orig Sat Oct 12 23:14:57 2002 -+++ aclocal.in Thu Feb 13 14:57:16 2003 -@@ -29,7 +29,7 @@ - - BEGIN +--- aclocal.in.orig Sat Feb 7 04:32:57 2004 ++++ aclocal.in Sun Mar 14 17:03:19 2004 +@@ -31,3 +31,3 @@ { - 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. + unshift @INC, (split ':', $perllibdir); +@@ -47,4 +47,5 @@ # 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'); - } +@@ -622,7 +623,3 @@ -+ 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'; +- # 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/."; - $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/automake19/files/patch-automake.in b/devel/automake19/files/patch-automake.in index f9500dbe28a3..3c9d43806bbe 100644 --- a/devel/automake19/files/patch-automake.in +++ b/devel/automake19/files/patch-automake.in @@ -1,20 +1,7 @@ ---- automake.in.orig Wed Oct 16 20:33:56 2002 -+++ automake.in Thu Feb 13 14:05:50 2003 -@@ -31,7 +31,7 @@ - - BEGIN +--- automake.in.orig Sun Feb 29 09:27:07 2004 ++++ automake.in Sun Mar 14 17:04:50 2004 +@@ -33,3 +33,3 @@ { - 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. + unshift @INC, (split ':', $perllibdir); diff --git a/devel/automake19/files/patch-automake.texi b/devel/automake19/files/patch-automake.texi deleted file mode 100644 index cce4740d30ae..000000000000 --- a/devel/automake19/files/patch-automake.texi +++ /dev/null @@ -1,28 +0,0 @@ ---- 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/automake19/files/patch-configure b/devel/automake19/files/patch-configure index 0e40d3c05ac7..77000a347d5d 100644 --- a/devel/automake19/files/patch-configure +++ b/devel/automake19/files/patch-configure @@ -1,20 +1,20 @@ ---- configure.orig Sun May 18 07:22:17 2003 -+++ configure Sun Jun 29 03:35:27 2003 -@@ -275,3 +275,3 @@ +--- configure.orig Sun Mar 7 09:04:31 2004 ++++ configure Sun Mar 14 17:08:54 2004 +@@ -499,3 +499,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_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 build build_cpu build_vendor build_os 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 mkdir_p AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP 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 build build_cpu build_vendor build_os 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 mkdir_p AWK SET_MAKE am__leading_dot APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' -@@ -1622,2 +1622,3 @@ +@@ -1941,6 +1941,6 @@ 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 @@ +@@ -3130,2 +3130,3 @@ s,@APIVERSION@,$APIVERSION,;t t +s,@APIPVERSION@,$APIPVERSION,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t diff --git a/devel/automake19/files/patch-doc::Makefile.in b/devel/automake19/files/patch-doc::Makefile.in new file mode 100644 index 000000000000..b3c320a7de74 --- /dev/null +++ b/devel/automake19/files/patch-doc::Makefile.in @@ -0,0 +1,35 @@ +--- doc/Makefile.in.orig Sun Mar 7 09:04:33 2004 ++++ doc/Makefile.in Sun Mar 14 17:12:32 2004 +@@ -53,3 +53,3 @@ + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/automake.info ++INFO_DEPS = $(srcdir)/automake${APIPVERSION}.info + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +@@ -73,2 +73,3 @@ + APIVERSION = @APIVERSION@ ++APIPVERSION = @APIPVERSION@ + AUTOCONF = @AUTOCONF@ +@@ -93,3 +94,3 @@ + LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = @MAKEINFO@ --no-split + MODIFICATION_DELAY = @MODIFICATION_DELAY@ +@@ -135,3 +136,3 @@ + target_alias = @target_alias@ +-info_TEXINFOS = automake.texi ++info_TEXINFOS = automake${APIPVERSION}.texi + automake_TEXINFOS = fdl.texi +@@ -142,3 +143,3 @@ + +-TAGS_DEPENDENCIES = automake.texi ++TAGS_DEPENDENCIES = automake${APIPVERSION}.texi + all: all-am +@@ -222,5 +223,5 @@ + $(srcdir)/version.texi: $(srcdir)/stamp-vti +-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure +- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \ +- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \ ++$(srcdir)/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"; \ diff --git a/devel/automake19/files/patch-doc::automake.texi b/devel/automake19/files/patch-doc::automake.texi new file mode 100644 index 000000000000..3e2e8cd439f4 --- /dev/null +++ b/devel/automake19/files/patch-doc::automake.texi @@ -0,0 +1,19 @@ +--- doc/automake.texi.orig Sun Feb 15 10:01:40 2004 ++++ doc/automake.texi Sun Mar 14 17:13:45 2004 +@@ -2,4 +2,4 @@ + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake18.info ++@settitle automake18 + @setchapternewpage off +@@ -36,3 +36,3 @@ + @direntry +-* automake: (automake). Making Makefile.in's. ++* automake18: (automake18). Making Makefile.in's. + @end direntry +@@ -41,3 +41,3 @@ + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. ++* aclocal18: (automake18)Invoking aclocal. Generating aclocal.m4. + @end direntry diff --git a/devel/automake19/files/patch-m4-Makefile.in b/devel/automake19/files/patch-m4-Makefile.in index 4c336333e5e1..5125e696ab2c 100644 --- a/devel/automake19/files/patch-m4-Makefile.in +++ b/devel/automake19/files/patch-m4-Makefile.in @@ -1,19 +1,11 @@ ---- 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@ +--- m4/Makefile.in.orig Sun Mar 7 09:04:33 2004 ++++ m4/Makefile.in Sun Mar 14 17:09:37 2004 +@@ -60,2 +60,3 @@ APIVERSION = @APIVERSION@ +APIPVERSION = @APIPVERSION@ AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ -@@ -92,7 +93,7 @@ - sysconfdir = @sysconfdir@ +@@ -122,3 +123,3 @@ target_alias = @target_alias@ - -m4datadir = $(datadir)/aclocal-$(APIVERSION) +m4datadir = $(datadir)/aclocal$(APIPVERSION) - dist_m4data_DATA = \ - as.m4 \ diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist index a7f80f4a2792..3865ef48b0ab 100644 --- a/devel/automake19/pkg-plist +++ b/devel/automake19/pkg-plist @@ -22,6 +22,7 @@ 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%%/mkdirp.m4 share/aclocal%%BUILD_VERSION%%/multi.m4 share/aclocal%%BUILD_VERSION%%/obsol-gt.m4 share/aclocal%%BUILD_VERSION%%/obsol-lt.m4 @@ -33,9 +34,25 @@ share/aclocal%%BUILD_VERSION%%/regex.m4 share/aclocal%%BUILD_VERSION%%/runlog.m4 share/aclocal%%BUILD_VERSION%%/sanity.m4 share/aclocal%%BUILD_VERSION%%/strip.m4 +share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm share/automake%%BUILD_VERSION%%/Automake/Channels.pm +share/automake%%BUILD_VERSION%%/Automake/Condition.pm +share/automake%%BUILD_VERSION%%/Automake/Config.pm +share/automake%%BUILD_VERSION%%/Automake/Configure_ac.pm +share/automake%%BUILD_VERSION%%/Automake/DisjConditions.pm +share/automake%%BUILD_VERSION%%/Automake/FileUtils.pm share/automake%%BUILD_VERSION%%/Automake/General.pm +share/automake%%BUILD_VERSION%%/Automake/Item.pm +share/automake%%BUILD_VERSION%%/Automake/ItemDef.pm +share/automake%%BUILD_VERSION%%/Automake/Location.pm +share/automake%%BUILD_VERSION%%/Automake/Options.pm +share/automake%%BUILD_VERSION%%/Automake/Rule.pm +share/automake%%BUILD_VERSION%%/Automake/RuleDef.pm share/automake%%BUILD_VERSION%%/Automake/Struct.pm +share/automake%%BUILD_VERSION%%/Automake/VarDef.pm +share/automake%%BUILD_VERSION%%/Automake/Variable.pm +share/automake%%BUILD_VERSION%%/Automake/Version.pm +share/automake%%BUILD_VERSION%%/Automake/Wrap.pm share/automake%%BUILD_VERSION%%/Automake/XFile.pm share/automake%%BUILD_VERSION%%/COPYING share/automake%%BUILD_VERSION%%/INSTALL @@ -81,6 +98,7 @@ 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-ml.in share/automake%%BUILD_VERSION%%/config.guess share/automake%%BUILD_VERSION%%/config.sub share/automake%%BUILD_VERSION%%/depcomp @@ -90,6 +108,7 @@ 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%%/symlink-tree share/automake%%BUILD_VERSION%%/texinfo.tex share/automake%%BUILD_VERSION%%/ylwrap @dirrm share/aclocal%%BUILD_VERSION%% diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile index 1e8db5b5260e..b2e5c1a61332 100644 --- a/devel/gnu-autoconf/Makefile +++ b/devel/gnu-autoconf/Makefile @@ -6,21 +6,20 @@ # PORTNAME= autoconf -PORTVERSION= 2.57 -PORTREVISION= 1 +PORTVERSION= 2.59 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= autoconf DISTNAME= autoconf-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= Automatically configure source code on many Un*x platforms (version 2.57) +COMMENT= Automatically configure source code on many Un*x platforms (version 2.59) BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ help2man:${PORTSDIR}/misc/help2man RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 -BUILD_VERSION= 257 +BUILD_VERSION= 259 PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} LATEST_LINK= autoconf${BUILD_VERSION} USE_BZIP2= yes diff --git a/devel/gnu-autoconf/distinfo b/devel/gnu-autoconf/distinfo index 330fc36a42de..5da53db8ed4a 100644 --- a/devel/gnu-autoconf/distinfo +++ b/devel/gnu-autoconf/distinfo @@ -1 +1,2 @@ -MD5 (autoconf-2.57.tar.bz2) = 407ea53787ce13f5ca427e9a51e05bc2 +MD5 (autoconf-2.59.tar.bz2) = 1ee40f7a676b3cfdc0e3f7cd81551b5f +SIZE (autoconf-2.59.tar.bz2) = 925073 diff --git a/devel/gnu-autoconf/files/patch-autoconf.texi b/devel/gnu-autoconf/files/patch-autoconf.texi index 50e1e8e7acab..5454129a2eb6 100644 --- a/devel/gnu-autoconf/files/patch-autoconf.texi +++ b/devel/gnu-autoconf/files/patch-autoconf.texi @@ -1,23 +1,15 @@ ---- doc/autoconf.texi.orig Tue Dec 3 07:16:32 2002 -+++ doc/autoconf.texi Sun Jun 1 19:17:51 2003 -@@ -1,9 +1,9 @@ - \input texinfo @c -*-texinfo-*- - @comment ======================================================== +--- doc/autoconf.texi.orig Wed Nov 5 02:38:29 2003 ++++ doc/autoconf.texi Sun Mar 14 16:46:41 2004 +@@ -3,5 +3,5 @@ @comment %**start of header -@setfilename autoconf.info -+@setfilename autoconf257.info ++@setfilename autoconf259.info @include version.texi -@settitle Autoconf -+@settitle Autoconf257 ++@settitle Autoconf259 @setchapternewpage odd - @setcontentsaftertitlepage - @finalout -@@ -97,7 +97,7 @@ - - @dircategory GNU programming tools +@@ -212,3 +212,3 @@ @direntry --* Autoconf: (autoconf). Create source code configuration scripts -+* Autoconf257: (autoconf257). Create source code configuration scripts +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf259: (autoconf259). Create source code configuration scripts. @end direntry - - @dircategory Individual utilities diff --git a/devel/gnu-autoconf/files/patch-configure b/devel/gnu-autoconf/files/patch-configure new file mode 100644 index 000000000000..bc622f2b52b1 --- /dev/null +++ b/devel/gnu-autoconf/files/patch-configure @@ -0,0 +1,7 @@ +--- configure.orig Thu Nov 6 01:33:28 2003 ++++ configure Sun Mar 14 16:53:34 2004 +@@ -1536,3 +1536,3 @@ + # Define the identity of the package. +- PACKAGE='autoconf' ++ PACKAGE='autoconf259' + VERSION='2.59' diff --git a/devel/gnu-autoconf/files/patch-standards.texi b/devel/gnu-autoconf/files/patch-standards.texi index 51c669fafb1b..9d6134950668 100644 --- a/devel/gnu-autoconf/files/patch-standards.texi +++ b/devel/gnu-autoconf/files/patch-standards.texi @@ -1,19 +1,12 @@ ---- doc/standards.texi.orig Sun Jun 1 18:52:56 2003 -+++ doc/standards.texi Sun Jun 1 18:54:00 2003 -@@ -1,6 +1,6 @@ - \input texinfo @c -*-texinfo-*- +--- doc/standards.texi.orig Sun Sep 14 18:33:44 2003 ++++ doc/standards.texi Sun Mar 14 16:47:41 2004 +@@ -2,3 +2,3 @@ @c %**start of header -@setfilename standards.info -+@setfilename standards257.info ++@setfilename standards259.info @settitle GNU Coding Standards - @c This date is automagically updated when you save this file: - @set lastupdate November 23, 2002 -@@ -8,7 +8,7 @@ - - @dircategory GNU organization +@@ -10,3 +10,3 @@ @direntry -* Standards: (standards). GNU coding standards. -+* Standards257: (standards257). GNU coding standards. ++* Standards259: (standards259). GNU coding standards. @end direntry - - @c @setchapternewpage odd diff --git a/devel/gnu-autoconf/pkg-plist b/devel/gnu-autoconf/pkg-plist index 26f1b36ec1cc..c672876e59c4 100644 --- a/devel/gnu-autoconf/pkg-plist +++ b/devel/gnu-autoconf/pkg-plist @@ -11,7 +11,13 @@ info/autoconf%%BUILD_VERSION%%.info info/standards%%BUILD_VERSION%%.info @exec install-info %D/info/autoconf%%BUILD_VERSION%%.info %D/info/dir @exec install-info %D/info/standards%%BUILD_VERSION%%.info %D/info/dir +share/autoconf%%BUILD_VERSION%%/Autom4te/C4che.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/ChannelDefs.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Channels.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Configure_ac.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/FileUtils.pm share/autoconf%%BUILD_VERSION%%/Autom4te/General.pm +share/autoconf%%BUILD_VERSION%%/Autom4te/Request.pm share/autoconf%%BUILD_VERSION%%/Autom4te/Struct.pm share/autoconf%%BUILD_VERSION%%/Autom4te/XFile.pm share/autoconf%%BUILD_VERSION%%/INSTALL diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile index cf51948e4ae5..db69f70a4678 100644 --- a/devel/gnu-automake/Makefile +++ b/devel/gnu-automake/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: automake17 +# New ports collection makefile for: automake18 # Date created: 15 Feb 2003 # Whom: Udo Schweigert # @@ -6,26 +6,25 @@ # PORTNAME= automake -PORTVERSION= 1.7.5 -PORTREVISION= 1 +PORTVERSION= 1.8.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -COMMENT= GNU Standards-compliant Makefile generator (version 1.7) +COMMENT= GNU Standards-compliant Makefile generator (version 1.8) -BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 -RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +BUILD_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259 +RUN_DEPENDS= autoconf259:${PORTSDIR}/devel/autoconf259 -BUILD_VERSION= 17 +BUILD_VERSION= 18 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 MAKEINFO=makeinfo +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 @@ -41,7 +40,7 @@ pre-everything:: .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) post-patch: - @(cd ${WRKSRC} && \ + @(cd ${WRKSRC}/doc && \ ${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 && \ diff --git a/devel/gnu-automake/distinfo b/devel/gnu-automake/distinfo index e07b6fcf6a67..eb957abbf9e8 100644 --- a/devel/gnu-automake/distinfo +++ b/devel/gnu-automake/distinfo @@ -1 +1,2 @@ -MD5 (automake-1.7.5.tar.bz2) = 21c51ad339224c5862d5abd23121c362 +MD5 (automake-1.8.3.tar.bz2) = 5e8a685a304c0def671decdfe453a631 +SIZE (automake-1.8.3.tar.bz2) = 658156 diff --git a/devel/gnu-automake/files/patch-Makefile.in b/devel/gnu-automake/files/patch-Makefile.in index 0a0b0eaade6a..f24ffdd88721 100644 --- a/devel/gnu-automake/files/patch-Makefile.in +++ b/devel/gnu-automake/files/patch-Makefile.in @@ -1,56 +1,14 @@ ---- Makefile.in.orig Sun May 18 07:21:29 2003 -+++ Makefile.in Sun Jun 29 04:06:13 2003 -@@ -40,2 +40,3 @@ +--- Makefile.in.orig Sun Mar 7 09:04:32 2004 ++++ Makefile.in Sun Mar 14 17:07:15 2004 +@@ -82,2 +82,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 @@ +@@ -154,2 +155,3 @@ + -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ ++ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ +@@ -590,16 +592,4 @@ @$(POST_INSTALL) - @for p in $(bin_SCRIPTS); do \ - f="`echo $$p|sed '$(transform)'`"; \ diff --git a/devel/gnu-automake/files/patch-aclocal.in b/devel/gnu-automake/files/patch-aclocal.in index 0740a6dda4f9..214fcda58d8b 100644 --- a/devel/gnu-automake/files/patch-aclocal.in +++ b/devel/gnu-automake/files/patch-aclocal.in @@ -1,63 +1,23 @@ ---- aclocal.in.orig Sat Oct 12 23:14:57 2002 -+++ aclocal.in Thu Feb 13 14:57:16 2003 -@@ -29,7 +29,7 @@ - - BEGIN +--- aclocal.in.orig Sat Feb 7 04:32:57 2004 ++++ aclocal.in Sun Mar 14 17:03:19 2004 +@@ -31,3 +31,3 @@ { - 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. + unshift @INC, (split ':', $perllibdir); +@@ -47,4 +47,5 @@ # 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'); - } +@@ -622,7 +623,3 @@ -+ 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'; +- # 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/."; - $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/gnu-automake/files/patch-automake.in b/devel/gnu-automake/files/patch-automake.in index f9500dbe28a3..3c9d43806bbe 100644 --- a/devel/gnu-automake/files/patch-automake.in +++ b/devel/gnu-automake/files/patch-automake.in @@ -1,20 +1,7 @@ ---- automake.in.orig Wed Oct 16 20:33:56 2002 -+++ automake.in Thu Feb 13 14:05:50 2003 -@@ -31,7 +31,7 @@ - - BEGIN +--- automake.in.orig Sun Feb 29 09:27:07 2004 ++++ automake.in Sun Mar 14 17:04:50 2004 +@@ -33,3 +33,3 @@ { - 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. + unshift @INC, (split ':', $perllibdir); diff --git a/devel/gnu-automake/files/patch-automake.texi b/devel/gnu-automake/files/patch-automake.texi deleted file mode 100644 index cce4740d30ae..000000000000 --- a/devel/gnu-automake/files/patch-automake.texi +++ /dev/null @@ -1,28 +0,0 @@ ---- 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/gnu-automake/files/patch-configure b/devel/gnu-automake/files/patch-configure index 0e40d3c05ac7..77000a347d5d 100644 --- a/devel/gnu-automake/files/patch-configure +++ b/devel/gnu-automake/files/patch-configure @@ -1,20 +1,20 @@ ---- configure.orig Sun May 18 07:22:17 2003 -+++ configure Sun Jun 29 03:35:27 2003 -@@ -275,3 +275,3 @@ +--- configure.orig Sun Mar 7 09:04:31 2004 ++++ configure Sun Mar 14 17:08:54 2004 +@@ -499,3 +499,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_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 build build_cpu build_vendor build_os 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 mkdir_p AWK SET_MAKE am__leading_dot APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP 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 build build_cpu build_vendor build_os 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 mkdir_p AWK SET_MAKE am__leading_dot APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY GREP EGREP FGREP LIBOBJS LTLIBOBJS' ac_subst_files='' -@@ -1622,2 +1622,3 @@ +@@ -1941,6 +1941,6 @@ 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 @@ +@@ -3130,2 +3130,3 @@ s,@APIVERSION@,$APIVERSION,;t t +s,@APIPVERSION@,$APIPVERSION,;t t s,@pkgvdatadir@,$pkgvdatadir,;t t diff --git a/devel/gnu-automake/files/patch-doc::Makefile.in b/devel/gnu-automake/files/patch-doc::Makefile.in new file mode 100644 index 000000000000..b3c320a7de74 --- /dev/null +++ b/devel/gnu-automake/files/patch-doc::Makefile.in @@ -0,0 +1,35 @@ +--- doc/Makefile.in.orig Sun Mar 7 09:04:33 2004 ++++ doc/Makefile.in Sun Mar 14 17:12:32 2004 +@@ -53,3 +53,3 @@ + DIST_SOURCES = +-INFO_DEPS = $(srcdir)/automake.info ++INFO_DEPS = $(srcdir)/automake${APIPVERSION}.info + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +@@ -73,2 +73,3 @@ + APIVERSION = @APIVERSION@ ++APIPVERSION = @APIPVERSION@ + AUTOCONF = @AUTOCONF@ +@@ -93,3 +94,3 @@ + LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ ++MAKEINFO = @MAKEINFO@ --no-split + MODIFICATION_DELAY = @MODIFICATION_DELAY@ +@@ -135,3 +136,3 @@ + target_alias = @target_alias@ +-info_TEXINFOS = automake.texi ++info_TEXINFOS = automake${APIPVERSION}.texi + automake_TEXINFOS = fdl.texi +@@ -142,3 +143,3 @@ + +-TAGS_DEPENDENCIES = automake.texi ++TAGS_DEPENDENCIES = automake${APIPVERSION}.texi + all: all-am +@@ -222,5 +223,5 @@ + $(srcdir)/version.texi: $(srcdir)/stamp-vti +-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure +- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \ +- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \ ++$(srcdir)/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"; \ diff --git a/devel/gnu-automake/files/patch-doc::automake.texi b/devel/gnu-automake/files/patch-doc::automake.texi new file mode 100644 index 000000000000..3e2e8cd439f4 --- /dev/null +++ b/devel/gnu-automake/files/patch-doc::automake.texi @@ -0,0 +1,19 @@ +--- doc/automake.texi.orig Sun Feb 15 10:01:40 2004 ++++ doc/automake.texi Sun Mar 14 17:13:45 2004 +@@ -2,4 +2,4 @@ + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake18.info ++@settitle automake18 + @setchapternewpage off +@@ -36,3 +36,3 @@ + @direntry +-* automake: (automake). Making Makefile.in's. ++* automake18: (automake18). Making Makefile.in's. + @end direntry +@@ -41,3 +41,3 @@ + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. ++* aclocal18: (automake18)Invoking aclocal. Generating aclocal.m4. + @end direntry diff --git a/devel/gnu-automake/files/patch-m4-Makefile.in b/devel/gnu-automake/files/patch-m4-Makefile.in index 4c336333e5e1..5125e696ab2c 100644 --- a/devel/gnu-automake/files/patch-m4-Makefile.in +++ b/devel/gnu-automake/files/patch-m4-Makefile.in @@ -1,19 +1,11 @@ ---- 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@ +--- m4/Makefile.in.orig Sun Mar 7 09:04:33 2004 ++++ m4/Makefile.in Sun Mar 14 17:09:37 2004 +@@ -60,2 +60,3 @@ APIVERSION = @APIVERSION@ +APIPVERSION = @APIPVERSION@ AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ - AUTOMAKE = @AUTOMAKE@ -@@ -92,7 +93,7 @@ - sysconfdir = @sysconfdir@ +@@ -122,3 +123,3 @@ target_alias = @target_alias@ - -m4datadir = $(datadir)/aclocal-$(APIVERSION) +m4datadir = $(datadir)/aclocal$(APIPVERSION) - dist_m4data_DATA = \ - as.m4 \ diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist index a7f80f4a2792..3865ef48b0ab 100644 --- a/devel/gnu-automake/pkg-plist +++ b/devel/gnu-automake/pkg-plist @@ -22,6 +22,7 @@ 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%%/mkdirp.m4 share/aclocal%%BUILD_VERSION%%/multi.m4 share/aclocal%%BUILD_VERSION%%/obsol-gt.m4 share/aclocal%%BUILD_VERSION%%/obsol-lt.m4 @@ -33,9 +34,25 @@ share/aclocal%%BUILD_VERSION%%/regex.m4 share/aclocal%%BUILD_VERSION%%/runlog.m4 share/aclocal%%BUILD_VERSION%%/sanity.m4 share/aclocal%%BUILD_VERSION%%/strip.m4 +share/automake%%BUILD_VERSION%%/Automake/ChannelDefs.pm share/automake%%BUILD_VERSION%%/Automake/Channels.pm +share/automake%%BUILD_VERSION%%/Automake/Condition.pm +share/automake%%BUILD_VERSION%%/Automake/Config.pm +share/automake%%BUILD_VERSION%%/Automake/Configure_ac.pm +share/automake%%BUILD_VERSION%%/Automake/DisjConditions.pm +share/automake%%BUILD_VERSION%%/Automake/FileUtils.pm share/automake%%BUILD_VERSION%%/Automake/General.pm +share/automake%%BUILD_VERSION%%/Automake/Item.pm +share/automake%%BUILD_VERSION%%/Automake/ItemDef.pm +share/automake%%BUILD_VERSION%%/Automake/Location.pm +share/automake%%BUILD_VERSION%%/Automake/Options.pm +share/automake%%BUILD_VERSION%%/Automake/Rule.pm +share/automake%%BUILD_VERSION%%/Automake/RuleDef.pm share/automake%%BUILD_VERSION%%/Automake/Struct.pm +share/automake%%BUILD_VERSION%%/Automake/VarDef.pm +share/automake%%BUILD_VERSION%%/Automake/Variable.pm +share/automake%%BUILD_VERSION%%/Automake/Version.pm +share/automake%%BUILD_VERSION%%/Automake/Wrap.pm share/automake%%BUILD_VERSION%%/Automake/XFile.pm share/automake%%BUILD_VERSION%%/COPYING share/automake%%BUILD_VERSION%%/INSTALL @@ -81,6 +98,7 @@ 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-ml.in share/automake%%BUILD_VERSION%%/config.guess share/automake%%BUILD_VERSION%%/config.sub share/automake%%BUILD_VERSION%%/depcomp @@ -90,6 +108,7 @@ 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%%/symlink-tree share/automake%%BUILD_VERSION%%/texinfo.tex share/automake%%BUILD_VERSION%%/ylwrap @dirrm share/aclocal%%BUILD_VERSION%% |