Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Oct 2012 19:44:54 +0000 (UTC)
From:      Ruslan Mahmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306702 - in head/www/trac-downloads: . files
Message-ID:  <201210301944.q9UJisPR061677@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Tue Oct 30 19:44:54 2012
New Revision: 306702
URL: http://svn.freebsd.org/changeset/ports/306702

Log:
  - 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)
  
  PR:		173168
  Submitted by:	rm (myself)
  Approved by:	brooks (maintainer, by mail)
  Feature safe:	yes

Added:
  head/www/trac-downloads/files/patch-tracdownloads_tags.py   (contents, props changed)
Deleted:
  head/www/trac-downloads/files/no-sets-module.diff
Modified:
  head/www/trac-downloads/Makefile

Modified: head/www/trac-downloads/Makefile
==============================================================================
--- head/www/trac-downloads/Makefile	Tue Oct 30 19:43:48 2012	(r306701)
+++ head/www/trac-downloads/Makefile	Tue Oct 30 19:44:54 2012	(r306702)
@@ -1,12 +1,9 @@
-# New ports collection makefile for: trac-mercurial
-# Date created:                      January 23, 2009
-# Whom:                              Brooks Davis <brooks@freebsd.org>
-#
+# Created by: Brooks Davis <brooks@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,22 +12,19 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSIO
 DIST_SUBDIR=	trac
 
 MAINTAINER=	brooks@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
-
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME}-${PLUGIN_VERSION}-py${PYTHON_VER}.egg
+PYDISTUTILS_PKGVERSION=	${PLUGIN_VERSION}
+PLIST_FILES=		%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 
 .if defined(BOOTSTRAP)
 do-fetch:
@@ -41,10 +35,4 @@ do-fetch:
 	    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>

Added: head/www/trac-downloads/files/patch-tracdownloads_tags.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/trac-downloads/files/patch-tracdownloads_tags.py	Tue Oct 30 19:44:54 2012	(r306702)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210301944.q9UJisPR061677>