From owner-svn-ports-all@freebsd.org  Fri Aug 30 20:05:28 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 54A94D751B;
 Fri, 30 Aug 2019 20:05:28 +0000 (UTC)
 (envelope-from tcberner@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 46Kr7X1cZ1z4VTN;
 Fri, 30 Aug 2019 20:05:28 +0000 (UTC)
 (envelope-from tcberner@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 1A55F578A;
 Fri, 30 Aug 2019 20:05:28 +0000 (UTC)
 (envelope-from tcberner@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7UK5ROO072349;
 Fri, 30 Aug 2019 20:05:27 GMT (envelope-from tcberner@FreeBSD.org)
Received: (from tcberner@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7UK5ReG072344;
 Fri, 30 Aug 2019 20:05:27 GMT (envelope-from tcberner@FreeBSD.org)
Message-Id: <201908302005.x7UK5ReG072344@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tcberner set sender to
 tcberner@FreeBSD.org using -f
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Fri, 30 Aug 2019 20:05:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r510288 - in head/x11-fm/konqueror: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: tcberner
X-SVN-Commit-Paths: in head/x11-fm/konqueror: . files
X-SVN-Commit-Revision: 510288
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.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Aug 2019 20:05:28 -0000

Author: tcberner
Date: Fri Aug 30 20:05:27 2019
New Revision: 510288
URL: https://svnweb.freebsd.org/changeset/ports/510288

Log:
  x11-fm/konqueror: fix dependency on www/tidy-html5
  
  - Due to the workaround for the library name conflict between
    www/tidy-html5 (the wanted dependency) and www/tidy-lib,
    the build system was picking up the wrong shared library.
  
  PR:		240210
  Reported by:	Ting-Wei Lan <lantw44@gmail.com>

Added:
  head/x11-fm/konqueror/files/
  head/x11-fm/konqueror/files/patch-plugins_validators_FindLibTidy.cmake   (contents, props changed)
Modified:
  head/x11-fm/konqueror/Makefile

Modified: head/x11-fm/konqueror/Makefile
==============================================================================
--- head/x11-fm/konqueror/Makefile	Fri Aug 30 20:05:27 2019	(r510287)
+++ head/x11-fm/konqueror/Makefile	Fri Aug 30 20:05:27 2019	(r510288)
@@ -2,6 +2,7 @@
 
 PORTNAME=	konqueror
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-fm www kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org

Added: head/x11-fm/konqueror/files/patch-plugins_validators_FindLibTidy.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/konqueror/files/patch-plugins_validators_FindLibTidy.cmake	Fri Aug 30 20:05:27 2019	(r510288)
@@ -0,0 +1,14 @@
+Look for the renamed libtidy.so from www/tidy-html and not pick up www/tidy-lib
+by mistake
+
+--- plugins/validators/FindLibTidy.cmake.orig	2019-08-30 19:38:08 UTC
++++ plugins/validators/FindLibTidy.cmake
+@@ -28,7 +28,7 @@ endif( NOT LIBTIDY_INCLUDE_DIR )
+ 
+ 
+ 
+-FIND_LIBRARY(LIBTIDY_LIBRARIES NAMES tidy)
++FIND_LIBRARY(LIBTIDY_LIBRARIES NAMES tidy5)
+ 
+ if (LIBTIDY_INCLUDE_DIR AND LIBTIDY_LIBRARIES)
+    set(LIBTIDY_FOUND TRUE)