summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2018-04-17 13:24:16 +0000
committeradam <adam@pkgsrc.org>2018-04-17 13:24:16 +0000
commit79e7e893e443309c17a0c7bdd203380c64367a8e (patch)
tree3c271677136bf36a6825b05c13e22fd38e1a9c7c
parenta30423ebff2edca1136c71f61b961f9516974a70 (diff)
downloadpkgsrc-79e7e893e443309c17a0c7bdd203380c64367a8e.tar.gz
py-fastimport: updated to 0.9.8
0.9.8: * Fix version number. 0.9.7: * Don't attempt to encode bytestrings in utf8_bytes_helper(). * Add fast-import-filter, fast-import-query and fast-import-info script.
-rw-r--r--devel/py-fastimport/ALTERNATIVES3
-rw-r--r--devel/py-fastimport/Makefile15
-rw-r--r--devel/py-fastimport/PLIST14
-rw-r--r--devel/py-fastimport/distinfo12
-rw-r--r--devel/py-fastimport/patches/patch-fastimport_parser.py6
5 files changed, 36 insertions, 14 deletions
diff --git a/devel/py-fastimport/ALTERNATIVES b/devel/py-fastimport/ALTERNATIVES
new file mode 100644
index 00000000000..29d78d71f08
--- /dev/null
+++ b/devel/py-fastimport/ALTERNATIVES
@@ -0,0 +1,3 @@
+bin/fast-import-filter @PREFIX@/bin/fast-import-filter-@PYVERSSUFFIX@
+bin/fast-import-info @PREFIX@/bin/fast-import-info-@PYVERSSUFFIX@
+bin/fast-import-query @PREFIX@/bin/fast-import-query-@PYVERSSUFFIX@
diff --git a/devel/py-fastimport/Makefile b/devel/py-fastimport/Makefile
index 4c96e71ad11..5ecd4fb5d04 100644
--- a/devel/py-fastimport/Makefile
+++ b/devel/py-fastimport/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2017/07/25 16:10:53 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2018/04/17 13:24:16 adam Exp $
-DISTNAME= fastimport-0.9.6
+DISTNAME= fastimport-0.9.8
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION= 1
-CATEGORIES= devel scm
+CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_PYPI:=f/fastimport/}
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -11,7 +10,13 @@ HOMEPAGE= https://github.com/jelmer/python-fastimport
COMMENT= Fastimport parser and generator in Python
LICENSE= gnu-gpl-v2
-USE_LANGUAGES= # none
+USE_LANGUAGES= # none
+
+post-install:
+ cd ${DESTDIR}${PREFIX}/bin && \
+ ${MV} fast-import-filter fast-import-filter-${PYVERSSUFFIX} && \
+ ${MV} fast-import-info fast-import-info-${PYVERSSUFFIX} && \
+ ${MV} fast-import-query fast-import-query-${PYVERSSUFFIX} || ${TRUE}
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-fastimport/PLIST b/devel/py-fastimport/PLIST
index 3450bd0c844..322cbfabb1d 100644
--- a/devel/py-fastimport/PLIST
+++ b/devel/py-fastimport/PLIST
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2015/06/07 08:19:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/04/17 13:24:16 adam Exp $
+bin/fast-import-filter-${PYVERSSUFFIX}
+bin/fast-import-info-${PYVERSSUFFIX}
+bin/fast-import-query-${PYVERSSUFFIX}
${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/fastimport/__init__.py
${PYSITELIB}/fastimport/__init__.pyc
@@ -27,9 +30,15 @@ ${PYSITELIB}/fastimport/processors/__init__.pyo
${PYSITELIB}/fastimport/processors/filter_processor.py
${PYSITELIB}/fastimport/processors/filter_processor.pyc
${PYSITELIB}/fastimport/processors/filter_processor.pyo
+${PYSITELIB}/fastimport/processors/info_processor.py
+${PYSITELIB}/fastimport/processors/info_processor.pyc
+${PYSITELIB}/fastimport/processors/info_processor.pyo
${PYSITELIB}/fastimport/processors/query_processor.py
${PYSITELIB}/fastimport/processors/query_processor.pyc
${PYSITELIB}/fastimport/processors/query_processor.pyo
+${PYSITELIB}/fastimport/reftracker.py
+${PYSITELIB}/fastimport/reftracker.pyc
+${PYSITELIB}/fastimport/reftracker.pyo
${PYSITELIB}/fastimport/tests/__init__.py
${PYSITELIB}/fastimport/tests/__init__.pyc
${PYSITELIB}/fastimport/tests/__init__.pyo
@@ -48,6 +57,9 @@ ${PYSITELIB}/fastimport/tests/test_filter_processor.pyo
${PYSITELIB}/fastimport/tests/test_helpers.py
${PYSITELIB}/fastimport/tests/test_helpers.pyc
${PYSITELIB}/fastimport/tests/test_helpers.pyo
+${PYSITELIB}/fastimport/tests/test_info_processor.py
+${PYSITELIB}/fastimport/tests/test_info_processor.pyc
+${PYSITELIB}/fastimport/tests/test_info_processor.pyo
${PYSITELIB}/fastimport/tests/test_parser.py
${PYSITELIB}/fastimport/tests/test_parser.pyc
${PYSITELIB}/fastimport/tests/test_parser.pyo
diff --git a/devel/py-fastimport/distinfo b/devel/py-fastimport/distinfo
index 0ed03a76e4d..6fcb4e4f745 100644
--- a/devel/py-fastimport/distinfo
+++ b/devel/py-fastimport/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2017/07/25 16:10:53 joerg Exp $
+$NetBSD: distinfo,v 1.5 2018/04/17 13:24:16 adam Exp $
-SHA1 (fastimport-0.9.6.tar.gz) = b6d52ae8cc1d76c1db8d4f416fc4b334ad5fe568
-RMD160 (fastimport-0.9.6.tar.gz) = 1ca2b8486c5b6b7a76bbeca6b967c78dd4211aca
-SHA512 (fastimport-0.9.6.tar.gz) = cc38c1218d65ef4a9e3a68d8af3fadf98c7cc0dcd8075b338b8f492d25765bc2fe2247000868fd3c95e1f7f4c2b9a05964ef7b4f9196c2777f6a7941f127f416
-Size (fastimport-0.9.6.tar.gz) = 33333 bytes
-SHA1 (patch-fastimport_parser.py) = 830a12da3ef6939cfd37624eb7765f40a0d0ee8a
+SHA1 (fastimport-0.9.8.tar.gz) = 9ca3cbffbafe48f3e59dedc00ecfd37297ff0a6d
+RMD160 (fastimport-0.9.8.tar.gz) = 9fca430a0e9ead3b26d70e331db3879fb244798d
+SHA512 (fastimport-0.9.8.tar.gz) = 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
+Size (fastimport-0.9.8.tar.gz) = 39512 bytes
+SHA1 (patch-fastimport_parser.py) = 5e02b59ee11411d8288e0345b5014ff1fc97cc54
diff --git a/devel/py-fastimport/patches/patch-fastimport_parser.py b/devel/py-fastimport/patches/patch-fastimport_parser.py
index 26f6d6b0d28..0b76b65c77a 100644
--- a/devel/py-fastimport/patches/patch-fastimport_parser.py
+++ b/devel/py-fastimport/patches/patch-fastimport_parser.py
@@ -1,4 +1,6 @@
-$NetBSD: patch-fastimport_parser.py,v 1.1 2017/07/25 16:10:53 joerg Exp $
+$NetBSD: patch-fastimport_parser.py,v 1.2 2018/04/17 13:24:16 adam Exp $
+
+Fix encoding.
--- fastimport/parser.py.orig 2016-04-18 18:09:28.000000000 +0000
+++ fastimport/parser.py
@@ -7,7 +9,7 @@ $NetBSD: patch-fastimport_parser.py,v 1.1 2017/07/25 16:10:53 joerg Exp $
def __init__(self, input_stream, verbose=False, output=sys.stdout,
- user_mapper=None, strict=True):
-+ user_mapper=None, strict=True, message_fallback_encoding = None):
++ user_mapper=None, strict=True, message_fallback_encoding=None):
"""A Parser of import commands.
:param input_stream: the file-like object to read from