View | Details | Raw Unified | Return to bug 236428 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +15 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	dulwich
4
PORTNAME=	dulwich
5
PORTVERSION=	0.18.6
5
PORTVERSION=	0.19.11
6
CATEGORIES=	devel python
6
CATEGORIES=	devel python
7
MASTER_SITES=	CHEESESHOP
7
MASTER_SITES=	CHEESESHOP
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 14-20 Link Here
14
LICENSE_COMB=	dual
14
LICENSE_COMB=	dual
15
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/COPYING
16
16
17
PORTDOCS=	AUTHORS NEWS README.md TODO conclusion.txt \
17
PORTDOCS=	AUTHORS NEWS README.rst TODO conclusion.txt encoding.txt \
18
		file-format.txt index.txt introduction.txt object-store.txt \
18
		file-format.txt index.txt introduction.txt object-store.txt \
19
		performance.txt porcelain.txt protocol.txt remote.txt repo.txt tag.txt
19
		performance.txt porcelain.txt protocol.txt remote.txt repo.txt tag.txt
20
PORTEXAMPLES=	clone.py config.py diff.py latest_change.py
20
PORTEXAMPLES=	clone.py config.py diff.py latest_change.py
Lines 21-35 Link Here
21
21
22
USES=		cpe python
22
USES=		cpe python
23
CPE_VENDOR=	dulwich_project
23
CPE_VENDOR=	dulwich_project
24
USE_PYTHON=	distutils autoplist
24
USE_PYTHON=	distutils autoplist concurrent
25
25
26
OPTIONS_DEFINE=	DOCS EXAMPLES
26
OPTIONS_DEFINE=		DOCS EXAMPLES TESTS
27
OPTIONS_DEFAULT=	TESTS
28
TESTS_DESC=		Install tests and test data
27
29
30
.include <bsd.port.options.mk>
31
28
post-patch:
32
post-patch:
29
	${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = ${PYTHON_CMD}|g' \
33
	${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = ${PYTHON_CMD}|g' \
30
		${WRKSRC}/Makefile
34
		${WRKSRC}/Makefile
31
	${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
35
	${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
32
		${WRKSRC}/setup.py ${WRKSRC}/examples/*.py
36
		${WRKSRC}/setup.py ${WRKSRC}/examples/*.py
37
.if ! ${PORT_OPTIONS:MTESTS}
38
	${REINPLACE_CMD} -e '/tests/d' \
39
		${WRKSRC}/dulwich.egg-info/SOURCES.txt \
40
		${WRKSRC}/MANIFEST.in
41
	${REINPLACE_CMD} -e "/packages=/s|'dulwich\.tests[^']*',||g" \
42
		${WRKSRC}/setup.py
43
.endif
33
44
34
post-install:
45
post-install:
35
	@${STRIP_CMD} ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/*.so
46
	@${STRIP_CMD} ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/*.so
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1516829918
1
TIMESTAMP = 1552164645
2
SHA256 (dulwich-0.18.6.tar.gz) = 38a04406bc68315794c3bab37c7d4ed137fb8a839482d8894e72b0d9b3eb41a9
2
SHA256 (dulwich-0.19.11.tar.gz) = afbe070f6899357e33f63f3f3696e601731fef66c64a489dea1bc9f539f4a725
3
SIZE (dulwich-0.18.6.tar.gz) = 331325
3
SIZE (dulwich-0.19.11.tar.gz) = 364581
(-)files/patch-MANIFEST.in (-10 lines)
Lines 1-10 Link Here
1
--- MANIFEST.in.orig	2016-07-03 19:17:14 UTC
2
+++ MANIFEST.in
3
@@ -11,7 +11,6 @@ include setup.cfg
4
 include dulwich/stdint.h
5
 recursive-include docs conf.py *.txt Makefile make.bat
6
 recursive-include examples *.py
7
-graft dulwich/tests/data
8
 include tox.ini
9
 include dulwich.cfg
10
 include appveyor.yml
(-)files/patch-dulwich.egg-info_SOURCES.txt (-130 lines)
Lines 1-130 Link Here
1
--- dulwich.egg-info/SOURCES.txt.orig	2018-01-24 22:39:28 UTC
2
+++ dulwich.egg-info/SOURCES.txt
3
@@ -76,125 +76,7 @@ dulwich/contrib/swift.py
4
 dulwich/contrib/test_release_robot.py
5
 dulwich/contrib/test_swift.py
6
 dulwich/contrib/test_swift_smoke.py
7
-dulwich/tests/__init__.py
8
-dulwich/tests/test_archive.py
9
-dulwich/tests/test_blackbox.py
10
-dulwich/tests/test_client.py
11
-dulwich/tests/test_config.py
12
-dulwich/tests/test_diff_tree.py
13
-dulwich/tests/test_fastexport.py
14
-dulwich/tests/test_file.py
15
-dulwich/tests/test_grafts.py
16
-dulwich/tests/test_greenthreads.py
17
-dulwich/tests/test_hooks.py
18
-dulwich/tests/test_ignore.py
19
-dulwich/tests/test_index.py
20
-dulwich/tests/test_lru_cache.py
21
-dulwich/tests/test_missing_obj_finder.py
22
-dulwich/tests/test_object_store.py
23
-dulwich/tests/test_objects.py
24
-dulwich/tests/test_objectspec.py
25
-dulwich/tests/test_pack.py
26
-dulwich/tests/test_patch.py
27
-dulwich/tests/test_porcelain.py
28
-dulwich/tests/test_protocol.py
29
-dulwich/tests/test_reflog.py
30
-dulwich/tests/test_refs.py
31
-dulwich/tests/test_repository.py
32
-dulwich/tests/test_server.py
33
-dulwich/tests/test_utils.py
34
-dulwich/tests/test_walk.py
35
-dulwich/tests/test_web.py
36
-dulwich/tests/utils.py
37
-dulwich/tests/compat/__init__.py
38
-dulwich/tests/compat/server_utils.py
39
-dulwich/tests/compat/test_client.py
40
-dulwich/tests/compat/test_pack.py
41
-dulwich/tests/compat/test_repository.py
42
-dulwich/tests/compat/test_server.py
43
-dulwich/tests/compat/test_utils.py
44
-dulwich/tests/compat/test_web.py
45
-dulwich/tests/compat/utils.py
46
-dulwich/tests/data/blobs/11/11111111111111111111111111111111111111
47
-dulwich/tests/data/blobs/6f/670c0fb53f9463760b7295fbb814e965fb20c8
48
-dulwich/tests/data/blobs/95/4a536f7819d40e6f637f849ee187dd10066349
49
-dulwich/tests/data/blobs/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
50
-dulwich/tests/data/commits/0d/89f20333fbb1d2f3a94da77f4981373d8f4310
51
-dulwich/tests/data/commits/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc
52
-dulwich/tests/data/commits/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e
53
-dulwich/tests/data/indexes/index
54
-dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.idx
55
-dulwich/tests/data/packs/pack-bc63ddad95e7321ee734ea11a7a62d314e0d7481.pack
56
-dulwich/tests/data/repos/.gitattributes
57
-dulwich/tests/data/repos/issue88_expect_ack_nak_client.export
58
-dulwich/tests/data/repos/issue88_expect_ack_nak_other.export
59
-dulwich/tests/data/repos/issue88_expect_ack_nak_server.export
60
-dulwich/tests/data/repos/server_new.export
61
-dulwich/tests/data/repos/server_old.export
62
-dulwich/tests/data/repos/a.git/HEAD
63
-dulwich/tests/data/repos/a.git/packed-refs
64
-dulwich/tests/data/repos/a.git/objects/28/237f4dc30d0d462658d6b937b08a0f0b6ef55a
65
-dulwich/tests/data/repos/a.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91
66
-dulwich/tests/data/repos/a.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec
67
-dulwich/tests/data/repos/a.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9
68
-dulwich/tests/data/repos/a.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364
69
-dulwich/tests/data/repos/a.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005
70
-dulwich/tests/data/repos/a.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097
71
-dulwich/tests/data/repos/a.git/objects/b0/931cadc54336e78a1d980420e3268903b57a50
72
-dulwich/tests/data/repos/a.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f
73
-dulwich/tests/data/repos/a.git/refs/heads/master
74
-dulwich/tests/data/repos/a.git/refs/tags/mytag
75
-dulwich/tests/data/repos/empty.git/HEAD
76
-dulwich/tests/data/repos/empty.git/config
77
-dulwich/tests/data/repos/empty.git/objects/info/.gitignore
78
-dulwich/tests/data/repos/empty.git/objects/pack/.gitignore
79
-dulwich/tests/data/repos/empty.git/refs/heads/.gitignore
80
-dulwich/tests/data/repos/empty.git/refs/tags/.gitignore
81
-dulwich/tests/data/repos/ooo_merge.git/HEAD
82
-dulwich/tests/data/repos/ooo_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b
83
-dulwich/tests/data/repos/ooo_merge.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520
84
-dulwich/tests/data/repos/ooo_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8
85
-dulwich/tests/data/repos/ooo_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
86
-dulwich/tests/data/repos/ooo_merge.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1
87
-dulwich/tests/data/repos/ooo_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870
88
-dulwich/tests/data/repos/ooo_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349
89
-dulwich/tests/data/repos/ooo_merge.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa
90
-dulwich/tests/data/repos/ooo_merge.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614
91
-dulwich/tests/data/repos/ooo_merge.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c
92
-dulwich/tests/data/repos/ooo_merge.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5
93
-dulwich/tests/data/repos/ooo_merge.git/refs/heads/master
94
-dulwich/tests/data/repos/refs.git/HEAD
95
-dulwich/tests/data/repos/refs.git/packed-refs
96
-dulwich/tests/data/repos/refs.git/objects/3b/9e5457140e738c2dcd39bf6d7acf88379b90d1
97
-dulwich/tests/data/repos/refs.git/objects/3e/c9c43c84ff242e3ef4a9fc5bc111fd780a76a8
98
-dulwich/tests/data/repos/refs.git/objects/42/d06bd4b77fed026b154d16493e5deab78f02ec
99
-dulwich/tests/data/repos/refs.git/objects/a1/8114c31713746a33a2e70d9914d1ef3e781425
100
-dulwich/tests/data/repos/refs.git/objects/cd/a609072918d7b70057b6bef9f4c2537843fcfe
101
-dulwich/tests/data/repos/refs.git/objects/df/6800012397fb85c56e7418dd4eb9405dee075c
102
-dulwich/tests/data/repos/refs.git/refs/heads/40-char-ref-aaaaaaaaaaaaaaaaaa
103
-dulwich/tests/data/repos/refs.git/refs/heads/loop
104
-dulwich/tests/data/repos/refs.git/refs/heads/master
105
-dulwich/tests/data/repos/refs.git/refs/tags/refs-0.2
106
-dulwich/tests/data/repos/simple_merge.git/HEAD
107
-dulwich/tests/data/repos/simple_merge.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310
108
-dulwich/tests/data/repos/simple_merge.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853
109
-dulwich/tests/data/repos/simple_merge.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b
110
-dulwich/tests/data/repos/simple_merge.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6
111
-dulwich/tests/data/repos/simple_merge.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc
112
-dulwich/tests/data/repos/simple_merge.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e
113
-dulwich/tests/data/repos/simple_merge.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8
114
-dulwich/tests/data/repos/simple_merge.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
115
-dulwich/tests/data/repos/simple_merge.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870
116
-dulwich/tests/data/repos/simple_merge.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349
117
-dulwich/tests/data/repos/simple_merge.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd
118
-dulwich/tests/data/repos/simple_merge.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7
119
-dulwich/tests/data/repos/simple_merge.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86
120
-dulwich/tests/data/repos/simple_merge.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
121
-dulwich/tests/data/repos/simple_merge.git/refs/heads/master
122
-dulwich/tests/data/repos/submodule/dotgit
123
-dulwich/tests/data/tags/71/033db03a03c6a36721efcf1968dd8f8e0cf023
124
-dulwich/tests/data/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
125
 examples/clone.py
126
 examples/config.py
127
 examples/diff.py
128
-examples/latest_change.py
129
\ No newline at end of file
130
+examples/latest_change.py
(-)files/patch-setup.py (-12 lines)
Lines 1-12 Link Here
1
--- setup.py.orig	2018-01-24 16:10:15.448366000 -0600
2
+++ setup.py	2018-01-24 16:10:49.157689000 -0600
3
@@ -91,8 +91,7 @@
4
       The project is named after the part of London that Mr. and Mrs. Git live
5
       in in the particular Monty Python sketch.
6
       """,
7
-      packages=['dulwich', 'dulwich.tests', 'dulwich.tests.compat',
8
-                'dulwich.contrib'],
9
+      packages=['dulwich', 'dulwich.contrib'],
10
       package_data={'': ['../docs/tutorial/*.txt']},
11
       scripts=['bin/dulwich', 'bin/dul-receive-pack', 'bin/dul-upload-pack'],
12
       classifiers=[

Return to bug 236428