diff options
| author | wiz <wiz@pkgsrc.org> | 2016-02-05 12:40:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-02-05 12:40:56 +0000 |
| commit | 463feed0732c70b34b545a095cbe05d3c38937b8 (patch) | |
| tree | 43c8cb38b67ae9fd58d052065297e3efcf3874f3 /converters | |
| parent | 7c0f5680171712da176714d07bfd4ee7a919d731 (diff) | |
| download | pkgsrc-463feed0732c70b34b545a095cbe05d3c38937b8.tar.gz | |
Fix self-conflict between different python versions of this package.
Bump PKGREVISION.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/py-chardet/ALTERNATIVES | 1 | ||||
| -rw-r--r-- | converters/py-chardet/Makefile | 10 | ||||
| -rw-r--r-- | converters/py-chardet/PLIST | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/converters/py-chardet/ALTERNATIVES b/converters/py-chardet/ALTERNATIVES new file mode 100644 index 00000000000..6b48b679846 --- /dev/null +++ b/converters/py-chardet/ALTERNATIVES @@ -0,0 +1 @@ +bin/chardetect @PREFIX@/bin/chardetect-@PYVERSSUFFIX@ diff --git a/converters/py-chardet/Makefile b/converters/py-chardet/Makefile index cdd7d690e94..b5dddc60814 100644 --- a/converters/py-chardet/Makefile +++ b/converters/py-chardet/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2014/10/12 14:52:36 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2016/02/05 12:40:56 wiz Exp $ DISTNAME= chardet-2.3.0 +PKGREVISION= 1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= converters python MASTER_SITES= http://pypi.python.org/packages/source/c/chardet/ @@ -10,7 +11,12 @@ HOMEPAGE= http://pypi.python.org/pypi/chardet COMMENT= Character encoding auto-detection in Python LICENSE= gnu-lgpl-v2.1 -REPLACE_PYTHON= chardet/chardetect.py +REPLACE_PYTHON= chardet/chardetect.py +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} + +post-install: + ${MV} ${DESTDIR}${PREFIX}/bin/chardetect ${DESTDIR}${PREFIX}/bin/chardetect-${PYVERSSUFFIX} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/converters/py-chardet/PLIST b/converters/py-chardet/PLIST index 7aef0313145..a7d406805ec 100644 --- a/converters/py-chardet/PLIST +++ b/converters/py-chardet/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.7 2014/01/02 17:55:40 wiz Exp $ -bin/chardetect +@comment $NetBSD: PLIST,v 1.8 2016/02/05 12:40:56 wiz Exp $ +bin/chardetect-${PYVERSSUFFIX} ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt |