From owner-svn-ports-all@FreeBSD.ORG Sun Mar 15 13:11:50 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 057FBE05; Sun, 15 Mar 2015 13:11:50 +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 CB976F2B; Sun, 15 Mar 2015 13:11:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FDBnJU046825; Sun, 15 Mar 2015 13:11:49 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FDBnF8046823; Sun, 15 Mar 2015 13:11:49 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201503151311.t2FDBnF8046823@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 15 Mar 2015 13:11:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381327 - head/science/vmd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2015 13:11:50 -0000 Author: marino Date: Sun Mar 15 13:11:48 2015 New Revision: 381327 URL: https://svnweb.freebsd.org/changeset/ports/381327 QAT: https://qat.redports.org/buildarchive/r381327/ Log: science/vmd: Improve cc/gcc replacement patterns for Makefiles PR: 197103 Submitted by: Sakaue Mamoru Modified: head/science/vmd/Makefile Modified: head/science/vmd/Makefile ============================================================================== --- head/science/vmd/Makefile Sun Mar 15 13:05:41 2015 (r381326) +++ head/science/vmd/Makefile Sun Mar 15 13:11:48 2015 (r381327) @@ -3,7 +3,7 @@ PORTNAME= vmd DISTVERSION= 1.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science graphics python tcl tk MASTER_SITES= http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.99b2/:tachyon \ http://www.photonlimited.com/~johns/tachyon/files/0.99b2/:tachyon \ @@ -78,7 +78,7 @@ post-patch: ${REINPLACE_CMD} "s/\"gcc\"/\"${CC}\"/;s/\"g++\"/\"${CXX}\"/" ${WRKSRC}/configure ${REINPLACE_CMD} -E "s/(SHLD[[:space:]]*=[[:space:]]*)gcc/\1${CC}/" \ ${WRKDIR}/plugins/Make-arch - ${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)cc/\1${CC}/" \ + ${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)(gcc|cc)/\1${CC}/" \ ${WRKSRC}/lib/stride/Makefile \ ${WRKSRC}/lib/surf/Makefile \ ${WRKSRC}/lib/tachyon/unix/Make-arch \ @@ -86,13 +86,8 @@ post-patch: ${WRKDIR}/plugins/cionize/Makefile.specialbuilds \ ${WRKDIR}/plugins/cionize/Makefile.mine \ ${WRKDIR}/plugins/cionize/Makefile.testing \ - ${WRKDIR}/plugins/Make-arch - ${REINPLACE_CMD} -E "s/(CC[[:space:]]*=[[:space:]]*)gcc/\1${CC}/" \ ${WRKDIR}/plugins/Make-arch \ - ${WRKDIR}/plugins/cionize/Makefile.mine \ - ${WRKDIR}/plugins/cionize/Makefile.specialbuilds \ - ${WRKDIR}/plugins/molfile_plugin/f77/Makefile \ - ${WRKSRC}/lib/tachyon/unix/Make-arch + ${WRKDIR}/plugins/molfile_plugin/f77/Makefile ${REINPLACE_CMD} -E "s/(CXX[[:space:]]*=[[:space:]]*)g\+\+/\1${CXX}/" \ ${WRKDIR}/plugins/cionize/Makefile.specialbuilds \ ${WRKDIR}/plugins/fmtool/Makefile.specialbuilds \