Index: head/math/ump/Makefile
===================================================================
--- head/math/ump/Makefile	(revision 378548)
+++ head/math/ump/Makefile	(revision 378549)
@@ -1,34 +1,34 @@
 # Created by: Nicola Vitale <nivit@email.it>
 # $FreeBSD$
 
 PORTNAME=	ump
 PORTVERSION=	0.8.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 MASTER_SITES=	SF/u-m-p/u-m-p/${PORTVERSION}
 PKGNAMESUFFIX=	-math
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical, easy to use math program
 
-CONFLICTS=	ump-1.[0-9]*
+LICENSE=	GPLv2
 
 USES=		gmake pkgconfig tar:bzip2
 USE_GNOME=	gtk20
 USE_GL=		glu
 
 ALL_TARGET=	${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAKE_ENV+=	DATADIR="${DATADIR}"
+CONFLICTS=	ump-1.[0-9]*
 
-FIND_DIRS=	-type d
-FIND_DATA=	-type f
+DESKTOP_ENTRIES="Ump" "" "" "ump" "Education;Math;Science;GTK;" ""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/src/main.cpp
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/ump.conf ${STAGEDIR}${PREFIX}/etc/ump.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/ump.conf \
+		${STAGEDIR}${PREFIX}/etc/ump.conf.sample
 
 .include <bsd.port.mk>
Index: head/math/ump/files/patch-Makefile
===================================================================
--- head/math/ump/files/patch-Makefile	(revision 378548)
+++ head/math/ump/files/patch-Makefile	(revision 378549)
@@ -1,225 +1,225 @@
 --- Makefile.orig	2006-10-08 02:17:18.000000000 +0800
 +++ Makefile	2014-08-08 10:52:12.448321292 +0800
 @@ -2,19 +2,19 @@
  APP_NAME = ump
  
  ## Change this directory name as you like, it's the installation directory
 -BIN_DIR = /usr/bin
 -DATA_DIR = /usr/share/$(APP_NAME)
 +BIN_DIR = $(PREFIX)/bin
-+DATA_DIR = $(DATADIR)
++DATA_DIR = $(PREFIX)/share/$(APP_NAME)
  
  
  ## One of these three flags must be uncommented
  ##FLAGS = -DUSE_FLOAT
 -FLAGS = -DUSE_DOUBLE
 +FLAGS = -DUSE_DOUBLE $(CXXFLAGS)
  ##FLAGS = -DUSE_LONG_DOUBLE
  
  ## If you don't have OpenGL, comment these lines (the 3D plot support will be disabled)
  FLAGS += -DPLOT_3D
  ## You might have to change this path
 -GL_LIB = -lGL -lGLU -L/usr/X11/lib
 +GL_LIB = -lGL -lGLU -L$(LOCALBASE)/lib -lX11
  ## The next path will be required on some Mac-systems to compile
  ##FLAGS += -I/usr/X11/include/GL
  
 @@ -27,7 +27,7 @@ AUTO_COMPLETION = -DUSE_AUTO_COMPLETION
  
  ## Choose your optimization level
  ##FLAGS += -O1
 -FLAGS += -O2
 +##FLAGS += -O2
  ##FLAGS += -O3
  ##FLAGS += -Os
  
 @@ -44,9 +44,10 @@ FLAGS += -O2
  ## 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
  
 +## X11 includes
 +FLAGS += -I$(LOCALBASE)/include
  
  ## If you'd like to compile with debuging info avaliable
  ##FLAGS += -ggdb
 @@ -90,7 +91,7 @@ GUI_HEADER    = $(SRC)/main.h $(SRC)/pic
  # $< means the name of the first prerequisite
  
  $(APP_NAME): Makefile $(OBJ_FILES) main.o $(GUI_OBJ) addon_functions.o $(ASM_FILES)
 -	g++ $(FLAGS) $(GTK_LIB) $(OBJ_FILES) main.o $(GUI_OBJ) addon_functions.o $(ASM_FILES) -o $@ $(GL_LIB)
 +	$(CXX) $(FLAGS) $(GTK_LIB) $(OBJ_FILES) main.o $(GUI_OBJ) addon_functions.o $(ASM_FILES) -o $@ $(GL_LIB)
  
  clean:
  	-rm -f $(OBJ_FILES)
 @@ -102,18 +103,16 @@ clean:
  	-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)
 +	$(CXX) $(FLAGS) $(FILES) $(OBJ_FILES) addon_functions.text.o $(ASM_FILES) -DNO_GTK -o $(APP_NAME) -DDATA_DIR=\"$(DATA_DIR)\" -DFLAGS="\"$(FLAGS)\"" $(GL_LIB)
  
  
  install:
 -	install -s $(APP_NAME) $(BIN_DIR)/$(APP_NAME)
 -	chmod -c 755 $(BIN_DIR)/$(APP_NAME)
 -	install -d $(DATA_DIR)
 -	install ump.conf $(DATA_DIR)
 -	chmod -c 644 $(DATA_DIR)/ump.conf
 -	install -d $(DATA_DIR)/ump-files
 -	install ump-files/* $(DATA_DIR)/ump-files
 -	chmod -c 644 $(DATA_DIR)/ump-files/*
 +	install -s $(APP_NAME) $(DESTDIR)$(BIN_DIR)/$(APP_NAME)
 +	chmod 755 $(DESTDIR)$(BIN_DIR)/$(APP_NAME)
 +	install -d $(DESTDIR)$(DATA_DIR)
 +	install -d $(DESTDIR)$(DATA_DIR)/ump-files
 +	install ump-files/* $(DESTDIR)$(DATA_DIR)/ump-files
 +	chmod 644 $(DESTDIR)$(DATA_DIR)/ump-files/*
  
  uninstall:
  	rm -f $(BIN_DIR)/$(APP_NAME)
 @@ -123,108 +122,108 @@ uninstall:
  
  
  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)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h $(SRC)/addon_functions.h $(SRC)/ump_3d_viewer.h
 -	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)/utf8_string.h $(SRC)/keyfile.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 $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	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 $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  ump_editor.o: $(SRC)/ump_editor.cpp Makefile $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	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)/utf8_string.h $(SRC)/keyfile.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 $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/ump_picturewin.h
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
  ump_aboutwin.o: $(SRC)/ump_aboutwin.cpp Makefile $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
  ump_simplewin.o: $(SRC)/ump_simplewin.cpp Makefile $(SRC)/image_sqrt.c $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
  matrix_editor.o: $(SRC)/matrix_editor.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
  ump_picturewin.o: $(SRC)/ump_picturewin.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(GUI_HEADER) $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
  addon_functions.o: $(SRC)/addon_functions.cpp Makefile $(SRC)/addon_functions.h $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h $(SRC)/main.h $(SRC)/ump_picturewin.h
 -	g++ $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
 +	$(CXX) $(FLAGS) -c $(GTK_CFLAGS) $< -o $@
  
  addon_functions.text.o: $(SRC)/addon_functions.cpp Makefile $(SRC)/addon_functions.h $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h $(SRC)/main.h
 -	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)/utf8_string.h $(SRC)/keyfile.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 $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  keyfile.o: $(SRC)/keyfile.cpp Makefile $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  utf8_string.o: $(SRC)/utf8_string.cpp Makefile $(SRC)/utf8_string.h $(SRC)/vartypes.h $(SRC)/keyfile.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  picture.o: $(SRC)/picture.cpp Makefile $(SRC)/picture.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  integer.o: $(SRC)/integer.cpp Makefile $(SRC)/integer.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  real.o: $(SRC)/real.cpp Makefile $(SRC)/integer.h $(SRC)/real.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  complex.o: $(SRC)/complex.cpp Makefile $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/complex.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  matrix.o: $(SRC)/matrix.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  
  
  math2.o: $(SRC)/math2.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/math2.intern.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  math2.picture.o: $(SRC)/math2.picture.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  math2.variable.o: $(SRC)/math2.variable.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  math2.variablelist.o: $(SRC)/math2.variablelist.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  math2.functionlist.o: $(SRC)/math2.functionlist.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  math2.builtin.o: $(SRC)/math2.builtin.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  math2.codeline.o: $(SRC)/math2.codeline.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  math2.codeblock.o: $(SRC)/math2.codeblock.cpp Makefile $(SRC)/vector.h $(SRC)/math2.intern.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  math2.array.o: $(SRC)/math2.array.cpp Makefile $(SRC)/vector.h $(SRC)/integer.h $(SRC)/real.h $(SRC)/complex.h $(SRC)/matrix.h $(SRC)/math2.h $(SRC)/vartypes.h $(SRC)/utf8_string.h $(SRC)/keyfile.h $(SRC)/picture.h
 -	g++ $(FLAGS) -c $< -o $@
 +	$(CXX) $(FLAGS) -c $< -o $@
  
  
  
  ## Here we create the converter and convert the Swedish translation file into an inline-file
  inliner: $(SRC)/inliner.c Makefile
 -	gcc $< -o $@
 +	$(CC) $< -o $@
  
  translation_svenska.c: translations/Svenska inliner
  	./inliner $< translation_svenska $@
  
  translation_svenska.o: translation_svenska.c
 -	gcc $< -c -o $@
 +	$(CC) $< -c -o $@
Index: head/math/ump/files/patch-src__real.cpp
===================================================================
--- head/math/ump/files/patch-src__real.cpp	(nonexistent)
+++ head/math/ump/files/patch-src__real.cpp	(revision 378549)
@@ -0,0 +1,11 @@
+--- src/real.cpp.orig
++++ src/real.cpp
+@@ -764,7 +764,7 @@
+ }
+ 
+ // converts a Real to a fraction
+-Real frac(const Real &val, int32 highest_bottom_value) throw(error_obj)
++Real frac(const Real &val, int32 highest_bottom_value = 1000) throw(error_obj)
+ {
+ 	if( highest_bottom_value < 1 )
+ 		THROW_ERROR( ErrorType_Domain, _("Domain error: Value out of range.") );

Property changes on: head/math/ump/files/patch-src__real.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/math/ump/pkg-descr
===================================================================
--- head/math/ump/pkg-descr	(revision 378548)
+++ head/math/ump/pkg-descr	(revision 378549)
@@ -1,5 +1,4 @@
-ump is a graphical, easy to use math program, which works with complex numbers,
-matrices, functions and much more.
+ump is a graphical, easy to use math program, which works with complex
+numbers, matrices, functions and much more.
 
-Author:	Mattias Hultgren
 WWW: http://u-m-p.sourceforge.net/