pkgsrc-WIP-changes archive

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

py-octoprint: append the version of Python to the binary



Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Mon Nov 23 06:52:11 2020 +0100
Changeset:	526ee346870cf40e14d82e121de3822c55a09b1e

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

Log Message:
py-octoprint: append the version of Python to the binary

This should allow concurrent installation with different versions of Python.

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

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

diffstat:
 py-octoprint/ALTERNATIVES | 1 +
 py-octoprint/Makefile     | 4 ++++
 py-octoprint/PLIST        | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diffs:
diff --git a/py-octoprint/ALTERNATIVES b/py-octoprint/ALTERNATIVES
new file mode 100644
index 0000000000..ee13895a8a
--- /dev/null
+++ b/py-octoprint/ALTERNATIVES
@@ -0,0 +1 @@
+bin/octoprint @PREFIX@/bin/octoprint-@PYVERSSUFFIX@
diff --git a/py-octoprint/Makefile b/py-octoprint/Makefile
index 0fdcc84302..a261b5c000 100644
--- a/py-octoprint/Makefile
+++ b/py-octoprint/Makefile
@@ -45,5 +45,9 @@ DEPENDS+=	${PYPKGPREFIX}-websocket-client>=0.57:../../www/py-websocket-client
 DEPENDS+=	${PYPKGPREFIX}-werkzeug>=1.0.1:../../www/py-werkzeug
 DEPENDS+=	${PYPKGPREFIX}-wrapt>=1.12.1:../../devel/py-wrapt
 
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/bin/octoprint \
+		${DESTDIR}${PREFIX}/bin/octoprint-${PYVERSSUFFIX} || ${TRUE}
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-octoprint/PLIST b/py-octoprint/PLIST
index f5ef4a5518..b495b8b3bd 100644
--- a/py-octoprint/PLIST
+++ b/py-octoprint/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD$
-bin/octoprint
+bin/octoprint-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt


Home | Main Index | Thread Index | Old Index