From owner-svn-ports-all@FreeBSD.ORG Tue Feb 24 09:46:17 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 03642C1B; Tue, 24 Feb 2015 09:46:17 +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 C6F1AA0C; Tue, 24 Feb 2015 09:46:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1O9kGVE007926; Tue, 24 Feb 2015 09:46:16 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1O9kGPW007924; Tue, 24 Feb 2015 09:46:16 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201502240946.t1O9kGPW007924@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Tue, 24 Feb 2015 09:46:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379777 - 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: Tue, 24 Feb 2015 09:46:17 -0000 Author: marino Date: Tue Feb 24 09:46:15 2015 New Revision: 379777 URL: https://svnweb.freebsd.org/changeset/ports/379777 QAT: https://qat.redports.org/buildarchive/r379777/ Log: science/vmd: Unbreak on F10+ This patch removes the hardcoded "gcc" so that it works with USE_GCC variable. There is a slightly newer version of vmd available, so a version upgrade may soon follow. PR: 197103 Submitted by: Sakaue Mamoru Modified: head/science/vmd/Makefile Modified: head/science/vmd/Makefile ============================================================================== --- head/science/vmd/Makefile Tue Feb 24 09:29:17 2015 (r379776) +++ head/science/vmd/Makefile Tue Feb 24 09:46:15 2015 (r379777) @@ -26,6 +26,7 @@ RUN_DEPENDS= ${PYNUMERIC} USES= gmake perl5 python USE_PERL5= build USE_GL= glu +USE_GCC= any ONLY_FOR_ARCHS= i386 amd64 @@ -74,6 +75,30 @@ post-patch: ${REINPLACE_CMD} "s%log2f(\([^ ,]*\))%logf(\1)/(float)M_LN2%g" ${WRKSRC}/src/Orbital.C ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure + ${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}/" \ + ${WRKSRC}/lib/stride/Makefile \ + ${WRKSRC}/lib/surf/Makefile \ + ${WRKSRC}/lib/tachyon/unix/Make-arch \ + ${WRKDIR}/plugins/cionize/mcudahacks/Makefile.specialbuilds \ + ${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 + ${REINPLACE_CMD} -E "s/(CXX[[:space:]]*=[[:space:]]*)g\+\+/\1${CXX}/" \ + ${WRKDIR}/plugins/cionize/Makefile.specialbuilds \ + ${WRKDIR}/plugins/fmtool/Makefile.specialbuilds \ + ${WRKDIR}/plugins/hesstrans/src/foo/Makefile \ + ${WRKDIR}/plugins/hesstrans/src/foo/nm_gnu.mak \ + ${WRKDIR}/plugins/Make-arch do-build: ${SETENV} ${MAKE_ENV} ${MAKE_CMD} bsd -C ${WRKSRC}/lib/tachyon/unix \