ports/172858: www/trac-bzr: do not directly depend on setuptools
Ruslan Mahmatkhanov
rm at FreeBSD.org
Thu Oct 18 19:00:00 UTC 2012
>Number: 172858
>Category: ports
>Synopsis: www/trac-bzr: 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: Thu Oct 18 19:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>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 at sanatana.dharma>
-#
+# Created by: Radim Kolar <hsn at 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 @@
- at comment $FreeBSD$
- at unexec %%EASY_INSTALL_CMD%% -q -m -N %D/%%PYTHON_SITELIBDIR%%/%%PYTRAC_BZR_EGG%%
-%%PYTHON_SITELIBDIR%%/%%PYTRAC_BZR_EGG%%
- at exec %%EASY_INSTALL_CMD%% -N %D/%%PYTHON_SITELIBDIR%%/%%PYTRAC_BZR_EGG%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list