Wed May 15 14:23:15 2019 UTC ()
ibus-array: Add Python 3 support and use PY_PATHPLIST

 - setup/main.py bytecode was not generated just due inconsintent use of spaces
   and tabs for indentation, address that via patch-setup_main.py
 - Use PY_PATCHPLIST to avoid manually adjusting the PLIST for .pyo/.pyc

PKGREVISION++


(leot)
diff -r1.31 -r1.32 pkgsrc/inputmethod/ibus-array/Makefile
diff -r1.4 -r1.5 pkgsrc/inputmethod/ibus-array/PLIST
diff -r1.7 -r1.8 pkgsrc/inputmethod/ibus-array/distinfo
diff -r0 -r1.1 pkgsrc/inputmethod/ibus-array/patches/patch-setup_main.py
cvs diff -r1.31 -r1.32 pkgsrc/inputmethod/ibus-array/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-array/Makefile 2019/05/14 15:11:36 1.31
+++ pkgsrc/inputmethod/ibus-array/Makefile 2019/05/15 14:23:15 1.32
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: Makefile,v 1.31 2019/05/14 15:11:36 mef Exp $ 1# $NetBSD: Makefile,v 1.32 2019/05/15 14:23:15 leot Exp $
2 2
3DISTNAME= ibus-array-0.1.0 3DISTNAME= ibus-array-0.1.0
4PKGREVISION= 12 4PKGREVISION= 13
5CATEGORIES= inputmethod chinese 5CATEGORIES= inputmethod chinese
6MASTER_SITES= http://ibus-array.googlecode.com/svn/tarballs/ 6MASTER_SITES= http://ibus-array.googlecode.com/svn/tarballs/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://code.google.com/archive/p/ibus-array/ 10HOMEPAGE= https://code.google.com/archive/p/ibus-array/
11COMMENT= Array 30 Input Method for iBus 11COMMENT= Array 30 Input Method for iBus
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 14DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19USE_TOOLS+= gmake pkg-config automake autoconf autopoint msgfmt msgmerge 19USE_TOOLS+= gmake pkg-config automake autoconf autopoint msgfmt msgmerge
20 20
21WRKSRC= ${WRKDIR} 21WRKSRC= ${WRKDIR}
22 22
23.include "../../lang/python/application.mk" 23PY_PATCHPLIST= yes
24 
25PLIST_SUBST+= PYPKGPREFIX_NO=${PYPKGPREFIX:S/py//} 
26 24
27pre-configure: 25pre-configure:
28 ${RUN}cd ${WRKSRC};${PKGSRC_SETENV} ${CONFIGURE_ENV} ./autogen.sh 26 ${RUN}cd ${WRKSRC};${PKGSRC_SETENV} ${CONFIGURE_ENV} ./autogen.sh
29 27
30SUBST_CLASSES+= epython 28SUBST_CLASSES+= epython
31SUBST_STAGE.epython= pre-configure 29SUBST_STAGE.epython= pre-configure
32SUBST_FILES.epython= setup/ibus-setup-array.in 30SUBST_FILES.epython= setup/ibus-setup-array.in
33SUBST_SED.epython= -e 's;exec python;exec ${PYTHONBIN};g' 31SUBST_SED.epython= -e 's;exec python;exec ${PYTHONBIN};g'
34 32
35.include "../../databases/sqlite3/buildlink3.mk" 33.include "../../databases/sqlite3/buildlink3.mk"
36.include "../../devel/gettext-lib/buildlink3.mk" 34.include "../../devel/gettext-lib/buildlink3.mk"
 35.include "../../lang/python/application.mk"
 36.include "../../lang/python/extension.mk"
37.include "../../inputmethod/ibus/buildlink3.mk" 37.include "../../inputmethod/ibus/buildlink3.mk"
38 
39.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/inputmethod/ibus-array/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-array/PLIST 2019/05/14 14:39:34 1.4
+++ pkgsrc/inputmethod/ibus-array/PLIST 2019/05/15 14:23:15 1.5
@@ -1,15 +1,13 @@ @@ -1,15 +1,13 @@
1@comment $NetBSD: PLIST,v 1.4 2019/05/14 14:39:34 mef Exp $ 1@comment $NetBSD: PLIST,v 1.5 2019/05/15 14:23:15 leot Exp $
2libexec/ibus-engine-array 2libexec/ibus-engine-array
3libexec/ibus-setup-array 3libexec/ibus-setup-array
4share/ibus-array/icons/ibus-array.png 4share/ibus-array/icons/ibus-array.png
5${PLIST.py2x}share/ibus-array/setup/main.pyc 
6${PLIST.py2x}share/ibus-array/setup/main.pyo 
7${PLIST.py2x}share/ibus-array/setup/config.pyc 
8${PLIST.py2x}share/ibus-array/setup/config.pyo 
9share/ibus-array/setup/config.py 5share/ibus-array/setup/config.py
 6share/ibus-array/setup/config.pyc
 7share/ibus-array/setup/config.pyo
10share/ibus-array/setup/main.py 8share/ibus-array/setup/main.py
 9share/ibus-array/setup/main.pyc
 10share/ibus-array/setup/main.pyo
11share/ibus-array/tables/array.db 11share/ibus-array/tables/array.db
12share/ibus/component/array.xml 12share/ibus/component/array.xml
13share/locale/zh_TW/LC_MESSAGES/ibus-array.mo 13share/locale/zh_TW/LC_MESSAGES/ibus-array.mo
14${PLIST.py3x}share/ibus-array/setup/__pycache__/config.cpython-${PYPKGPREFIX_NO}.opt-1.pyc 
15${PLIST.py3x}share/ibus-array/setup/__pycache__/config.cpython-${PYPKGPREFIX_NO}.pyc 
cvs diff -r1.7 -r1.8 pkgsrc/inputmethod/ibus-array/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-array/distinfo 2015/11/03 22:13:34 1.7
+++ pkgsrc/inputmethod/ibus-array/distinfo 2019/05/15 14:23:15 1.8
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.7 2015/11/03 22:13:34 agc Exp $ 1$NetBSD: distinfo,v 1.8 2019/05/15 14:23:15 leot Exp $
2 2
3SHA1 (ibus-array-0.1.0.tgz) = f4f6f5ccb0c2d54ef80b5e694fc508f99bf1f381 3SHA1 (ibus-array-0.1.0.tgz) = f4f6f5ccb0c2d54ef80b5e694fc508f99bf1f381
4RMD160 (ibus-array-0.1.0.tgz) = 2526bd21f704bbd4bf8d563a6e89870a047562b9 4RMD160 (ibus-array-0.1.0.tgz) = 2526bd21f704bbd4bf8d563a6e89870a047562b9
5SHA512 (ibus-array-0.1.0.tgz) = b10f60c8e8b8c7fe54ef39c32a169be6ee53b69ea008e0526ac359a253129321afa830fb2b857f3d3cd5059abba452598909a0079164a440af1520ff651435fa 5SHA512 (ibus-array-0.1.0.tgz) = b10f60c8e8b8c7fe54ef39c32a169be6ee53b69ea008e0526ac359a253129321afa830fb2b857f3d3cd5059abba452598909a0079164a440af1520ff651435fa
6Size (ibus-array-0.1.0.tgz) = 3838716 bytes 6Size (ibus-array-0.1.0.tgz) = 3838716 bytes
 7SHA1 (patch-setup_main.py) = 3f6a2dc0e93c86b5e8f1b1cbc7cae77043ad9c1a
7SHA1 (patch-src_engine.c) = aa7978ae11c8e1410980585ff6f7a76200df6f99 8SHA1 (patch-src_engine.c) = aa7978ae11c8e1410980585ff6f7a76200df6f99
File Added: pkgsrc/inputmethod/ibus-array/patches/patch-setup_main.py
$NetBSD: patch-setup_main.py,v 1.1 2019/05/15 14:23:15 leot Exp $

Consistently use spaces instead of tabs to avoid Python 3 TabError-s.

--- setup/main.py.orig	2014-11-01 10:35:57.000000000 +0000
+++ setup/main.py
@@ -38,8 +38,8 @@ class Setup:
         self.__create_ui()
 
     def __create_ui(self):
-	gettext.bindtextdomain("ibus-array")
-	gettext.textdomain("ibus-array")
+        gettext.bindtextdomain("ibus-array")
+        gettext.textdomain("ibus-array")
         self.__window = Gtk.Dialog(_('ibus-array setup'), None, 
                                     Gtk.DialogFlags.MODAL, 
                                     (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, 
@@ -97,9 +97,9 @@ class Setup:
                     self.__special_notify_button.set_active(False)
 
     def __read(self, name, v):
-	value = self.__config.get_value("engine/Array", name)
-	if value is None:
-		return v
+        value = self.__config.get_value("engine/Array", name)
+        if value is None:
+                return v
         return value
 
     def __write(self, name, v):