ibus-hangul: Use PY_PATCHPLIST and MASTER_SITES_GITHUB (NFC)

- Instead of manually adjusting PLIST for Python 2.x and 3.x use PY_PATCHPLIST
- Use MASTER_SITE_GITHUB

2 files changed, 12 insertions, 18 deletions

diff --git a/inputmethod/ibus-hangul/Makefile b/inputmethod/ibus-hangul/Makefile
index 2c6ca469c18..a8eeb2bb7be 100644
--- a/inputmethod/ibus-hangul/Makefile
+++ b/inputmethod/ibus-hangul/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2019/05/14 14:47:14 mef Exp $
+# $NetBSD: Makefile,v 1.21 2019/05/15 14:33:13 leot Exp $
 #
 
 DISTNAME=	ibus-hangul-1.5.0
 PKGREVISION=	1
 CATEGORIES=	inputmethod korean
-MASTER_SITES=	https://github.com/choehwanjin/ibus-hangul/releases/download/${PKGVERSION_NOREV}/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=choehwanjin/}
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/ibus/ibus/wiki
@@ -16,9 +17,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config gmake msgfmt intltool
 
-.include "../../lang/python/application.mk"
-
-PLIST_SUBST+=   PYPKGPREFIX_NO=${PYPKGPREFIX:S/py//}
+PY_PATCHPLIST=		yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -26,4 +25,5 @@ BUILDLINK_API_DEPENDS.libhangul+=	libhangul>=0.1.0
 .include "../../inputmethod/libhangul/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ibus-hangul/PLIST b/inputmethod/ibus-hangul/PLIST
index e1b96c44cf6..791312c302a 100644
--- a/inputmethod/ibus-hangul/PLIST
+++ b/inputmethod/ibus-hangul/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2019/05/14 14:47:14 mef Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/05/15 14:33:13 leot Exp $
 bin/ibus-setup-hangul
 libexec/ibus-engine-hangul
 libexec/ibus-setup-hangul
@@ -7,14 +7,14 @@ share/ibus-hangul/data/symbol.txt
 share/ibus-hangul/icons/ibus-hangul.png
 share/ibus-hangul/icons/ibus-hangul.svg
 share/ibus-hangul/setup/config.py
-${PLIST.py2x}share/ibus-hangul/setup/config.pyc
-${PLIST.py2x}share/ibus-hangul/setup/config.pyo
+share/ibus-hangul/setup/config.pyc
+share/ibus-hangul/setup/config.pyo
 share/ibus-hangul/setup/keycapturedialog.py
-${PLIST.py2x}share/ibus-hangul/setup/keycapturedialog.pyc
-${PLIST.py2x}share/ibus-hangul/setup/keycapturedialog.pyo
+share/ibus-hangul/setup/keycapturedialog.pyc
+share/ibus-hangul/setup/keycapturedialog.pyo
 share/ibus-hangul/setup/main.py
-${PLIST.py2x}share/ibus-hangul/setup/main.pyc
-${PLIST.py2x}share/ibus-hangul/setup/main.pyo
+share/ibus-hangul/setup/main.pyc
+share/ibus-hangul/setup/main.pyo
 share/ibus-hangul/setup/setup.ui
 share/ibus/component/hangul.xml
 share/icons/hicolor/64x64/apps/ibus-hangul.png
@@ -23,9 +23,3 @@ share/icons/hicolor/scalable/apps/ibus-hangul.svg
 share/icons/hicolor/scalable/apps/ibus-setup-hangul.svg
 share/locale/ko/LC_MESSAGES/ibus-hangul.mo
 share/locale/zh_CN/LC_MESSAGES/ibus-hangul.mo
-${PLIST.py3x}share/ibus-hangul/setup/__pycache__/config.cpython-${PYPKGPREFIX_NO}.opt-1.pyc
-${PLIST.py3x}share/ibus-hangul/setup/__pycache__/config.cpython-${PYPKGPREFIX_NO}.pyc
-${PLIST.py3x}share/ibus-hangul/setup/__pycache__/keycapturedialog.cpython-${PYPKGPREFIX_NO}.opt-1.pyc
-${PLIST.py3x}share/ibus-hangul/setup/__pycache__/keycapturedialog.cpython-${PYPKGPREFIX_NO}.pyc
-${PLIST.py3x}share/ibus-hangul/setup/__pycache__/main.cpython-${PYPKGPREFIX_NO}.opt-1.pyc
-${PLIST.py3x}share/ibus-hangul/setup/__pycache__/main.cpython-${PYPKGPREFIX_NO}.pyc