Attachment #131319 for bug #175372




# $FreeBSD$

PORTNAME=	rhodecode
PORTVERSION=	1.5.1
CATEGORIES=	www devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

		${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:${PORTSDIR}/www/py-beaker \
		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:${PORTSDIR}/www/py-formencode \
		${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:${PORTSDIR}/www/py-webhelpers \
		${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:${PORTSDIR}/textproc/py-mako \
		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.9:${PORTSDIR}/databases/py-sqlalchemy \
		${PYTHON_PKGNAMEPREFIX}pygments>=1.5:${PORTSDIR}/textproc/py-pygments \
		${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:${PORTSDIR}/textproc/py-whoosh \
		${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:${PORTSDIR}/devel/py-babel \
		${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
		${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.7:${PORTSDIR}/devel/dulwich \
		${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:${PORTSDIR}/textproc/py-markdown \
		${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:${PORTSDIR}/textproc/py-docutils \
		${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock \
		${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:${PORTSDIR}/security/py-bcrypt \
		${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:${PORTSDIR}/devel/py-simplejson \
		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:${PORTSDIR}/www/py-pastescript \
		mercurial>=2.4:${PORTSDIR}/devel/mercurial

USE_PYTHON=	2.6+
USE_PYTHON=	yes
USE_PYDISTUTILS=	easy_install
PYDISTUTILS_PKGNAME=	RhodeCode


Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (RhodeCode-1.4.1.tar.gz) = 8f3b06a598f569841bb93832d7bbdebca54c213eb0f956396ed71f8cdae5b285	1	SHA256 (RhodeCode-1.5.1.tar.gz) = de47e1a995249069270f0d68a70d2a6a42ef82294f29947c7f30e571634aef77
2	SIZE (RhodeCode-1.4.1.tar.gz) = 2341169	2	SIZE (RhodeCode-1.5.1.tar.gz) = 2436257

Lines 1-6 Link Here

(-)files/patch-setup.py.in (-13 / +29 lines)
1	--- setup.py.orig 2012-09-07 19:17:25.000000000 -0300	1	diff --git setup.py setup.py
2	+++ setup.py 2012-09-18 20:52:11.031841469 -0300	2	index 17eb71e..1939a2c 100644
3	@@ -33,23 +33,22 @@	3	--- setup.py
		4	+++ setup.py
		5	@@ -33,23 +33,23 @@ __platform__ = platform.system()
4	is_windows = __platform__ in _get_meta_var('PLATFORM_WIN', _metadata)	6	is_windows = __platform__ in _get_meta_var('PLATFORM_WIN', _metadata)
5		7
6	requirements = [	8	requirements = [
Lines 13-33 Link Here
13	+ "Beaker>=1.6.4",	15	+ "Beaker>=1.6.4",
14	"WebHelpers==1.3",	16	"WebHelpers==1.3",
15	"formencode==1.2.4",	17	"formencode==1.2.4",
16	"SQLAlchemy==0.7.8",	18	- "SQLAlchemy==0.7.9",
17	- "Mako==0.7.2",	19	- "Mako==0.7.3",
18	+ "Mako>=0.7.2",	20	+ "SQLAlchemy>=0.7.9",
		21	+ "Mako>=0.7.3",
19	"pygments>=1.5",	22	"pygments>=1.5",
20	"whoosh>=2.4.0,<2.5",	23	"whoosh>=2.4.0,<2.5",
21	- "celery>=2.2.5,<2.3",	24	"celery>=2.2.5,<2.3",
22	"babel",	25	"babel",
23	"python-dateutil>=1.5.0,<2.0.0",	26	- "python-dateutil>=1.5.0,<2.0.0",
24	"dulwich>=0.8.5,<0.9.0",	27	+ "python-dateutil>=1.5.0, != 2.0",
25	- "markdown==2.1.1",	28	"dulwich>=0.8.7,<0.9.0",
26	- "docutils==0.8.1",	29	- "markdown==2.2.1",
		30	+ "markdown>=2.2.1",
		31	"docutils==0.8.1",
27	- "simplejson==2.5.2",	32	- "simplejson==2.5.2",
28	+ "markdown>=2.1.1",
29	+ "docutils>=0.8.1",
30	+ "simplejson>=2.5.2",	33	+ "simplejson>=2.5.2",
31	"mock",	34	"mock",
32	]	35	]
33		36
		37	@@ -60,10 +60,10 @@ if sys.version_info < (2, 7):
		38	requirements.append("unittest2")
		39
		40	if is_windows:
		41	- requirements.append("mercurial==2.4.1")
		42	+ requirements.append("mercurial>=2.4.1")
		43	else:
		44	requirements.append("py-bcrypt")
		45	- requirements.append("mercurial==2.4.1")
		46	+ requirements.append("mercurial>=2.4.1")
		47
		48
		49	dependency_links = [

Return to bug 175372

Lines 2-8 Link Here

(-)Makefile (-7 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= rhodecode	4	PORTNAME= rhodecode
5	PORTVERSION= 1.4.1	5	PORTVERSION= 1.5.1
6	CATEGORIES= www devel python	6	CATEGORIES= www devel python
7	MASTER_SITES= CHEESESHOP	7	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 20-42 Link Here
20	${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:${PORTSDIR}/www/py-beaker \	20	${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:${PORTSDIR}/www/py-beaker \
21	${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:${PORTSDIR}/www/py-formencode \	21	${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:${PORTSDIR}/www/py-formencode \
22	${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:${PORTSDIR}/www/py-webhelpers \	22	${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:${PORTSDIR}/www/py-webhelpers \
23	${PYTHON_PKGNAMEPREFIX}mako>=0.7.2:${PORTSDIR}/textproc/py-mako \	23	${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:${PORTSDIR}/textproc/py-mako \
24	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.8:${PORTSDIR}/databases/py-sqlalchemy \	24	${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7.9:${PORTSDIR}/databases/py-sqlalchemy \
25	${PYTHON_PKGNAMEPREFIX}pygments>=1.5:${PORTSDIR}/textproc/py-pygments \	25	${PYTHON_PKGNAMEPREFIX}pygments>=1.5:${PORTSDIR}/textproc/py-pygments \
26	${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:${PORTSDIR}/textproc/py-whoosh \	26	${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:${PORTSDIR}/textproc/py-whoosh \
27	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:${PORTSDIR}/devel/py-babel \	27	${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:${PORTSDIR}/devel/py-babel \
28	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \	28	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:${PORTSDIR}/devel/py-dateutil \
29	${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.5:${PORTSDIR}/devel/dulwich \	29	${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.7:${PORTSDIR}/devel/dulwich \
30	${PYTHON_PKGNAMEPREFIX}markdown>=2.1.1:${PORTSDIR}/textproc/py-markdown \	30	${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:${PORTSDIR}/textproc/py-markdown \
31	${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:${PORTSDIR}/textproc/py-docutils \	31	${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:${PORTSDIR}/textproc/py-docutils \
32	${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock \	32	${PYTHON_PKGNAMEPREFIX}mock>=0:${PORTSDIR}/devel/py-mock \
33	${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:${PORTSDIR}/security/py-bcrypt \	33	${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:${PORTSDIR}/security/py-bcrypt \
34	${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:${PORTSDIR}/devel/py-simplejson \	34	${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:${PORTSDIR}/devel/py-simplejson \
35	${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:${PORTSDIR}/www/py-pastescript \	35	${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:${PORTSDIR}/www/py-pastescript \
36	mercurial>=2.3:${PORTSDIR}/devel/mercurial	36	mercurial>=2.4:${PORTSDIR}/devel/mercurial
37		37
38	USE_PYTHON= 2.6+	38	USE_PYTHON= 2.6+
39	USE_PYTHON= yes
40	USE_PYDISTUTILS= easy_install	39	USE_PYDISTUTILS= easy_install
41	PYDISTUTILS_PKGNAME= RhodeCode	40	PYDISTUTILS_PKGNAME= RhodeCode
42		41

Lines 12-17 Link Here

(-)pkg-plist (-1 / +46 lines)
12	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rcextensions/hipchat.py	12	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rcextensions/hipchat.py
13	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rcextensions/hipchat.pyc	13	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rcextensions/hipchat.pyc
14	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rcextensions/hipchat.pyo	14	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rcextensions/hipchat.pyo
		15	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rcextensions/old_rcextensions/__init__.py
		16	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rcextensions/old_rcextensions/__init__.pyc
		17	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rcextensions/old_rcextensions/__init__.pyo
15	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/__init__.py	18	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/__init__.py
16	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/__init__.pyc	19	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/__init__.pyc
17	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/__init__.pyo	20	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/__init__.pyo
Lines 64-69 Link Here
64	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/admin.py	67	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/admin.py
65	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/admin.pyc	68	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/admin.pyc
66	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/admin.pyo	69	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/admin.pyo
		70	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/defaults.py
		71	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/defaults.pyc
		72	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/defaults.pyo
67	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/ldap_settings.py	73	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/ldap_settings.py
68	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/ldap_settings.pyc	74	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/ldap_settings.pyc
69	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/ldap_settings.pyo	75	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/controllers/admin/ldap_settings.pyo
Lines 158-163 Link Here
158	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/how_to	164	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/how_to
159	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo	165	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo
160	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po	166	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po
		167	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo
		168	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po
161	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.mo	169	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.mo
162	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po	170	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po
163	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/rhodecode.pot	171	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/i18n/rhodecode.pot
Lines 352-357 Link Here
352	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_4_0.py	360	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_4_0.py
353	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_4_0.pyc	361	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_4_0.pyc
354	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_4_0.pyo	362	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_4_0.pyo
		363	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_5_0.py
		364	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_5_0.pyc
		365	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/schema/db_1_5_0.pyo
355	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/001_initial_release.py	366	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/001_initial_release.py
356	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/001_initial_release.pyc	367	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/001_initial_release.pyc
357	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/001_initial_release.pyo	368	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/rhodecode/lib/dbmigrate/versions/001_initial_release.pyo