svn commit: r433125 - in branches/2017Q1/games: frobtads frobtads/files qtads qtads/files

[Jan Beich]

Author: jbeich
Date: Thu Feb  2 07:34:58 2017
New Revision: 433125
URL: https://svnweb.freebsd.org/changeset/ports/433125

Log:
  MFH: r432973 r432974
  
  games/frobtads, games/qtads: unbreak with clang 4.0
  
  tads3/vmtz.cpp:1987:30: error: ordered comparison between pointer and zero ('vmtz_trans *' and 'int')
              result->set(tcur > 0 ? tcur - 1 : tcur);
                          ~~~~ ^ ~
  
  PR:		216357
  Reported by:	antoine (via exp-run)
  Submitted by:	kaiwang27 at gmail.com (maintainer)
  Approved by:	ports-secteam blanket

Added:
  branches/2017Q1/games/frobtads/files/
     - copied from r432973, head/games/frobtads/files/
  branches/2017Q1/games/qtads/files/patch-tads3_vmtz.cpp
     - copied unchanged from r432974, head/games/qtads/files/patch-tads3_vmtz.cpp
Modified:
  branches/2017Q1/games/frobtads/Makefile
  branches/2017Q1/games/qtads/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/games/frobtads/Makefile
==============================================================================
--- branches/2017Q1/games/frobtads/Makefile	Thu Feb  2 07:06:18 2017	(r433124)
+++ branches/2017Q1/games/frobtads/Makefile	Thu Feb  2 07:34:58 2017	(r433125)
@@ -3,6 +3,7 @@
 
 PORTNAME=	frobtads
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	games lang
 MASTER_SITES=	http://www.tads.org/${PORTNAME}/ \
 		http://www.ifarchive.org/if-archive/programming/tads3/source/

Modified: branches/2017Q1/games/qtads/Makefile
==============================================================================
--- branches/2017Q1/games/qtads/Makefile	Thu Feb  2 07:06:18 2017	(r433124)
+++ branches/2017Q1/games/qtads/Makefile	Thu Feb  2 07:34:58 2017	(r433125)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtads
 PORTVERSION=	2.1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-2.x/${PORTVERSION}
 

Copied: branches/2017Q1/games/qtads/files/patch-tads3_vmtz.cpp (from r432974, head/games/qtads/files/patch-tads3_vmtz.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/games/qtads/files/patch-tads3_vmtz.cpp	Thu Feb  2 07:34:58 2017	(r433125, copy of r432974, head/games/qtads/files/patch-tads3_vmtz.cpp)
@@ -0,0 +1,11 @@
+--- tads3/vmtz.cpp.orig	2012-08-31 05:09:31 UTC
++++ tads3/vmtz.cpp
+@@ -1982,7 +1982,7 @@ void CVmTimeZone::query(vmtzquery *resul
+              *   the transition in terms of the local time that was in effect
+              *   up until that moment
+              */
+-            result->set(tcur > 0 ? tcur - 1 : tcur);
++            result->set(cur > 0 ? tcur - 1 : tcur);
+             return;
+         }
+     }