svn commit: r318495 - head/finance/trytond_analytic_account

[Wen Heping]

Author: wen
Date: Sun May 19 08:29:12 2013
New Revision: 318495
URL: http://svnweb.freebsd.org/changeset/ports/318495

Log:
  - Update MASTER_SITES
  - Add CONFLICTS
  - Trim Makefile headers
  
  PR:		178161
  Submitted by:	Matthias Petermann <matthias at petermann.it> (maintainer)

Modified:
  head/finance/trytond_analytic_account/Makefile

Modified: head/finance/trytond_analytic_account/Makefile
==============================================================================
--- head/finance/trytond_analytic_account/Makefile	Sun May 19 08:16:30 2013	(r318494)
+++ head/finance/trytond_analytic_account/Makefile	Sun May 19 08:29:12 2013	(r318495)
@@ -1,10 +1,10 @@
-# Created by: Matthias Petermann<matthias at petermann.it>
 # $FreeBSD$
 
 PORTNAME=	trytond_analytic_account
 PORTVERSION=	2.4.1
 CATEGORIES=	finance python
-MASTER_SITES=	http://downloads2.tryton.org/${PORTVERSION:R}/
+MASTER_SITES=	http://downloads.tryton.org/${PORTVERSION:R}/ \
+		http://downloads2.tryton.org/${PORTVERSION:R}/
 
 MAINTAINER=	matthias at petermann.it
 COMMENT=	Tryton Application Platform (Analytic Account Module)
@@ -17,6 +17,8 @@ RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/
 		trytond_currency>=2.4.0:${PORTSDIR}/finance/trytond_currency \
 		trytond_account>=2.4.1:${PORTSDIR}/finance/trytond_account
 
+CONFLICTS=	trytond_analytic_account-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install