svn commit: r318535 - head/finance/trytond_stock_product_location

[Wen Heping]

Author: wen
Date: Sun May 19 15:13:47 2013
New Revision: 318535
URL: http://svnweb.freebsd.org/changeset/ports/318535

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

Modified:
  head/finance/trytond_stock_product_location/Makefile

Modified: head/finance/trytond_stock_product_location/Makefile
==============================================================================
--- head/finance/trytond_stock_product_location/Makefile	Sun May 19 15:08:47 2013	(r318534)
+++ head/finance/trytond_stock_product_location/Makefile	Sun May 19 15:13:47 2013	(r318535)
@@ -1,10 +1,10 @@
-# Created by: Matthias Petermann<matthias at petermann.it>
 # $FreeBSD$
 
 PORTNAME=	trytond_stock_product_location
 PORTVERSION=	2.4.0
 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 (Stock Product Location Module)
@@ -15,6 +15,8 @@ RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/
 		trytond_product>=2.4.0:${PORTSDIR}/finance/trytond_product \
 		trytond_stock>=2.4.0:${PORTSDIR}/finance/trytond_stock
 
+CONFLICTS=	trytond_stock_product_location-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install