Upgrade 3.0 -> 3.4.

PR:		40455
Submitted by:	Pedro Giffuni <pgiffuni@fps.biblos.unal.edu.co>

3 files changed, 59 insertions, 40 deletions

diff --git a/math/freefem/files/patch-aa b/math/freefem/files/patch-aa
index 1058b9a9757a..c340f606bcd9 100644
--- a/math/freefem/files/patch-aa
+++ b/math/freefem/files/patch-aa
@@ -1,42 +1,19 @@
-*** makefile.x.orig	Wed Jan 24 08:37:09 1996
---- makefile.x	Tue Dec 24 14:46:59 1996
+*** contrib/Emacs/Makefile.in.orig	Sat Jul  5 22:59:05 1997
+--- contrib/Emacs/Makefile.in	Sat Jul  5 23:06:38 1997
 ***************
-*** 26,35 ****
-  #
-  # the following preprocessing options are available
-  #  ADAPT : to enable mesh adaptation
-! export CXXFLAGS	= -g -DADAPT
-  #export CXXFLAGS = -g
-! export CXXINC	= -I./ -Iadapt/ -I/usr/local/X11R5/include
-! export CXXLIBS	= -Ladapt/ -ladapt -L/usr/local/X11R5/lib -lX11 -lm 
-  #export CXXLIBS	= -L/usr/local/X11R5/lib -lX11 -lm 
+*** 119,125 ****
+  	done
+  .el.elc:
+  	@echo 'WARNING: Warnings can be ignored. :-)'
+! 	EMACS=$(EMACS) $(SHELL) $(srcdir)/elisp-comp $<
+  tags: TAGS
+  TAGS:
+  
+--- 119,125 ----
+  	done
+  .el.elc:
+  	@echo 'WARNING: Warnings can be ignored. :-)'
+! #	EMACS=$(EMACS); $(SHELL) $(srcdir)/elisp-comp $<
+  tags: TAGS
+  TAGS:
   
-  
---- 26,35 ----
-  #
-  # the following preprocessing options are available
-  #  ADAPT : to enable mesh adaptation
-! export CXXFLAGS	= -O $(CFLAGS) -DADAPT
-  #export CXXFLAGS = -g
-! export CXXINC	= -I./ -Iadapt/ -I$(X11BASE)/include
-! export CXXLIBS	= -Ladapt/ -ladapt -L$(X11BASE)/lib -lX11 -lm 
-  #export CXXLIBS	= -L/usr/local/X11R5/lib -lX11 -lm 
-  
-  
-***************
-*** 48,54 ****
-  	$(CXX) $(CXXFLAGS) $(CXXINC) -c $<
-  
-  libadapt:
-! 	cd adapt;make -f makefile.x;cd ..
-  
-  purify: freefem
-  	purify $(CXX)  -o freefem.pure $(OBJS) $(CXXLIBS)
---- 48,54 ----
-  	$(CXX) $(CXXFLAGS) $(CXXINC) -c $<
-  
-  libadapt:
-! 	cd adapt;$(MAKE) -f makefile.x;cd ..
-  
-  purify: freefem
-  	purify $(CXX)  -o freefem.pure $(OBJS) $(CXXLIBS)
diff --git a/math/freefem/files/patch-ab b/math/freefem/files/patch-ab
new file mode 100644
index 000000000000..55fda0f6e3e7
--- /dev/null
+++ b/math/freefem/files/patch-ab
@@ -0,0 +1,23 @@
+*** doc/Makefile.in.orig	Sun Jul  6 00:48:30 1997
+--- doc/Makefile.in	Sun Jul  6 00:50:23 1997
+***************
+*** 233,241 ****
+  
+  
+  install-data-hook:
+! 	$(mkinstalldirs) $(prefix)/doc/$(PACKAGE)
+  	for file in $(EXTRA_DIST); do \
+! 	$(INSTALL_DATA) $(srcdir)/doc/$$file $(prefix)/doc/$(PACKAGE);\
+  	done
+  
+  #.tex.dvi: freefem.tex
+--- 233,241 ----
+  
+  
+  install-data-hook:
+! 	$(mkinstalldirs) $(datadir)/doc/$(PACKAGE)
+  	for file in $(EXTRA_DIST); do \
+! 	$(INSTALL_DATA) $(srcdir)/doc/$$file $(datadir)/doc/$(PACKAGE);\
+  	done
+  
+  #.tex.dvi: freefem.tex
diff --git a/math/freefem/files/patch-ac b/math/freefem/files/patch-ac
new file mode 100644
index 000000000000..4a36e399b075
--- /dev/null
+++ b/math/freefem/files/patch-ac
@@ -0,0 +1,19 @@
+*** doc/freefem/Makefile.in.orig	Wed Feb 26 12:38:22 1997
+--- doc/freefem/Makefile.in	Sun Jul  6 00:58:28 1997
+***************
+*** 79,85 ****
+  
+  SUFFIXES	=  .html
+  
+! htmldir		= $(prefix)/doc/$(PACKAGE)/html
+  html_DATA	= freefem.html  index.html  node1.html  node10.html  node11.html  node12.html  node13.html  node14.html  node15.html  node16.html  node17.html  node18.html  node19.html  node2.html  node20.html  node21.html  node22.html  node23.html  node24.html  node25.html  node26.html  node27.html  node28.html  node29.html  node3.html  node30.html  node31.html  node32.html  node33.html  node34.html  node35.html  node36.html  node37.html  node38.html  node39.html  node4.html  node40.html  node41.html  node42.html  node43.html  node44.html  node45.html  node46.html  node47.html  node48.html  node49.html  node5.html  node50.html  node51.html  node52.html  node53.html  node54.html  node55.html  node56.html  node57.html  node58.html  node59.html  node6.html  node60.html  node61.html  node62.html  node63.html  node64.html  node65.html  node66.html  node67.html  node68.html  node69.html  node7.html  node70.html  node71.html  node8.html  node9.html  blueball.gif  change_begin.gif  change_delete.gif  change_end.gif  contents_motif.gif  cross_ref_motif.gif  foot_motif.gif  greenball.gif  image.gif  img1.gif  img10.gif  img11.gif  img12.gif  img13.gif  img14.gif  img15.gif  img16.gif  img17.gif  img18.gif  img19.gif  img2.gif  img20.gif  img21.gif  img22.gif  img3.gif  img4.gif  img5.gif  img6.gif  img7.gif  img8.gif  img9.gif  index_motif.gif  next_group_motif.gif  next_group_motif_gr.gif  next_motif.gif  next_motif_gr.gif  orangeball.gif  pinkball.gif  previous_group_motif.gif  previous_group_motif_gr.gif  previous_motif.gif  previous_motif_gr.gif  purpleball.gif  redball.gif  up_motif.gif  up_motif_gr.gif  whiteball.gif  yellowball.gif  
+  
+  EXTRA_DIST	= $(html_DATA)
+--- 79,85 ----
+  
+  SUFFIXES	=  .html
+  
+! htmldir		= $(datadir)/doc/$(PACKAGE)/html
+  html_DATA	= freefem.html  index.html  node1.html  node10.html  node11.html  node12.html  node13.html  node14.html  node15.html  node16.html  node17.html  node18.html  node19.html  node2.html  node20.html  node21.html  node22.html  node23.html  node24.html  node25.html  node26.html  node27.html  node28.html  node29.html  node3.html  node30.html  node31.html  node32.html  node33.html  node34.html  node35.html  node36.html  node37.html  node38.html  node39.html  node4.html  node40.html  node41.html  node42.html  node43.html  node44.html  node45.html  node46.html  node47.html  node48.html  node49.html  node5.html  node50.html  node51.html  node52.html  node53.html  node54.html  node55.html  node56.html  node57.html  node58.html  node59.html  node6.html  node60.html  node61.html  node62.html  node63.html  node64.html  node65.html  node66.html  node67.html  node68.html  node69.html  node7.html  node70.html  node71.html  node8.html  node9.html  blueball.gif  change_begin.gif  change_delete.gif  change_end.gif  contents_motif.gif  cross_ref_motif.gif  foot_motif.gif  greenball.gif  image.gif  img1.gif  img10.gif  img11.gif  img12.gif  img13.gif  img14.gif  img15.gif  img16.gif  img17.gif  img18.gif  img19.gif  img2.gif  img20.gif  img21.gif  img22.gif  img3.gif  img4.gif  img5.gif  img6.gif  img7.gif  img8.gif  img9.gif  index_motif.gif  next_group_motif.gif  next_group_motif_gr.gif  next_motif.gif  next_motif_gr.gif  orangeball.gif  pinkball.gif  previous_group_motif.gif  previous_group_motif_gr.gif  previous_motif.gif  previous_motif_gr.gif  purpleball.gif  redball.gif  up_motif.gif  up_motif_gr.gif  whiteball.gif  yellowball.gif  
+  
+  EXTRA_DIST	= $(html_DATA)