Attachment 154186 Details for Bug 198382 – Preliminary patch for 0.97 -> 0.97_1

[patch] Preliminary patch for 0.97 -> 0.97_1

x11-terminator-0.97_to_0.97_1.diff (text/plain), 3.31 KB, created by Thomas Hurst on 2015-03-11 09:05:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Hurst

Created: 2015-03-11 09:05:49 UTC

Size: 3.31 KB

patch

obsolete

>diff --git x11/terminator/Makefile x11/terminator/Makefile
>index 2211b12..fd76127 100644
>--- x11/terminator/Makefile
>+++ x11/terminator/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	terminator
> PORTVERSION=	0.97
>+PORTREVISION=	1
> CATEGORIES=	x11 python
> MASTER_SITES=	http://launchpad.net/terminator/trunk/0.97/+download/
> 
>@@ -15,38 +16,32 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0:${PORTSDIR}/devel/py-notify \
> 		${PYTHON_SITELIBDIR}/keybinder/_keybinder.so:${PORTSDIR}/x11/keybinder \
> 		${PYTHON_PKGNAMEPREFIX}vte>=0:${PORTSDIR}/x11-toolkits/py-vte
> 
>-OPTIONS_DEFINE=	NLS GCONF
>-GCONF_DESC=	Use GNOME Terminal settings
>-OPTIONS_DEFAULT=	NLS GCONF
>-
> USES=		python
>+USE=		GNOME=pygtk2
> USE_PYTHON=	distutils
> PYDISTUTILS_PKGNAME=	Terminator
> 
> INSTALLS_ICONS=	yes
> 
>-WANT_GNOME=	yes
>-
>-.include <bsd.port.options.mk>
>-
>-.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext
>-PLIST_SUB+=	NLS=""
>-.else
>-PLIST_SUB+=	NLS="@comment "
>-PYSETUP+=	--without-gettext
>-.endif
>+OPTIONS_DEFINE=		NLS GCONF
>+OPTIONS_DEFAULT=	NLS GCONF
>+OPTIONS_SUB=		yes
>+GCONF_DESC=		Use GNOME Terminal settings
>+GCONF_USE=		GNOME=pygnome2
>+NLS_USES=		gettext
> 
> .include <bsd.port.pre.mk>
> 
>+.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
>+.endif
>+
> PYDISTUTILS_SETUP+=	--without-icon-cache
> 
>-.if ${PORT_OPTIONS:MGCONF}
>-USE_GNOME+=	pygnome2
>-.endif
>-USE_GNOME+=	pygtk2
>-
>-MAN1=	terminator.1
>-MAN5=	terminator_config.5
>+pre-patch:
>+	${REINPLACE_CMD} -e 's/libc\.so/libc.so.7/' ${WRKSRC}/terminatorlib/freebsd.py
> 
> .include <bsd.port.post.mk>
>diff --git x11/terminator/pkg-descr x11/terminator/pkg-descr
>index b5abc46..dd03074 100644
>--- x11/terminator/pkg-descr
>+++ x11/terminator/pkg-descr
>@@ -2,4 +2,4 @@ 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/p/terminator.html
>+WWW: http://gnometerminator.blogspot.co.uk/p/introduction.html
>diff --git x11/terminator/pkg-plist x11/terminator/pkg-plist
>index 1643d36..05dba47 100644
>--- x11/terminator/pkg-plist
>+++ x11/terminator/pkg-plist
>@@ -203,16 +203,13 @@ share/icons/hicolor/scalable/apps/terminator.svg
> %%NLS%%share/locale/zh_HK/LC_MESSAGES/terminator.mo
> %%NLS%%share/locale/zh_TW/LC_MESSAGES/terminator.mo
> share/pixmaps/terminator.png
>-%%NLS%%@dirrmtry share/locale/tyv/LC_MESSAGES
>-%%NLS%%@dirrmtry share/locale/tyv
>-%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
>-%%NLS%%@dirrmtry share/locale/ru_RU
>-%%NLS%%@dirrmtry share/locale/jv/LC_MESSAGES
>-%%NLS%%@dirrmtry share/locale/jv
>-%%NLS%%@dirrmtry share/locale/fy/LC_MESSAGES
>-%%NLS%%@dirrmtry share/locale/fy
>-%%NLS%%@dirrmtry share/locale/ckb/LC_MESSAGES
>-%%NLS%%@dirrmtry share/locale/ckb
>-@dirrm %%PYTHON_SITELIBDIR%%/terminatorlib/plugins
>-@dirrm %%PYTHON_SITELIBDIR%%/terminatorlib/configobj
>-@dirrm %%PYTHON_SITELIBDIR%%/terminatorlib
>+%%NLS%%@dir share/locale/tyv/LC_MESSAGES
>+%%NLS%%@dir share/locale/tyv
>+%%NLS%%@dir share/locale/ru_RU/LC_MESSAGES
>+%%NLS%%@dir share/locale/ru_RU
>+%%NLS%%@dir share/locale/jv/LC_MESSAGES
>+%%NLS%%@dir share/locale/jv
>+%%NLS%%@dir share/locale/fy/LC_MESSAGES
>+%%NLS%%@dir share/locale/fy
>+%%NLS%%@dir share/locale/ckb/LC_MESSAGES
>+%%NLS%%@dir share/locale/ckb

Actions: View | Diff

Attachments on bug 198382: 154186 | 154187 | 154188 | 154189 | 154191