Hi Marco,
Marco Bröder wrote on 16.12.2012 13:52:
Hi,
could a ports committer take ports/173531 pr, please? It is unassigned for
over a month, now.
Thank you very much!
Please review patch attached. I changed some things in your patch:
- using OPTIONSFILE instead of UNIQUENAME (it's common practice to fix
things like that)
- limit to python 2.x (dulwich is not python 3.x-aware yet)
- tab -> space change in pkg-descr:WWW (style bug)
- remove DOCS_DESC (we have generic description in bsd.options.desc.mk)
- use PYTHON_CMD instead of ``/usr/bin/env python'' (to make sure it
will be runned with the same python branch, that it was built with)
Please let me know if you agree with the changes, and I commit the
update shortly.
PS. Surely, it builds fine with this patch.
--
Regards,
Ruslan
Tinderboxing kills... the drives.
Index: Makefile
===================================================================
--- Makefile (revision 308996)
+++ Makefile (working copy)
@@ -1,12 +1,8 @@
-# Ports collection makefile for: dulwich
-# Date created: 2009-10-24
-# Whom: Marco Broeder <marco.broe...@gmx.eu>
-#
+# Created by: Marco Broeder <marco.broe...@gmx.eu>
# $FreeBSD$
-#
PORTNAME= dulwich
-PORTVERSION= 0.8.5
+PORTVERSION= 0.8.7
CATEGORIES= devel python
MASTER_SITES= http://samba.org/~jelmer/${PORTNAME}/ \
http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
@@ -20,23 +16,31 @@
MAKE_JOBS_SAFE= yes
-USE_PYTHON= yes
+USE_PYTHON= -2.7
USE_PYDISTUTILS=yes
FETCH_ARGS= -Fpr # default '-AFpr' prevents 302 redirects by launchpad
-.ifndef (NOPORTDOCS)
-PORTDOCS= AUTHORS COPYING HACKING NEWS README
+OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT=DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS= AUTHORS COPYING HACKING NEWS README introduction.txt \
+ object-store.txt protocol.txt remote.txt repo.txt
.endif
post-patch:
- ${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = /usr/bin/env python|g' \
+ ${REINPLACE_CMD} -e 's|PYTHON = python|PYTHON = ${PYTHON_CMD}|g' \
${WRKSRC}/Makefile
- ${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \
+ ${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
${WRKSRC}/setup.py
post-install:
-.ifndef (NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+ ${CP} ${WRKSRC}/docs/*.txt ${WRKSRC}/docs/tutorial/*.txt ${WRKSRC}
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
Index: distinfo
===================================================================
--- distinfo (revision 308996)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (dulwich-0.8.5.tar.gz) =
546d2840199500dc270da5bda456df68de4d1733f8b184bf425c5e560f988b6a
-SIZE (dulwich-0.8.5.tar.gz) = 203727
+SHA256 (dulwich-0.8.7.tar.gz) =
7ba336d0100b90baf843b20d71fedc8a92e36de41c1acdebe4cba12e76b93810
+SIZE (dulwich-0.8.7.tar.gz) = 208639
Index: pkg-descr
===================================================================
--- pkg-descr (revision 308996)
+++ pkg-descr (working copy)
@@ -4,4 +4,4 @@
but instead uses pure Python. It is based on the Python-Git module released by
James Westby.
-WWW: http://samba.org/~jelmer/dulwich/
+WWW: http://samba.org/~jelmer/dulwich/
_______________________________________________
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
