svn commit: r433029 - in branches/2017Q1/multimedia/vdr-plugin-vdrmanager: . files

[Jan Beich]

Author: jbeich
Date: Wed Feb  1 13:00:03 2017
New Revision: 433029
URL: https://svnweb.freebsd.org/changeset/ports/433029

Log:
  MFH: r432969
  
  multimedia/vdr-plugin-vdrmanager: unbreak with clang 4.0
  
  sock.cpp:23:13: error: ordered comparison between pointer and zero ('int (*)(int, int, int)' and 'int')
          if (socket >= 0) {
              ~~~~~~ ^  ~
  
  PR:		216217
  Reported by:	antoine (via exp-run)
  Obtained from:	upstream
  Approved by:	ports-secteam blanket

Added:
  branches/2017Q1/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp
     - copied unchanged from r432969, head/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp
Modified:
  branches/2017Q1/multimedia/vdr-plugin-vdrmanager/Makefile
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/multimedia/vdr-plugin-vdrmanager/Makefile
==============================================================================
--- branches/2017Q1/multimedia/vdr-plugin-vdrmanager/Makefile	Wed Feb  1 12:58:40 2017	(r433028)
+++ branches/2017Q1/multimedia/vdr-plugin-vdrmanager/Makefile	Wed Feb  1 13:00:03 2017	(r433029)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vdr-plugin-vdrmanager
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/828/
 DISTNAME=	${PORTNAME:S/-plugin//}-${PORTVERSION}

Copied: branches/2017Q1/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp (from r432969, head/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q1/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp	Wed Feb  1 13:00:03 2017	(r433029, copy of r432969, head/multimedia/vdr-plugin-vdrmanager/files/patch-sock.cpp)
@@ -0,0 +1,17 @@
+From 333d83324710bbdef6f6feea38a9dadc3c01b959 Mon Sep 17 00:00:00 2001
+From: bju <bju at maxi.fritz.box>
+Date: Tue, 24 Jan 2012 23:06:34 +0100
+Subject: Close() has used socket (method pointer) and not sock (variable) to
+ check if close() should be called.
+
+--- a/sock.cpp.orig	2011-12-28 15:11:48 UTC
++++ b/sock.cpp
+@@ -20,7 +20,7 @@ cVdrmanagerSocket::~cVdrmanagerSocket() 
+ }
+ 
+ void cVdrmanagerSocket::Close() {
+-	if (socket >= 0) {
++	if (sock >= 0) {
+ 		close(sock);
+ 		sock = -1;
+ 	}