svn commit: r318508 - head/finance/trytond_carrier

[Wen Heping]

Author: wen
Date: Sun May 19 09:35:50 2013
New Revision: 318508
URL: http://svnweb.freebsd.org/changeset/ports/318508

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

Modified:
  head/finance/trytond_carrier/Makefile

Modified: head/finance/trytond_carrier/Makefile
==============================================================================
--- head/finance/trytond_carrier/Makefile	Sun May 19 09:26:42 2013	(r318507)
+++ head/finance/trytond_carrier/Makefile	Sun May 19 09:35:50 2013	(r318508)
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	trytond_carrier
-# Date created:		08 September, 2012
-# Whom:			Matthias Petermann<matthias at petermann.it>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	trytond_carrier
 PORTVERSION=	2.4.1
 CATEGORIES=	finance python
-MASTER_SITES=	http://downloads2.tryton.org/${PORTVERSION:R}/
+MASTER_SITES=	http://downloads.tryton.org/${PORTVERSION:R}/
 
 MAINTAINER=	matthias at petermann.it
 COMMENT=	Tryton Application Platform (Carrier Module)
@@ -19,6 +14,8 @@ RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/
 		trytond_party>=2.4.0:${PORTSDIR}/finance/trytond_party \
 		trytond_product>=2.4.0:${PORTSDIR}/finance/trytond_product
 
+CONFLICTS=	trytond_carrier-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install