svn commit: r474549 - head/science/openstructure

[Tobias Kortkamp]

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 at 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
>