Page MenuHomeFreeBSD
Files F153650990

D13448.id36511.diff
No OneTemporary
Actions

D13448.id36511.diff
View Options

Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk
+++ Mk/Uses/python.mk
@@ -1,4 +1,4 @@
-# $FreeBSD: head/Mk/Uses/python.mk 455522 2017-12-04 15:43:36Z mat $
+# $FreeBSD$
#
# Provide support for Python related ports. This includes detecting Python
# interpreters, ports providing package and modules for python as well as
@@ -415,25 +415,22 @@
.endif # defined(_PYTHON_VERSION_NONSUPPORTED)
# Automatically generates FLAVORS if empty
-.if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS)
-. undef _VALID_PYTHON_VERSIONS
-. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
+.undef _VALID_PYTHON_VERSIONS
+.for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS}
__VER= ${ver}
-. if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
+. if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \
${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \
!(!empty(_PYTHON_VERSION_MAXIMUM) && ( \
${__VER} > ${_PYTHON_VERSION_MAXIMUM}))
-. if empty(_VALID_PYTHON_VERSIONS:M${ver})
+. if empty(_VALID_PYTHON_VERSIONS:M${ver})
_VALID_PYTHON_VERSIONS+= ${ver}
-. endif
. endif
-. endfor
+. endif
+.endfor
+_VALID_PYTHON_VERSIONS?= ${_PYTHON_VERSIONS}
+.if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS)
# Get all possible flavors depending on version requirements
-. if defined(_VALID_PYTHON_VERSIONS)
_ALL_PYTHON_FLAVORS= ${_VALID_PYTHON_VERSIONS:S/.//:S/^/py/}
-. else
-_ALL_PYTHON_FLAVORS= ${_PYTHON_VERSIONS:S/.//:S/^/py/}
-. endif
# Decide how many flavors we want. By default, only generate the default
# versions.
. if defined(BUILD_ALL_PYTHON_FLAVORS) || defined(_PYTHON_FEATURE_ALLFLAVORS)
@@ -449,10 +446,9 @@
. if !empty(FLAVORS) && empty(FLAVOR)
FLAVOR= ${FLAVORS:[1]}
. endif
-.endif
-
-.if ${FLAVOR:Mpy[23]*}
+. if ${FLAVOR:Mpy[23]*}
_PYTHON_VERSION= ${FLAVOR:S/py//:C/(.)/\1./}
+. endif
.endif
.if !empty(FLAVOR) && ${_PYTHON_VERSION} != ${PYTHON_DEFAULT}
@@ -463,11 +459,7 @@
.endif
# To avoid having dependencies with @ and empty flavor:
-.if empty(FLAVOR)
-PY_FLAVOR= ${PYTHON_VERSION:S/^python/py/:S/.//}
-.else
-PY_FLAVOR= ${FLAVOR}
-.endif
+PY_FLAVOR= py${_PYTHON_VERSION:S/.//}
# Pass PYTHON_VERSION down the dependency chain. This ensures that
# port A -> B -> C all will use the same python version and do not
@@ -567,7 +559,7 @@
.if defined(_PYTHON_FEATURE_CONCURRENT)
_USES_POST+= uniquefiles:dirs
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+.if ${PYTHON_VERSION:S/python//} == ${_VALID_PYTHON_VERSIONS:[1]}
UNIQUE_DEFAULT_LINKS= yes
.else
UNIQUE_DEFAULT_LINKS= no
Index: chinese/eric6/distinfo
===================================================================
--- chinese/eric6/distinfo
+++ chinese/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509051439
-SHA256 (eric6-i18n-zh_CN-17.10.tar.gz) = 23dc3d8ab877330ca63402edb7d1f051a7d3b1903e7cef3c629e17f35884e1ec
-SIZE (eric6-i18n-zh_CN-17.10.tar.gz) = 595047
+TIMESTAMP = 1512941853
+SHA256 (eric6-i18n-zh_CN-17.11.1.tar.gz) = 50446df66d835331ad8bd5217ce30770872c7228b319aff9b0b787c0a6a5a9a1
+SIZE (eric6-i18n-zh_CN-17.11.1.tar.gz) = 595829
Index: devel/cs-eric6/distinfo
===================================================================
--- devel/cs-eric6/distinfo
+++ devel/cs-eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509051541
-SHA256 (eric6-i18n-cs-17.10.tar.gz) = 13e6e3bea8f87b77d093bde57bc6204f18d40becbfb16b8b67dc257e8a0d2c15
-SIZE (eric6-i18n-cs-17.10.tar.gz) = 605270
+TIMESTAMP = 1512941911
+SHA256 (eric6-i18n-cs-17.11.1.tar.gz) = 38a1be9635a0dcb2ad6a22fa2f55c9387db3429608f134d489a7d0d0c91d9e58
+SIZE (eric6-i18n-cs-17.11.1.tar.gz) = 606237
Index: devel/eric6/Makefile
===================================================================
--- devel/eric6/Makefile
+++ devel/eric6/Makefile
@@ -1,7 +1,6 @@
# Created by: Boris Samorodov <bsam@FreeBSD.org>
# $FreeBSD: head/devel/eric6/Makefile 455210 2017-11-30 15:50:30Z mat $
-PORTREVISION= 1
CATEGORIES= devel python
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -17,20 +16,9 @@
USES= desktop-file-utils
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@${PY_FLAVOR}
-EXTRA_PATCHES=
-MASTERPORT=
+PYQTVER= ${FLAVOR:C/qt([45])_py[0-9]+/\1/}
+MASTERPORT= yes
PORTDATA= *
PORTDOCS= *
Index: devel/eric6/Makefile.inc
===================================================================
--- devel/eric6/Makefile.inc
+++ devel/eric6/Makefile.inc
@@ -3,34 +3,47 @@
#
# This is a set of Makefile macros which allow to build the core and
# localized language packages for devel/eric6:
-# french/eric6, german/eric6, russian/eric6
+# chinese/eric6, french/eric6, german/eric6, russian/eric6, portugese/eric6,
+# devel/cs-eric6, devel/es-eric6, devel/it-eric6, devel/tr-eric6
PORTNAME= eric6
-PORTVERSION= 17.10
+PORTVERSION= 17.11.1
+PKGNAMESUFFIX= -${FLAVOR:S/_/-/}
MASTER_SITES= SF/eric-ide/${PORTNAME}/stable/${PORTVERSION}
-DISTNAME?= ${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-MAINTAINER?= dbn@FreeBSD.org
+MAINTAINER= dbn@FreeBSD.org
COMMENT= Full featured Python and Ruby editor and IDE based on Qt
LICENSE= GPLv3
-RUN_DEPENDS?= ${LOCALBASE}/bin/eric6:devel/eric6
-
-I18N_LANG?= ru
-INSTALL_CMD?= install-i18n.py -p ${STAGEDIR}
MAKE_ENV+= "HOME=${WRKDIR}"
-USES+= python:2.7
+CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PKGNAMEPREFIX}${PORTNAME}-/:C/$/-[0-9]*/}
+USES+= python:${FLAVOR:C/.*_py([0-9])/\1./}
NO_BUILD= yes
-PLIST_FILES?= %%DATADIR%%/i18n/${PORTNAME}_${I18N_LANG}.qm
-EXTRA_PATCHES?= ${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py
-.if ! defined(MASTERPORT)
+.if defined(MASTERPORT)
+DISTNAME= ${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION}
+
+RUN_DEPENDS= ${LOCALBASE}/bin/eric6:devel/eric6@${FLAVOR}
+
+EXTRA_PATCHES= ${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py
+I18N_LANG?= ru
+INSTALL_CMD= install-i18n.py -p ${STAGEDIR}
NO_ARCH= yes
+PLIST_FILES= ${DATADIR}/i18n/${PORTNAME}_${I18N_LANG}.qm
.endif
+.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:Mqt4_${flavor})
+FLAVORS:= ${FLAVORS} qt4_${flavor} qt5_${flavor}
+. endif
+.endfor
+
.include <bsd.port.pre.mk>
.if ${PYTHON_VER} <= 2.7
@@ -39,6 +52,10 @@
PLIST_SUB+= PYTHON2="@comment "
.endif
+.if defined(MASTERPORT) && ${PYQTVER} == 5
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets@${PY_FLAVOR}
+.endif
+
do-install:
@(cd ${WRKSRC}; \
${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_CMD})
Index: devel/eric6/distinfo
===================================================================
--- devel/eric6/distinfo
+++ devel/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509047590
-SHA256 (eric6-17.10.tar.gz) = 2fdcde6d6a9c2b23b0ce488ef7e80c74b85900d24b4ced1760b761f543af35ce
-SIZE (eric6-17.10.tar.gz) = 18938811
+TIMESTAMP = 1512941764
+SHA256 (eric6-17.11.1.tar.gz) = 2a7eb6392ce5782ac514c96574587d40240b75e2a9fd970d859db842faeaa89c
+SIZE (eric6-17.11.1.tar.gz) = 18986262
Index: devel/es-eric6/distinfo
===================================================================
--- devel/es-eric6/distinfo
+++ devel/es-eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509051586
-SHA256 (eric6-i18n-es-17.10.tar.gz) = b420e35e4d79319a5323dbf0650c083eea970424235fac5fbd32287267b592cd
-SIZE (eric6-i18n-es-17.10.tar.gz) = 897187
+TIMESTAMP = 1512941964
+SHA256 (eric6-i18n-es-17.11.1.tar.gz) = c960618db95ac6be2b9f46972ac925520fa02bdfa523fe9346a773f354dc0c3f
+SIZE (eric6-i18n-es-17.11.1.tar.gz) = 901638
Index: devel/it-eric6/distinfo
===================================================================
--- devel/it-eric6/distinfo
+++ devel/it-eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509051631
-SHA256 (eric6-i18n-it-17.10.tar.gz) = 9c96dccf586e0d8f1772f8e5d7ab83014b6d9d0ad5c34b09fc5641d3cb9d7069
-SIZE (eric6-i18n-it-17.10.tar.gz) = 696894
+TIMESTAMP = 1512942017
+SHA256 (eric6-i18n-it-17.11.1.tar.gz) = 73ef8c70e4339e74aa55bbdbd1b6a191be3d2b5c043546a99ab5c7376f1abc26
+SIZE (eric6-i18n-it-17.11.1.tar.gz) = 681546
Index: devel/tr-eric6/distinfo
===================================================================
--- devel/tr-eric6/distinfo
+++ devel/tr-eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509051675
-SHA256 (eric6-i18n-tr-17.10.tar.gz) = c1b848f935aa69efcb486cdc06b2442743aaf4a3a6dad4d1c33d5198e7529af9
-SIZE (eric6-i18n-tr-17.10.tar.gz) = 541728
+TIMESTAMP = 1512942072
+SHA256 (eric6-i18n-tr-17.11.1.tar.gz) = ab0031d9ff24cd5f5a69b767185c9d2b854246ef3eba659bdad56ef7bf86eae1
+SIZE (eric6-i18n-tr-17.11.1.tar.gz) = 542590
Index: finance/R-cran-timeDate/Makefile
===================================================================
--- finance/R-cran-timeDate/Makefile
+++ finance/R-cran-timeDate/Makefile
@@ -2,16 +2,17 @@
# $FreeBSD: head/finance/R-cran-timeDate/Makefile 378080 2015-01-28 19:30:09Z dbn $
PORTNAME= timeDate
-PORTVERSION= 3012.100
+DISTVERSION= 3042.101
CATEGORIES= finance
-DISTNAME= ${PORTNAME}_${PORTVERSION}
+DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= dbn@FreeBSD.org
-COMMENT= Chronological and Calendar Objects
+COMMENT= Rmetrics - Chronological and Calendar Objects
-LICENSE= GPLv2 GPLv3
-LICENSE_COMB= dual
+LICENSE= GPLv2+
-USES= cran:auto-plist
+TEST_DEPENDS= R-cran-RUnit>0:devel/R-cran-RUnit
+
+USES= cran:auto-plist
.include <bsd.port.mk>
Index: finance/R-cran-timeDate/distinfo
===================================================================
--- finance/R-cran-timeDate/distinfo
+++ finance/R-cran-timeDate/distinfo
@@ -1,2 +1,3 @@
-SHA256 (timeDate_3012.100.tar.gz) = 6262ef7ca9f5eeb9db8229d6bb7a51d46d467a4fa73e2ccc5b4b78e18780c432
-SIZE (timeDate_3012.100.tar.gz) = 314306
+TIMESTAMP = 1512940595
+SHA256 (timeDate_3042.101.tar.gz) = 6c8d4c7689b31c6a43555d9c7258516556ba03b132e5643691e3e317b89a8c6d
+SIZE (timeDate_3042.101.tar.gz) = 314661
Index: french/eric6/distinfo
===================================================================
--- french/eric6/distinfo
+++ french/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509051719
-SHA256 (eric6-i18n-fr-17.10.tar.gz) = b02c117c3847116e4358ceadee71d05d4345adf11635cb8c75c429c993c906c3
-SIZE (eric6-i18n-fr-17.10.tar.gz) = 549936
+TIMESTAMP = 1512942125
+SHA256 (eric6-i18n-fr-17.11.1.tar.gz) = b9b3d42b896ea6bd23e34abdc2245d1fcc9e65a0787b9116e19a04a94f9ec298
+SIZE (eric6-i18n-fr-17.11.1.tar.gz) = 550428
Index: german/eric6/distinfo
===================================================================
--- german/eric6/distinfo
+++ german/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509051764
-SHA256 (eric6-i18n-de-17.10.tar.gz) = 9586ca5d968f26ccfcac43abb15c2ca7c665ad5226a1660bb3d3915de6ce961b
-SIZE (eric6-i18n-de-17.10.tar.gz) = 895479
+TIMESTAMP = 1512942181
+SHA256 (eric6-i18n-de-17.11.1.tar.gz) = e5ea6ef07f6b35265670b71c0d014edb1a77847d3c5207a673e74cc411223e14
+SIZE (eric6-i18n-de-17.11.1.tar.gz) = 898485
Index: math/R-cran-car/Makefile
===================================================================
--- math/R-cran-car/Makefile
+++ math/R-cran-car/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD: head/math/R-cran-car/Makefile 445398 2017-07-09 10:07:34Z dbn $
PORTNAME= car
-DISTVERSION= 2.1-5
+DISTVERSION= 2.1-6
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -17,7 +17,6 @@
R-cran-MatrixModels>0:math/R-cran-MatrixModels \
R-cran-SparseM>0:math/R-cran-SparseM \
R-cran-lme4>0:math/R-cran-lme4 \
- R-cran-nloptr>0:math/R-cran-nloptr \
R-cran-sandwich>0:math/R-cran-sandwich \
R-cran-survey>0:math/R-cran-survey
Index: math/R-cran-car/distinfo
===================================================================
--- math/R-cran-car/distinfo
+++ math/R-cran-car/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499592682
-SHA256 (car_2.1-5.tar.gz) = a60eb64a59cbc238ede7a1018182f364a79ce39ea401fc7e1c1f18f5929ea0ae
-SIZE (car_2.1-5.tar.gz) = 628590
+TIMESTAMP = 1512940665
+SHA256 (car_2.1-6.tar.gz) = d2426a66f63324d9db34dc89becb728d2d4b6d5f183f2efe02cbf683646a8492
+SIZE (car_2.1-6.tar.gz) = 627349
Index: portuguese/eric6/distinfo
===================================================================
--- portuguese/eric6/distinfo
+++ portuguese/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509051809
-SHA256 (eric6-i18n-pt-17.10.tar.gz) = fa2e4a7103f940222e2a51e7e9f015fcdd140ab278968cc79a63e8bafc06f594
-SIZE (eric6-i18n-pt-17.10.tar.gz) = 621317
+TIMESTAMP = 1512942234
+SHA256 (eric6-i18n-pt-17.11.1.tar.gz) = 8eb5cf2e8c1c83540c992fcca225e870222b15a5d400a1dd4beca4f8485777ae
+SIZE (eric6-i18n-pt-17.11.1.tar.gz) = 622235
Index: russian/eric6/distinfo
===================================================================
--- russian/eric6/distinfo
+++ russian/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509051853
-SHA256 (eric6-i18n-ru-17.10.tar.gz) = 1f11fff894aa8f40d1a7ccdef8aaa77fbce52185cfef06b42cbd5833269f4f7e
-SIZE (eric6-i18n-ru-17.10.tar.gz) = 939464
+TIMESTAMP = 1512942289
+SHA256 (eric6-i18n-ru-17.11.1.tar.gz) = 1297aa73b80ff795bcd13898c63af2d71a61348f48816a64bbc88fd8dc4a7799
+SIZE (eric6-i18n-ru-17.11.1.tar.gz) = 943045

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 23, 4:05 PM (14 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32032619
Default Alt Text
D13448.id36511.diff (13 KB)

Event Timeline