5 files changed, 79 insertions, 108 deletions

diff --git a/x11/terminator/Makefile b/x11/terminator/Makefile
index 530a829ccb44..649d070c830a 100644
--- a/x11/terminator/Makefile
+++ b/x11/terminator/Makefile
@@ -6,34 +6,44 @@
 #
 
 PORTNAME=	terminator
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.9
 CATEGORIES=	x11 python
 MASTER_SITES=	https://launchpad.net/terminator/trunk/${PORTVERSION}/+download/ \
-		https://hur.st/mirror/terminator/
+		http://hur.st/mirror/terminator/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	tom@hur.st
 COMMENT=	Multiple GNOME terminals in one window
 
+OPTIONS=	NLS	"Native language support" 	on \
+		GCONF	"Use GNOME Terminal settings"	on
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Terminator
 
-.if !defined(WITHOUT_NLS)
+INSTALLS_ICONS=	yes
+
+WANT_GNOME=	yes
+
+.include <bsd.port.pre.mk>
+
+.ifdef(WITHOUT_NLS)
+PLIST_SUB+=	NLS="@comment "
+PYSETUP+=	--without-gettext
+.else
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
-.else
-MAKE_ENV+=	WITHOUT_NLS="yes"
-PLIST_SUB+=	NLS="@comment "
 .endif
 
-INSTALLS_ICONS=	yes
-
-USE_GNOME=	pygnome2 pygtk2
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
+.if defined(WITH_GCONF)
+USE_GNOME+=	pygnome2
+.endif
+USE_GNOME+=	pygtk2
 
 MAN1=	terminator.1
+MAN5=	terminator_config.5
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/terminator/distinfo b/x11/terminator/distinfo
index 1b59ce01d8fd..c2d1cfa0e8fe 100644
--- a/x11/terminator/distinfo
+++ b/x11/terminator/distinfo
@@ -1,3 +1,3 @@
-MD5 (terminator_0.8.1.tar.gz) = 7e8a76c52b4b397674acea0d8a0dfc05
-SHA256 (terminator_0.8.1.tar.gz) = 87c24891941dd5a3c3b8417db7bb8af4df0fbfb853fd62dd53841b8f97c4a4a3
-SIZE (terminator_0.8.1.tar.gz) = 35647
+MD5 (terminator_0.9.tar.gz) = 86447fd0149f1f3eadd78d4fffc6cbd1
+SHA256 (terminator_0.9.tar.gz) = 8d4d4240f9e0f1d136936d67ce70e6b6e013dcc561746d8b4c1d3e6b657042b5
+SIZE (terminator_0.9.tar.gz) = 69508
diff --git a/x11/terminator/files/patch-setup.py b/x11/terminator/files/patch-setup.py
deleted file mode 100644
index e370573d1ea2..000000000000
--- a/x11/terminator/files/patch-setup.py
+++ /dev/null
@@ -1,77 +0,0 @@
---- setup.py.orig	2008-02-20 00:05:58.000000000 +0000
-+++ setup.py	2008-04-06 14:03:24.000000000 +0100
-@@ -2,23 +2,19 @@
- 
- from distutils.core import setup
- from distutils.command.install_data import install_data
-+from distutils.command.build import build
- from distutils.dep_util import newer
- from distutils.log import info
- import glob
- import os
- import sys
- 
--class InstallData(install_data):
--  def run (self):
--    self.data_files.extend (self._compile_po_files ())
--    install_data.run (self)
--
--  def _compile_po_files (self):
--    data_files = []
--
-+class BuildData(build):
-+  def run(self):
-+    build.run(self)
-     # Don't install language files on win32
--    if sys.platform == 'win32':
--      return data_files
-+    if sys.platform == 'win32' or os.environ.has_key("WITHOUT_NLS"):
-+      return
- 
-     PO_DIR = 'po'
-     for po in glob.glob (os.path.join (PO_DIR,'*.po')):
-@@ -37,8 +33,25 @@
-         if os.system(cmd) != 0:
-           raise SystemExit('Error while running msgfmt')
- 
--        dest = os.path.dirname(os.path.join('share', 'locale', lang, 'LC_MESSAGES', 'terminator.mo'))
--        data_files.append((dest, [mo]))
-+class InstallData(install_data):
-+  def run (self):
-+    self.data_files.extend (self._compile_po_files ())
-+    install_data.run (self)
-+
-+  def _compile_po_files (self):
-+    data_files = []
-+
-+    # Don't install language files on win32
-+    if sys.platform == 'win32' or os.environ.has_key("WITHOUT_NLS"):
-+      return data_files
-+
-+    PO_DIR = 'po'
-+    for po in glob.glob (os.path.join (PO_DIR,'*.po')):
-+      lang = os.path.basename(po[:-3])
-+      mo = os.path.join('build', 'mo', lang, 'terminator.mo')
-+
-+      dest = os.path.dirname(os.path.join('share', 'locale', lang, 'LC_MESSAGES', 'terminator.mo'))
-+      data_files.append((dest, [mo]))
- 
-     return data_files
- 
-@@ -53,7 +66,7 @@
-       scripts=['terminator'],
-       data_files=[
-                   ('share/applications', ['data/terminator.desktop']),
--                  ('share/man/man1', ['doc/terminator.1']),
-+                  ('man/man1', ['doc/terminator.1']),
-                   ('share/pixmaps', ['data/icons/48x48/apps/terminator.png']),
-                   ('share/icons/hicolor/scalable/apps', glob.glob('data/icons/scalable/apps/*.svg')),
-                   ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')),
-@@ -61,6 +74,6 @@
-                   ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/24x24/apps/*.png')),
-                   ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/48x48/apps/*.png')),
-                  ],
--      cmdclass={'install_data': InstallData}
-+      cmdclass={'build': BuildData, 'install_data': InstallData}
-      )
- 
diff --git a/x11/terminator/files/patch-terminator b/x11/terminator/files/patch-terminator
deleted file mode 100644
index b0e3edfa1d0a..000000000000
--- a/x11/terminator/files/patch-terminator
+++ /dev/null
@@ -1,17 +0,0 @@
---- terminator.orig	2008-02-20 00:05:58.000000000 +0000
-+++ terminator	2008-04-06 14:19:29.000000000 +0100
-@@ -21,8 +21,12 @@
- import os, sys, string, time, math
- from optparse import OptionParser
- 
--import gettext
--gettext.install ('terminator')
-+try:
-+  import gettext
-+  gettext.install ('terminator')
-+except:
-+  def _(text):
-+    return text
- 
- # import unix-lib
- import pwd
diff --git a/x11/terminator/pkg-plist b/x11/terminator/pkg-plist
index d64f197d0d84..e6a0126e5c33 100644
--- a/x11/terminator/pkg-plist
+++ b/x11/terminator/pkg-plist
@@ -1,18 +1,73 @@
 bin/terminator
+%%PYTHON_SITELIBDIR%%/terminatorlib/__init__.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/config.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/config.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/config.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/encoding.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/encoding.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/encoding.pyo
+%%PYTHON_SITELIBDIR%%/terminatorlib/freebsd.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/freebsd.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/freebsd.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/version.py
+%%PYTHON_SITELIBDIR%%/terminatorlib/version.pyc
+%%PYTHON_SITELIBDIR%%/terminatorlib/version.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_horiz.png
+share/icons/hicolor/16x16/actions/terminator_vert.png
 share/icons/hicolor/22x22/apps/terminator.png
 share/icons/hicolor/24x24/apps/terminator.png
 share/icons/hicolor/48x48/apps/terminator.png
+%%NLS%%share/locale/ar/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/da/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/de/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/el/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/es/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/et/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/fy/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/he/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/hi/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/ko/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/terminator.mo
+%%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/sk/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/te/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/terminator.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/terminator.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/terminator.mo