svn commit: r475273 - in head/science/mpqc: . files

[Yuri Victorovich]

Author: yuri
Date: Tue Jul 24 20:22:15 2018
New Revision: 475273
URL: https://svnweb.freebsd.org/changeset/ports/475273

Log:
  science/mpqc: Fix build
  
  Two fixes:
  * Force some stl-related define values because configured values are wrong
  * Force the C++-98 standard because of breakage on newer clangs/systems
  
  Reported by:	fallout

Deleted:
  head/science/mpqc/files/patch-src_lib_util_keyval_ipv2__scan.cc
  head/science/mpqc/files/patch-src_lib_util_keyval_ipv2__scan.ll
Modified:
  head/science/mpqc/Makefile

Modified: head/science/mpqc/Makefile
==============================================================================
--- head/science/mpqc/Makefile	Tue Jul 24 20:14:36 2018	(r475272)
+++ head/science/mpqc/Makefile	Tue Jul 24 20:22:15 2018	(r475273)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpqc
 PORTVERSION=	2.3.1
-PORTREVISION=	34
+PORTREVISION=	35
 CATEGORIES=	science parallel
 MASTER_SITES=	SF
 
@@ -32,6 +32,7 @@ INSTALL_TARGET=	install install_devel
 DESTDIRNAME=	installroot
 SHEBANG_FILES=	src/bin/mpqc/ccarunproc src/bin/mpqc/mpqcrunproc
 USE_LDCONFIG=	yes
+USE_CXXSTD=	c++98 # workaround https://github.com/ValeevGroup/mpqc/issues/57
 
 OPTIONS_DEFINE=		ATLAS DOXYGEN EXAMPLES ICC MPICH OPTIFLAGS
 OPTIONS_DEFAULT=	DOXYGEN
@@ -69,6 +70,12 @@ post-patch:
 		-e 's/pthread_join(0,0)/pthread_create(0,0,0,0)/' \
 		-e 's|/usr/bin/wish|${LOCALBASE}/bin/wish|' \
 		${WRKSRC}/configure
+
+post-configure: # workaround: https://github.com/ValeevGroup/mpqc/issues/56
+	@${REINPLACE_CMD} -e ' \
+		s|/\* #undef USING_NAMESPACE_STD \*/|#define USING_NAMESPACE_STD 1|; \
+		s|/\* #undef HAVE_SGETN \*/|#define HAVE_SGETN 1|' \
+		${WRKSRC}/src/lib/scconfig.h
 
 do-build-DOXYGEN-on:
 	@(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS})