CVS commit: pkgsrc/audio/py-beets

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jan  3 08:42:32 UTC 2020

Modified Files:
        pkgsrc/audio/py-beets: ALTERNATIVES Makefile PLIST

Log Message:
py-beets: mark as incompatible with Python 2.7; add dash to binary


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/py-beets/ALTERNATIVES
cvs rdiff -u -r1.24 -r1.25 pkgsrc/audio/py-beets/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/py-beets/PLIST

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

Modified files:

Index: pkgsrc/audio/py-beets/ALTERNATIVES
diff -u pkgsrc/audio/py-beets/ALTERNATIVES:1.1 pkgsrc/audio/py-beets/ALTERNATIVES:1.2
--- pkgsrc/audio/py-beets/ALTERNATIVES:1.1      Sun Jul 23 19:04:10 2017
+++ pkgsrc/audio/py-beets/ALTERNATIVES  Fri Jan  3 08:42:32 2020
@@ -1 +1 @@
-bin/beet @PREFIX@/bin/beet@PYVERSSUFFIX@
+bin/beet @PREFIX@/bin/beet-@PYVERSSUFFIX@

Index: pkgsrc/audio/py-beets/Makefile
diff -u pkgsrc/audio/py-beets/Makefile:1.24 pkgsrc/audio/py-beets/Makefile:1.25
--- pkgsrc/audio/py-beets/Makefile:1.24 Sun Dec 29 15:57:24 2019
+++ pkgsrc/audio/py-beets/Makefile      Fri Jan  3 08:42:32 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2019/12/29 15:57:24 sevan Exp $
+# $NetBSD: Makefile,v 1.25 2020/01/03 08:42:32 adam Exp $
 
 DISTNAME=      beets-1.4.9
+PKGREVISION=   1
 CATEGORIES=    audio python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=b/beets/}
 
@@ -20,15 +21,12 @@ DEPENDS+=   ${PYPKGPREFIX}-six>=1.9:../../
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-DEPENDS+=      ${PYPKGPREFIX}-enum34-[0-9]*:../../devel/py-enum34
-.endif
-
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-jellyfish
+
 post-install:
-       cd ${DESTDIR}${PREFIX}/bin && ${MV} beet beet${PYVERSSUFFIX} || ${TRUE}
+       cd ${DESTDIR}${PREFIX}/bin && ${MV} beet beet-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/py-beets/PLIST
diff -u pkgsrc/audio/py-beets/PLIST:1.14 pkgsrc/audio/py-beets/PLIST:1.15
--- pkgsrc/audio/py-beets/PLIST:1.14    Sun Dec 29 16:31:03 2019
+++ pkgsrc/audio/py-beets/PLIST Fri Jan  3 08:42:32 2020
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.14 2019/12/29 16:31:03 adam Exp $
-bin/beet${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.15 2020/01/03 08:42:32 adam Exp $
+bin/beet-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt