From owner-svn-ports-head@freebsd.org Wed Oct 12 09:01:19 2016 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 27E20C0E74A; Wed, 12 Oct 2016 09:01:19 +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 F2C741E9; Wed, 12 Oct 2016 09:01:18 +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 u9C91Ir6099117; Wed, 12 Oct 2016 09:01:18 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9C91HIr099113; Wed, 12 Oct 2016 09:01:17 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201610120901.u9C91HIr099113@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 12 Oct 2016 09:01:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423836 - in head/games/7kaa: . 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: Wed, 12 Oct 2016 09:01:19 -0000 Author: amdmi3 Date: Wed Oct 12 09:01:17 2016 New Revision: 423836 URL: https://svnweb.freebsd.org/changeset/ports/423836 Log: - Fix segfault on exit [1] - Fix license PR: 212866 [1] Submitted by: kdrakehp@zoho.com [1] Added: head/games/7kaa/files/ head/games/7kaa/files/patch-src_audio_openal_openal__audio.cpp (contents, props changed) head/games/7kaa/files/patch-src_client_OMUSIC.cpp (contents, props changed) head/games/7kaa/files/patch-src_client_OSYS.cpp (contents, props changed) head/games/7kaa/files/patch-src_video_sdl_vga__sdl.cpp (contents, props changed) Modified: head/games/7kaa/Makefile Modified: head/games/7kaa/Makefile ============================================================================== --- head/games/7kaa/Makefile Wed Oct 12 08:54:28 2016 (r423835) +++ head/games/7kaa/Makefile Wed Oct 12 09:01:17 2016 (r423836) @@ -3,13 +3,14 @@ PORTNAME= 7kaa PORTVERSION= 2.14.6 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/skfans/7KAA%20${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Seven Kingdoms: Ancient Adversaries -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libenet.so:net/enet Added: head/games/7kaa/files/patch-src_audio_openal_openal__audio.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/7kaa/files/patch-src_audio_openal_openal__audio.cpp Wed Oct 12 09:01:17 2016 (r423836) @@ -0,0 +1,12 @@ +--- src/audio/openal/openal_audio.cpp.orig 2016-09-04 17:31:41 UTC ++++ src/audio/openal/openal_audio.cpp +@@ -168,7 +168,8 @@ OpenALAudio::OpenALAudio() + + OpenALAudio::~OpenALAudio() + { +- this->deinit(); ++ if (this->init_flag != 0) ++ this->deinit(); + } + + // Initialize the mid driver Added: head/games/7kaa/files/patch-src_client_OMUSIC.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/7kaa/files/patch-src_client_OMUSIC.cpp Wed Oct 12 09:01:17 2016 (r423836) @@ -0,0 +1,12 @@ +--- src/client/OMUSIC.cpp.orig 2015-05-19 01:00:20 UTC ++++ src/client/OMUSIC.cpp +@@ -81,7 +81,8 @@ Music::Music() + // -------- begin of function Music::~Music ---------// + Music::~Music() + { +- deinit(); ++ if (init_flag != 0) ++ deinit(); + } + // -------- end of function Music::~Music ---------// + Added: head/games/7kaa/files/patch-src_client_OSYS.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/7kaa/files/patch-src_client_OSYS.cpp Wed Oct 12 09:01:17 2016 (r423836) @@ -0,0 +1,11 @@ +--- src/client/OSYS.cpp.orig 2016-09-04 17:31:41 UTC ++++ src/client/OSYS.cpp +@@ -240,6 +240,8 @@ void Sys::deinit() + + //-------------------------------------// + ++ deinit_directx(); ++ + init_flag = 0; + } + //--------- End of function Sys::deinit ---------// Added: head/games/7kaa/files/patch-src_video_sdl_vga__sdl.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/7kaa/files/patch-src_video_sdl_vga__sdl.cpp Wed Oct 12 09:01:17 2016 (r423836) @@ -0,0 +1,12 @@ +--- src/video/sdl/vga_sdl.cpp.orig 2016-09-04 17:31:41 UTC ++++ src/video/sdl/vga_sdl.cpp +@@ -58,7 +58,8 @@ VgaSDL::VgaSDL() + + VgaSDL::~VgaSDL() + { +- deinit(); ++ if (window != NULL) ++ deinit(); + } + //-------- End of function VgaSDL::~VgaSDL ----------// +