From owner-svn-ports-head@freebsd.org  Fri Dec 16 09:24:33 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FD7CC82FE1;
 Fri, 16 Dec 2016 09:24:33 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 6F9ED1038;
 Fri, 16 Dec 2016 09:24:33 +0000 (UTC) (envelope-from tz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBG9OWXJ005722;
 Fri, 16 Dec 2016 09:24:32 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBG9OWhl005721;
 Fri, 16 Dec 2016 09:24:32 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201612160924.uBG9OWhl005721@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Fri, 16 Dec 2016 09:24:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428665 - head/cad/openvsp
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Dec 2016 09:24:33 -0000

Author: tz
Date: Fri Dec 16 09:24:32 2016
New Revision: 428665
URL: https://svnweb.freebsd.org/changeset/ports/428665

Log:
  cad/openvsp: fix compilation in 10.1
  
  The port broke on 10.1 since the update to gcc 4.9. Now we enforce
  gcc 4.8 on FreeBSD 10.1.
  
  PR:           215307
  Submitted by: fernando.apesteguia@gmail.com (maintainer)
  Approved by:  mentors (implict)
  MFH:          2016Q4

Modified:
  head/cad/openvsp/Makefile

Modified: head/cad/openvsp/Makefile
==============================================================================
--- head/cad/openvsp/Makefile	Fri Dec 16 09:21:24 2016	(r428664)
+++ head/cad/openvsp/Makefile	Fri Dec 16 09:24:32 2016	(r428665)
@@ -4,7 +4,7 @@
 PORTNAME=	openvsp
 PORTVERSION=	3.9.1
 DISTVERSIONPREFIX=	${GH_PROJECT}_
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	fernando.apesteguia@gmail.com
@@ -39,7 +39,20 @@ WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_PR
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
-USES=		cmake:outsource compiler:gcc-c++11-lib jpeg
+USES=		cmake:outsource jpeg
+
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} == 1001000
+# Fails to build with GCC 4.9 in 10.1
+USE_GCC=	4.8
+LDFLAGS+=	-L${LOCALBASE}/lib/c++
+CXXFLAGS+=	-nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
+BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
+.else
+USES +=		compiler:gcc-c++11-lib
+.endif
+
 CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_LIBXML2:BOOLEAN=yes \