From owner-svn-ports-all@freebsd.org  Mon Jul 17 12:25:11 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 9D806D7E6AA;
 Mon, 17 Jul 2017 12:25:11 +0000 (UTC)
 (envelope-from martymac@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 7802D83592;
 Mon, 17 Jul 2017 12:25:11 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6HCPAHG037255;
 Mon, 17 Jul 2017 12:25:10 GMT (envelope-from martymac@FreeBSD.org)
Received: (from martymac@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6HCPAp2037252;
 Mon, 17 Jul 2017 12:25:10 GMT (envelope-from martymac@FreeBSD.org)
Message-Id: <201707171225.v6HCPAp2037252@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: martymac set sender to
 martymac@FreeBSD.org using -f
From: Ganael LAPLANCHE <martymac@FreeBSD.org>
Date: Mon, 17 Jul 2017 12:25:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r446068 - in head/devel/simgear: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: martymac
X-SVN-Commit-Paths: in head/devel/simgear: . files
X-SVN-Commit-Revision: 446068
X-SVN-Commit-Repository: ports
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jul 2017 12:25:11 -0000

Author: martymac
Date: Mon Jul 17 12:25:09 2017
New Revision: 446068
URL: https://svnweb.freebsd.org/changeset/ports/446068

Log:
  Remove tr1 dependency to prepare for Boost 1.65
  
  PR:		220718
  Submitted by:	jbeich

Added:
  head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx   (contents, props changed)
  head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx   (contents, props changed)
Modified:
  head/devel/simgear/Makefile

Modified: head/devel/simgear/Makefile
==============================================================================
--- head/devel/simgear/Makefile	Mon Jul 17 11:56:51 2017	(r446067)
+++ head/devel/simgear/Makefile	Mon Jul 17 12:25:09 2017	(r446068)
@@ -2,7 +2,7 @@
 
 PORTNAME=	simgear
 PORTVERSION=	2017.1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 

Added: head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.cxx	Mon Jul 17 12:25:09 2017	(r446068)
@@ -0,0 +1,27 @@
+--- simgear/scene/material/Effect.cxx.orig	2017-04-04 09:24:44.000000000 +0200
++++ simgear/scene/material/Effect.cxx	2017-07-16 21:55:10.888904000 +0200
+@@ -32,7 +32,7 @@
+ #include <map>
+ #include <queue>
+ #include <utility>
+-#include <boost/tr1/unordered_map.hpp>
++#include <unordered_map>
+ 
+ #include <boost/bind.hpp>
+ #include <boost/foreach.hpp>
+@@ -832,13 +832,13 @@
+ 
+ // XXX Should these be protected by a mutex? Probably
+ 
+-typedef tr1::unordered_map<ProgramKey, ref_ptr<Program>,
++typedef std::unordered_map<ProgramKey, ref_ptr<Program>,
+                            boost::hash<ProgramKey>, ProgramKey::EqualTo>
+ ProgramMap;
+ ProgramMap programMap;
+ ProgramMap resolvedProgramMap;  // map with resolved shader file names
+ 
+-typedef tr1::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> >
++typedef std::unordered_map<ShaderKey, ref_ptr<Shader>, boost::hash<ShaderKey> >
+ ShaderMap;
+ ShaderMap shaderMap;
+ 

Added: head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/simgear/files/patch-BOOST-simgear-scene-material-Effect.hxx	Mon Jul 17 12:25:09 2017	(r446068)
@@ -0,0 +1,20 @@
+--- simgear/scene/material/Effect.hxx.orig	2017-04-04 09:24:44.000000000 +0200
++++ simgear/scene/material/Effect.hxx	2017-07-16 21:55:33.247324000 +0200
+@@ -19,7 +19,7 @@
+ 
+ #include <vector>
+ #include <string>
+-#include <boost/tr1/unordered_map.hpp>
++#include <unordered_map>
+ 
+ #include <boost/functional/hash.hpp>
+ 
+@@ -127,7 +127,7 @@
+             bool operator()(const Key& lhs, const Key& rhs) const;
+         };
+     };
+-    typedef std::tr1::unordered_map<Key, osg::observer_ptr<Effect>,
++    typedef std::unordered_map<Key, osg::observer_ptr<Effect>,
+                                     boost::hash<Key>, Key::EqualTo> Cache;
+     Cache* getCache()
+     {