CVS commit: pkgsrc/www/py-notebook

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Fri May 11 19:46:36 UTC 2018

Modified Files:
        pkgsrc/www/py-notebook: Makefile PLIST

Log Message:
www/py-notebook: Use PLIST.py3x instead of defining new one

Suggested by leot@.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-notebook/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/py-notebook/PLIST

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

Modified files:

Index: pkgsrc/www/py-notebook/Makefile
diff -u pkgsrc/www/py-notebook/Makefile:1.7 pkgsrc/www/py-notebook/Makefile:1.8
--- pkgsrc/www/py-notebook/Makefile:1.7 Fri May 11 19:24:58 2018
+++ pkgsrc/www/py-notebook/Makefile     Fri May 11 19:46:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/05/11 19:24:58 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/11 19:46:36 minskim Exp $
 
 DISTNAME=      notebook-5.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -25,13 +25,6 @@ DEPENDS+=    ${PYPKGPREFIX}-zmq>=17.0.0:../
 
 USE_LANGUAGES= # none
 
-.include "../../lang/python/pyversion.mk"
-
-PLIST_VARS+=   py3
-.if "${PYPKGPREFIX}" != "py27"
-PLIST.py3=     yes
-.endif
-
 post-install:
        for f in jupyter-bundlerextension jupyter-nbextension jupyter-notebook jupyter-serverextension; do \
                ${MV} ${DESTDIR}${PREFIX}/bin/$$f ${DESTDIR}${PREFIX}/bin/$${f}${PYVERSSUFFIX} || ${TRUE}; \

Index: pkgsrc/www/py-notebook/PLIST
diff -u pkgsrc/www/py-notebook/PLIST:1.5 pkgsrc/www/py-notebook/PLIST:1.6
--- pkgsrc/www/py-notebook/PLIST:1.5    Fri May 11 19:24:58 2018
+++ pkgsrc/www/py-notebook/PLIST        Fri May 11 19:46:36 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/05/11 19:24:58 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/05/11 19:46:36 minskim Exp $
 bin/jupyter-bundlerextension${PYVERSSUFFIX}
 bin/jupyter-nbextension${PYVERSSUFFIX}
 bin/jupyter-notebook${PYVERSSUFFIX}
@@ -1421,8 +1421,8 @@ ${PYSITELIB}/notebook/tests/selenium/und
 ${PYSITELIB}/notebook/tests/selenium/undelete.pyc
 ${PYSITELIB}/notebook/tests/selenium/undelete.pyo
 ${PYSITELIB}/notebook/tests/selenium/utils.py
-${PLIST.py3}${PYSITELIB}/notebook/tests/selenium/utils.pyc
-${PLIST.py3}${PYSITELIB}/notebook/tests/selenium/utils.pyo
+${PLIST.py3x}${PYSITELIB}/notebook/tests/selenium/utils.pyc
+${PLIST.py3x}${PYSITELIB}/notebook/tests/selenium/utils.pyo
 ${PYSITELIB}/notebook/tests/services/kernel.js
 ${PYSITELIB}/notebook/tests/services/serialize.js
 ${PYSITELIB}/notebook/tests/services/session.js