Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Nov 2016 15:47:50 +0000 (UTC)
From:      "Jason E. Hale" <jhale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r425749 - head/math/convertall
Message-ID:  <201611081547.uA8FloEA073512@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhale
Date: Tue Nov  8 15:47:49 2016
New Revision: 425749
URL: https://svnweb.freebsd.org/changeset/ports/425749

Log:
  Update to 0.6.1
  Convert to USES=pyqt
  Add NO_ARCH
  Fix plist for Python 3.5

Modified:
  head/math/convertall/Makefile
  head/math/convertall/distinfo
  head/math/convertall/pkg-plist

Modified: head/math/convertall/Makefile
==============================================================================
--- head/math/convertall/Makefile	Tue Nov  8 15:21:56 2016	(r425748)
+++ head/math/convertall/Makefile	Tue Nov  8 15:47:49 2016	(r425749)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	convertall
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.1
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
@@ -12,15 +12,12 @@ COMMENT=	Another unit converter
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:x11-toolkits/py-qt4-gui
-
-USES=		python:3.3+
+USES=		pyqt:4 python:3.3+
+USE_PYQT=	core gui
 
 CONFIGURE_ARGS=	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -b ${STAGEDIR}
+NO_ARCH=	yes
 NO_BUILD=	yes
-
-PLIST_SUB=	PYTHON_SUFFIX="${PYTHON_SUFFIX}"
 WRKSRC=		${WRKDIR}/ConvertAll
 
 DESKTOP_ENTRIES="ConvertAll" \
@@ -44,6 +41,15 @@ do-install:
 
 .include <bsd.port.pre.mk>
 
+.if ${PYTHON_REL} < 3500
+PYOEXTENSION=	pyo
+.else
+PYOEXTENSION=	opt-1.pyc
+.endif
+
+PLIST_SUB+=	PYTHON_SUFFIX="${PYTHON_SUFFIX}" \
+		PYOEXTENSION="${PYOEXTENSION}"
+
 .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}
 IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
 .endif

Modified: head/math/convertall/distinfo
==============================================================================
--- head/math/convertall/distinfo	Tue Nov  8 15:21:56 2016	(r425748)
+++ head/math/convertall/distinfo	Tue Nov  8 15:47:49 2016	(r425749)
@@ -1,2 +1,3 @@
-SHA256 (convertall-0.6.0.tar.gz) = 871ce44bd59566a95b88fdb9c0ce196389a72c56192387a62b308ead358f87c0
-SIZE (convertall-0.6.0.tar.gz) = 204400
+TIMESTAMP = 1477031474
+SHA256 (convertall-0.6.1.tar.gz) = 11bae7cbde7a06579cf5b650659f54c9621eae043ad975e6ad29cee6d08d220e
+SIZE (convertall-0.6.1.tar.gz) = 277630

Modified: head/math/convertall/pkg-plist
==============================================================================
--- head/math/convertall/pkg-plist	Tue Nov  8 15:21:56 2016	(r425748)
+++ head/math/convertall/pkg-plist	Tue Nov  8 15:47:49 2016	(r425749)
@@ -1,48 +1,49 @@
 bin/convertall
 %%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/cmdline.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/convertall.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/convertdlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/finddlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/helpview.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/icondict.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/modbutton.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/numedit.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/option.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/optiondefaults.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/optiondlg.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/recentunits.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitatom.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitdata.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitedit.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitgroup.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.pyo
+%%DATADIR%%/__pycache__/unitlistview.cpython-%%PYTHON_SUFFIX%%.%%PYOEXTENSION%%
 %%DATADIR%%/cmdline.py
 %%DATADIR%%/convertall.pro
 %%DATADIR%%/convertall.py
 %%DATADIR%%/convertdlg.py
 %%DATADIR%%/data/units.dat
-%%DATADIR%%/data/units_de.dat
-%%DATADIR%%/data/units_es.dat
-%%DATADIR%%/data/units_fr.dat
+%%NLS%%%%DATADIR%%/data/units_de.dat
+%%NLS%%%%DATADIR%%/data/units_es.dat
+%%NLS%%%%DATADIR%%/data/units_fr.dat
+%%NLS%%%%DATADIR%%/data/units_ru.dat
 %%DATADIR%%/finddlg.py
 %%DATADIR%%/helpview.py
 %%DATADIR%%/icondict.py
@@ -68,12 +69,15 @@ bin/convertall
 %%NLS%%%%DATADIR%%/translations/convertall_es.ts
 %%NLS%%%%DATADIR%%/translations/convertall_fr.qm
 %%NLS%%%%DATADIR%%/translations/convertall_fr.ts
+%%NLS%%%%DATADIR%%/translations/convertall_ru.qm
+%%NLS%%%%DATADIR%%/translations/convertall_ru.ts
 %%NLS%%%%DATADIR%%/translations/qt_de.qm
 %%NLS%%%%DATADIR%%/translations/qt_de.ts
 %%NLS%%%%DATADIR%%/translations/qt_es.qm
 %%NLS%%%%DATADIR%%/translations/qt_es.ts
 %%NLS%%%%DATADIR%%/translations/qt_fr.qm
 %%NLS%%%%DATADIR%%/translations/qt_fr.ts
+%%NLS%%%%DATADIR%%/translations/qt_ru.qm
 %%DATADIR%%/unitatom.py
 %%DATADIR%%/unitdata.py
 %%DATADIR%%/unitedit.py
@@ -83,3 +87,4 @@ bin/convertall
 %%NLS%%%%DOCSDIR%%/README_de.html
 %%NLS%%%%DOCSDIR%%/README_es.html
 %%NLS%%%%DOCSDIR%%/README_fr.html
+%%NLS%%%%DOCSDIR%%/README_ru.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611081547.uA8FloEA073512>