From owner-svn-ports-all@freebsd.org  Sat Jan 20 17:46:13 2018
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 2664DEBC094;
 Sat, 20 Jan 2018 17:46:13 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0181983562;
 Sat, 20 Jan 2018 17:46:13 +0000 (UTC)
 (envelope-from jbeich@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 549831F92C;
 Sat, 20 Jan 2018 17:46:12 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0KHkCIR032309;
 Sat, 20 Jan 2018 17:46:12 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0KHkCOl032308;
 Sat, 20 Jan 2018 17:46:12 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201801201746.w0KHkCOl032308@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 20 Jan 2018 17:46:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r459534 - head/games/avanor/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: head/games/avanor/files
X-SVN-Commit-Revision: 459534
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.25
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: Sat, 20 Jan 2018 17:46:13 -0000

Author: jbeich
Date: Sat Jan 20 17:46:12 2018
New Revision: 459534
URL: https://svnweb.freebsd.org/changeset/ports/459534

Log:
  games/avanor: unbreak build with Clang 6 (C++14 by default)
  
  creature/Uniquem.cpp:628:11: error: cannot initialize return object of type 'int' with an rvalue of
        type 'nullptr_t'
                          return NULL;
                                 ^~~~
  /usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
   #define NULL    nullptr
                   ^~~~~~~
  
  Reported by:	pkg-fallout

Added:
  head/games/avanor/files/patch-creature__Uniquem.cpp   (contents, props changed)

Added: head/games/avanor/files/patch-creature__Uniquem.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/avanor/files/patch-creature__Uniquem.cpp	Sat Jan 20 17:46:12 2018	(r459534)
@@ -0,0 +1,19 @@
+creature/Uniquem.cpp:628:11: error: cannot initialize return object of type 'int' with an rvalue of
+      type 'nullptr_t'
+                        return NULL;
+                               ^~~~
+/usr/include/sys/_null.h:37:14: note: expanded from macro 'NULL'
+#define NULL    nullptr
+                ^~~~~~~
+
+--- creature/Uniquem.cpp.orig	2003-12-10 07:03:57 UTC
++++ creature/Uniquem.cpp
+@@ -625,7 +625,7 @@ int XYohjishiro::onGiveItem(XCreature * giver, XItem *
+ 					(*it)->Item()->Identify(1);
+ 					
+ 			}
+-			return NULL;
++			return 0;
+ 		} else
+ 		{
+ 			char tbuf[256];