From owner-svn-ports-head@FreeBSD.ORG  Sat Feb 16 15:04:17 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2ECD4329;
 Sat, 16 Feb 2013 15:04:17 +0000 (UTC) (envelope-from nox@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E64C2E14;
 Sat, 16 Feb 2013 15:04:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1GF4GCM026334;
 Sat, 16 Feb 2013 15:04:16 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1GF4GTs026332;
 Sat, 16 Feb 2013 15:04:16 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201302161504.r1GF4GTs026332@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Sat, 16 Feb 2013 15:04:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r312357 - in head/multimedia/vdr-plugin-infosatepg: .
 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Feb 2013 15:04:17 -0000

Author: nox
Date: Sat Feb 16 15:04:16 2013
New Revision: 312357
URL: http://svnweb.freebsd.org/changeset/ports/312357

Log:
  - Add bugfix for infosatepg grabbing a bonded device.
  - Convert Makefile header.

Modified:
  head/multimedia/vdr-plugin-infosatepg/Makefile
  head/multimedia/vdr-plugin-infosatepg/files/patch-infosatepg.cpp   (contents, props changed)

Modified: head/multimedia/vdr-plugin-infosatepg/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-infosatepg/Makefile	Sat Feb 16 14:58:51 2013	(r312356)
+++ head/multimedia/vdr-plugin-infosatepg/Makefile	Sat Feb 16 15:04:16 2013	(r312357)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	vdr-plugin-infosatepg
-# Date created:		Wed Apr 14 18:11:42 CEST 2010
-# Whom:			Juergen Lock <nox@freebsd.org>
-#
+# Created by: Juergen Lock <nox@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	vdr-plugin-infosatepg
 PORTVERSION=	0.0.11
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/342/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}

Modified: head/multimedia/vdr-plugin-infosatepg/files/patch-infosatepg.cpp
==============================================================================
--- head/multimedia/vdr-plugin-infosatepg/files/patch-infosatepg.cpp	Sat Feb 16 14:58:51 2013	(r312356)
+++ head/multimedia/vdr-plugin-infosatepg/files/patch-infosatepg.cpp	Sat Feb 16 15:04:16 2013	(r312357)
@@ -16,7 +16,16 @@
              if (dev->IsTunedToTransponder(chan))
              {
                  // we already have a device which is tuned (maybe switched manually?)
-@@ -403,7 +407,7 @@ cString cPluginInfosatepg::SVDRPCommand(
+@@ -202,6 +206,8 @@ void cPluginInfosatepg::MainThreadHook(v
+                 return;
+             }
+ 
++            if (!dev->MaySwitchTransponder(chan)) continue; // bonded?
++
+             // ok -> use this device
+             dsyslog("infosatepg: found free device %i",dev->DeviceNumber()+1);
+             dev->SwitchChannel(chan,false);
+@@ -403,7 +409,7 @@ cString cPluginInfosatepg::SVDRPCommand(
          cString head2;
          head2="\n" \
                "      |        | missed  |            |            | unlocated\n" \