Update to 0.8.4

PR:		100022
Submitted by:	Nicola Vitale <nivit@email.it> (maintainer)

1 files changed, 27 insertions, 22 deletions

diff --git a/math/ump/files/patch-Makefile b/math/ump/files/patch-Makefile
index 8cabf98a0a9c..b4a69ff27818 100644
--- a/math/ump/files/patch-Makefile
+++ b/math/ump/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Wed Apr  5 14:41:05 2006
-+++ Makefile	Thu May  4 16:50:55 2006
-@@ -2,25 +2,24 @@
+--- Makefile	Sun Jul  9 12:51:41 2006
++++ Makefile.port	Mon Jul 10 14:07:04 2006
+@@ -2,19 +2,19 @@
  APP_NAME = ump
  
  ## Change this directory name as you like, it's the installation directory
@@ -23,26 +23,29 @@
 +GL_LIB = -lGL -lGLU -L$(X11BASE)/lib
  
  
+ ## This will give auto completion in the main window, but it requires GTK+2.6
+@@ -25,7 +25,7 @@
  
  ## Choose your optimization level
  ##FLAGS += -O0
 -FLAGS += -O2
++##FLAGS += -O2
  ##FLAGS += -O3
  ##FLAGS += -Os
  
-@@ -35,7 +34,10 @@
+@@ -40,8 +40,10 @@
  ## Uncomment one or both of these if the compilation failes
  ## due to trunc undefined or log2 undefined
  ##FLAGS += -DDONT_HAVE_TRUNC
 -##FLAGS += -DDONT_HAVE_LOG2
 +FLAGS += -DDONT_HAVE_LOG2
-+
-+# include X11 libs
-+FLAGS += -I$(X11BASE)/include
  
++# X11 includes
++FLAGS += -I$(X11BASE)/include
  
  
-@@ -82,7 +84,7 @@
+ ## If you'd like to compile with debuging info avaliable
+@@ -87,7 +89,7 @@
  # $< means the name of the first prerequisite
  
  $(APP_NAME): Makefile $(OBJ_FILES) main.o $(GUI_OBJ) addon_functions.o $(ASM_FILES)
@@ -51,8 +54,8 @@
  
  clean:
  	-rm -f $(OBJ_FILES)
-@@ -93,18 +95,16 @@
- 	-rm -f translation_svenska.c
+@@ -99,18 +101,16 @@
+ 	-rm -f inliner
  
  text: Makefile $(OBJ_FILES) addon_functions.text.o $(ASM_FILES)
 -	g++ $(FLAGS) $(FILES) $(OBJ_FILES) addon_functions.text.o $(ASM_FILES) -DNO_GTK -o $(APP_NAME) -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" $(GL_LIB)
@@ -73,20 +76,20 @@
  
  uninstall:
  	rm -f $(BIN_DIR)/$(APP_NAME)
-@@ -114,106 +114,106 @@
+@@ -120,107 +120,107 @@
  
  
  main.o: $(FILES) Makefile $(GUI_HEADER) $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/picture.h $(SRC)/addon_functions.h $(SRC)/ump_3d_viewer.h
--	g++ $(FLAGS) $(ASM_FLAG) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\""
-+	$(CXX) $(FLAGS) $(ASM_FLAG) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\""
+-	g++ $(FLAGS) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\""
++	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $(FILES) -o $@ -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\""
  
  picture2gtk.o: $(SRC)/picture2gtk.cpp Makefile $(SRC)/picture2gtk.h $(SRC)/vartypes.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
  ump_advancedwin.o: $(SRC)/ump_advancedwin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/picture.h $(GUI_HEADER) $(SRC)/vartypes.h
--	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
-+	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
+-	g++ $(FLAGS) $(AUTO_COMPLETION) -c $(GTK_CFLAGS) $< -o $@
++	$(CXX) $(FLAGS) $(AUTO_COMPLETION) -c $(GTK_CFLAGS) $< -o $@
  
  ump_3d_viewer.o: $(SRC)/ump_3d_viewer.cpp Makefile $(SRC)/ump_3d_viewer.h $(SRC)/main.h $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/picture.h $(SRC)/vartypes.h
 -	g++ $(FLAGS) -c $< -o $@
@@ -96,11 +99,11 @@
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
- ump_graphwin.o: $(SRC)/ump_graphwin.cpp Makefile $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/picture.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vector.h
+ ump_graphwin.o: $(SRC)/ump_graphwin.cpp Makefile $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/picture.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vector.h $(SRC)/gradient_editor.h
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
- ump_prefwin.o: $(SRC)/ump_prefwin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/picture.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h
+ ump_prefwin.o: $(SRC)/ump_prefwin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/picture.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/ump_picturewin.h
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
@@ -128,7 +131,9 @@
 -	g++ $(FLAGS) -c -DNO_GTK $(SRC)/addon_functions.cpp -o $@
 +	$(CXX) $(FLAGS) -c -DNO_GTK $(SRC)/addon_functions.cpp -o $@
  
- 
+ gradient_editor.o: $(SRC)/gradient_editor.cpp $(SRC)/gradient_editor.h $(SRC)/vector.h $(SRC)/vartypes.h $(SRC)/picture.h
+-	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
++	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
  vartypes.o: $(SRC)/vartypes.cpp Makefile $(SRC)/vartypes.h
 -	g++ $(FLAGS) -c $< -o $@
@@ -143,8 +148,8 @@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  integer.o: $(SRC)/integer.cpp Makefile $(SRC)/integer.h $(SRC)/vartypes.h
--	g++ $(FLAGS) $(ASM_FLAG) -c $< -o $@
-+	$(CXX) $(FLAGS) $(ASM_FLAG) -c $< -o $@
+-	g++ $(FLAGS) -c $< -o $@
++	$(CXX) $(FLAGS) -c $< -o $@
  
  real.o: $(SRC)/real.cpp Makefile $(SRC)/integer.h $(SRC)/real.h $(SRC)/vartypes.h
 -	g++ $(FLAGS) -c $< -o $@
@@ -201,13 +206,13 @@
  ## Here we create the converter and convert the Swedish translation file into an inline-file
  inliner: $(SRC)/inliner.c Makefile
 -	gcc $< -o $@
-+	$(CC) $(CFLAGS) $< -o $@
++	$(CC) $< -o $@
  
  translation_svenska.c: translations/Svenska inliner
  	./inliner $< translation_svenska $@
  
  translation_svenska.o: translation_svenska.c
 -	gcc $< -c -o $@
-+	$(CC) $(CFLAGS) $< -c -o $@
++	$(CC) $< -c -o $@