From owner-svn-ports-head@freebsd.org Thu Jan 12 11:29:48 2017 Return-Path: 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 D3A5FCAC11F; Thu, 12 Jan 2017 11:29:48 +0000 (UTC) (envelope-from amdmi3@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 AE5B81AC3; Thu, 12 Jan 2017 11:29:48 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0CBTlWu025299; Thu, 12 Jan 2017 11:29:47 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0CBTlIW025296; Thu, 12 Jan 2017 11:29:47 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201701121129.v0CBTlIW025296@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 12 Jan 2017 11:29:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431250 - in head/games/dunelegacy: . files 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 11:29:48 -0000 Author: amdmi3 Date: Thu Jan 12 11:29:47 2017 New Revision: 431250 URL: https://svnweb.freebsd.org/changeset/ports/431250 Log: - Fix LICENSE - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL Approved by: portmgr blanket Added: head/games/dunelegacy/files/patch-include__misc__functional.h - copied unchanged from r431249, head/games/dunelegacy/files/extra-patch-include__misc__functional.h head/games/dunelegacy/files/patch-include__misc__memory.h - copied unchanged from r431249, head/games/dunelegacy/files/extra-patch-include__misc__memory.h Deleted: head/games/dunelegacy/files/extra-patch-include__misc__functional.h head/games/dunelegacy/files/extra-patch-include__misc__memory.h Modified: head/games/dunelegacy/Makefile Modified: head/games/dunelegacy/Makefile ============================================================================== --- head/games/dunelegacy/Makefile Thu Jan 12 11:29:27 2017 (r431249) +++ head/games/dunelegacy/Makefile Thu Jan 12 11:29:47 2017 (r431250) @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= swills@FreeBSD.org COMMENT= Open source clone of Dune II -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USES= autoreconf compiler:c++11-lib tar:bzip2 @@ -20,10 +20,4 @@ USE_SDL= sdl mixer WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKE_JOBS_UNSAFE= yes -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -EXTRA_PATCHES= files/extra-patch-include__misc__functional.h files/extra-patch-include__misc__memory.h -.endif - -.include +.include Copied: head/games/dunelegacy/files/patch-include__misc__functional.h (from r431249, head/games/dunelegacy/files/extra-patch-include__misc__functional.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dunelegacy/files/patch-include__misc__functional.h Thu Jan 12 11:29:47 2017 (r431250, copy of r431249, head/games/dunelegacy/files/extra-patch-include__misc__functional.h) @@ -0,0 +1,21 @@ +--- ./include/misc/functional.h.orig 2011-01-07 18:30:22.000000000 +0000 ++++ ./include/misc/functional.h 2014-08-15 18:13:48.592575865 +0000 +@@ -1,14 +1,14 @@ + #ifndef FUNCTIONAL_INCLUDED + #define FUNCTIONAL_INCLUDED + +-#include ++#include + + namespace std { +- using std::tr1::bind; +- using std::tr1::function; ++ using std::bind; ++ using std::function; + + namespace placeholders { +- using namespace std::tr1::placeholders; ++ using namespace std::placeholders; + } + } + Copied: head/games/dunelegacy/files/patch-include__misc__memory.h (from r431249, head/games/dunelegacy/files/extra-patch-include__misc__memory.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dunelegacy/files/patch-include__misc__memory.h Thu Jan 12 11:29:47 2017 (r431250, copy of r431249, head/games/dunelegacy/files/extra-patch-include__misc__memory.h) @@ -0,0 +1,18 @@ +--- ./include/misc/memory.h.orig 2011-07-15 23:19:01.000000000 +0000 ++++ ./include/misc/memory.h 2014-08-15 18:13:48.594576019 +0000 +@@ -1,12 +1,12 @@ + #ifndef MEMORY_INCLUDED + #define MEMORY_INCLUDED + +-#include ++#include + + namespace std { +- using std::tr1::shared_ptr; ++ using std::shared_ptr; + +- using std::tr1::dynamic_pointer_cast; ++ using std::dynamic_pointer_cast; + } + + #endif //MEMORY_INCLUDED