Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Apr 2017 20:34:19 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r439566 - head/textproc/ibus-typing-booster
Message-ID:  <201704272034.v3RKYJGc053437@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thierry
Date: Thu Apr 27 20:34:19 2017
New Revision: 439566
URL: https://svnweb.freebsd.org/changeset/ports/439566

Log:
  Do not run the included py-compile, in order to not depend on PYTHON_VERSION.
  
  PR:		218864
  Reported by:	miwi

Modified:
  head/textproc/ibus-typing-booster/Makefile
  head/textproc/ibus-typing-booster/pkg-plist

Modified: head/textproc/ibus-typing-booster/Makefile
==============================================================================
--- head/textproc/ibus-typing-booster/Makefile	Thu Apr 27 20:24:43 2017	(r439565)
+++ head/textproc/ibus-typing-booster/Makefile	Thu Apr 27 20:34:19 2017	(r439566)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ibus-typing-booster
 PORTVERSION=	1.5.32
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -47,6 +48,7 @@ PY2FIX=		setup/user_transliteration.py
 M17N2FIX=	setup/main.py
 SHR2FIX=	engine/tabsqlitedb.py engine/itb_util.py engine/itb_emoji.py	\
 		engine/hunspell_table.py engine/main.py setup/user_transliteration.py
+COMP2DEL=	engine/Makefile setup/Makefile
 
 pre-configure:
 .for f in ${SPELL2FIX}
@@ -70,6 +72,12 @@ pre-configure:
 		-e 's|/usr/share|${LOCALBASE}/share|' ${WRKSRC}/${f}
 .endfor
 
+post-configure:
+.for f in ${COMP2DEL}
+	${SED} -i.orig -e '/if test -n "\$$\$$dlist"/,/^	else :; fi$$/ d'	\
+		${WRKSRC}/${f}
+.endfor
+
 post-install:
 	(cd ${STAGEDIR}${PREFIX} \
 	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \

Modified: head/textproc/ibus-typing-booster/pkg-plist
==============================================================================
--- head/textproc/ibus-typing-booster/pkg-plist	Thu Apr 27 20:24:43 2017	(r439565)
+++ head/textproc/ibus-typing-booster/pkg-plist	Thu Apr 27 20:34:19 2017	(r439566)
@@ -174,30 +174,30 @@ share/applications/ibus-setup-typing-boo
 %%DATADIR%%/data/emoji-test.txt
 %%DATADIR%%/data/emoji-zwj-sequences.txt
 %%DATADIR%%/data/emojione.json
-%%DATADIR%%/engine/__pycache__/emoji_picker.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/emoji_picker.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/factory.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/factory.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/hunspell_suggest.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/hunspell_suggest.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/hunspell_table.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/hunspell_table.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/itb_emoji.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/itb_emoji.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/itb_nltk.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/itb_nltk.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/itb_pango.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/itb_pango.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/itb_util.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/itb_util.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/m17n_translit.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/m17n_translit.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/main.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/main.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/tabsqlitedb.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/tabsqlitedb.cpython-35.pyc
-%%DATADIR%%/engine/__pycache__/version.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/engine/__pycache__/version.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/emoji_picker.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/emoji_picker.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/factory.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/factory.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/hunspell_suggest.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/hunspell_suggest.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/hunspell_table.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/hunspell_table.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/itb_emoji.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_emoji.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/itb_nltk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_nltk.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/itb_pango.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_pango.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/itb_util.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_util.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/m17n_translit.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/m17n_translit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/tabsqlitedb.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/tabsqlitedb.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/engine/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/engine/emoji_picker.py
 %%DATADIR%%/engine/factory.py
 %%DATADIR%%/engine/hunspell_suggest.py
@@ -361,14 +361,14 @@ share/applications/ibus-setup-typing-boo
 %%DATADIR%%/icons/uk_UA.svg
 %%DATADIR%%/icons/ur_PK.svg
 %%DATADIR%%/icons/yi_US.svg
-%%DATADIR%%/setup/__pycache__/i18n.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/setup/__pycache__/i18n.cpython-35.pyc
-%%DATADIR%%/setup/__pycache__/main.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/setup/__pycache__/main.cpython-35.pyc
-%%DATADIR%%/setup/__pycache__/pkginstall.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/setup/__pycache__/pkginstall.cpython-35.pyc
-%%DATADIR%%/setup/__pycache__/version.cpython-35.%%PYTHON_PYOEXTENSION%%
-%%DATADIR%%/setup/__pycache__/version.cpython-35.pyc
+%%DATADIR%%/setup/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/setup/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/setup/__pycache__/pkginstall.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/pkginstall.cpython-%%PYTHON_SUFFIX%%.pyc
+%%DATADIR%%/setup/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATADIR%%/setup/i18n.py
 %%DATADIR%%/setup/main.py
 %%DATADIR%%/setup/pkginstall.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704272034.v3RKYJGc053437>