pkgsrc-WIP-changes archive

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

sip5: linting, better home page, cleanup.



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Mon Jan 17 21:23:24 2022 +0100
Changeset:	4f633d28aa00b888b40990e72027b80cc45e8275

Modified Files:
	py-sip5/Makefile
Removed Files:
	py-sip5/TODO

Log Message:
sip5: linting, better home page, cleanup.

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

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

diffstat:
 py-sip5/Makefile | 15 +++++++++------
 py-sip5/TODO     |  8 --------
 2 files changed, 9 insertions(+), 14 deletions(-)

diffs:
diff --git a/py-sip5/Makefile b/py-sip5/Makefile
index 542c97bc39..242ddd8ec6 100644
--- a/py-sip5/Makefile
+++ b/py-sip5/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD$
 
 DISTNAME=	sip-${PKGVERSION_NOREV}
-PKGNAME=        ${PYPKGPREFIX}-sip5-5.5.0
+PKGNAME=	${PYPKGPREFIX}-sip5-5.5.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/sip/}
 
 MAINTAINER=	rhialto%NetBSD.org@localhost
-HOMEPAGE=	https://pypi.org/project/sip/
+HOMEPAGE=	https://www.riverbankcomputing.com/software/sip/
 COMMENT=	Tool to create Python bindings for C++ libraries
 LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3 OR modified-bsd
 
@@ -17,19 +17,22 @@ DEPENDS+=	${PYPKGPREFIX}-toml>=0:../../textproc/py-toml
 
 USE_LANGUAGES=	c c++
 
-CLI=			build distinfo install module sdist wheel
+CLI=			build distinfo install module sdist sip5 wheel
 MODULE.build=		sipbuild.tools.build
 MODULE.distinfo=	sipbuild.distinfo.main
 MODULE.install=		sipbuild.tools.install
 MODULE.module=		sipbuild.module.main
 MODULE.sdist=		sipbuild.tools.sdist
+MODULE.sip5=		sipbuild.legacy.sip5
 MODULE.wheel=		sipbuild.tools.wheel
 
+# Overwrite the console scripts with versions that don't fail
+# when sip-4.* is also installed.
 post-install:
 .for cli in ${CLI}
-	{ echo "#!${PYTHONBIN}"; \
-	  echo "import sys"; \
-	  echo "from ${MODULE.${cli}} import main; sys.exit(main());"; \
+	{ ${ECHO} "#!${PYTHONBIN}"; \
+	  ${ECHO} "import sys"; \
+	  ${ECHO} "from ${MODULE.${cli}} import main; sys.exit(main());"; \
 	} > ${DESTDIR}${PREFIX}/bin/sip-${cli}
 .endfor
 
diff --git a/py-sip5/TODO b/py-sip5/TODO
deleted file mode 100644
index faea576aa1..0000000000
--- a/py-sip5/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/sip-build doesn't find its libraries.
-
-It seems this is because importlib.metadata.distribution(name) only returns
-the first of the .dist-info and/or .egg-info instances it finds.
-But we can have both sip-4.19.25.dist-info and sip-6.5.0-py3.9.egg-info
-because they have no conflicting files, and then it finds the wrong one...
-
-This seems to be a systematic problem for all command line wrappers like these.


Home | Main Index | Thread Index | Old Index