pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
py-cutadapt: Ditch ALTERNATIVES in favor of PYTHON_SELF_CONFLICT
Module Name: pkgsrc-wip
Committed By: Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By: outpaddling
Date: Sat Feb 10 06:47:41 2024 -0600
Changeset: 9a162ee9bf4f899cbb329e3db85297da478075f5
Modified Files:
py-cutadapt/Makefile
py-cutadapt/PLIST
Log Message:
py-cutadapt: Ditch ALTERNATIVES in favor of PYTHON_SELF_CONFLICT
Alternatives is overkill and there is no reason to have more than
one installation of py-cutadapt.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9a162ee9bf4f899cbb329e3db85297da478075f5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-cutadapt/Makefile | 10 +---------
py-cutadapt/PLIST | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diffs:
diff --git a/py-cutadapt/Makefile b/py-cutadapt/Makefile
index 9a45f02668..031bcc6219 100644
--- a/py-cutadapt/Makefile
+++ b/py-cutadapt/Makefile
@@ -13,9 +13,6 @@ LICENSE= mit
TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
# needed for python 3.11 as of cutadapt 3.5 release
TOOL_DEPENDS+= ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
-# The ALTERNATIVES file has no effect without this, and yet almost
-# none of the packages using ALTERNATIVES have this dependency
-TOOL_DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
DEPENDS+= ${PYPKGPREFIX}-xopen>=1.6.0:../../devel/py-xopen
DEPENDS+= ${PYPKGPREFIX}-dnaio>=0.10.0:../../wip/py-dnaio
@@ -23,12 +20,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-xopen
USE_PKG_RESOURCES= yes
-# Trying to use ALTERNATIVES instead
-# PYTHON_SELF_CONFLICT= yes
-
-post-install:
- cd ${DESTDIR}${PREFIX}/bin && \
- ${MV} cutadapt cutadapt-${PYVERSSUFFIX} || ${TRUE}
+PYTHON_SELF_CONFLICT= yes
.include "../../lang/python/wheel.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-cutadapt/PLIST b/py-cutadapt/PLIST
index f7a2355a82..deb85e0075 100644
--- a/py-cutadapt/PLIST
+++ b/py-cutadapt/PLIST
@@ -1,5 +1,5 @@
@comment $NetBSD$
-bin/cutadapt-${PYVERSSUFFIX}
+bin/cutadapt
${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
${PYSITELIB}/${WHEEL_INFODIR}/METADATA
${PYSITELIB}/${WHEEL_INFODIR}/RECORD
Home |
Main Index |
Thread Index |
Old Index