pkgsrc-WIP-changes archive

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

py-weewx: try making this work with poetry-core 1.x and 2.x



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Feb 1 21:55:53 2025 +0100
Changeset:	5e4f49bf68b8572c66d144f03a0ee7480122449a

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

Log Message:
py-weewx: try making this work with poetry-core 1.x and 2.x

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

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

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

diffs:
diff --git a/py-weewx/Makefile b/py-weewx/Makefile
index 26220092c5..31783fe1f5 100644
--- a/py-weewx/Makefile
+++ b/py-weewx/Makefile
@@ -16,7 +16,6 @@ USE_LANGUAGES=
 # weewx uses sqlite3
 .include "../../lang/python/batteries-included.mk"
 
-TOOL_DEPENDS+=	${PYPKGPREFIX}-poetry-core>=2:../../devel/py-poetry-core
 TOOL_DEPENDS+=	${PYPKGPREFIX}-poetry>=0.12:../../devel/py-poetry
 
 # pyproject.toml, in order:
@@ -34,7 +33,7 @@ REPLACE_PYTHON+=		src/weewx_data/util/i18n/i18n-report
 # a split package.
 CHECK_INTERPRETER_SKIP+=	${PYSITELIB}/weewx_data/util/logwatch/scripts/services/weewx
 
-DOCDIR=		${PREFIX}/share/doc/weewx
+DOCDIR=		${PREFIX}/share/doc/weewx-${PYVERSSUFFIX}
 
 INSTALLATION_DIRS=	${DOCDIR}
 
@@ -44,8 +43,12 @@ INSTALLATION_DIRS=	${DOCDIR}
 # and sort of config files.
 
 post-install:
+	${RM} -f ${DESTDIR}/${PREFIX}/${PYSITELIB}/LICENSE.txt
+	${RM} -f ${DESTDIR}/${PREFIX}/${PYSITELIB}/README.md
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} weectl weectl-${PYVERSSUFFIX} || ${TRUE}
 	cd ${DESTDIR}${PREFIX}/bin && ${MV} weewxd weewxd-${PYVERSSUFFIX} || ${TRUE}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${DOCDIR}
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/wheel.mk"
diff --git a/py-weewx/PLIST b/py-weewx/PLIST
index 1943398d08..140bd7d3cd 100644
--- a/py-weewx/PLIST
+++ b/py-weewx/PLIST
@@ -476,3 +476,5 @@ ${PYSITELIB}/weewx_data/weewx.conf
 ${PYSITELIB}/weewxd.py
 ${PYSITELIB}/weewxd.pyc
 ${PYSITELIB}/weewxd.pyo
+share/doc/weewx-${PYVERSSUFFIX}/LICENSE.txt
+share/doc/weewx-${PYVERSSUFFIX}/README.md


Home | Main Index | Thread Index | Old Index