3 files changed, 70 insertions, 10 deletions

diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index bf4c0b32a7b6..add755cbc479 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	terminator
-PORTVERSION=	0.97
-PORTREVISION=	2
+PORTVERSION=	1.0
 CATEGORIES=	x11 python
-MASTER_SITES=	http://launchpad.net/terminator/trunk/0.97/+download/
+MASTER_SITES=	http://launchpad.net/terminator/trunk/1.0/+download/
 
 MAINTAINER=	tom@hur.st
 COMMENT=	Multiple GNOME terminals in one window
@@ -14,15 +13,19 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/keybinder/_keybinder.so:x11/keybinder \
-		${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 
-USES=		python:2.7
+USES=		gnome python:2.7 shebangfix
 USE_GNOME=	pygtk2 intltool
 USE_PYTHON=	distutils
+
 PYDISTUTILS_PKGNAME=	Terminator
 
 INSTALLS_ICONS=	yes
 
+SHEBANG_FILES=	terminator.wrapper
+
 OPTIONS_DEFINE=		NLS GCONF
 OPTIONS_DEFAULT=	GCONF
 OPTIONS_SUB=		yes
@@ -37,11 +40,13 @@ PYDISTUTILS_SETUP+=	--without-gettext
 post-patch:
 	${CP} ${WRKSRC}/data/terminator.desktop.in ${WRKSRC}/data/terminator.desktop
 	${REINPLACE_CMD} -e 's/^_//' ${WRKSRC}/data/terminator.desktop
+	${CP} ${WRKSRC}/data/terminator.appdata.xml.in ${WRKSRC}/data/terminator.appdata.xml
+	${REINPLACE_CMD} \
+		-e 's|<_|<|' \
+		-e 's|</_|</|' \
+		${WRKSRC}/data/terminator.appdata.xml
 .endif
 
 PYDISTUTILS_SETUP+=	--without-icon-cache
 
-pre-patch:
-	${REINPLACE_CMD} -e 's/libc\.so/libc.so.7/' ${WRKSRC}/terminatorlib/freebsd.py
-
 .include <bsd.port.post.mk>
diff --git a/x11/terminator/distinfo b/x11/terminator/distinfo
index edc257e82a45..38adb79363e6 100644
--- a/x11/terminator/distinfo
+++ b/x11/terminator/distinfo
@@ -1,2 +1,3 @@
-SHA256 (terminator-0.97.tar.gz) = 9131847023fa22f11cf812f6ceff51b5d66d140b6518ad41d7fa8b0742bfd3f7
-SIZE (terminator-0.97.tar.gz) = 343857
+TIMESTAMP = 1551503788
+SHA256 (terminator-1.0.tar.gz) = 88aa09e96591c4fd7ff2765617acee6c9bae9c188db2590652a8aba53bbbdadd
+SIZE (terminator-1.0.tar.gz) = 881675
diff --git a/x11/terminator/pkg-plist b/x11/terminator/pkg-plist
index e7929d56a791..55e9f27e5267 100644
--- a/x11/terminator/pkg-plist
+++ b/x11/terminator/pkg-plist
@@ -1,5 +1,6 @@
 bin/remotinator
 bin/terminator
+bin/terminator.wrapper
 %%PYTHON_SITELIBDIR%%/terminatorlib/__init__.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/__init__.pyo
@@ -45,6 +46,10 @@ bin/terminator
 %%PYTHON_SITELIBDIR%%/terminatorlib/keybindings.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/keybindings.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/keybindings.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/layoutlauncher.glade
+%%PYTHON_SITELIBDIR%%/terminatorlib/layoutlauncher.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/layoutlauncher.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/layoutlauncher.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/notebook.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/notebook.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/notebook.pyo
@@ -57,6 +62,9 @@ bin/terminator
 %%PYTHON_SITELIBDIR%%/terminatorlib/plugin.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/plugin.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/plugin.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/__init__.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/__init__.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/plugins/activitywatch.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/plugins/activitywatch.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/plugins/activitywatch.pyo
@@ -114,7 +122,40 @@ bin/terminator
 %%PYTHON_SITELIBDIR%%/terminatorlib/window.pyo
 man/man1/terminator.1.gz
 man/man5/terminator_config.5.gz
+share/appdata/terminator.appdata.xml
 share/applications/terminator.desktop
+share/icons/HighContrast/16x16/actions/terminator_active_broadcast_all.png
+share/icons/HighContrast/16x16/actions/terminator_active_broadcast_group.png
+share/icons/HighContrast/16x16/actions/terminator_active_broadcast_off.png
+share/icons/HighContrast/16x16/actions/terminator_horiz.png
+share/icons/HighContrast/16x16/actions/terminator_receive_off.png
+share/icons/HighContrast/16x16/actions/terminator_receive_on.png
+share/icons/HighContrast/16x16/actions/terminator_vert.png
+share/icons/HighContrast/16x16/apps/terminator-custom-commands.png
+share/icons/HighContrast/16x16/apps/terminator-layout.png
+share/icons/HighContrast/16x16/apps/terminator-preferences.png
+share/icons/HighContrast/16x16/apps/terminator.png
+share/icons/HighContrast/16x16/status/terminal-bell.png
+share/icons/HighContrast/22x22/apps/terminator-custom-commands.png
+share/icons/HighContrast/22x22/apps/terminator-layout.png
+share/icons/HighContrast/22x22/apps/terminator-preferences.png
+share/icons/HighContrast/22x22/apps/terminator.png
+share/icons/HighContrast/24x24/apps/terminator-custom-commands.png
+share/icons/HighContrast/24x24/apps/terminator-layout.png
+share/icons/HighContrast/24x24/apps/terminator-preferences.png
+share/icons/HighContrast/24x24/apps/terminator.png
+share/icons/HighContrast/32x32/apps/terminator-custom-commands.png
+share/icons/HighContrast/32x32/apps/terminator-layout.png
+share/icons/HighContrast/32x32/apps/terminator-preferences.png
+share/icons/HighContrast/32x32/apps/terminator.png
+share/icons/HighContrast/48x48/apps/terminator-custom-commands.png
+share/icons/HighContrast/48x48/apps/terminator-layout.png
+share/icons/HighContrast/48x48/apps/terminator-preferences.png
+share/icons/HighContrast/48x48/apps/terminator.png
+share/icons/HighContrast/scalable/apps/terminator-custom-commands.svg
+share/icons/HighContrast/scalable/apps/terminator-layout.svg
+share/icons/HighContrast/scalable/apps/terminator-preferences.svg
+share/icons/HighContrast/scalable/apps/terminator.svg
 share/icons/hicolor/16x16/actions/terminator_active_broadcast_all.png
 share/icons/hicolor/16x16/actions/terminator_active_broadcast_group.png
 share/icons/hicolor/16x16/actions/terminator_active_broadcast_off.png
@@ -127,12 +168,19 @@ share/icons/hicolor/16x16/status/terminal-bell.png
 share/icons/hicolor/22x22/apps/terminator.png
 share/icons/hicolor/24x24/apps/terminator.png
 share/icons/hicolor/32x32/apps/terminator.png
+share/icons/hicolor/48x48/apps/terminator-custom-commands.png
+share/icons/hicolor/48x48/apps/terminator-layout.png
+share/icons/hicolor/48x48/apps/terminator-preferences.png
 share/icons/hicolor/48x48/apps/terminator.png
+share/icons/hicolor/scalable/apps/terminator-custom-commands.svg
+share/icons/hicolor/scalable/apps/terminator-layout.svg
+share/icons/hicolor/scalable/apps/terminator-preferences.svg
 share/icons/hicolor/scalable/apps/terminator.svg
 %%NLS%%share/locale/af/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/az/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/be/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/terminator.mo
@@ -161,6 +209,8 @@ share/icons/hicolor/scalable/apps/terminator.svg
 %%NLS%%share/locale/hi/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/ia/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/id/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/is/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/it/LC_MESSAGES/terminator.mo
@@ -191,14 +241,18 @@ share/icons/hicolor/scalable/apps/terminator.svg
 %%NLS%%share/locale/sl/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/su/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/te/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/th/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/tyv/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/wa/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/terminator.mo