Attachment 88570 Details for Bug 125384 – terminator-0.9.patch

[patch] terminator-0.9.patch

terminator-0.9.patch (text/plain), 9.92 KB, created by Thomas Hurst on 2008-07-08 01:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Hurst

Created: 2008-07-08 01:10:03 UTC

Size: 9.92 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/x11/terminator/Makefile /usr/home/freaky/work/ports/x11/terminator/Makefile
>--- /usr/ports/x11/terminator/Makefile	2008-06-06 15:09:10.000000000 +0100
>+++ /usr/home/freaky/work/ports/x11/terminator/Makefile	2008-07-06 18:28:26.000000000 +0100
>@@ -2,38 +2,48 @@
> # Date created:		2008-03-14
> # Whom:			Thomas Hurst <tom@hur.st>
> #
>-# $FreeBSD: ports/x11/terminator/Makefile,v 1.2 2008/06/06 14:09:10 edwin Exp $
>+# $FreeBSD$
> #
> 
> 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 -ruN --exclude=CVS /usr/ports/x11/terminator/distinfo /usr/home/freaky/work/ports/x11/terminator/distinfo
>--- /usr/ports/x11/terminator/distinfo	2008-04-30 09:21:59.000000000 +0100
>+++ /usr/home/freaky/work/ports/x11/terminator/distinfo	2008-07-08 00:51:22.000000000 +0100
>@@ -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 -ruN --exclude=CVS /usr/ports/x11/terminator/files/patch-setup.py /usr/home/freaky/work/ports/x11/terminator/files/patch-setup.py
>--- /usr/ports/x11/terminator/files/patch-setup.py	2008-04-30 09:22:00.000000000 +0100
>+++ /usr/home/freaky/work/ports/x11/terminator/files/patch-setup.py	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -ruN --exclude=CVS /usr/ports/x11/terminator/files/patch-terminator /usr/home/freaky/work/ports/x11/terminator/files/patch-terminator
>--- /usr/ports/x11/terminator/files/patch-terminator	2008-04-30 09:22:00.000000000 +0100
>+++ /usr/home/freaky/work/ports/x11/terminator/files/patch-terminator	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -ruN --exclude=CVS /usr/ports/x11/terminator/pkg-plist /usr/home/freaky/work/ports/x11/terminator/pkg-plist
>--- /usr/ports/x11/terminator/pkg-plist	2008-04-30 09:21:59.000000000 +0100
>+++ /usr/home/freaky/work/ports/x11/terminator/pkg-plist	2008-07-08 01:03:21.000000000 +0100
>@@ -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

Actions: View | Diff

Attachments on bug 125384: 88570