From owner-svn-ports-all@FreeBSD.ORG Fri Sep 13 19:31:57 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 522B354C; Fri, 13 Sep 2013 19:31:57 +0000 (UTC) (envelope-from nox@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 260142CC9; Fri, 13 Sep 2013 19:31:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8DJVvfQ013641; Fri, 13 Sep 2013 19:31:57 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8DJVudB013628; Fri, 13 Sep 2013 19:31:56 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201309131931.r8DJVudB013628@svn.freebsd.org> From: Juergen Lock Date: Fri, 13 Sep 2013 19:31:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327181 - in head/multimedia/linux_dvbwrapper-kmod: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 19:31:57 -0000 Author: nox Date: Fri Sep 13 19:31:56 2013 New Revision: 327181 URL: http://svnweb.freebsd.org/changeset/ports/327181 Log: - Fix build on recent head. (cap_rights_t type change in r255219) [1] - Convert Makefile header. Reported by: beefy2 via pkg-fallout [1] Modified: head/multimedia/linux_dvbwrapper-kmod/Makefile (contents, props changed) head/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c (contents, props changed) Modified: head/multimedia/linux_dvbwrapper-kmod/Makefile ============================================================================== --- head/multimedia/linux_dvbwrapper-kmod/Makefile Fri Sep 13 19:27:05 2013 (r327180) +++ head/multimedia/linux_dvbwrapper-kmod/Makefile Fri Sep 13 19:31:56 2013 (r327181) @@ -1,9 +1,5 @@ -# New ports collection makefile for: linux_dvbwrapper-kmod -# Date created: Thu Apr 21 17:34:08 CEST 2011 -# Whom: nox@FreeBSD.org -# +# Created by: nox@FreeBSD.org # $FreeBSD$ -# PORTNAME= linux_dvbwrapper-kmod PORTVERSION= 1.0 Modified: head/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c ============================================================================== --- head/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c Fri Sep 13 19:27:05 2013 (r327180) +++ head/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c Fri Sep 13 19:31:56 2013 (r327181) @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: /tmp/pcvs/ports/multimedia/linux_dvbwrapper-kmod/files/linux_dvbwrapper.c,v 1.3 2012-06-28 17:49:51 nox Exp $"); +__FBSDID("$FreeBSD$"); #include #include @@ -192,6 +192,9 @@ linux_ioctl_dvb(struct thread *td, struc struct dtv_property *vp, *p; size_t l_propsiz, propsiz; vm_offset_t uvp; +#if __FreeBSD_version > 1000051 + cap_rights_t rights; +#endif l_vp = NULL; vp = NULL; @@ -299,7 +302,11 @@ linux_ioctl_dvb(struct thread *td, struc goto out2; copyout(vp, (void *)uvp, propsiz); -#if __FreeBSD_version > 900040 +#if __FreeBSD_version > 1000051 + error = fget(td, args->fd, + cap_rights_init(&rights, CAP_IOCTL), &fp); + if (error != 0) +#elif __FreeBSD_version > 900040 if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) #else if ((error = fget(td, args->fd, &fp)) != 0)