From owner-svn-ports-all@freebsd.org Tue Mar 27 09:32:05 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 248D9F65121; Tue, 27 Mar 2018 09:32:05 +0000 (UTC) (envelope-from decke@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 CB8C6794B7; Tue, 27 Mar 2018 09:32:04 +0000 (UTC) (envelope-from decke@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 C66C21A430; Tue, 27 Mar 2018 09:32:04 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2R9W4Rp013695; Tue, 27 Mar 2018 09:32:04 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2R9W462013692; Tue, 27 Mar 2018 09:32:04 GMT (envelope-from decke@FreeBSD.org) Message-Id: <201803270932.w2R9W462013692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Tue, 27 Mar 2018 09:32:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465680 - in head/multimedia/tvheadend: . files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head/multimedia/tvheadend: . files X-SVN-Commit-Revision: 465680 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2018 09:32:05 -0000 Author: decke Date: Tue Mar 27 09:32:04 2018 New Revision: 465680 URL: https://svnweb.freebsd.org/changeset/ports/465680 Log: - Update to 4.2.6 - Add a patch for a build failure when kerberos is installed Reported by: Frank Razenberg Added: head/multimedia/tvheadend/files/patch-Makefile (contents, props changed) Modified: head/multimedia/tvheadend/Makefile head/multimedia/tvheadend/distinfo Modified: head/multimedia/tvheadend/Makefile ============================================================================== --- head/multimedia/tvheadend/Makefile Tue Mar 27 09:24:39 2018 (r465679) +++ head/multimedia/tvheadend/Makefile Tue Mar 27 09:32:04 2018 (r465680) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tvheadend -PORTVERSION= 4.2.5 +PORTVERSION= 4.2.6 DISTVERSIONPREFIX= v CATEGORIES= multimedia Modified: head/multimedia/tvheadend/distinfo ============================================================================== --- head/multimedia/tvheadend/distinfo Tue Mar 27 09:24:39 2018 (r465679) +++ head/multimedia/tvheadend/distinfo Tue Mar 27 09:32:04 2018 (r465680) @@ -1,3 +1,3 @@ -TIMESTAMP = 1515264849 -SHA256 (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 36816c8b506af6b0f5df442bd96aa301223dc7c44d8b88eec53262e92956d740 -SIZE (tvheadend-tvheadend-v4.2.5_GH0.tar.gz) = 21528718 +TIMESTAMP = 1522131748 +SHA256 (tvheadend-tvheadend-v4.2.6_GH0.tar.gz) = 09b4d4ff436a2006001ef3c3f38553dc4db3ea31bf9871b046a33180a0e8a8b9 +SIZE (tvheadend-tvheadend-v4.2.6_GH0.tar.gz) = 21528720 Added: head/multimedia/tvheadend/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/tvheadend/files/patch-Makefile Tue Mar 27 09:32:04 2018 (r465680) @@ -0,0 +1,29 @@ +Prepend local include paths in CFLAGS to avoid conflict with system wide includes + +CFLAGS could contain system wide include paths which might conflict +with our filenames. So make sure that our local directories are first +in the search order. + +Example with conflicting profile.h from kerberos: + +tvheadend-4.2.5/src/dvr/dvr.h:27: +/usr/local/include/profile.h:24:28: error: typedef redefinition with +different types ('struct _profile_t *' vs 'struct profile') +typedef struct _profile_t *profile_t; + ^ +tvheadend-4.2.5/src/profile.h:147:3: +note: previous definition is here +} profile_t; + +Reported by: Frank Razenberg +--- Makefile.bak 2018-02-22 16:07:14.367738000 +0000 ++++ Makefile 2018-02-22 16:08:14.628857000 +0000 +@@ -52,7 +52,7 @@ + CFLAGS += -Wmissing-prototypes + CFLAGS += -fms-extensions -funsigned-char -fno-strict-aliasing + CFLAGS += -D_FILE_OFFSET_BITS=64 +-CFLAGS += -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR} ++CFLAGS := -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR} ${CFLAGS} + ifeq ($(CONFIG_ANDROID),yes) + LDFLAGS += -lm + else