From owner-svn-ports-head@freebsd.org Fri Jul 13 08:50:17 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19234102F7B3; Fri, 13 Jul 2018 08:50:17 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (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 A63FD7BA68; Fri, 13 Jul 2018 08:50:16 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id E808A349; Fri, 13 Jul 2018 04:50:14 -0400 (EDT) Received: from web2 ([10.202.2.212]) by compute4.internal (MEProxy); Fri, 13 Jul 2018 04:50:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=8woyo+ AleOXkZFIyqtkod1KVZ2JsTqNR6ILRMD8m/wc=; b=CxdzkyMkSdalDyUxbn1R9y T9BPjvNb55+njYdWITZYmpwXzbJe3ZZHdH3cPMiC1vYaFjjHGAOUz8XBKWAWtW4V dDm3W0UjoxojtmhIkmxgNQ/xZ+kh+TzEdJcE2Oq/kyyuukgqoz4Dvfs0V+VdKQ8R aRhT+Du1SUEKFcSqGXeoFGEXd7CR0gOi4Smm1Q7H6La68HXDzX4pVyRasEcoE00K ZDJTIDqPNfMginDobUcnDd4lvm532K2nFV+XHyc2DVirFM7xiIFMSwnAZOttJ28v MIiiz0dOT00k5dS1dQLOW0qRijIPspBBmS8SjeflScvYjV1SCC0jHMHDoTRAmkRw == X-ME-Proxy: X-ME-Sender: Received: by mailuser.nyi.internal (Postfix, from userid 99) id 31F0C621B8; Fri, 13 Jul 2018 04:50:14 -0400 (EDT) Message-Id: <1531471814.2871913.1439454520.54749A25@webmail.messagingengine.com> From: Tobias Kortkamp To: Yuri Victorovich , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" X-Mailer: MessagingEngine.com Webmail Interface - ajax-957169fa References: <201807130532.w6D5WJM9044525@repo.freebsd.org> In-Reply-To: <201807130532.w6D5WJM9044525@repo.freebsd.org> Subject: Re: svn commit: r474549 - head/science/openstructure Date: Fri, 13 Jul 2018 10:50:14 +0200 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 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, 13 Jul 2018 08:50:17 -0000 On Fri, Jul 13, 2018, at 07:32, Yuri Victorovich wrote: > Author: yuri > Date: Fri Jul 13 05:32:19 2018 > New Revision: 474549 > URL: https://svnweb.freebsd.org/changeset/ports/474549 > > Log: > science/openstructure: Fix build by using -std=c++98 > > The upstream recommended to use -std=c++98 to fix C++ errors on CURRENT. > Also switch to USE_GITLAB. > > Reported by: fallout (build failure) > Reported by: mat (USE_GITLAB use) > > Modified: > head/science/openstructure/Makefile > head/science/openstructure/distinfo > > Modified: head/science/openstructure/Makefile > ============================================================================== > --- head/science/openstructure/Makefile Fri Jul 13 04:58:15 2018 (r474548) > +++ head/science/openstructure/Makefile Fri Jul 13 05:32:19 2018 (r474549) > @@ -2,9 +2,8 @@ > > PORTNAME= openstructure > DISTVERSION= 1.7.1 > -PORTREVISION= 2 > +PORTREVISION= 3 > CATEGORIES= science > -MASTER_SITES= https://git.scicore.unibas.ch/schwede/${PORTNAME}/ > repository/${DISTVERSION}/archive.tar.gz?dummy=/ > > MAINTAINER= yuri@FreeBSD.org > COMMENT= Molecular modelling and visualization environment > @@ -22,6 +21,10 @@ RUN_DEPENDS= ${PYNUMPY} \ > bash:shells/bash > > USES= cmake:outsource eigen:3 python pyqt:4 qt:4 shebangfix > +USE_GITLAB= yes > +GL_SITE= https://git.scicore.unibas.ch/ > +GL_ACCOUNT= schwede > +GL_COMMIT= ${DISTVERSION} Hmm, I thought this was supposed to always be a full commit hash. > SHEBANG_FILES= scripts/dng.in scripts/ost.in scripts/ost_config.in > USE_QT= corelib gui network opengl xml qmake_build moc_build rcc_build > uic_build > USE_PYQT= core gui > @@ -32,7 +35,8 @@ BINARY_ALIAS= python=${PYTHON_CMD} > CMAKE_ARGS= -DPYTHON_INCLUDE_PATH=${PYTHON_INCLUDEDIR} \ > -DPYTHON_LIBRARIES=${PYTHON_LIBDIR} \ > -DFREEBSD_BOOST_PYTHON_COMPONENT=python${PYTHON_VER:S/.//} \ > - -DFREEBSD_PYTHON_LIBRARY=python${PYTHON_VER} > + -DFREEBSD_PYTHON_LIBRARY=python${PYTHON_VER} \ > + -DCMAKE_CXX_FLAGS='-std=c++98' # c++98 is needed until 1.8.0 to prevent > C++ code build breakage This is a noop and does not have the desired effect. The framework adds CMAKE_CXX_FLAGS to CMAKE_ARGS itself based on CXXFLAGS later, so previous values are just overwritten. It would be better to USE_CXXSTD=c++98 instead. > > post-extract: > @${MV} ${WRKSRC}-* ${WRKSRC} This breaks with USE_GITLAB now: mv: rename /wrkdirs/usr/ports/science/openstructure/work/openstructure-1.7.1-1.7.1-* to /wrkdirs/usr/ports/science/openstructure/work/openstructure-1.7.1-1.7.1: No such file or directory > > Modified: head/science/openstructure/distinfo > ============================================================================== > --- head/science/openstructure/distinfo Fri Jul 13 04:58:15 2018 (r474548) > +++ head/science/openstructure/distinfo Fri Jul 13 05:32:19 2018 (r474549) > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1531159037 > -SHA256 (openstructure-1.7.1.tar.gz) = > a3715a921e3f992ae66ebdc19e6bcb161292bd83ac1302174ff33dc1fc98db50 > -SIZE (openstructure-1.7.1.tar.gz) = 59275493 > +TIMESTAMP = 1531459774 > +SHA256 (schwede-openstructure-1.7.1_GL0.tar.gz) = > a3715a921e3f992ae66ebdc19e6bcb161292bd83ac1302174ff33dc1fc98db50 > +SIZE (schwede-openstructure-1.7.1_GL0.tar.gz) = 59275493 >