From nobody@FreeBSD.org  Sun Dec 22 18:52:21 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id BDA65FC9
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 22 Dec 2013 18:52:21 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 9C96D1106
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 22 Dec 2013 18:52:21 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rBMIqLqh036860
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 22 Dec 2013 18:52:21 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rBMIqL7K036852;
	Sun, 22 Dec 2013 18:52:21 GMT
	(envelope-from nobody)
Message-Id: <201312221852.rBMIqL7K036852@oldred.freebsd.org>
Date: Sun, 22 Dec 2013 18:52:21 GMT
From: Marco Brder <marco.broeder@gmx.eu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] [patch] devel/hg-git: Update to 0.5.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         185100
>Category:       ports
>Synopsis:       [maintainer-update] [patch] devel/hg-git: Update to 0.5.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    antoine
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 22 19:00:00 UTC 2013
>Closed-Date:    Sun Dec 22 21:26:42 UTC 2013
>Last-Modified:  Sun Dec 22 21:30:00 UTC 2013
>Originator:     Marco Brder
>Release:        
>Organization:
>Environment:
>Description:
Update to 0.5.0 release. Remove obsolete patches (and files directory). Remove obsolete PYDISTUTILS_PKGNAME workaround.

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

Thanks!

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/devel/hg-git/Makefile b/devel/hg-git/Makefile
index 8caa6de..835478e 100644
--- a/devel/hg-git/Makefile
+++ b/devel/hg-git/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/devel/hg-git/Makefile 330310 2013-10-14 12:10:40Z wg $
 
 PORTNAME=	hg-git
-PORTVERSION=	0.4.0
+PORTVERSION=	0.5.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,6 +19,5 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=*:${PORTSDIR}/devel/dulwich \
 USE_PYTHON=	2
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGNAME=	${PORTNAME:S/-/_/}
 
 .include <bsd.port.mk>
diff --git a/devel/hg-git/distinfo b/devel/hg-git/distinfo
index 8d2f78e..2a0e409 100644
--- a/devel/hg-git/distinfo
+++ b/devel/hg-git/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hg-git-0.4.0.tar.gz) = 6a2289539bae5f898c25e66c149cb27eacb3ac2bcd90d3e247ba42ebba9f8a9c
-SIZE (hg-git-0.4.0.tar.gz) = 21981
+SHA256 (hg-git-0.5.0.tar.gz) = bad27f98f4a3d58acbea6495b93d6b7ca27e5544e1c685c4432e5d0fe09fcbee
+SIZE (hg-git-0.5.0.tar.gz) = 28923
diff --git a/devel/hg-git/files/patch-hggit__git_handler.py b/devel/hg-git/files/patch-hggit__git_handler.py
deleted file mode 100644
index 9901ae9..0000000
--- a/devel/hg-git/files/patch-hggit__git_handler.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./hggit/git_handler.py.orig	2013-03-24 22:35:51.000000000 +0100
-+++ ./hggit/git_handler.py	2013-10-05 10:40:01.222598222 +0200
-@@ -1034,7 +1034,7 @@
-                         and ( ref.startswith('refs/heads/') or ref.startswith('refs/tags/') ) ]
-             want = [x for x in want if x not in self.git]
-             return want
--        f, commit = self.git.object_store.add_pack()
-+        f, commit = self.git.object_store.add_pack()[:2]
-         try:
-             try:
-                 progress = GitProgress(self.ui)
diff --git a/devel/hg-git/files/patch-setup.py b/devel/hg-git/files/patch-setup.py
deleted file mode 100644
index bdab167..0000000
--- a/devel/hg-git/files/patch-setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./setup.py.orig	2013-03-24 22:35:51.000000000 +0100
-+++ ./setup.py	2013-03-30 13:51:43.535271164 +0100
-@@ -1,13 +1,5 @@
--try:
--    from setuptools import setup
--except:
--    from distutils.core import setup
--
--try:
--    from collections import OrderedDict
--    extra_req = []
--except ImportError:
--    extra_req = ['ordereddict>=1.1']
-+from distutils.core import setup
-+from collections import OrderedDict
- 
- setup(
-     name='hg-git',
-@@ -26,5 +18,4 @@
-     license='GPLv2',
-     packages=['hggit'],
-     package_data={ 'hggit': ['help/git.rst'] },
--    install_requires=['dulwich>=0.8.6'] + extra_req,
- )


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->antoine 
Responsible-Changed-By: antoine 
Responsible-Changed-When: Sun Dec 22 20:46:35 UTC 2013 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185100 
State-Changed-From-To: open->closed 
State-Changed-By: antoine 
State-Changed-When: Sun Dec 22 21:26:15 UTC 2013 
State-Changed-Why:  
Patch committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185100 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185100: commit references a PR
Date: Sun, 22 Dec 2013 21:21:37 +0000 (UTC)

 Author: antoine
 Date: Sun Dec 22 21:21:24 2013
 New Revision: 337220
 URL: http://svnweb.freebsd.org/changeset/ports/337220
 
 Log:
   - Update to 0.5.0
   - Remove no longer needed patches
   
   PR:		ports/185100
   Submitted by:	Marco Broder (maintainer)
 
 Deleted:
   head/devel/hg-git/files/
 Modified:
   head/devel/hg-git/Makefile
   head/devel/hg-git/distinfo
 
 Modified: head/devel/hg-git/Makefile
 ==============================================================================
 --- head/devel/hg-git/Makefile	Sun Dec 22 21:09:27 2013	(r337219)
 +++ head/devel/hg-git/Makefile	Sun Dec 22 21:21:24 2013	(r337220)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	hg-git
 -PORTVERSION=	0.4.0
 +PORTVERSION=	0.5.0
  CATEGORIES=	devel python
  MASTER_SITES=	CHEESESHOP
  PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 @@ -19,6 +19,5 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}dulwich>=*:
  USE_PYTHON=	2
  USE_PYDISTUTILS=yes
  PYDISTUTILS_AUTOPLIST=	yes
 -PYDISTUTILS_PKGNAME=	${PORTNAME:S/-/_/}
  
  .include <bsd.port.mk>
 
 Modified: head/devel/hg-git/distinfo
 ==============================================================================
 --- head/devel/hg-git/distinfo	Sun Dec 22 21:09:27 2013	(r337219)
 +++ head/devel/hg-git/distinfo	Sun Dec 22 21:21:24 2013	(r337220)
 @@ -1,2 +1,2 @@
 -SHA256 (hg-git-0.4.0.tar.gz) = 6a2289539bae5f898c25e66c149cb27eacb3ac2bcd90d3e247ba42ebba9f8a9c
 -SIZE (hg-git-0.4.0.tar.gz) = 21981
 +SHA256 (hg-git-0.5.0.tar.gz) = bad27f98f4a3d58acbea6495b93d6b7ca27e5544e1c685c4432e5d0fe09fcbee
 +SIZE (hg-git-0.5.0.tar.gz) = 28923
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
