From owner-svn-ports-head@freebsd.org Fri Nov 18 20:57:53 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47A21C48848; Fri, 18 Nov 2016 20:57:53 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F390F1FD4; Fri, 18 Nov 2016 20:57:52 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAIKvqr7080425; Fri, 18 Nov 2016 20:57:52 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAIKvqXJ080423; Fri, 18 Nov 2016 20:57:52 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201611182057.uAIKvqXJ080423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Fri, 18 Nov 2016 20:57:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426340 - in head/math/mathmod: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Nov 2016 20:57:53 -0000 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 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