pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-wheel: avoid conflicts between same package, different python versions



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Jan 26 14:58:52 2016 +0100
Changeset:	0f198c5ff3749b9d81514a5ee7798b1580f4ebbc

Modified Files:
	py-wheel/Makefile
	py-wheel/PLIST
Added Files:
	py-wheel/ALTERNATIVES

Log Message:
py-wheel: avoid conflicts between same package, different python versions

From Thomas Orgis on pkgsrc-users.

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

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

diffstat:
 py-wheel/ALTERNATIVES |  1 +
 py-wheel/Makefile     | 10 ++++++++--
 py-wheel/PLIST        |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diffs:
diff --git a/py-wheel/ALTERNATIVES b/py-wheel/ALTERNATIVES
new file mode 100644
index 0000000..dc05a54
--- /dev/null
+++ b/py-wheel/ALTERNATIVES
@@ -0,0 +1 @@
+bin/wheel @PREFIX@/bin/wheel-@PYVERSSUFFIX@
diff --git a/py-wheel/Makefile b/py-wheel/Makefile
index a0dd737..f9baf90 100644
--- a/py-wheel/Makefile
+++ b/py-wheel/Makefile
@@ -3,15 +3,21 @@
 DISTNAME=	wheel-0.26.0
 PKGNAME=        ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
-MASTER_SITES=	https://pypi.python.org/packages/source/w/wheel/
+MASTER_SITES=	${MASTER_SITE_PYPI:=w/wheel/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://bitbucket.org/pypa/wheel/
 COMMENT=	Built-package format for Python
 LICENSE=	mit
 
-WRKSRC=		${WRKDIR}/wheel-0.26.0
 USE_LANGUAGES=	# none
 
+PLIST_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX}
+FILES_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX}
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/bin/wheel \
+	      ${DESTDIR}${PREFIX}/bin/wheel-${PYVERSSUFFIX}
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-wheel/PLIST b/py-wheel/PLIST
index 3927822..8b8ed3a 100644
--- a/py-wheel/PLIST
+++ b/py-wheel/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD$
-bin/wheel
+bin/wheel-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt


Home | Main Index | Thread Index | Old Index