From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 3 10:40:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 293F4AD2 for ; Sat, 3 Nov 2012 10:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id EF98C8FC0A for ; Sat, 3 Nov 2012 10:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qA3Ae0Zf053840 for ; Sat, 3 Nov 2012 10:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qA3Ae0Nu053839; Sat, 3 Nov 2012 10:40:00 GMT (envelope-from gnats) Resent-Date: Sat, 3 Nov 2012 10:40:00 GMT Resent-Message-Id: <201211031040.qA3Ae0Nu053839@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marco Bröder Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A40CFACE for ; Sat, 3 Nov 2012 10:39:18 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 8774A8FC0C for ; Sat, 3 Nov 2012 10:39:18 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qA3AdIsF075889 for ; Sat, 3 Nov 2012 10:39:18 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qA3AdI1k075888; Sat, 3 Nov 2012 10:39:18 GMT (envelope-from nobody) Message-Id: <201211031039.qA3AdI1k075888@red.freebsd.org> Date: Sat, 3 Nov 2012 10:39:18 GMT From: Marco Bröder To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/173327: [maintainer-update] [patch] devel/hg-git: Update to 0.3.4 release X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Nov 2012 10:40:01 -0000 >Number: 173327 >Category: ports >Synopsis: [maintainer-update] [patch] devel/hg-git: Update to 0.3.4 release >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: Sat Nov 03 10:40:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Marco Bröder >Release: stable/9 amd64 >Organization: >Environment: >Description: - Update to 0.3.4 release - Adjust required dependencies versions - Add patch for setup.py - Add pkg-plist file - Do not use easy_install - Trim Makefile header Tested: portlint, tinderbox, pkg install / delete, runtime Thanks! >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile index 0641c76..7514526 100644 --- a/devel/hg-git/Makefile +++ b/devel/hg-git/Makefile @@ -1,12 +1,8 @@ -# Ports collection makefile for: hg-git -# Date created: 2009-10-24 -# Whom: Marco Broeder -# +# Created by: Marco Broeder # $FreeBSD: ports/devel/hg-git/Makefile,v 1.11 2012/08/08 14:09:54 scheidell Exp $ -# PORTNAME= hg-git -PORTVERSION= 0.3.3 +PORTVERSION= 0.3.4 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,16 +13,14 @@ COMMENT= Mercurial extension to pull from or push to a Git repository LICENSE= GPLv2 RUN_DEPENDS= ${PKGNAMEPREFIX}dulwich>=0.8.5:${PORTSDIR}/devel/dulwich \ - mercurial>=2.0.2:${PORTSDIR}/devel/mercurial + mercurial>=2.3.2:${PORTSDIR}/devel/mercurial MAKE_JOBS_SAFE= yes USE_PYTHON= yes -USE_PYDISTUTILS=easy_install +USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME= ${PORTNAME:S/-/_/} -PLIST_FILES= %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% - post-install: @${CAT} ${PKGMESSAGE} diff --git a/devel/hg-git/distinfo b/devel/hg-git/distinfo index d6335d2..c6d272e 100644 --- a/devel/hg-git/distinfo +++ b/devel/hg-git/distinfo @@ -1,2 +1,2 @@ -SHA256 (hg-git-0.3.3.tar.gz) = 51fb0cbe0364e3515f498b428466adddf5423b77e4882b6663320cb4fbd8d20f -SIZE (hg-git-0.3.3.tar.gz) = 17295 +SHA256 (hg-git-0.3.4.tar.gz) = 3770dd4ce9f230fedff9c699f3a8f8d7210510b799c2ee7df774758026612c50 +SIZE (hg-git-0.3.4.tar.gz) = 18554 diff --git a/devel/hg-git/files/patch-setup.py b/devel/hg-git/files/patch-setup.py new file mode 100644 index 0000000..adceafe --- /dev/null +++ b/devel/hg-git/files/patch-setup.py @@ -0,0 +1,17 @@ +--- ./setup.py.orig 2012-11-01 15:10:46.000000000 +0100 ++++ ./setup.py 2012-11-03 10:28:03.799021557 +0100 +@@ -1,7 +1,4 @@ +-try: +- from setuptools import setup +-except: +- from distutils.core import setup ++from distutils.core import setup + + setup( + name='hg-git', +@@ -20,5 +17,4 @@ + license='GPLv2', + packages=['hggit'], + package_data={ 'hggit': ['help/git.rst'] }, +- install_requires=['dulwich>=0.8.0'], + ) diff --git a/devel/hg-git/pkg-plist b/devel/hg-git/pkg-plist new file mode 100644 index 0000000..cebe734 --- /dev/null +++ b/devel/hg-git/pkg-plist @@ -0,0 +1,22 @@ +%%PYTHON_SITELIBDIR%%/hggit/__init__.py +%%PYTHON_SITELIBDIR%%/hggit/__init__.pyc +%%PYTHON_SITELIBDIR%%/hggit/__init__.pyo +%%PYTHON_SITELIBDIR%%/hggit/_ssh.py +%%PYTHON_SITELIBDIR%%/hggit/_ssh.pyc +%%PYTHON_SITELIBDIR%%/hggit/_ssh.pyo +%%PYTHON_SITELIBDIR%%/hggit/git_handler.py +%%PYTHON_SITELIBDIR%%/hggit/git_handler.pyc +%%PYTHON_SITELIBDIR%%/hggit/git_handler.pyo +%%PYTHON_SITELIBDIR%%/hggit/gitrepo.py +%%PYTHON_SITELIBDIR%%/hggit/gitrepo.pyc +%%PYTHON_SITELIBDIR%%/hggit/gitrepo.pyo +%%PYTHON_SITELIBDIR%%/hggit/hgrepo.py +%%PYTHON_SITELIBDIR%%/hggit/hgrepo.pyc +%%PYTHON_SITELIBDIR%%/hggit/hgrepo.pyo +%%PYTHON_SITELIBDIR%%/hggit/overlay.py +%%PYTHON_SITELIBDIR%%/hggit/overlay.pyc +%%PYTHON_SITELIBDIR%%/hggit/overlay.pyo +%%PYTHON_SITELIBDIR%%/hggit/util.py +%%PYTHON_SITELIBDIR%%/hggit/util.pyc +%%PYTHON_SITELIBDIR%%/hggit/util.pyo +@dirrm %%PYTHON_SITELIBDIR%%/hggit >Release-Note: >Audit-Trail: >Unformatted: