From owner-freebsd-ports@FreeBSD.ORG Fri Mar 29 04:21:05 2013 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 09D1CEE7 for ; Fri, 29 Mar 2013 04:21:05 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) by mx1.freebsd.org (Postfix) with ESMTP id D7CB5A56 for ; Fri, 29 Mar 2013 04:21:04 +0000 (UTC) Received: by mail-pd0-f174.google.com with SMTP id p12so101010pdj.33 for ; Thu, 28 Mar 2013 21:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:cc :subject:references:in-reply-to:x-enigmail-version:content-type; bh=GpJwPb86rtMvNVd9453RcLXb/C7N5TaY6PLRO01MWnA=; b=cygxYV6pls/V/EJqEbApn3qqECLmAUhVUsbXTVCS74tH8ZA+5hE2ARE2Wo3DWvWoKh XPcphKHoMDFcUwfBvggTZ4ELyBS4INjsxbW+f1x4uMRxguwFAWGpa3sPfn2PtSCwsjnb v+a6vljdITD5bqDAOapMWRWUVM1pj3ig2ZEh5xO+bZPU0/4iUHAkQmjgvNl84QyBXStv u5lQI7GPaXSIAAsTUUmagjP2g7NSTnzgLProKcjf/qjaU2SQ4Cdeqd04LFW4fOug4Y5Q 0afVPBW47LoO3hqXJUe6VWrwRVEry1V803eGpZX+TawsMDG7obBDGiFR3Z92/zKvA4Gn wEVQ== X-Received: by 10.68.177.162 with SMTP id cr2mr1580421pbc.179.1364530864132; Thu, 28 Mar 2013 21:21:04 -0700 (PDT) Received: from [192.168.1.7] (ppp59-167-128-11.static.internode.on.net. [59.167.128.11]) by mx.google.com with ESMTPS id zm1sm1291995pbc.26.2013.03.28.21.21.01 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Mar 2013 21:21:03 -0700 (PDT) Message-ID: <515516A5.4080502@FreeBSD.org> Date: Fri, 29 Mar 2013 15:20:53 +1100 From: Kubilay Kocak User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130307 Thunderbird/17.0.4 MIME-Version: 1.0 To: Tod Olson Subject: Re: FreeBSD Port: py27-hg-git-0.3.4 References: In-Reply-To: X-Enigmail-Version: 1.5.1 Content-Type: multipart/mixed; boundary="------------090107080702020309070201" Cc: "ports@FreeBSD.org" , Peggy Wilkins , "marco.broeder@gmx.eu" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 04:21:05 -0000 This is a multi-part message in MIME format. --------------090107080702020309070201 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 29/03/2013 5:05 AM, Tod Olson wrote: > Having upgraded to mercurial 2.5.2, we see problems with hg-git 0.3.4, and they seem to be fixed with hg-git 0.4.0. Will you be updating the FreeBSD port of hg-git in the near future? > > Best, > > -Tod > > > Tod Olson > Systems Librarian > University of Chicago Library > > > > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" > Tod, The patch attached updates hg-git to 0.4.0 and tweaks a couple of port things: - Re-patch setup.py - Tab->space in pkg-descr - Update min version required for dulwich - Require py-ordereddict for users running Python < 2.7 Kick the tyres, take it for a test run and submit a PR for Marco if it works out well :) -- Ta, Koobs --------------090107080702020309070201 Content-Type: text/plain; charset=windows-1252; name="hg-git-0.4.0.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="hg-git-0.4.0.patch" Index: Makefile =================================================================== --- Makefile (revision 315519) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= hg-git -PORTVERSION= 0.3.4 +PORTVERSION= 0.4.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.5:${PORTSDIR}/devel/dulwich \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.6:${PORTSDIR}/devel/dulwich \ mercurial>=2.3.2:${PORTSDIR}/devel/mercurial MAKE_JOBS_SAFE= yes @@ -21,7 +21,13 @@ USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME= ${PORTNAME:S/-/_/} +.include + +.if ${PYTHON_REL} < 270 +RUn_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ordereddict>=1.1:${PORTSDIR}/devel/py-ordereddict +.endif + post-install: @${CAT} ${PKGMESSAGE} -.include +.include Index: distinfo =================================================================== --- distinfo (revision 315519) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (hg-git-0.3.4.tar.gz) = 3770dd4ce9f230fedff9c699f3a8f8d7210510b799c2ee7df774758026612c50 -SIZE (hg-git-0.3.4.tar.gz) = 18554 +SHA256 (hg-git-0.4.0.tar.gz) = 6a2289539bae5f898c25e66c149cb27eacb3ac2bcd90d3e247ba42ebba9f8a9c +SIZE (hg-git-0.4.0.tar.gz) = 21981 Index: files/patch-setup.py =================================================================== --- files/patch-setup.py (revision 315519) +++ files/patch-setup.py (working copy) @@ -1,5 +1,5 @@ ---- ./setup.py.orig 2012-11-01 15:10:46.000000000 +0100 -+++ ./setup.py 2012-11-03 10:28:03.799021557 +0100 +--- ./setup.py.orig 2013-03-25 08:35:51.000000000 +1100 ++++ ./setup.py 2013-03-29 15:04:08.555460472 +1100 @@ -1,7 +1,4 @@ -try: - from setuptools import setup @@ -7,11 +7,12 @@ - from distutils.core import setup +from distutils.core import setup - setup( - name='hg-git', -@@ -20,5 +17,4 @@ + try: + from collections import OrderedDict +@@ -25,6 +22,4 @@ + keywords='hg git mercurial', license='GPLv2', packages=['hggit'], - package_data={ 'hggit': ['help/git.rst'] }, -- install_requires=['dulwich>=0.8.0'], +- package_data={ 'hggit': ['help/git.rst'] }, +- install_requires=['dulwich>=0.8.6'] + extra_req, ) Index: pkg-descr =================================================================== --- pkg-descr (revision 315519) +++ pkg-descr (working copy) @@ -18,4 +18,4 @@ edge cases. However, there are several people using it effectively, so please test it yourself and report encountered bugs upstream (see website). Thanks! -WWW: http://hg-git.github.com/ +WWW: http://hg-git.github.com/ --------------090107080702020309070201--