From owner-svn-ports-all@freebsd.org Sat Mar 5 19:03:39 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A86FA9284B; Sat, 5 Mar 2016 19:03:39 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 136A0A02; Sat, 5 Mar 2016 19:03:39 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u25J3cns028101; Sat, 5 Mar 2016 19:03:38 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u25J3bSY028098; Sat, 5 Mar 2016 19:03:37 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201603051903.u25J3bSY028098@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Sat, 5 Mar 2016 19:03:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410198 - in head/editors: gedit gedit-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Mar 2016 19:03:39 -0000 Author: rm Date: Sat Mar 5 19:03:37 2016 New Revision: 410198 URL: https://svnweb.freebsd.org/changeset/ports/410198 Log: editors/gedit: fix packaging with Python 3.5 This simple change fixes packaging of editors/gedit and editors/gedit-plugins when Python 3.5 are default python3 version. PR: 207241 With hat: gnome Modified: head/editors/gedit-plugins/pkg-plist head/editors/gedit/Makefile head/editors/gedit/pkg-plist Modified: head/editors/gedit-plugins/pkg-plist ============================================================================== --- head/editors/gedit-plugins/pkg-plist Sat Mar 5 19:00:04 2016 (r410197) +++ head/editors/gedit-plugins/pkg-plist Sat Mar 5 19:03:37 2016 (r410198) @@ -91,11 +91,11 @@ lib/gedit/plugins/commander/windowactiva lib/gedit/plugins/dashboard.plugin lib/gedit/plugins/dashboard/__init__.py lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYVER%%.pyc -lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYVER%%.pyo +lib/gedit/plugins/dashboard/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYVER%%.pyc -lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYVER%%.pyo +lib/gedit/plugins/dashboard/__pycache__/dashboard.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYVER%%.pyc -lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYVER%%.pyo +lib/gedit/plugins/dashboard/__pycache__/utils.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/dashboard/dashboard.py lib/gedit/plugins/dashboard/utils.py lib/gedit/plugins/drawspaces.plugin Modified: head/editors/gedit/Makefile ============================================================================== --- head/editors/gedit/Makefile Sat Mar 5 19:00:04 2016 (r410197) +++ head/editors/gedit/Makefile Sat Mar 5 19:03:37 2016 (r410198) @@ -47,10 +47,19 @@ GLIB_SCHEMAS= org.gnome.gedit.enums.xml org.gnome.gedit.plugins.time.enums.xml \ org.gnome.gedit.plugins.time.gschema.xml -PLIST_SUB+= PYVER=${PYTHON_VER:S/.//} +.include + +.if ${PYTHON_REL} < 3500 +PYOEXTENSION= pyo +.else +PYOEXTENSION= opt-1.pyc +.endif + +PLIST_SUB+= PYOEXTENSION=${PYOEXTENSION} \ + PYVER=${PYTHON_VER:S/.//} post-patch: @${REINPLACE_CMD} -e 's|=python|=${PYTHON_CMD}|g' \ ${WRKSRC}/py-compile -.include +.include Modified: head/editors/gedit/pkg-plist ============================================================================== --- head/editors/gedit/pkg-plist Sat Mar 5 19:00:04 2016 (r410197) +++ head/editors/gedit/pkg-plist Sat Mar 5 19:03:37 2016 (r410198) @@ -23,25 +23,25 @@ lib/gedit/plugins/docinfo.plugin lib/gedit/plugins/externaltools.plugin lib/gedit/plugins/externaltools/__init__.py lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc -lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.pyo +lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/externaltools/appactivatable.py lib/gedit/plugins/externaltools/capture.py lib/gedit/plugins/externaltools/filelookup.py @@ -62,61 +62,61 @@ lib/gedit/plugins/modelines.plugin lib/gedit/plugins/pythonconsole.plugin lib/gedit/plugins/pythonconsole/__init__.py lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.pyc -lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.pyo +lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.pyc -lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.pyo +lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.pyc -lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.pyo +lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/pythonconsole/config.py lib/gedit/plugins/pythonconsole/console.py lib/gedit/plugins/quickopen.plugin lib/gedit/plugins/quickopen/__init__.py lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.pyc -lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.pyo +lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.pyc -lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.pyo +lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.pyc -lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.pyo +lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/quickopen/popup.py lib/gedit/plugins/quickopen/virtualdirs.py lib/gedit/plugins/snippets.plugin lib/gedit/plugins/snippets/__init__.py lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc -lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.pyo +lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.%%PYOEXTENSION%% lib/gedit/plugins/snippets/appactivatable.py lib/gedit/plugins/snippets/completion.py lib/gedit/plugins/snippets/document.py @@ -139,7 +139,7 @@ lib/gedit/plugins/spell.plugin lib/gedit/plugins/time.plugin %%PYTHON_SITELIBDIR%%/gi/overrides/Gedit.py %%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.pyo +%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.%%PYOEXTENSION%% libdata/pkgconfig/gedit.pc libexec/gedit/gedit-bugreport.sh man/man1/gedit.1.gz