pkgsrc-WIP-changes archive

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

py-qtbuilder: add python version numbers to conflicting file names



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sat Jan 15 20:53:46 2022 +0100
Changeset:	6059e9892d7952ee1531c09d509ba408154600de

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

Log Message:
py-qtbuilder: add python version numbers to conflicting file names

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

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

diffstat:
 py-qtbuilder/Makefile | 5 +++++
 py-qtbuilder/PLIST    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs:
diff --git a/py-qtbuilder/Makefile b/py-qtbuilder/Makefile
index 07fbd6ab66..b94466681d 100644
--- a/py-qtbuilder/Makefile
+++ b/py-qtbuilder/Makefile
@@ -19,8 +19,13 @@ DEPENDS+=	${PYPKGPREFIX}-toml>=0:../../textproc/py-toml
 
 USE_LANGUAGES=	c c++
 
+PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX}
+
 post-install:
 	cd ${DESTDIR}${PREFIX}/${PYSITELIB}/pyqtbuild/bundle && rm -r dlls
+	cd ${DESTDIR}${PREFIX}/bin && \
+		mv pyqt-bundle ${PYPKGPREFIX}qt-bundle && \
+		mv pyqt-qt-wheel ${PYPKGPREFIX}qt-qt-wheel
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-qtbuilder/PLIST b/py-qtbuilder/PLIST
index cddd56c5e6..7bb180fd5f 100644
--- a/py-qtbuilder/PLIST
+++ b/py-qtbuilder/PLIST
@@ -1,6 +1,6 @@
 @comment $NetBSD$
-bin/pyqt-bundle
-bin/pyqt-qt-wheel
+bin/${PYPKGPREFIX}qt-bundle
+bin/${PYPKGPREFIX}qt-qt-wheel
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt


Home | Main Index | Thread Index | Old Index