Date: Tue, 9 Jun 2020 01:31:26 +0000 (UTC) From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538273 - head/devel/eric6 Message-ID: <202006090131.0591VQLj038566@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fluffy Date: Tue Jun 9 01:31:25 2020 New Revision: 538273 URL: https://svnweb.freebsd.org/changeset/ports/538273 Log: devel/eric6: limit python to 3.5+ - simplify FLAVORS use - while here, tty to resolve fallouts to i18n packs Reported by: pkg-fallout Modified: head/devel/eric6/Makefile head/devel/eric6/Makefile.inc Modified: head/devel/eric6/Makefile ============================================================================== --- head/devel/eric6/Makefile Tue Jun 9 01:11:29 2020 (r538272) +++ head/devel/eric6/Makefile Tue Jun 9 01:31:25 2020 (r538273) @@ -1,8 +1,8 @@ # Created by: Boris Samorodov <bsam@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 0 -PKGNAMESUFFIX= -${FLAVOR:U:S/_/-/} +PORTREVISION= 1 +PKGNAMESUFFIX= -qt5-${FLAVOR:U:S/_/-/} DISTNAME= ${PORTNAME}-nolang-${DISTVERSION} CATEGORIES= devel python @@ -11,9 +11,10 @@ BUILD_DEPENDS+= ${PYQT_PY_RELNAME}-chart>=${PYQT_VERSI RUN_DEPENDS+= ${PYQT_PY_RELNAME}-chart>=${PYQT_VERSION}:x11-toolkits/py-qt5-chart@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} -CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PKGNAMEPREFIX}${PORTNAME}-/:C/$/-[0-9]*/} +CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}${PKGNAMESUFFIX}-/:C/$/-[0-9]*/} -USES= desktop-file-utils python:${FLAVOR:C/.*_py([0-9])/\1./} pyqt:5 +USES= desktop-file-utils python:3.5+ pyqt:5 +USE_PYTHON= flavors USE_PYQT= core gui qscintilla2 webengine \ help_run network_run svg_run sql_run INSTALL_CMD= install.py -c -f eric6config.freebsd -i ${STAGEDIR} @@ -28,16 +29,6 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include "${.CURDIR}/bsd.eric6.mk" .include <bsd.port.options.mk> - -PY_FLAVORS= py${PYTHON_DEFAULT:S/.//} py${PYTHON2_DEFAULT:S/.//} py${PYTHON3_DEFAULT:S/.//} -.for flavor in ${PY_FLAVORS} -. if empty(FLAVORS:Mqt5_${flavor}) -FLAVORS:= ${FLAVORS} qt5_${flavor} -. endif -.endfor -.if empty(FLAVOR) -FLAVOR= ${FLAVORS:[1]} -.endif post-patch: ${RM} ${WRKSRC}/eric/i18n/*.qm ${WRKSRC}/eric/i18n/*.ts Modified: head/devel/eric6/Makefile.inc ============================================================================== --- head/devel/eric6/Makefile.inc Tue Jun 9 01:11:29 2020 (r538272) +++ head/devel/eric6/Makefile.inc Tue Jun 9 01:31:25 2020 (r538273) @@ -10,8 +10,9 @@ PKGNAMEPREFIX= ${I18N_LANG}- DISTNAME= ${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION} -INSTALL_CMD= ${WRKSRC}/install-i18n.py -p ${STAGEDIR} +#INSTALL_CMD= ${WRKSRC}/install-i18n.py -p ${STAGEDIR} NO_ARCH= yes +NO_BUILD= yes PLIST_FILES= ${DATADIR}/i18n/${PORTNAME}_${I18N_LANG}.qm do-install:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006090131.0591VQLj038566>