Attachment 69541 Details for Bug 101730 – m4-1.4.5.patch

[patch] m4-1.4.5.patch

m4-1.4.5.patch (text/plain), 6.78 KB, created by Stanislav Sedov on 2006-08-09 22:40:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislav Sedov

Created: 2006-08-09 22:40:11 UTC

Size: 6.78 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/m4/Makefile /var/tmp/ruby/m4/Makefile
>--- /usr/ports/devel/m4/Makefile	Mon Dec  5 04:35:13 2005
>+++ /var/tmp/ruby/m4/Makefile	Thu Aug 10 01:24:53 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	m4
>-PORTVERSION=	1.4.4
>+PORTVERSION=	1.4.5
> CATEGORIES=	devel
> MASTER_SITES=	${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	m4
>@@ -16,18 +16,31 @@
> 
> USE_BZIP2=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--program-prefix=g
>+CONFIGURE_ARGS=	--program-prefix=g \
>+		--mandir=${PREFIX}/man --infodir=${PREFIX}/info
>+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
> 
> .if defined(WITH_CHANGEWORD)
> CONFIGURE_ARGS+=	--enable-changeword
> .endif
> 
> INFO=	m4
>-
> EXAMPLESDIR=	share/examples/gm4
> 
>+.include <bsd.port.pre.mk>
>+
>+#
>+# makeinfo 4.8 is required to rebuild m4.info
>+#
>+.if ${OSVERSION} < 601000
>+EXTRA_PATCHES=	${PATCHDIR}/Makefile.in.diff \
>+		${PATCHDIR}/m4.info.diff
>+.endif
>+
> post-install:
>+.if !defined(NOPORTDOCS)
> 	@${MKDIR} ${PREFIX}/${EXAMPLESDIR}
> 	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/${EXAMPLESDIR}
>+.endif
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/devel/m4/distinfo /var/tmp/ruby/m4/distinfo
>--- /usr/ports/devel/m4/distinfo	Mon Nov 14 04:27:29 2005
>+++ /var/tmp/ruby/m4/distinfo	Wed Aug  9 16:38:33 2006
>@@ -1,3 +1,3 @@
>-MD5 (m4-1.4.4.tar.bz2) = eb93bfbcb12cf00165583302bb31a822
>-SHA256 (m4-1.4.4.tar.bz2) = 5a06ae07a7c7b6e9895be14015468947ef3f95182e60400e840efb25feea4b8f
>-SIZE (m4-1.4.4.tar.bz2) = 306737
>+MD5 (m4-1.4.5.tar.bz2) = 8bcd8244d5bed9f8e2d5f05ad693b8b4
>+SHA256 (m4-1.4.5.tar.bz2) = 78b24e519d76a55e53c06fd98b1562637b95cef335142c295e11cdb6cf95166f
>+SIZE (m4-1.4.5.tar.bz2) = 490343
>diff -ruN --exclude=CVS /usr/ports/devel/m4/files/Makefile.in.diff /var/tmp/ruby/m4/files/Makefile.in.diff
>--- /usr/ports/devel/m4/files/Makefile.in.diff	Thu Jan  1 05:00:00 1970
>+++ /var/tmp/ruby/m4/files/Makefile.in.diff	Thu Aug 10 01:22:00 2006
>@@ -0,0 +1,29 @@
>+--- doc/Makefile.in.orig	Thu Aug 10 01:21:44 2006
>++++ doc/Makefile.in	Thu Aug 10 01:22:00 2006
>+@@ -228,26 +228,6 @@
>+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
>+ 
>+ .texinfo.info:
>+-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
>+-	am__cwd=`pwd` && cd $(srcdir) && \
>+-	rm -rf $$backupdir && mkdir $$backupdir && \
>+-	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
>+-	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
>+-	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
>+-	  done; \
>+-	else :; fi && \
>+-	cd "$$am__cwd"; \
>+-	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
>+-	 -o $@ $<; \
>+-	then \
>+-	  rc=0; \
>+-	  cd $(srcdir); \
>+-	else \
>+-	  rc=$$?; \
>+-	  cd $(srcdir) && \
>+-	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
>+-	fi; \
>+-	rm -rf $$backupdir; exit $$rc
>+ 
>+ .texinfo.dvi:
>+ 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
>diff -ruN --exclude=CVS /usr/ports/devel/m4/files/m4.info.diff /var/tmp/ruby/m4/files/m4.info.diff
>--- /usr/ports/devel/m4/files/m4.info.diff	Thu Jan  1 05:00:00 1970
>+++ /var/tmp/ruby/m4/files/m4.info.diff	Thu Aug 10 01:21:12 2006
>@@ -0,0 +1,11 @@
>+--- doc/m4.info.orig	Thu Aug 10 01:21:07 2006
>++++ doc/m4.info	Thu Aug 10 01:21:12 2006
>+@@ -20,7 +20,7 @@
>+ 
>+ INFO-DIR-SECTION GNU programming tools
>+ START-INFO-DIR-ENTRY
>+-* M4: (m4).                     A powerful macro processor.
>++* GM4: (m4).                     A powerful macro processor.
>+ END-INFO-DIR-ENTRY
>+ 
>+ 
>diff -ruN --exclude=CVS /usr/ports/devel/m4/files/patch-aa /var/tmp/ruby/m4/files/patch-aa
>--- /usr/ports/devel/m4/files/patch-aa	Mon Jun 16 14:19:15 1997
>+++ /var/tmp/ruby/m4/files/patch-aa	Thu Jan  1 05:00:00 1970
>@@ -1,11 +0,0 @@
>---- doc/Makefile.in.orig	Sun Nov  6 05:52:26 1994
>-+++ doc/Makefile.in	Mon Jun 16 16:08:39 1997
>-@@ -40,7 +40,7 @@
>- info: m4.info
>- 
>- m4.info: m4.texinfo version.texi
>--	cd $(srcdir) && $(MAKEINFO) m4.texinfo
>-+	cd $(srcdir) && rm -f m4.info* && $(MAKEINFO) --no-split m4.texinfo
>- 
>- dvi: m4.dvi
>- 
>diff -ruN --exclude=CVS /usr/ports/devel/m4/files/patch-ab /var/tmp/ruby/m4/files/patch-ab
>--- /usr/ports/devel/m4/files/patch-ab	Tue Apr  5 13:39:55 2005
>+++ /var/tmp/ruby/m4/files/patch-ab	Thu Aug 10 01:10:08 2006
>@@ -1,11 +1,11 @@
>---- doc/m4.texinfo.orig	Thu Mar 31 15:17:00 2005
>-+++ doc/m4.texinfo	Tue Apr  5 11:36:34 2005
>-@@ -18,7 +18,7 @@
>+--- doc/m4.texinfo.orig	Sun Jul 16 03:48:08 2006
>++++ doc/m4.texinfo	Thu Aug 10 01:10:08 2006
>+@@ -64,7 +64,7 @@
>  
>  @dircategory GNU programming tools
>  @direntry
>--* m4: (m4).			A powerful macro processor.
>-+* Gm4: (m4).			A powerful macro processor.
>+-* M4: (m4).                     A powerful macro processor.
>++* GM4: (m4).                     A powerful macro processor.
>  @end direntry
>  
>- @ifnottex
>+ @titlepage
>diff -ruN --exclude=CVS /usr/ports/devel/m4/pkg-plist /var/tmp/ruby/m4/pkg-plist
>--- /usr/ports/devel/m4/pkg-plist	Fri Jul 16 20:54:27 2004
>+++ /var/tmp/ruby/m4/pkg-plist	Thu Aug 10 01:11:21 2006
>@@ -1,28 +1,30 @@
> bin/gm4
>-%%EXAMPLESDIR%%/capitalize.m4
>-%%EXAMPLESDIR%%/comments.m4
>-%%EXAMPLESDIR%%/ddivert.m4
>-%%EXAMPLESDIR%%/debug.m4
>-%%EXAMPLESDIR%%/esyscmd.m4
>-%%EXAMPLESDIR%%/exp.m4
>-%%EXAMPLESDIR%%/file.m4
>-%%EXAMPLESDIR%%/foreach.m4
>-%%EXAMPLESDIR%%/forloop.m4
>-%%EXAMPLESDIR%%/fstab.m4
>-%%EXAMPLESDIR%%/hanoi.m4
>-%%EXAMPLESDIR%%/incl-test.m4
>-%%EXAMPLESDIR%%/include.m4
>-%%EXAMPLESDIR%%/indir.m4
>-%%EXAMPLESDIR%%/misc.m4
>-%%EXAMPLESDIR%%/multiquotes.m4
>-%%EXAMPLESDIR%%/patsubst.m4
>-%%EXAMPLESDIR%%/pushpop.m4
>-%%EXAMPLESDIR%%/regexp.m4
>-%%EXAMPLESDIR%%/reverse.m4
>-%%EXAMPLESDIR%%/sync-lines.m4
>-%%EXAMPLESDIR%%/sysv-args.m4
>-%%EXAMPLESDIR%%/trace.m4
>-%%EXAMPLESDIR%%/translit.m4
>-%%EXAMPLESDIR%%/undivert.m4
>-%%EXAMPLESDIR%%/wrap.m4
>-@dirrm %%EXAMPLESDIR%%
>+%%PORTDOCS%%%%EXAMPLESDIR%%/capitalize.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/comments.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/ddivert.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/debug.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/esyscmd.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/exp.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/file.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/foreach.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/forloop.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/fstab.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/hanoi.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/incl-test.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/incl.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/include.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/indir.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/misc.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/multiquotes.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/patsubst.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/pushpop.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/regexp.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/reverse.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/sync-lines.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/sysv-args.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/trace.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/translit.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/undivert.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/wrap.m4
>+%%PORTDOCS%%%%EXAMPLESDIR%%/wrapfifo.m4
>+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%

Actions: View | Diff

Attachments on bug 101730: 69541