From nobody@FreeBSD.org  Thu Oct 18 18:54:34 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 109092EA
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 18 Oct 2012 18:54:34 +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 D1B1F8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 18 Oct 2012 18:54:33 +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 q9IIsXnh083177
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 18 Oct 2012 18:54:33 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q9IIsXX0083174;
	Thu, 18 Oct 2012 18:54:33 GMT
	(envelope-from nobody)
Message-Id: <201210181854.q9IIsXX0083174@red.freebsd.org>
Date: Thu, 18 Oct 2012 18:54:33 GMT
From: Ruslan Mahmatkhanov <rm@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: www/trac-bzr: do not directly depend on setuptools
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: hsn@sendmail.cz

>Number:         172858
>Category:       ports
>Synopsis:       www/trac-bzr: do not directly depend on setuptools
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 18 19:00:00 UTC 2012
>Closed-Date:    Mon Oct 22 07:23:48 UTC 2012
>Last-Modified:  Mon Oct 22 07:23:48 UTC 2012
>Originator:     Ruslan Mahmatkhanov
>Release:        10.0-CURRENT
>Organization:
>Environment:
10.0-CURRENT amd64
>Description:
- replace direct setuptools dependency with USE_DISTUTILS=easy_install
- bump PORTREVISION because USE_DISTUTILS implies both build and run dependency
  on setuptools
- trim Makefile header
- tune PYDISTUTILS_* variables and rely upon bsd.python.mk code instead of
  implementing the same stuff manually
- tab -> space change in pkg-descr:WWW
- move pkg-plist contents into Makefile:PLIST_FILES

buildlog:
http://people.freebsd.org/~rm/trac-bzr-20110228_1.log
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
--- Makefile	(revision 306080)
+++ Makefile	(working copy)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	trac-bzr
-# Date created:		2007-03-30
-# Whom:			Radim Kolar <hsn@sanatana.dharma>
-#
+# Created by: Radim Kolar <hsn@sanatana.dharma>
 # $FreeBSD$
-#
 
 PORTNAME=	bzr
 PORTVERSION=	20110228
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://schema.filez.com/distfiles/
 PKGNAMEPREFIX=	trac-
@@ -18,21 +14,16 @@
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac bzr:${PORTSDIR}/devel/bzr
+RUN_DEPENDS=	tracd:${PORTSDIR}/www/trac \
+		bzr:${PORTSDIR}/devel/bzr
 
-USE_PYTHON=		-2.7
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_NOEGGINFO=	yes
-
 USE_BZIP2=	yes
+USE_PYTHON=	-2.7
+USE_PYDISTUTILS=easy_install
+PYDISTUTILS_PKGNAME=	TracBzr
+PYDISTUTILS_PKGVERSION=	0.4.2
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
-PLIST_SUB=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
-		PYTRAC_BZR_EGG=${PYTRAC_BZR_EGG}
-
-EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
-PYTRAC_BZR_EGG=	TracBzr-0.4.2-py${PYTHON_VER}.egg
-
 post-patch:
 	${REINPLACE_CMD} -e 's|tag_date = 1||' ${WRKSRC}/setup.cfg
 
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 306080)
+++ pkg-descr	(working copy)
@@ -1,4 +1,4 @@
 Trac-Bzr is a plugin for Trac (>= 0.10) that provides a
 version control backend for Bzr.
 
-WWW:	https://launchpad.net/trac-bzr
+WWW: https://launchpad.net/trac-bzr
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 306080)
+++ pkg-plist	(working copy)
@@ -1,4 +0,0 @@
-@comment $FreeBSD$
-@unexec %%EASY_INSTALL_CMD%% -q -m -N %D/%%PYTHON_SITELIBDIR%%/%%PYTRAC_BZR_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYTRAC_BZR_EGG%%
-@exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/%%PYTRAC_BZR_EGG%%


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Oct 18 19:00:08 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: hsn@sendmail.cz
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/172858: www/trac-bzr: do not directly depend on setuptools
Date: Thu, 18 Oct 2012 19:00:07 UT

 Maintainer of www/trac-bzr,
 
 Please note that PR ports/172858 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/172858
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->rm 
Responsible-Changed-By: rm 
Responsible-Changed-When: Thu Oct 18 19:21:59 UTC 2012 
Responsible-Changed-Why:  
My PR. 

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

From: Radim Kolar <hsn@sendmail.cz>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/172858: www/trac-bzr: do not directly depend on setuptools
Date: Sun, 21 Oct 2012 14:59:05 +0200

 i approve patch
 
State-Changed-From-To: feedback->closed 
State-Changed-By: rm 
State-Changed-When: Mon Oct 22 07:23:47 UTC 2012 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172858 
>Unformatted:
