svn commit: r431250 - in head/games/dunelegacy: . files

[Dmitry Marakasov]

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 at 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 <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-EXTRA_PATCHES=	files/extra-patch-include__misc__functional.h files/extra-patch-include__misc__memory.h
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

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 <tr1/functional>
++#include <functional>
+ 
+ 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 <tr1/memory>
++#include <memory>
+ 
+ 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