ports/182746: [maintainer-update] [patch] devel/dulwich: Update to 0.9.1. Add stage support.

Marco Bröder marco.broeder at gmx.eu
Sun Oct 6 14:40:00 UTC 2013


>Number:         182746
>Category:       ports
>Synopsis:       [maintainer-update] [patch] devel/dulwich: Update to 0.9.1. Add stage support.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 06 14:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Marco Bröder
>Release:        
>Organization:
>Environment:
>Description:
Update to 0.9.1 release.

Add PORTEXAMPLES.

Support staging.

Remove options file workaround.

Use the new PYDISTUTILS_AUTOPLIST knob and remove pkg-plist.

Since it is now possible to use the python meta-ports as direct dependencies,
just depend on the python 2 meta-port, because a specific minor version is not
relevant.

Minor fixes / safety belt additions.

Tested (amd64) on head, stable/9, releng/9.2, releng/8.4.

Thanks!

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/devel/dulwich/Makefile b/devel/dulwich/Makefile
index 3e7befe..0abca30 100644
--- a/devel/dulwich/Makefile
+++ b/devel/dulwich/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/devel/dulwich/Makefile 327722 2013-09-20 17:03:26Z bapt $
 
 PORTNAME=	dulwich
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.samba.org/~jelmer/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,31 +13,37 @@ COMMENT=	Pure-Python implementation of the Git file formats and protocols
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
+PORTDOCS=	NEWS README introduction.txt object-store.txt protocol.txt \
+		remote.txt repo.txt tag.txt
+PORTEXAMPLES=	clone.py diff.py
 
-PORTDOCS=	AUTHORS HACKING NEWS README introduction.txt \
-		object-store.txt protocol.txt remote.txt repo.txt tag.txt
-
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_PYDISTUTILS=yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
-OPTIONS_DEFINE=	DOCS
-OPTIONS_DEFAULT=DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFAULT=DOCS EXAMPLES
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = ${PYTHON_CMD}|g' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
-		${WRKSRC}/setup.py
+		${WRKSRC}/setup.py ${WRKSRC}/examples/*.py
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${CP} ${WRKSRC}/docs/*.txt ${WRKSRC}/docs/tutorial/*.txt ${WRKSRC}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	${CP} ${WRKSRC}/docs/*.txt ${WRKSRC}/docs/tutorial/*.txt ${WRKSRC}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/)
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${CP} ${WRKSRC}/examples/*.py ${WRKSRC}/
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} ${PORTEXAMPLES} \
+		${STAGEDIR}${EXAMPLESDIR}/)
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/dulwich/distinfo b/devel/dulwich/distinfo
index 191a928..b48a048 100644
--- a/devel/dulwich/distinfo
+++ b/devel/dulwich/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dulwich-0.9.0.tar.gz) = bc6df3634216d01064d86c0bad8b39f26802dbfe37d34f1b0edf8a60c4ca8f25
-SIZE (dulwich-0.9.0.tar.gz) = 221697
+SHA256 (dulwich-0.9.1.tar.gz) = 3396b821e6119b33ab0d6554f193d3d51e1debf5bcd7206ac155b808f426a1e8
+SIZE (dulwich-0.9.1.tar.gz) = 223606
diff --git a/devel/dulwich/pkg-plist b/devel/dulwich/pkg-plist
deleted file mode 100644
index 7c74bd0..0000000
--- a/devel/dulwich/pkg-plist
+++ /dev/null
@@ -1,137 +0,0 @@
-bin/dul-daemon
-bin/dul-web
-bin/dulwich
-%%PYTHON_SITELIBDIR%%/dulwich/__init__.py
-%%PYTHON_SITELIBDIR%%/dulwich/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/__init__.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/_compat.py
-%%PYTHON_SITELIBDIR%%/dulwich/_compat.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/_compat.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/_diff_tree.so
-%%PYTHON_SITELIBDIR%%/dulwich/_objects.so
-%%PYTHON_SITELIBDIR%%/dulwich/_pack.so
-%%PYTHON_SITELIBDIR%%/dulwich/client.py
-%%PYTHON_SITELIBDIR%%/dulwich/client.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/client.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/config.py
-%%PYTHON_SITELIBDIR%%/dulwich/config.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/config.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/diff_tree.py
-%%PYTHON_SITELIBDIR%%/dulwich/diff_tree.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/diff_tree.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/errors.py
-%%PYTHON_SITELIBDIR%%/dulwich/errors.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/errors.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/fastexport.py
-%%PYTHON_SITELIBDIR%%/dulwich/fastexport.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/fastexport.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/file.py
-%%PYTHON_SITELIBDIR%%/dulwich/file.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/file.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/hooks.py
-%%PYTHON_SITELIBDIR%%/dulwich/hooks.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/hooks.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/index.py
-%%PYTHON_SITELIBDIR%%/dulwich/index.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/index.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/log_utils.py
-%%PYTHON_SITELIBDIR%%/dulwich/log_utils.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/log_utils.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/lru_cache.py
-%%PYTHON_SITELIBDIR%%/dulwich/lru_cache.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/lru_cache.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/object_store.py
-%%PYTHON_SITELIBDIR%%/dulwich/object_store.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/object_store.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/objects.py
-%%PYTHON_SITELIBDIR%%/dulwich/objects.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/objects.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/pack.py
-%%PYTHON_SITELIBDIR%%/dulwich/pack.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/pack.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/patch.py
-%%PYTHON_SITELIBDIR%%/dulwich/patch.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/patch.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/protocol.py
-%%PYTHON_SITELIBDIR%%/dulwich/protocol.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/protocol.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/repo.py
-%%PYTHON_SITELIBDIR%%/dulwich/repo.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/repo.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/server.py
-%%PYTHON_SITELIBDIR%%/dulwich/server.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/server.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/walk.py
-%%PYTHON_SITELIBDIR%%/dulwich/walk.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/walk.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/web.py
-%%PYTHON_SITELIBDIR%%/dulwich/web.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/web.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_blackbox.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_blackbox.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_blackbox.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_client.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_client.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_client.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_config.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_config.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_config.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_diff_tree.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_diff_tree.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_diff_tree.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_fastexport.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_fastexport.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_fastexport.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_file.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_file.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_file.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_hooks.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_hooks.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_hooks.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_index.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_index.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_index.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_lru_cache.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_lru_cache.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_lru_cache.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_missing_obj_finder.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_missing_obj_finder.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_missing_obj_finder.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_object_store.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_object_store.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_object_store.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_objects.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_objects.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_objects.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_pack.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_pack.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_pack.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_patch.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_patch.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_patch.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_protocol.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_protocol.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_protocol.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_repository.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_repository.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_repository.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_server.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_server.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_server.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_walk.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_walk.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_walk.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_web.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_web.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_web.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_utils.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_utils.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/test_utils.pyo
-%%PYTHON_SITELIBDIR%%/dulwich/tests/utils.py
-%%PYTHON_SITELIBDIR%%/dulwich/tests/utils.pyc
-%%PYTHON_SITELIBDIR%%/dulwich/tests/utils.pyo
- at dirrm %%PYTHON_SITELIBDIR%%/dulwich/tests
- at dirrm %%PYTHON_SITELIBDIR%%/dulwich


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list