svn commit: r378549 - in head/math/ump: . files

[John Marino]

Author: marino
Date: Fri Feb  6 18:25:04 2015
New Revision: 378549
URL: https://svnweb.freebsd.org/changeset/ports/378549
QAT: https://qat.redports.org/buildarchive/r378549/

Log:
  math/ump: Finish original "fix on current"
  
  Back on 10 OCT 2014 when the PR was opened, this unmaintained port
  didn't build on current.  The PR stagnanted due to an unanswered
  question and the port was eventually fixed by amdmi3 on 21 NOV.  Let's
  go ahead and make the remaining changes which include adding a license
  (GPLv2), defining desktop entries, tweaking pkg-descr, and make real_frac
  function match its changed header (for clang).
  
  PR:		194497
  Submitted by:	Ports Fury

Added:
  head/math/ump/files/patch-src__real.cpp   (contents, props changed)
Modified:
  head/math/ump/Makefile
  head/math/ump/files/patch-Makefile
  head/math/ump/pkg-descr

Modified: head/math/ump/Makefile
==============================================================================
--- head/math/ump/Makefile	Fri Feb  6 16:58:49 2015	(r378548)
+++ head/math/ump/Makefile	Fri Feb  6 18:25:04 2015	(r378549)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ump
 PORTVERSION=	0.8.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math
 MASTER_SITES=	SF/u-m-p/u-m-p/${PORTVERSION}
 PKGNAMESUFFIX=	-math
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	-math
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Graphical, easy to use math program
 
-CONFLICTS=	ump-1.[0-9]*
+LICENSE=	GPLv2
 
 USES=		gmake pkgconfig tar:bzip2
 USE_GNOME=	gtk20
@@ -20,15 +20,15 @@ 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>

Modified: head/math/ump/files/patch-Makefile
==============================================================================
--- head/math/ump/files/patch-Makefile	Fri Feb  6 16:58:49 2015	(r378548)
+++ head/math/ump/files/patch-Makefile	Fri Feb  6 18:25:04 2015	(r378549)
@@ -7,7 +7,7 @@
 -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

Added: head/math/ump/files/patch-src__real.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/ump/files/patch-src__real.cpp	Fri Feb  6 18:25:04 2015	(r378549)
@@ -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.") );

Modified: head/math/ump/pkg-descr
==============================================================================
--- head/math/ump/pkg-descr	Fri Feb  6 16:58:49 2015	(r378548)
+++ head/math/ump/pkg-descr	Fri Feb  6 18:25:04 2015	(r378549)
@@ -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/