Attachment 69540 Details for Bug 101729 – gnu-autoconf-2.60.patch

[patch] gnu-autoconf-2.60.patch

gnu-autoconf-2.60.patch (text/plain), 7.86 KB, created by Stanislav Sedov on 2006-08-09 22:00:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislav Sedov

Created: 2006-08-09 22:00:30 UTC

Size: 7.86 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/gnu-autoconf/Makefile /var/tmp/ruby/gnu-autoconf/Makefile
>--- /usr/ports/devel/gnu-autoconf/Makefile	Thu Jun 16 23:27:25 2005
>+++ /var/tmp/ruby/gnu-autoconf/Makefile	Thu Aug 10 00:26:45 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	autoconf
>-PORTVERSION=	2.59
>+PORTVERSION=	2.60
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	autoconf
>@@ -33,8 +33,18 @@
> CONFIGURE_ENV+=	M4=${LOCALBASE}/bin/gm4
> CONFIGURE_ARGS=	--without-lispdir
> CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+INFODIR=	${PREFIX}/${INFO_PATH}
> 
> MAN1=		autoconf.1 autoheader.1 autom4te.1 autoreconf.1 autoscan.1 \
> 		autoupdate.1 config.guess.1 config.sub.1 ifnames.1
>+
>+post-configure:
>+	@${REINPLACE_CMD} -E \
>+		-e "s,^(infodir[[:space:]]=[[:space:]]).*,\1${INFODIR}," \
>+		${WRKSRC}/doc/Makefile
>+
>+	@${REINPLACE_CMD} -E \
>+		-e "s,^(mandir[[:space:]]=[[:space:]]).*,\1${MANPREFIX}/man," \
>+		${WRKSRC}/man/Makefile
> 
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/devel/gnu-autoconf/distinfo /var/tmp/ruby/gnu-autoconf/distinfo
>--- /usr/ports/devel/gnu-autoconf/distinfo	Mon Nov 14 08:05:46 2005
>+++ /var/tmp/ruby/gnu-autoconf/distinfo	Wed Aug  9 16:39:29 2006
>@@ -1,3 +1,3 @@
>-MD5 (autoconf-2.59.tar.bz2) = 1ee40f7a676b3cfdc0e3f7cd81551b5f
>-SHA256 (autoconf-2.59.tar.bz2) = f0cde70a8f135098a6a3e85869f2e1cc3f141beea766fa3d6636e086cd8b90a7
>-SIZE (autoconf-2.59.tar.bz2) = 925073
>+MD5 (autoconf-2.60.tar.bz2) = 019609c29d0cbd9110c38480304aafc8
>+SHA256 (autoconf-2.60.tar.bz2) = 044bc0037c9d40dccef92bf9a82fb19b56c02aeff12ab72a7ad9b04deaf0fcc5
>+SIZE (autoconf-2.60.tar.bz2) = 1019170
>diff -ruN --exclude=CVS /usr/ports/devel/gnu-autoconf/files/patch-lib_autoconf_general.m4 /var/tmp/ruby/gnu-autoconf/files/patch-lib_autoconf_general.m4
>--- /usr/ports/devel/gnu-autoconf/files/patch-lib_autoconf_general.m4	Thu Jan  1 05:00:00 1970
>+++ /var/tmp/ruby/gnu-autoconf/files/patch-lib_autoconf_general.m4	Thu Aug 10 00:48:20 2006
>@@ -0,0 +1,31 @@
>+--- lib/autoconf/general.m4.orig	Thu Aug 10 00:43:54 2006
>++++ lib/autoconf/general.m4	Thu Aug 10 00:48:20 2006
>+@@ -563,14 +563,14 @@
>+ AC_SUBST([docdir],         [m4_ifset([AC_PACKAGE_TARNAME],
>+ 				     ['${datarootdir}/doc/${PACKAGE_TARNAME}'],
>+ 				     ['${datarootdir}/doc/${PACKAGE}'])])dnl
>+-AC_SUBST([infodir],        ['${datarootdir}/info'])dnl
>++AC_SUBST([infodir],        ['${prefix}/info'])dnl
>+ AC_SUBST([htmldir],        ['${docdir}'])dnl
>+ AC_SUBST([dvidir],         ['${docdir}'])dnl
>+ AC_SUBST([pdfdir],         ['${docdir}'])dnl
>+ AC_SUBST([psdir],          ['${docdir}'])dnl
>+ AC_SUBST([libdir],         ['${exec_prefix}/lib'])dnl
>+ AC_SUBST([localedir],      ['${datarootdir}/locale'])dnl
>+-AC_SUBST([mandir],         ['${datarootdir}/man'])dnl
>++AC_SUBST([mandir],         ['${prefix}/man'])dnl
>+ 
>+ ac_prev=
>+ ac_dashdash=
>+@@ -1003,9 +1003,9 @@
>+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
>+   --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
>+   --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
>+-  --infodir=DIR          info documentation [DATAROOTDIR/info]
>++  --infodir=DIR          info documentation [PREFIX/info]
>+   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
>+-  --mandir=DIR           man documentation [DATAROOTDIR/man]
>++  --mandir=DIR           man documentation [PREFIX/man]
>+   --docdir=DIR           documentation root ]@<:@DATAROOTDIR/doc/m4_ifset([AC_PACKAGE_TARNAME], [AC_PACKAGE_TARNAME], [PACKAGE])@:>@[
>+   --htmldir=DIR          html documentation [DOCDIR]
>+   --dvidir=DIR           dvi documentation [DOCDIR]
>diff -ruN --exclude=CVS /usr/ports/devel/gnu-autoconf/pkg-descr /var/tmp/ruby/gnu-autoconf/pkg-descr
>--- /usr/ports/devel/gnu-autoconf/pkg-descr	Sun Oct 17 12:34:52 2004
>+++ /var/tmp/ruby/gnu-autoconf/pkg-descr	Thu Aug 10 00:53:24 2006
>@@ -11,4 +11,10 @@
> should _NEVER_ be used with the FreeBSD ports system as a replacement for the
> versioned copies of autoconf.
> 
>+This (FreeBSD) version differs from original in two aspects:
>+@mandir points to ${prefix}/man
>+@infodir points to ${prefix}/info
>+
>+These defaults will match FreeBSD mtree.
>+
> WWW: http://www.gnu.org/software/autoconf/
>diff -ruN --exclude=CVS /usr/ports/devel/gnu-autoconf/pkg-plist /var/tmp/ruby/gnu-autoconf/pkg-plist
>--- /usr/ports/devel/gnu-autoconf/pkg-plist	Sun Feb 27 13:54:13 2005
>+++ /var/tmp/ruby/gnu-autoconf/pkg-plist	Thu Aug 10 00:28:11 2006
>@@ -5,55 +5,52 @@
> bin/autoscan
> bin/autoupdate
> bin/ifnames
>-share/autoconf/Autom4te/C4che.pm
>-share/autoconf/Autom4te/ChannelDefs.pm
>-share/autoconf/Autom4te/Channels.pm
>-share/autoconf/Autom4te/Configure_ac.pm
>-share/autoconf/Autom4te/FileUtils.pm
>-share/autoconf/Autom4te/General.pm
>-share/autoconf/Autom4te/Request.pm
>-share/autoconf/Autom4te/Struct.pm
>-share/autoconf/Autom4te/XFile.pm
>-share/autoconf/INSTALL
>-share/autoconf/autoconf/autoconf.m4
>-share/autoconf/autoconf/autoconf.m4f
>-share/autoconf/autoconf/autoheader.m4
>-share/autoconf/autoconf/autoscan.m4
>-share/autoconf/autoconf/autotest.m4
>-share/autoconf/autoconf/autoupdate.m4
>-share/autoconf/autoconf/c.m4
>-share/autoconf/autoconf/fortran.m4
>-share/autoconf/autoconf/functions.m4
>-share/autoconf/autoconf/general.m4
>-share/autoconf/autoconf/headers.m4
>-share/autoconf/autoconf/lang.m4
>-share/autoconf/autoconf/libs.m4
>-share/autoconf/autoconf/oldnames.m4
>-share/autoconf/autoconf/programs.m4
>-share/autoconf/autoconf/specific.m4
>-share/autoconf/autoconf/status.m4
>-share/autoconf/autoconf/types.m4
>-share/autoconf/autom4te.cfg
>-share/autoconf/autoscan/autoscan.list
>-share/autoconf/autotest/autotest.m4
>-share/autoconf/autotest/autotest.m4f
>-share/autoconf/autotest/general.m4
>-share/autoconf/m4sugar/m4sh.m4
>-share/autoconf/m4sugar/m4sh.m4f
>-share/autoconf/m4sugar/m4sugar.m4
>-share/autoconf/m4sugar/m4sugar.m4f
>-share/autoconf/m4sugar/version.m4
>-@dirrm share/autoconf/m4sugar
>-@dirrm share/autoconf/autotest
>-@dirrm share/autoconf/autoscan
>-@dirrm share/autoconf/autoconf
>-@dirrm share/autoconf/Autom4te
>-@dirrm share/autoconf
>-@unexec /bin/rmdir %D/share/aclocal 2>/dev/null || /usr/bin/true
>-@unexec /bin/rmdir %D/share 2>/dev/null || /usr/bin/true
>-@unexec /bin/rmdir %D/man/man1 2>/dev/null || /usr/bin/true
>-@unexec /bin/rmdir %D/man 2>/dev/null || /usr/bin/true
>-@unexec /bin/rmdir %D/lib 2>/dev/null || /usr/bin/true
>-@unexec /bin/rmdir %D/include 2>/dev/null || /usr/bin/true
>-@unexec /bin/rmdir %D/bin 2>/dev/null || /usr/bin/true
>-@unexec /bin/rmdir %D 2>/dev/null || /usr/bin/true
>+%%DATADIR%%/Autom4te/C4che.pm
>+%%DATADIR%%/Autom4te/ChannelDefs.pm
>+%%DATADIR%%/Autom4te/Channels.pm
>+%%DATADIR%%/Autom4te/Configure_ac.pm
>+%%DATADIR%%/Autom4te/FileUtils.pm
>+%%DATADIR%%/Autom4te/General.pm
>+%%DATADIR%%/Autom4te/Request.pm
>+%%DATADIR%%/Autom4te/Struct.pm
>+%%DATADIR%%/Autom4te/XFile.pm
>+%%DATADIR%%/INSTALL
>+%%DATADIR%%/autoconf/autoconf.m4
>+%%DATADIR%%/autoconf/autoconf.m4f
>+%%DATADIR%%/autoconf/autoheader.m4
>+%%DATADIR%%/autoconf/autoscan.m4
>+%%DATADIR%%/autoconf/autotest.m4
>+%%DATADIR%%/autoconf/autoupdate.m4
>+%%DATADIR%%/autoconf/c.m4
>+%%DATADIR%%/autoconf/erlang.m4
>+%%DATADIR%%/autoconf/fortran.m4
>+%%DATADIR%%/autoconf/functions.m4
>+%%DATADIR%%/autoconf/general.m4
>+%%DATADIR%%/autoconf/headers.m4
>+%%DATADIR%%/autoconf/lang.m4
>+%%DATADIR%%/autoconf/libs.m4
>+%%DATADIR%%/autoconf/oldnames.m4
>+%%DATADIR%%/autoconf/programs.m4
>+%%DATADIR%%/autoconf/specific.m4
>+%%DATADIR%%/autoconf/status.m4
>+%%DATADIR%%/autoconf/types.m4
>+%%DATADIR%%/autom4te.cfg
>+%%DATADIR%%/autoscan/autoscan.list
>+%%DATADIR%%/autotest/autotest.m4
>+%%DATADIR%%/autotest/autotest.m4f
>+%%DATADIR%%/autotest/general.m4
>+%%DATADIR%%/m4sugar/m4sh.m4
>+%%DATADIR%%/m4sugar/m4sh.m4f
>+%%DATADIR%%/m4sugar/m4sugar.m4
>+%%DATADIR%%/m4sugar/m4sugar.m4f
>+%%DATADIR%%/m4sugar/version.m4
>+@dirrm %%DATADIR%%/m4sugar
>+@dirrm %%DATADIR%%/autotest
>+@dirrm %%DATADIR%%/autoscan
>+@dirrm %%DATADIR%%/autoconf
>+@dirrm %%DATADIR%%/Autom4te
>+@dirrm %%DATADIR%%
>+@dirrmtry share
>+@dirrmtry man/man1
>+@dirrmtry man
>+@dirrmtry bin

Actions: View | Diff

Attachments on bug 101729: 69540