svn commit: r420409 - head/devel/eric6

[David Naylor]

Author: dbn
Date: Thu Aug 18 15:39:55 2016
New Revision: 420409
URL: https://svnweb.freebsd.org/changeset/ports/420409

Log:
  devel/eric6: add option to use PyQt5, fix PyQt4.
  
   - Fix the use of PyQt4 when PyQt5 is installed:
     - Specify which version of PyQt to target on installation
   - Add support for switching between PyQt4 and PyQt5 for the GUI.
   - Fix stage-qa warning:
     - Make symlink to pixmap relative.
   - Take over maintainership
  
  PR:		211908

Modified:
  head/devel/eric6/Makefile
  head/devel/eric6/Makefile.inc

Modified: head/devel/eric6/Makefile
==============================================================================
--- head/devel/eric6/Makefile	Thu Aug 18 15:07:39 2016	(r420408)
+++ head/devel/eric6/Makefile	Thu Aug 18 15:39:55 2016	(r420409)
@@ -1,24 +1,34 @@
 # Created by: Boris Samorodov <bsam at FreeBSD.org>
 # $FreeBSD$
 
+PORTREVISION=	1
 CATEGORIES=	devel python
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \
-		${PYTHON_SITELIBDIR}/PyQt4/Qsci.so:devel/py-qt4-qscintilla2
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtGui.so:x11-toolkits/py-qt${PYQTVER}-gui \
+		${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/Qsci.so:devel/py-qt${PYQTVER}-qscintilla2
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \
-		${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:databases/py-qt4-sql \
-		${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \
-		${PYTHON_SITELIBDIR}/PyQt4/QtHelp.so:devel/py-qt4-help \
+		${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtNetwork.so:net/py-qt${PYQTVER}-network \
+		${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSvg.so:graphics/py-qt${PYQTVER}-svg \
+		${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSql.so:databases/py-qt${PYQTVER}-sql \
+		${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtWebKit.so:www/py-qt${PYQTVER}-webkit \
+		${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtHelp.so:devel/py-qt${PYQTVER}-help \
 		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3
 
 USES=		desktop-file-utils
-INSTALL_CMD=	install.py -c -f eric6config.freebsd -i ${STAGEDIR}
+INSTALL_CMD=	install.py -c -f eric6config.freebsd -i ${STAGEDIR} --pyqt=${PYQTVER}
 PLIST_FILES=
 SUB_FILES=	eric6.desktop
 OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFAULT=PYQT4
+OPTIONS_SINGLE=	PYQT
+OPTIONS_SINGLE_PYQT=	PYQT4 PYQT5
+PYQT_DESC=	PyQt Version
+PYQT4_DESC=	Python bindings for Qt4
+PYQT4_VARS=	PYQTVER=4
+PYQT5_DESC=	Python bindings for Qt5
+PYQT5_VARS=	PYQTVER=5
+PYQT5_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets
 EXTRA_PATCHES=
 MASTERPORT=
 
@@ -37,7 +47,8 @@ do-configure:
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/eric6.desktop ${STAGEDIR}${PREFIX}/share/applications/
-	${LN} -sf ${DATADIR}/icons/default/eric.png ${STAGEDIR}${PREFIX}/share/pixmaps/eric6.png
+	${LN} -sf ${DATADIR:C|${PREFIX}(/share(/pixmaps)?)?||:C|/[^/]+|../|g}icons/default/eric.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/eric6.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}/i18n
 
 .include "${.CURDIR}/../../devel/eric6/Makefile.inc"

Modified: head/devel/eric6/Makefile.inc
==============================================================================
--- head/devel/eric6/Makefile.inc	Thu Aug 18 15:07:39 2016	(r420408)
+++ head/devel/eric6/Makefile.inc	Thu Aug 18 15:39:55 2016	(r420409)
@@ -11,8 +11,8 @@ MASTER_SITES=	SF/eric-ide/${PORTNAME}/st
 DISTNAME?=	${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER?=	bsam at FreeBSD.org
-COMMENT=	Full featured Python and Ruby editor and IDE based on Qt4
+MAINTAINER?=	dbn at FreeBSD.org
+COMMENT=	Full featured Python and Ruby editor and IDE based on Qt
 
 LICENSE=	GPLv3