From owner-svn-ports-head@FreeBSD.ORG Mon Sep 8 16:23:57 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7B63B211; Mon, 8 Sep 2014 16:23:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4D83414E5; Mon, 8 Sep 2014 16:23:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88GNvng056442; Mon, 8 Sep 2014 16:23:57 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88GNukD056440; Mon, 8 Sep 2014 16:23:56 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201409081623.s88GNukD056440@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Mon, 8 Sep 2014 16:23:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367651 - in head/math/gracetmpl: . 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.18-1 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: Mon, 08 Sep 2014 16:23:57 -0000 Author: adamw Date: Mon Sep 8 16:23:56 2014 New Revision: 367651 URL: http://svnweb.freebsd.org/changeset/ports/367651 QAT: https://qat.redports.org/buildarchive/r367651/ Log: Fix python detection. This port still does not build on 10+. Modified: head/math/gracetmpl/Makefile head/math/gracetmpl/files/patch-Makefile Modified: head/math/gracetmpl/Makefile ============================================================================== --- head/math/gracetmpl/Makefile Mon Sep 8 16:22:34 2014 (r367650) +++ head/math/gracetmpl/Makefile Mon Sep 8 16:23:56 2014 (r367651) @@ -21,7 +21,8 @@ MAKE_ARGS= PREFIX="${PREFIX}" \ AR="${AR}" \ CPP="${CXX} ${LDFLAGS}" \ CPPFLAGS="${CXXFLAGS} ${CPPFLAGS}" \ - CXX="${CXX}" + CXX="${CXX}" \ + PYTHON="${PYTHON_CMD}" ALL_TARGET= all pythonwrap INSTALL_TARGET= install Modified: head/math/gracetmpl/files/patch-Makefile ============================================================================== --- head/math/gracetmpl/files/patch-Makefile Mon Sep 8 16:22:34 2014 (r367650) +++ head/math/gracetmpl/files/patch-Makefile Mon Sep 8 16:23:56 2014 (r367651) @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Sep 27 16:59:48 2004 -+++ Makefile Sun Jun 5 01:14:44 2005 +--- Makefile.orig 2004-09-27 03:59:48.000000000 -0400 ++++ Makefile 2014-09-08 12:19:12.246360998 -0400 @@ -58,10 +58,10 @@ $(CPP) -o envtest envtest.o gracetmpl.o @@ -15,20 +15,23 @@ gracetmpl-config: gracetmpl-config.in Makefile.defs sed -e 's!__PREFIX__!$(PREFIX)!g' \ -@@ -79,7 +79,7 @@ +@@ -78,16 +78,16 @@ + rm -f *~ \#*\# pythonwrap: - @if python python/prereq.py 2>/dev/null; then \ +- @if python python/prereq.py 2>/dev/null; then \ - (cd python; make); \ ++ @if $(PYTHON) python/prereq.py 2>/dev/null; then \ + (cd python; $(MAKE)); \ else \ echo missing python numarray extension.; \ echo not building python stuff; \ -@@ -87,7 +87,7 @@ + fi pythonwrap_install: - @if python python/prereq.py 2>/dev/null; then \ +- @if python python/prereq.py 2>/dev/null; then \ - (cd python; make install); \ ++ @if $(PYTHON) python/prereq.py 2>/dev/null; then \ + (cd python; $(MAKE) install); \ else \ echo not installing python stuff; \