From cc8a667aa283dbd1c377aa55dd4b47568cebc6b9 Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Thu, 22 Nov 2018 20:18:37 +0000
Subject: pyqt: Change install directories for Python flavor support

* PyQt could not be installed for multiple Python versions at
  the same time, as there were conflicting files.

  This patch creates Python-version versioned directories for
  all these, and further installs binaries with a version number.

* Note, there might be some hickups for software that depends on
  on of the .so's provided by PyQt5, which might not be found
  anymore autmotically, and maybe need some LD-flaggery.

* Update PyQt5 to 5.10.1

* Mark www/py-qt5-webengine broken. It is unforuntately no longer
  compatible with the old qt5-webengine-5.9.4 we ship.

PR:		232745
Exp-run by:	antoine
Differential Revision:	https://reviews.freebsd.org/D8714
---
 deskutils/calibre/Makefile  | 4 +++-
 deskutils/treeline/Makefile | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'deskutils')

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 044fc7d478c5..6e1852e22d59 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	calibre
 PORTVERSION=	3.34.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
@@ -71,7 +72,8 @@ MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
 		XDG_CONFIG_HOME=${WRKDIR}/xdg-config \
 		XDG_UTILS_INSTALL_MODE=system \
 		QMAKE=${QMAKE} \
-		SIP_BIN=sip-${PYTHON_VER}
+		SIP_BIN=${SIP} \
+		SIP_DIR=${PYQT_SIPDIR}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \
diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 468e13ba7f70..b0eb9ef3d0ef 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	treeline
 PORTVERSION=	3.0.2
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	https://github.com/doug-101/TreeLine/releases/download/v${PORTVERSION}/ \
 		SF/${PORTNAME}/${PORTVERSION}
-- 
cgit v1.2.3