svn commit: r426340 - in head/math/mathmod: . files

[Thierry Thomas]

Author: thierry
Date: Fri Nov 18 20:57:51 2016
New Revision: 426340
URL: https://svnweb.freebsd.org/changeset/ports/426340

Log:
  - Simplify Makefile with USE=qmake
  
  - Since I'm there fix USE_GL.
  
  PR:		214627
  Submitted by:	tcberner

Modified:
  head/math/mathmod/Makefile
  head/math/mathmod/files/patch-MathMod.pro

Modified: head/math/mathmod/Makefile
==============================================================================
--- head/math/mathmod/Makefile	Fri Nov 18 20:46:42 2016	(r426339)
+++ head/math/mathmod/Makefile	Fri Nov 18 20:57:51 2016	(r426340)
@@ -12,8 +12,8 @@ COMMENT=	Mathematical modeling software
 
 LICENSE=	GPLv2
 
-USES=		dos2unix zip
-USE_GL=		yes
+USES=		dos2unix qmake zip
+USE_GL=		gl
 USE_QT5=	buildtools_build core gui opengl qmake_build widgets
 
 BRANCHE=	246
@@ -24,10 +24,4 @@ PLIST_FILES=	bin/MathMod
 # LL / ULL suffix would be needed for integer constants
 BROKEN_FreeBSD_9_i386=	YES
 
-pre-build:
-	cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE}
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ARGET/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
 .include <bsd.port.mk>

Modified: head/math/mathmod/files/patch-MathMod.pro
==============================================================================
--- head/math/mathmod/files/patch-MathMod.pro	Fri Nov 18 20:46:42 2016	(r426339)
+++ head/math/mathmod/files/patch-MathMod.pro	Fri Nov 18 20:57:51 2016	(r426340)
@@ -1,4 +1,4 @@
---- MathMod.pro.orig	2016-03-03 21:15:56 UTC
+--- MathMod.pro.orig	2016-11-18 12:53:17 UTC
 +++ MathMod.pro
 @@ -58,7 +58,6 @@ FORMS     = ui_forms/drawingoptions.ui \
  			 
@@ -8,3 +8,16 @@
  QT         += opengl widgets
  
  OTHER_FILES += \
+@@ -67,10 +66,10 @@ OTHER_FILES += \
+ 			mathmodconfig.js
+ 
+ # install
+-target.path    = $TARGET
++target.path    = $$INSTALL_ROOT/$$PREFIX/bin/
+ sources.files  = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mathmod.pro
+ sources.path   = $TARGET
+-INSTALLS      += target sources
++INSTALLS      += target
+ 
+ DISTFILES += \
+     advancedmodels.js