>Number: 173168
>Category: ports
>Synopsis: www/trac-downloads: do not directly depend on setuptools
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 28 20:10:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: 10.0-CURRENT
>Organization:
>Environment:
10.0-CURRENT amd64
>Description:
- do not directly depend on setuptools, use USE_DISTUTILS instead
- bump PORTREVISION because of dependency change
- trim Makefile header
- remove indefinite article in COMMENT
- limit python version to 2.x only
- clean-up unsupported python versions (apply the >2.6 patch unconditionally)
buildlog:
http://people.freebsd.org/~rm/trac-downloads-0.12.0.3.10047.log
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 306539)
+++ Makefile (working copy)
@@ -1,12 +1,9 @@
-# New ports collection makefile for: trac-mercurial
-# Date created: January 23, 2009
-# Whom: Brooks Davis <brooks at freebsd.org>
-#
+# Created by: Brooks Davis <brooks at freebsd.org>
# $FreeBSD$
-#
PORTNAME= ${PYDISTUTILS_PKGNAME:S;^Trac;;:L}
PORTVERSION= ${TRAC_VERSION}.${PLUGIN_VERSION}.${SVN_REV}
+PORTREVISION= 1
CATEGORIES= www devel python
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= brooks
@@ -15,23 +12,20 @@
DIST_SUBDIR= trac
MAINTAINER= brooks at FreeBSD.org
-COMMENT= A trac plugin providing a downloads section
+COMMENT= Trac plugin providing a downloads section
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
-BUILD_DEPENDS+= easy_install:${PORTSDIR}/devel/py-setuptools
TRAC_VERSION= 0.12
PLUGIN_VERSION= 0.3
SVN_REV= 10047
-USE_PYTHON= yes
-NO_BUILD= yes
-USE_PYDISTUTILS=yes
+USE_PYTHON= -2.7
+USE_PYDISTUTILS= easy_install
PYDISTUTILS_PKGNAME= TracDownloads
-PYDISTUTILS_NOEGGINFO= yes
+PYDISTUTILS_PKGVERSION= ${PLUGIN_VERSION}
+PLIST_FILES= %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME}-${PLUGIN_VERSION}-py${PYTHON_VER}.egg
-
.if defined(BOOTSTRAP)
do-fetch:
${MKDIR} ${WRKDIR}
@@ -41,10 +35,4 @@
tar cfvz ${_DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
.endif
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} >= 260
-EXTRA_PATCHES= ${PATCHDIR}/no-sets-module.diff
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/no-sets-module.diff
===================================================================
--- files/no-sets-module.diff (revision 306539)
+++ files/no-sets-module.diff (working copy)
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- tracdownloads/tags.py.orig
-+++ tracdownloads/tags.py
-@@ -1,11 +1,5 @@
- # -*- coding: utf-8 -*-
-
--# Deprecated as for Python 2.6.
--try:
-- import sets
--except:
-- pass
--
- # Trac imports.
- from trac.core import *
- from trac.resource import Resource
Index: files/patch-tracdownloads_tags.py
===================================================================
--- files/patch-tracdownloads_tags.py (revision 0)
+++ files/patch-tracdownloads_tags.py (working copy)
@@ -0,0 +1,17 @@
+
+$FreeBSD: ports/www/trac-downloads/files/no-sets-module.diff,v 1.1 2011/01/12 00:47:17 brooks Exp $
+
+--- tracdownloads/tags.py.orig
++++ tracdownloads/tags.py
+@@ -1,11 +1,5 @@
+ # -*- coding: utf-8 -*-
+
+-# Deprecated as for Python 2.6.
+-try:
+- import sets
+-except:
+- pass
+-
+ # Trac imports.
+ from trac.core import *
+ from trac.resource import Resource
Property changes on: files/patch-tracdownloads_tags.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
>Release-Note:
>Audit-Trail:
>Unformatted: