Attachment #69541 for bug #101730

View | Details | Raw Unified | Return to bug 101730
Collapse All | Expand All

Lines 6-12 Link Here

(-)/var/tmp/ruby/m4/Makefile (-4 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= m4	8	PORTNAME= m4
9	PORTVERSION= 1.4.4	9	PORTVERSION= 1.4.5
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_GNU}	11	MASTER_SITES= ${MASTER_SITE_GNU}
12	MASTER_SITE_SUBDIR= m4	12	MASTER_SITE_SUBDIR= m4
Lines 16-33 Link Here
16		16
17	USE_BZIP2= yes	17	USE_BZIP2= yes
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	CONFIGURE_ARGS= --program-prefix=g	19	CONFIGURE_ARGS= --program-prefix=g \
		20	--mandir=${PREFIX}/man --infodir=${PREFIX}/info
		21	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
20		22
21	.if defined(WITH_CHANGEWORD)	23	.if defined(WITH_CHANGEWORD)
22	CONFIGURE_ARGS+= --enable-changeword	24	CONFIGURE_ARGS+= --enable-changeword
23	.endif	25	.endif
24		26
25	INFO= m4	27	INFO= m4
26
27	EXAMPLESDIR= share/examples/gm4	28	EXAMPLESDIR= share/examples/gm4
28		29
		30	.include <bsd.port.pre.mk>
		31
		32	#
		33	# makeinfo 4.8 is required to rebuild m4.info
		34	#
		35	.if ${OSVERSION} < 601000
		36	EXTRA_PATCHES= ${PATCHDIR}/Makefile.in.diff \
		37	${PATCHDIR}/m4.info.diff
		38	.endif
		39
29	post-install:	40	post-install:
		41	.if !defined(NOPORTDOCS)
30	@${MKDIR} ${PREFIX}/${EXAMPLESDIR}	42	@${MKDIR} ${PREFIX}/${EXAMPLESDIR}
31	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/${EXAMPLESDIR}	43	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/${EXAMPLESDIR}
		44	.endif
32		45
33	.include <bsd.port.mk>	46	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/var/tmp/ruby/m4/distinfo (-3 / +3 lines)
1	MD5 (m4-1.4.4.tar.bz2) = eb93bfbcb12cf00165583302bb31a822	1	MD5 (m4-1.4.5.tar.bz2) = 8bcd8244d5bed9f8e2d5f05ad693b8b4
2	SHA256 (m4-1.4.4.tar.bz2) = 5a06ae07a7c7b6e9895be14015468947ef3f95182e60400e840efb25feea4b8f	2	SHA256 (m4-1.4.5.tar.bz2) = 78b24e519d76a55e53c06fd98b1562637b95cef335142c295e11cdb6cf95166f
3	SIZE (m4-1.4.4.tar.bz2) = 306737	3	SIZE (m4-1.4.5.tar.bz2) = 490343




--- 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" \

Line 0 Link Here

(-)/var/tmp/ruby/m4/files/m4.info.diff (+11 lines)
	1	--- doc/m4.info.orig Thu Aug 10 01:21:07 2006
	2	+++ doc/m4.info Thu Aug 10 01:21:12 2006
	3	@@ -20,7 +20,7 @@
	4
	5	INFO-DIR-SECTION GNU programming tools
	6	START-INFO-DIR-ENTRY
	7	-* M4: (m4). A powerful macro processor.
	8	+* GM4: (m4). A powerful macro processor.
	9	END-INFO-DIR-ENTRY
	10
	11

Lines 1-11 Link Here

(-)/var/tmp/ruby/m4/files/patch-aa (-11 lines)
1	--- doc/Makefile.in.orig Sun Nov 6 05:52:26 1994
2	+++ doc/Makefile.in Mon Jun 16 16:08:39 1997
3	@@ -40,7 +40,7 @@
4	info: m4.info
5
6	m4.info: m4.texinfo version.texi
7	- cd $(srcdir) && $(MAKEINFO) m4.texinfo
8	+ cd $(srcdir) && rm -f m4.info* && $(MAKEINFO) --no-split m4.texinfo
9
10	dvi: m4.dvi
11

Lines 1-11 Link Here

(-)/var/tmp/ruby/m4/files/patch-ab (-6 / +6 lines)
1	--- doc/m4.texinfo.orig Thu Mar 31 15:17:00 2005	1	--- doc/m4.texinfo.orig Sun Jul 16 03:48:08 2006
2	+++ doc/m4.texinfo Tue Apr 5 11:36:34 2005	2	+++ doc/m4.texinfo Thu Aug 10 01:10:08 2006
3	@@ -18,7 +18,7 @@	3	@@ -64,7 +64,7 @@
4		4
5	@dircategory GNU programming tools	5	@dircategory GNU programming tools
6	@direntry	6	@direntry
7	-* m4: (m4). A powerful macro processor.	7	-* M4: (m4). A powerful macro processor.
8	+* Gm4: (m4). A powerful macro processor.	8	+* GM4: (m4). A powerful macro processor.
9	@end direntry	9	@end direntry
10		10
11	@ifnottex	11	@titlepage




bin/gm4
%%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%%

Return to bug 101730

Line 0 Link Here

(-)/var/tmp/ruby/m4/files/Makefile.in.diff (+29 lines)
	1	--- doc/Makefile.in.orig Thu Aug 10 01:21:44 2006
	2	+++ doc/Makefile.in Thu Aug 10 01:22:00 2006
	3	@@ -228,26 +228,6 @@
	4	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
	5
	6	.texinfo.info:
	7	- restore=: && backupdir="$(am__leading_dot)am$$$$" && \
	8	- am__cwd=`pwd` && cd $(srcdir) && \
	9	- rm -rf $$backupdir && mkdir $$backupdir && \
	10	- if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
	11	- for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
	12	- if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
	13	- done; \
	14	- else :; fi && \
	15	- cd "$$am__cwd"; \
	16	- if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
	17	- -o $@ $<; \
	18	- then \
	19	- rc=0; \
	20	- cd $(srcdir); \
	21	- else \
	22	- rc=$$?; \
	23	- cd $(srcdir) && \
	24	- $$restore $$backupdir/* `echo "./$@" \| sed 's\|[^/]*$$\|\|'`; \
	25	- fi; \
	26	- rm -rf $$backupdir; exit $$rc
	27
	28	.texinfo.dvi:
	29	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \

Lines 1-28 Link Here

(-)/var/tmp/ruby/m4/pkg-plist (-27 / +29 lines)
1	bin/gm4	1	bin/gm4
2	%%EXAMPLESDIR%%/capitalize.m4	2	%%PORTDOCS%%%%EXAMPLESDIR%%/capitalize.m4
3	%%EXAMPLESDIR%%/comments.m4	3	%%PORTDOCS%%%%EXAMPLESDIR%%/comments.m4
4	%%EXAMPLESDIR%%/ddivert.m4	4	%%PORTDOCS%%%%EXAMPLESDIR%%/ddivert.m4
5	%%EXAMPLESDIR%%/debug.m4	5	%%PORTDOCS%%%%EXAMPLESDIR%%/debug.m4
6	%%EXAMPLESDIR%%/esyscmd.m4	6	%%PORTDOCS%%%%EXAMPLESDIR%%/esyscmd.m4
7	%%EXAMPLESDIR%%/exp.m4	7	%%PORTDOCS%%%%EXAMPLESDIR%%/exp.m4
8	%%EXAMPLESDIR%%/file.m4	8	%%PORTDOCS%%%%EXAMPLESDIR%%/file.m4
9	%%EXAMPLESDIR%%/foreach.m4	9	%%PORTDOCS%%%%EXAMPLESDIR%%/foreach.m4
10	%%EXAMPLESDIR%%/forloop.m4	10	%%PORTDOCS%%%%EXAMPLESDIR%%/forloop.m4
11	%%EXAMPLESDIR%%/fstab.m4	11	%%PORTDOCS%%%%EXAMPLESDIR%%/fstab.m4
12	%%EXAMPLESDIR%%/hanoi.m4	12	%%PORTDOCS%%%%EXAMPLESDIR%%/hanoi.m4
13	%%EXAMPLESDIR%%/incl-test.m4	13	%%PORTDOCS%%%%EXAMPLESDIR%%/incl-test.m4
14	%%EXAMPLESDIR%%/include.m4	14	%%PORTDOCS%%%%EXAMPLESDIR%%/incl.m4
15	%%EXAMPLESDIR%%/indir.m4	15	%%PORTDOCS%%%%EXAMPLESDIR%%/include.m4
16	%%EXAMPLESDIR%%/misc.m4	16	%%PORTDOCS%%%%EXAMPLESDIR%%/indir.m4
17	%%EXAMPLESDIR%%/multiquotes.m4	17	%%PORTDOCS%%%%EXAMPLESDIR%%/misc.m4
18	%%EXAMPLESDIR%%/patsubst.m4	18	%%PORTDOCS%%%%EXAMPLESDIR%%/multiquotes.m4
19	%%EXAMPLESDIR%%/pushpop.m4	19	%%PORTDOCS%%%%EXAMPLESDIR%%/patsubst.m4
20	%%EXAMPLESDIR%%/regexp.m4	20	%%PORTDOCS%%%%EXAMPLESDIR%%/pushpop.m4
21	%%EXAMPLESDIR%%/reverse.m4	21	%%PORTDOCS%%%%EXAMPLESDIR%%/regexp.m4
22	%%EXAMPLESDIR%%/sync-lines.m4	22	%%PORTDOCS%%%%EXAMPLESDIR%%/reverse.m4
23	%%EXAMPLESDIR%%/sysv-args.m4	23	%%PORTDOCS%%%%EXAMPLESDIR%%/sync-lines.m4
24	%%EXAMPLESDIR%%/trace.m4	24	%%PORTDOCS%%%%EXAMPLESDIR%%/sysv-args.m4
25	%%EXAMPLESDIR%%/translit.m4	25	%%PORTDOCS%%%%EXAMPLESDIR%%/trace.m4
26	%%EXAMPLESDIR%%/undivert.m4	26	%%PORTDOCS%%%%EXAMPLESDIR%%/translit.m4
27	%%EXAMPLESDIR%%/wrap.m4	27	%%PORTDOCS%%%%EXAMPLESDIR%%/undivert.m4
28	@dirrm %%EXAMPLESDIR%%	28	%%PORTDOCS%%%%EXAMPLESDIR%%/wrap.m4
		29	%%PORTDOCS%%%%EXAMPLESDIR%%/wrapfifo.m4
		30	%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%