Index: head/x11/terminator/files/patch-terminatorlib__notebook.py =================================================================== --- head/x11/terminator/files/patch-terminatorlib__notebook.py (revision 532195) +++ head/x11/terminator/files/patch-terminatorlib__notebook.py (nonexistent) @@ -1,29 +0,0 @@ ---- terminatorlib/notebook.py.orig 2020-04-19 03:13:43 UTC -+++ terminatorlib/notebook.py -@@ -77,17 +77,6 @@ class Notebook(Container, Gtk.Notebook): - - def create_layout(self, layout): - """Apply layout configuration""" -- def child_compare(a, b): -- order_a = children[a]['order'] -- order_b = children[b]['order'] -- -- if (order_a == order_b): -- return 0 -- if (order_a < order_b): -- return -1 -- if (order_a > order_b): -- return 1 -- - if 'children' not in layout: - err('layout specifies no children: %s' % layout) - return -@@ -100,7 +89,7 @@ class Notebook(Container, Gtk.Notebook): - - num = 0 - keys = list(children.keys()) -- keys.sort(child_compare) -+ keys.sort(key=lambda x: children[x]['order']) - - for child_key in keys: - child = children[child_key] Property changes on: head/x11/terminator/files/patch-terminatorlib__notebook.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/terminator/Makefile =================================================================== --- head/x11/terminator/Makefile (revision 532195) +++ head/x11/terminator/Makefile (revision 532196) @@ -1,53 +1,51 @@ # Created by: Thomas Hurst # $FreeBSD$ PORTNAME= terminator PORTVERSION= 1.92 +PORTREVISION= 1 CATEGORIES= x11 python -MASTER_SITES= https://bazaar.launchpad.net/~hellodeargrandma/terminator/python3/tarball/1852/ -DISTNAME= terminator-python3-bzr-r1852 +MASTER_SITES= https://github.com/gnome-terminator/terminator/releases/download/v${PORTVERSION}/ MAINTAINER= ume@FreeBSD.org COMMENT= Multiple GNOME terminals in one window LICENSE= GPLv2 RUN_DEPENDS= ${LOCALBASE}/lib/libkeybinder-3.0.so:x11/keybinder-gtk3 \ ${LOCALBASE}/lib/libnotify.so:devel/libnotify \ ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} USES= gnome python:3.5+ shebangfix USE_GNOME= intltool pygobject3 vte3 USE_PYTHON= autoplist distutils PYDISTUTILS_PKGNAME= Terminator INSTALLS_ICONS= yes SHEBANG_FILES= terminator.wrapper bash_CMD= ${SH} OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext - -WRKSRC= ${WRKDIR}/~hellodeargrandma/terminator/python3 .include .if !${PORT_OPTIONS:MNLS} 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| Index: head/x11/terminator/distinfo =================================================================== --- head/x11/terminator/distinfo (revision 532195) +++ head/x11/terminator/distinfo (revision 532196) @@ -1,3 +1,3 @@ -TIMESTAMP = 1587305888 -SHA256 (terminator-python3-bzr-r1852.tar.gz) = 223802142fb535a9174a0da50051eeb6fce153a6462c9992deba1c9ee15e3a12 -SIZE (terminator-python3-bzr-r1852.tar.gz) = 889301 +TIMESTAMP = 1587381360 +SHA256 (terminator-1.92.tar.gz) = 1f94d676ad42c814e159e6374dca81e4e68ac1f03f2013395ba99b69c17573f1 +SIZE (terminator-1.92.tar.gz) = 910613 Index: head/x11/terminator/pkg-descr =================================================================== --- head/x11/terminator/pkg-descr (revision 532195) +++ head/x11/terminator/pkg-descr (revision 532196) @@ -1,5 +1,5 @@ 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://gnometerminator.blogspot.co.uk/p/introduction.html +WWW: https://github.com/gnome-terminator/terminator