From owner-svn-ports-all@freebsd.org Mon May 20 19:40:29 2019 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 9B1EE159050A; Mon, 20 May 2019 19:40:29 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3AFF98F409; Mon, 20 May 2019 19:40:29 +0000 (UTC) (envelope-from adridg@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 0F4FE22CAC; Mon, 20 May 2019 19:40:29 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4KJeSiS023617; Mon, 20 May 2019 19:40:28 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4KJeSKS023616; Mon, 20 May 2019 19:40:28 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201905201940.x4KJeSKS023616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 20 May 2019 19:40:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r502159 - in head/devel/kf5-kcoreaddons: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/devel/kf5-kcoreaddons: . files X-SVN-Commit-Revision: 502159 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3AFF98F409 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Mon, 20 May 2019 19:40:29 -0000 Author: adridg Date: Mon May 20 19:40:28 2019 New Revision: 502159 URL: https://svnweb.freebsd.org/changeset/ports/502159 Log: Fix looking for os-release in the face of unusual LOCALBASE - Use a post-patch inspired by https://reviews.freebsd.org/D19866 - While the previous patch might have been upstreamable, since we need to patch *anyway* I've given that up. Submitted by: pkubaj Deleted: head/devel/kf5-kcoreaddons/files/ Modified: head/devel/kf5-kcoreaddons/Makefile Modified: head/devel/kf5-kcoreaddons/Makefile ============================================================================== --- head/devel/kf5-kcoreaddons/Makefile Mon May 20 19:35:57 2019 (r502158) +++ head/devel/kf5-kcoreaddons/Makefile Mon May 20 19:40:28 2019 (r502159) @@ -2,7 +2,7 @@ PORTNAME= kcoreaddons DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org @@ -29,5 +29,9 @@ INOTIFY_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_INO FAM_DESC= Filesystem alteration notifications using fam (broken: hangs on NFS) FAM_USES= fam FAM_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_FAM + +post-patch: + ${REINPLACE_CMD} -e '/QStringLiteral/s|/etc/os-release|${LOCALBASE}/etc/os-release|g' \ + ${WRKSRC}/src/lib/util/kosrelease.cpp .include