2 files changed, 76 insertions, 70 deletions

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 825956db2a89..8289a0a9f934 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	gedit
 PORTVERSION=	3.14.2
+PORTREVISION=	1
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,6 +13,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Small but powerful text editor for GNOME 3 Desktop Environment
 
 BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
+		vala:${PORTSDIR}/lang/vala \
 		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		itstool:${PORTSDIR}/textproc/itstool
 LIB_DEPENDS=	libenchant.so:${PORTSDIR}/textproc/enchant \
@@ -44,4 +46,6 @@ 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 <bsd.port.mk>
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index dc704fa90d7d..5f6dd30f7aa7 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -45,44 +45,44 @@ lib/gedit/plugins/externaltools/linkparsing.py
 lib/gedit/plugins/externaltools/manager.py
 lib/gedit/plugins/externaltools/outputpanel.py
 lib/gedit/plugins/externaltools/windowactivatable.py
-lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-33.pyo
-lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-33.pyo
-lib/gedit/plugins/externaltools/__pycache__/capture.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/capture.cpython-33.pyo
-lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-33.pyo
-lib/gedit/plugins/externaltools/__pycache__/functions.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/functions.cpython-33.pyo
-lib/gedit/plugins/externaltools/__pycache__/library.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/library.cpython-33.pyo
-lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-33.pyo
-lib/gedit/plugins/externaltools/__pycache__/manager.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/manager.cpython-33.pyo
-lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-33.pyo
-lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-33.pyc
-lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-33.pyo
+lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/__init__.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/appactivatable.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/capture.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/filelookup.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/functions.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/library.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/linkparsing.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/manager.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/outputpanel.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/externaltools/__pycache__/windowactivatable.cpython-%%PYVER%%.pyo
 lib/gedit/plugins/pythonconsole/__init__.py
 lib/gedit/plugins/pythonconsole/config.py
 lib/gedit/plugins/pythonconsole/console.py
-lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-33.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-33.pyo
-lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-33.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-33.pyo
-lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-33.pyc
-lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-33.pyo
+lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/__init__.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/config.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/pythonconsole/__pycache__/console.cpython-%%PYVER%%.pyo
 lib/gedit/plugins/quickopen/__init__.py
 lib/gedit/plugins/quickopen/popup.py
 lib/gedit/plugins/quickopen/virtualdirs.py
-lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-33.pyc
-lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-33.pyo
-lib/gedit/plugins/quickopen/__pycache__/popup.cpython-33.pyc
-lib/gedit/plugins/quickopen/__pycache__/popup.cpython-33.pyo
-lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-33.pyc
-lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-33.pyo
+lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/__init__.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/popup.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/quickopen/__pycache__/virtualdirs.cpython-%%PYVER%%.pyo
 lib/gedit/plugins/snippets/__init__.py
 lib/gedit/plugins/snippets/appactivatable.py
 lib/gedit/plugins/snippets/completion.py
@@ -101,45 +101,45 @@ lib/gedit/plugins/snippets/singleton.py
 lib/gedit/plugins/snippets/snippet.py
 lib/gedit/plugins/snippets/substitutionparser.py
 lib/gedit/plugins/snippets/windowactivatable.py
-lib/gedit/plugins/snippets/__pycache__/__init__.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/__init__.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/completion.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/completion.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/document.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/document.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/exporter.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/exporter.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/helper.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/helper.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/importer.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/importer.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/library.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/library.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/manager.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/manager.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/parser.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/parser.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/signals.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/signals.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/singleton.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/singleton.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/snippet.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/snippet.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-33.pyo
-lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-33.pyc
-lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-33.pyo
+lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/__init__.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/appactivatable.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/completion.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/document.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/exporter.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/helper.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/importer.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/languagemanager.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/library.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/manager.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/parser.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/placeholder.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/shareddata.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/signals.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/singleton.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/snippet.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/substitutionparser.cpython-%%PYVER%%.pyo
+lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.pyc
+lib/gedit/plugins/snippets/__pycache__/windowactivatable.cpython-%%PYVER%%.pyo
 %%PYTHON_SITELIBDIR%%/gi/overrides/Gedit.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-33.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-33.pyo
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gedit.cpython-%%PYVER%%.pyo
 libdata/pkgconfig/gedit.pc
 libexec/gedit/gedit-bugreport.sh
 man/man1/gedit.1.gz
@@ -1758,3 +1758,5 @@ share/locale/xh/LC_MESSAGES/gedit.mo
 share/locale/zh_CN/LC_MESSAGES/gedit.mo
 share/locale/zh_HK/LC_MESSAGES/gedit.mo
 share/locale/zh_TW/LC_MESSAGES/gedit.mo
+share/vala/vapi/gedit.deps
+share/vala/vapi/gedit.vapi