3 files changed, 96 insertions, 24 deletions

diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index 40f5975ae8c5..f2b2f2e7018b 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	terminator
-PORTVERSION=	0.13
-PORTREVISION=	3
+PORTVERSION=	0.93
 CATEGORIES=	x11 python
-MASTER_SITES=	https://launchpad.net/terminator/trunk/${PORTVERSION}/+download/ \
-		https://launchpadlibrarian.net/28258738/ \
+MASTER_SITES=	http://launchpadlibrarian.net/44348818/ \
 		http://hur.st/mirror/terminator/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tom@hur.st
 COMMENT=	Multiple GNOME terminals in one window
@@ -20,7 +17,6 @@ COMMENT=	Multiple GNOME terminals in one window
 OPTIONS=	NLS	"Native language support" 	on \
 		GCONF	"Use GNOME Terminal settings"	on
 
-WRKSRC=		${WRKDIR}/${PORTVERSION}
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Terminator
@@ -49,8 +45,4 @@ USE_GNOME+=	pygtk2
 MAN1=	terminator.1
 MAN5=	terminator_config.5
 
-post-patch:
-	# setup.py installs 32x32 icons in the wrong place.
-	@${REINPLACE_CMD} -e "s|24x24/apps', glob.glob('data/icons/32x32|32x32/apps', glob.glob('data/icons/32x32|" ${WRKSRC}/setup.py
-
 .include <bsd.port.post.mk>
diff --git a/x11/terminator/distinfo b/x11/terminator/distinfo
index 02c422395a0c..28e6ec667900 100644
--- a/x11/terminator/distinfo
+++ b/x11/terminator/distinfo
@@ -1,3 +1,3 @@
-MD5 (terminator_0.13.tar.gz) = 808e48d2b69f3366fb6ea14312ea403e
-SHA256 (terminator_0.13.tar.gz) = 5f8e8ec8ba1add72fd71974fa85c66bba1b0ee671771fe7b8aa636d7e574cd9e
-SIZE (terminator_0.13.tar.gz) = 2253315
+MD5 (terminator-0.93.tar.gz) = bb47ff829bc281cd921dece0197e7d9d
+SHA256 (terminator-0.93.tar.gz) = eee742fb43750b49dac9d8ebc341b999f46c69063476df26eddabae0526dd855
+SIZE (terminator-0.93.tar.gz) = 194922
diff --git a/x11/terminator/pkg-plist b/x11/terminator/pkg-plist
index 80464cca2be3..4ca620c39dc3 100644
--- a/x11/terminator/pkg-plist
+++ b/x11/terminator/pkg-plist
@@ -2,45 +2,115 @@ bin/terminator
 %%PYTHON_SITELIBDIR%%/terminatorlib/__init__.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/borg.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/borg.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/borg.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/config.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/config.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/config.pyo
-%%PYTHON_SITELIBDIR%%/terminatorlib/configfile.py
-%%PYTHON_SITELIBDIR%%/terminatorlib/configfile.pyc
-%%PYTHON_SITELIBDIR%%/terminatorlib/configfile.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/configobj/__init__.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/configobj/__init__.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/configobj/__init__.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/configobj/configobj.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/configobj/configobj.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/configobj/configobj.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/configobj/validate.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/configobj/validate.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/configobj/validate.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/container.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/container.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/container.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/cwd.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/cwd.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/cwd.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/debugserver.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/debugserver.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/debugserver.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/editablelabel.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/editablelabel.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/editablelabel.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/encoding.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/encoding.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/encoding.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/factory.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/factory.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/factory.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/freebsd.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/freebsd.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/freebsd.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/keybindings.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/keybindings.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/keybindings.pyo
-%%PYTHON_SITELIBDIR%%/terminatorlib/prefs_profile.py
-%%PYTHON_SITELIBDIR%%/terminatorlib/prefs_profile.pyc
-%%PYTHON_SITELIBDIR%%/terminatorlib/prefs_profile.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/notebook.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/notebook.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/notebook.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/optionparse.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/optionparse.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/optionparse.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/paned.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/paned.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/paned.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugin.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugin.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugin.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/custom_commands.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/custom_commands.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/custom_commands.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/terminal_menu.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/terminal_menu.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/terminal_menu.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/testplugin.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/testplugin.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/testplugin.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/url_handlers.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/url_handlers.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/plugins/url_handlers.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/preferences.glade
+%%PYTHON_SITELIBDIR%%/terminatorlib/prefseditor.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/prefseditor.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/prefseditor.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/searchbar.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/searchbar.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/searchbar.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/signalman.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/signalman.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/signalman.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/terminal.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/terminal.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/terminal.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/terminal_popup_menu.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/terminal_popup_menu.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/terminal_popup_menu.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/terminator.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/terminator.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/terminator.pyo
-%%PYTHON_SITELIBDIR%%/terminatorlib/terminatorterm.py
-%%PYTHON_SITELIBDIR%%/terminatorlib/terminatorterm.pyc
-%%PYTHON_SITELIBDIR%%/terminatorlib/terminatorterm.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/titlebar.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/titlebar.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/titlebar.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/translation.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/translation.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/translation.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/util.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/util.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/util.pyo
 %%PYTHON_SITELIBDIR%%/terminatorlib/version.py
 %%PYTHON_SITELIBDIR%%/terminatorlib/version.pyc
 %%PYTHON_SITELIBDIR%%/terminatorlib/version.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/window.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/window.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/window.pyo
 share/applications/terminator.desktop
 share/pixmaps/terminator.png
 share/icons/hicolor/scalable/apps/terminator.svg
-share/icons/hicolor/16x16/apps/terminator.png
+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
 share/icons/hicolor/16x16/actions/terminator_horiz.png
+share/icons/hicolor/16x16/actions/terminator_receive_off.png
+share/icons/hicolor/16x16/actions/terminator_receive_on.png
 share/icons/hicolor/16x16/actions/terminator_vert.png
+share/icons/hicolor/16x16/apps/terminator.png
+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
@@ -66,11 +136,13 @@ share/icons/hicolor/48x48/apps/terminator.png
 %%NLS%%share/locale/gl/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/he/LC_MESSAGES/terminator.mo
 %%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/id/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/it/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/jv/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/terminator.mo
@@ -85,20 +157,28 @@ share/icons/hicolor/48x48/apps/terminator.png
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/ru_RU/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/si/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/terminator.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/sr/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/uk/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
+%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru_RU
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
 %%NLS%%@dirrmtry share/locale/fy/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/fy
 %%NLS%%@dirrmtry share/locale/jv/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/jv
+@dirrm %%PYTHON_SITELIBDIR%%/terminatorlib/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/terminatorlib/configobj
 @dirrm %%PYTHON_SITELIBDIR%%/terminatorlib