py-brotli: fix installation for Python 3 and misc improvements

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Feb 13 22:48:49 2017 +0100
Changeset:	c069d986073de3343c810ed497f26077e3614bb9

Modified Files:
	py-brotlipy/Makefile
	py-brotlipy/PLIST

Log Message:
py-brotli: fix installation for Python 3 and misc improvements

- Use _PYTHON_VERSION instead of PYPKGPREFIX (more consistent with other
  packages)
- include egg.mk before using using _PYTHON_VERSION (otherwise for packages
  that DEPENDS on py-brotli broken conditional can happen)
- Fix PLIST for Python 3 marking the offending entry via PLIST.py{2,3}x

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c069d986073de3343c810ed497f26077e3614bb9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-brotlipy/Makefile | 5 +++--
 py-brotlipy/PLIST    | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs:
diff --git a/py-brotlipy/Makefile b/py-brotlipy/Makefile
index 445c9880ff..fde430e0e6 100644
--- a/py-brotlipy/Makefile
+++ b/py-brotlipy/Makefile
@@ -12,9 +12,10 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-cffi>=1.0.0:../../devel/py-cffi
 
-.if ${PYPKGPREFIX} == "py27"
+.include "../../lang/python/egg.mk"
+
+.if ${_PYTHON_VERSION} < 33
 DEPENDS+=	${PYPKGPREFIX}-enum34>=1.0.4:../../devel/py-enum34
 .endif
 
-.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-brotlipy/PLIST b/py-brotlipy/PLIST
index 6f505f3d35..f98e6b5d44 100644
--- a/py-brotlipy/PLIST
+++ b/py-brotlipy/PLIST
@@ -2,7 +2,8 @@
 ${PYSITELIB}/brotli/__init__.py
 ${PYSITELIB}/brotli/__init__.pyc
 ${PYSITELIB}/brotli/__init__.pyo
-${PYSITELIB}/brotli/_brotli.so
+${PLIST.py2x}${PYSITELIB}/brotli/_brotli.so
+${PLIST.py3x}${PYSITELIB}/brotli/_brotli.abi3.so
 ${PYSITELIB}/brotli/brotli.py
 ${PYSITELIB}/brotli/brotli.pyc
 ${PYSITELIB}/brotli/brotli.pyo