games/gzdoom: Update to 3.3.0

Due to too many skipped releases, see
https://github.com/coelckers/gzdoom/releases for release notes between 3.1.0
and 3.3.0.

The patches have since been made redundant by upstream, so they can
safely/happily go away.

MAINTAINER has been updated to my @FreeBSD.org address; this port was still
a work in progress when r445117 to update my other ports was committed.

Tested with:	Poudriere (10.4, amd64)
Tested with:	Poudriere (stable/11, amd64)
Tested with:	Poudriere (head, amd64)
Approved by:	lwhsu (ports), me (maintainer)
Differential Revision:	https://reviews.freebsd.org/D14864

5 files changed, 5 insertions, 38 deletions

diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile
index a16a7f293f03..55522c4e0c2d 100644
--- a/games/gzdoom/Makefile
+++ b/games/gzdoom/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	gzdoom
-PORTVERSION=	3.1.0
+PORTVERSION=	3.3.0
 DISTVERSIONPREFIX=	g
 CATEGORIES=	games
 
-MAINTAINER=	bsdports@kyle-evans.net
+MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	GL-enhanced source port for Doom-engine games
 
 LICENSE=	BSD3CLAUSE GPLv3 LGPL3
diff --git a/games/gzdoom/distinfo b/games/gzdoom/distinfo
index 6bd541b000ec..5e15de5b000a 100644
--- a/games/gzdoom/distinfo
+++ b/games/gzdoom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498082404
-SHA256 (coelckers-gzdoom-g3.1.0_GH0.tar.gz) = c011ce9a95b765da5b81cf723062379d585c57cb586848385a2319deba1996c3
-SIZE (coelckers-gzdoom-g3.1.0_GH0.tar.gz) = 9026969
+TIMESTAMP = 1522031247
+SHA256 (coelckers-gzdoom-g3.3.0_GH0.tar.gz) = 1639bd172901085e55629db92598e49f527f832a651d9978cf8ec981fd916343
+SIZE (coelckers-gzdoom-g3.3.0_GH0.tar.gz) = 9887523
diff --git a/games/gzdoom/files/patch-src_dobject.h b/games/gzdoom/files/patch-src_dobject.h
deleted file mode 100644
index c2ab03fbc97b..000000000000
--- a/games/gzdoom/files/patch-src_dobject.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/dobject.h.orig	2017-06-22 13:58:35 UTC
-+++ src/dobject.h
-@@ -198,7 +198,7 @@ class DObject (protected)
- 	enum { MetaClassNum = CLASSREG_PClass };
- 
- 	// Per-instance variables. There are four.
--#ifdef _DEBUG
-+#ifndef NDEBUG
- public:
- 	enum
- 	{
diff --git a/games/gzdoom/files/patch-src_scripting_vm_vm.h b/games/gzdoom/files/patch-src_scripting_vm_vm.h
deleted file mode 100644
index a23649420a27..000000000000
--- a/games/gzdoom/files/patch-src_scripting_vm_vm.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/scripting/vm/vm.h.orig	2017-06-22 13:58:53 UTC
-+++ src/scripting/vm/vm.h
-@@ -376,7 +376,7 @@ int VMCall(VMFunction *func, VMValue *params, int nump
- // variable name <x> at position <p>
- void NullParam(const char *varname);
- 
--#ifdef _DEBUG
-+#ifndef NDEBUG
- bool AssertObject(void * ob);
- #endif
- 
diff --git a/games/gzdoom/files/patch-src_scripting_vm_vmexec.cpp b/games/gzdoom/files/patch-src_scripting_vm_vmexec.cpp
deleted file mode 100644
index 822a54be2e6f..000000000000
--- a/games/gzdoom/files/patch-src_scripting_vm_vmexec.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/scripting/vm/vmexec.cpp.orig	2017-06-22 13:59:05 UTC
-+++ src/scripting/vm/vmexec.cpp
-@@ -229,7 +229,7 @@ void VMFillParams(VMValue *params, VMFrame *callee, in
- }
- 
- 
--#ifdef _DEBUG
-+#ifndef NDEBUG
- bool AssertObject(void * ob)
- {
- 	auto obj = (DObject*)ob;