From freaky@voi.aagh.net  Sun Apr  6 14:08:23 2008
Return-Path: <freaky@voi.aagh.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54AF7106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  6 Apr 2008 14:08:23 +0000 (UTC)
	(envelope-from freaky@voi.aagh.net)
Received: from spork.qfe3.net (spork.qfe3.net [212.13.207.101])
	by mx1.freebsd.org (Postfix) with ESMTP id EDD458FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  6 Apr 2008 14:08:22 +0000 (UTC)
	(envelope-from freaky@voi.aagh.net)
Received: from [81.104.123.28] (helo=voi.aagh.net)
	by spork.qfe3.net with esmtp (Exim 4.66 (FreeBSD))
	(envelope-from <freaky@voi.aagh.net>)
	id 1JiVDr-000Onz-Hk
	for FreeBSD-gnats-submit@freebsd.org; Sun, 06 Apr 2008 14:47:51 +0100
Received: from freaky by voi.aagh.net with local (Exim 4.69 (FreeBSD))
	(envelope-from <freaky@voi.aagh.net>)
	id 1JiVDr-0003m4-Bq
	for FreeBSD-gnats-submit@freebsd.org; Sun, 06 Apr 2008 14:47:51 +0100
Message-Id: <E1JiVDr-0003m4-Bq@voi.aagh.net>
Date: Sun, 06 Apr 2008 14:47:51 +0100
From: Thomas Hurst <tom@hur.st>
Sender: Thomas Hurst <freaky@voi.aagh.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [NEW PORT] x11/terminator: Multiple GNOME terminals in one window
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         122489
>Category:       ports
>Synopsis:       [NEW PORT] x11/terminator: Multiple GNOME terminals in one window
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 06 14:10:01 UTC 2008
>Closed-Date:    Wed Apr 30 08:22:38 UTC 2008
>Last-Modified:  Wed Apr 30 08:30:01 UTC 2008
>Originator:     Thomas Hurst
>Release:        FreeBSD 7.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD voi.nightsdawn.sf 7.0-STABLE FreeBSD 7.0-STABLE #0: Fri Mar 28 15:27:09 GMT 2008
>Description:
Terminator is a Python terminal program, using the same widget as
gnome-terminal to provide a tiled set of terminals in as little
space as possible.

WWW:	http://www.tenshu.net/terminator/

Generated with FreeBSD Port Tools 0.77

The patches enable WITHOUT_NLS support, and avoid building .mo files
during install so !root build, root install, !root clean works.
>How-To-Repeat:
>Fix:

--- terminator-0.8.1.shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	terminator
#	terminator/pkg-descr
#	terminator/Makefile
#	terminator/pkg-plist
#	terminator/distinfo
#	terminator/files
#	terminator/files/patch-setup.py
#	terminator/files/patch-terminator
#
echo c - terminator
mkdir -p terminator > /dev/null 2>&1
echo x - terminator/pkg-descr
sed 's/^X//' >terminator/pkg-descr << 'END-of-terminator/pkg-descr'
XTerminator is a Python terminal program, using the same widget as
Xgnome-terminal to provide a tiled set of terminals in as little
Xspace as possible.
X
XWWW:	http://www.tenshu.net/terminator/
END-of-terminator/pkg-descr
echo x - terminator/Makefile
sed 's/^X//' >terminator/Makefile << 'END-of-terminator/Makefile'
X# New ports collection makefile for:	terminator
X# Date created:		2008-03-14
X# Whom:			Thomas Hurst <tom@hur.st>
X#
X# $FreeBSD$
X#
X
XPORTNAME=	terminator
XPORTVERSION=	0.8.1
XCATEGORIES=	x11 python
XMASTER_SITES=	https://launchpad.net/terminator/trunk/${PORTVERSION}/+download/ \
X		https://hur.st/mirror/terminator/
XDISTNAME=	${PORTNAME}_${PORTVERSION}
X
XMAINTAINER=	tom@hur.st
XCOMMENT=	Multiple GNOME terminals in one window
X
XWRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
XUSE_PYTHON=	2.4+
XUSE_PYDISTUTILS=	yes
XPYDISTUTILS_PKGNAME=	Terminator
X
X.if !defined(WITHOUT_NLS)
XUSE_GETTEXT=	yes
XPLIST_SUB+=	NLS=""
X.else
XMAKE_ENV+=	WITHOUT_NLS="yes"
XPLIST_SUB+=	NLS="@comment "
X.endif
X
XINSTALLS_ICONS=	yes
X
XUSE_GNOME=	pygnome2 pygtk2
XRUN_DEPENDS+=	${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte
X
XMAN1=	terminator.1
X
X.include <bsd.port.mk>
END-of-terminator/Makefile
echo x - terminator/pkg-plist
sed 's/^X//' >terminator/pkg-plist << 'END-of-terminator/pkg-plist'
Xbin/terminator
Xshare/applications/terminator.desktop
Xshare/pixmaps/terminator.png
Xshare/icons/hicolor/scalable/apps/terminator.svg
Xshare/icons/hicolor/16x16/apps/terminator.png
Xshare/icons/hicolor/22x22/apps/terminator.png
Xshare/icons/hicolor/24x24/apps/terminator.png
Xshare/icons/hicolor/48x48/apps/terminator.png
X%%NLS%%share/locale/de/LC_MESSAGES/terminator.mo
X%%NLS%%share/locale/en_GB/LC_MESSAGES/terminator.mo
X%%NLS%%share/locale/es/LC_MESSAGES/terminator.mo
X%%NLS%%share/locale/fr/LC_MESSAGES/terminator.mo
X%%NLS%%share/locale/it/LC_MESSAGES/terminator.mo
X%%NLS%%share/locale/nl/LC_MESSAGES/terminator.mo
X%%NLS%%share/locale/ro/LC_MESSAGES/terminator.mo
X%%NLS%%share/locale/ru/LC_MESSAGES/terminator.mo
X%%NLS%%share/locale/sv/LC_MESSAGES/terminator.mo
X%%NLS%%share/locale/zh_CN/LC_MESSAGES/terminator.mo
END-of-terminator/pkg-plist
echo x - terminator/distinfo
sed 's/^X//' >terminator/distinfo << 'END-of-terminator/distinfo'
XMD5 (terminator_0.8.1.tar.gz) = 7e8a76c52b4b397674acea0d8a0dfc05
XSHA256 (terminator_0.8.1.tar.gz) = 87c24891941dd5a3c3b8417db7bb8af4df0fbfb853fd62dd53841b8f97c4a4a3
XSIZE (terminator_0.8.1.tar.gz) = 35647
END-of-terminator/distinfo
echo c - terminator/files
mkdir -p terminator/files > /dev/null 2>&1
echo x - terminator/files/patch-setup.py
sed 's/^X//' >terminator/files/patch-setup.py << 'END-of-terminator/files/patch-setup.py'
X--- setup.py.orig	2008-02-20 00:05:58.000000000 +0000
X+++ setup.py	2008-04-06 14:03:24.000000000 +0100
X@@ -2,23 +2,19 @@
X 
X from distutils.core import setup
X from distutils.command.install_data import install_data
X+from distutils.command.build import build
X from distutils.dep_util import newer
X from distutils.log import info
X import glob
X import os
X import sys
X 
X-class InstallData(install_data):
X-  def run (self):
X-    self.data_files.extend (self._compile_po_files ())
X-    install_data.run (self)
X-
X-  def _compile_po_files (self):
X-    data_files = []
X-
X+class BuildData(build):
X+  def run(self):
X+    build.run(self)
X     # Don't install language files on win32
X-    if sys.platform == 'win32':
X-      return data_files
X+    if sys.platform == 'win32' or os.environ.has_key("WITHOUT_NLS"):
X+      return
X 
X     PO_DIR = 'po'
X     for po in glob.glob (os.path.join (PO_DIR,'*.po')):
X@@ -37,8 +33,25 @@
X         if os.system(cmd) != 0:
X           raise SystemExit('Error while running msgfmt')
X 
X-        dest = os.path.dirname(os.path.join('share', 'locale', lang, 'LC_MESSAGES', 'terminator.mo'))
X-        data_files.append((dest, [mo]))
X+class InstallData(install_data):
X+  def run (self):
X+    self.data_files.extend (self._compile_po_files ())
X+    install_data.run (self)
X+
X+  def _compile_po_files (self):
X+    data_files = []
X+
X+    # Don't install language files on win32
X+    if sys.platform == 'win32' or os.environ.has_key("WITHOUT_NLS"):
X+      return data_files
X+
X+    PO_DIR = 'po'
X+    for po in glob.glob (os.path.join (PO_DIR,'*.po')):
X+      lang = os.path.basename(po[:-3])
X+      mo = os.path.join('build', 'mo', lang, 'terminator.mo')
X+
X+      dest = os.path.dirname(os.path.join('share', 'locale', lang, 'LC_MESSAGES', 'terminator.mo'))
X+      data_files.append((dest, [mo]))
X 
X     return data_files
X 
X@@ -53,7 +66,7 @@
X       scripts=['terminator'],
X       data_files=[
X                   ('share/applications', ['data/terminator.desktop']),
X-                  ('share/man/man1', ['doc/terminator.1']),
X+                  ('man/man1', ['doc/terminator.1']),
X                   ('share/pixmaps', ['data/icons/48x48/apps/terminator.png']),
X                   ('share/icons/hicolor/scalable/apps', glob.glob('data/icons/scalable/apps/*.svg')),
X                   ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')),
X@@ -61,6 +74,6 @@
X                   ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/24x24/apps/*.png')),
X                   ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/48x48/apps/*.png')),
X                  ],
X-      cmdclass={'install_data': InstallData}
X+      cmdclass={'build': BuildData, 'install_data': InstallData}
X      )
X 
END-of-terminator/files/patch-setup.py
echo x - terminator/files/patch-terminator
sed 's/^X//' >terminator/files/patch-terminator << 'END-of-terminator/files/patch-terminator'
X--- terminator.orig	2008-02-20 00:05:58.000000000 +0000
X+++ terminator	2008-04-06 14:19:29.000000000 +0100
X@@ -21,8 +21,12 @@
X import os, sys, string, time, math
X from optparse import OptionParser
X 
X-import gettext
X-gettext.install ('terminator')
X+try:
X+  import gettext
X+  gettext.install ('terminator')
X+except:
X+  def _(text):
X+    return text
X 
X # import unix-lib
X import pwd
END-of-terminator/files/patch-terminator
exit
--- terminator-0.8.1.shar ends here ---

>Release-Note:
>Audit-Trail:

From: Thomas Hurst <tom@hur.st>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/122489: [NEW PORT] x11/terminator: Multiple GNOME
	terminals in one window
Date: Wed, 9 Apr 2008 07:56:39 +0100

 Update patch-terminator so the URL matching regexps work.
 
 I have commit access upstream now, so these patches should all disappear
 next release (which should also make a lot of the gnome deps optional).
 
 --- files/patch-terminator.orig	2008-04-09 07:52:45.000000000 +0100
 +++ files/patch-terminator	2008-04-09 07:45:52.000000000 +0100
 @@ -1,5 +1,5 @@
  --- terminator.orig	2008-02-20 00:05:58.000000000 +0000
 -+++ terminator	2008-04-06 14:19:29.000000000 +0100
 ++++ terminator	2008-04-09 07:44:43.000000000 +0100
  @@ -21,8 +21,12 @@
   import os, sys, string, time, math
   from optparse import OptionParser
 @@ -15,3 +15,20 @@
   
   # import unix-lib
   import pwd
 +@@ -165,12 +169,12 @@
 +     self._vte.add_events (gtk.gdk.ENTER_NOTIFY_MASK)
 +     self._vte.connect ("enter_notify_event", self.on_vte_notify_enter)
 + 
 +-    self.matches['full_uri'] = self._vte.match_add ('''\<(news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:)//([-A-Za-z0-9]+(:[-A-Za-z0-9,?;.:/!%$^*&~"#']+)?@)?[-A-Za-z0-9.]+(:[0-9]+)?(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\"])?\>/?''')
 +-    self.matches['addr_only'] = self._vte.match_add ('''\<(www|ftp)[-A-Za-z0-9]*\.[-A-Za-z0-9.]+(:[0-9]+)?(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\"])?\>/?''')
 ++    self.matches['full_uri'] = self._vte.match_add ('''[[:<:]](news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:)//([-A-Za-z0-9]+(:[-A-Za-z0-9,?;.:/!%$^*&~"#']+)?@)?[-A-Za-z0-9.]+(:[0-9]+)?(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\"])?[[:>:]]/?''')
 ++    self.matches['addr_only'] = self._vte.match_add ('''[[:<:]](www|ftp)[-A-Za-z0-9]*\.[-A-Za-z0-9.]+(:[0-9]+)?(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\"])?[[:>:]]/?''')
 + 
 +-    self.matches['email'] = self._vte.match_add ('''\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\.[a-z0-9][a-z0-9-]*)+\>''')
 ++    self.matches['email'] = self._vte.match_add ('''[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\.[a-z0-9][a-z0-9-]*)+[[:>:]]''')
 + 
 +-    self.matches['nntp'] = self._vte.match_add ('''\<news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@[-A-Za-z0-9.]+(:[0-9]+)?\>''')
 ++    self.matches['nntp'] = self._vte.match_add ('''[[:<:]]news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@[-A-Za-z0-9.]+(:[0-9]+)?[[:>:]]''')
 + 
 +     self.spawn_child ()
 + 
 
 
 -- 
 Thomas 'Freaky' Hurst
     http://hur.st/
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Apr 30 08:22:37 UTC 2008 
State-Changed-Why:  
New port added, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=122489 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/122489: commit references a PR
Date: Wed, 30 Apr 2008 08:22:04 +0000 (UTC)

 miwi        2008-04-30 08:22:00 UTC
 
   FreeBSD ports repository
 
   Modified files:
     x11                  Makefile 
   Added files:
     x11/terminator       Makefile distinfo pkg-descr pkg-plist 
     x11/terminator/files patch-setup.py patch-terminator 
   Log:
   Terminator is a Python terminal program, using the same widget as
   gnome-terminal to provide a tiled set of terminals in as little
   space as possible.
   
   WWW:    http://www.tenshu.net/terminator/
   
   PR:             ports/122489
   Submitted by:   Thomas Hurst <tom at hur.st>
   
   Revision  Changes    Path
   1.680     +1 -0      ports/x11/Makefile
   1.1       +38 -0     ports/x11/terminator/Makefile (new)
   1.1       +3 -0      ports/x11/terminator/distinfo (new)
   1.1       +77 -0     ports/x11/terminator/files/patch-setup.py (new)
   1.1       +17 -0     ports/x11/terminator/files/patch-terminator (new)
   1.1       +5 -0      ports/x11/terminator/pkg-descr (new)
   1.1       +18 -0     ports/x11/terminator/pkg-plist (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
