svn commit: r318533 - in head/finance: trytond_stock_forecast trytond_stock_inventory_location trytond_stock_location_sequence trytond_stock_lot trytond_stock_split trytond_stock_supply_forecast

[Wen Heping]

Author: wen
Date: Sun May 19 14:53:37 2013
New Revision: 318533
URL: http://svnweb.freebsd.org/changeset/ports/318533

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_forecast/Makefile
  head/finance/trytond_stock_inventory_location/Makefile
  head/finance/trytond_stock_location_sequence/Makefile
  head/finance/trytond_stock_lot/Makefile
  head/finance/trytond_stock_split/Makefile
  head/finance/trytond_stock_supply_forecast/Makefile

Modified: head/finance/trytond_stock_forecast/Makefile
==============================================================================
--- head/finance/trytond_stock_forecast/Makefile	Sun May 19 14:50:45 2013	(r318532)
+++ head/finance/trytond_stock_forecast/Makefile	Sun May 19 14:53:37 2013	(r318533)
@@ -1,11 +1,10 @@
-# Created by: Matthias Petermann<matthias at petermann.it>
 # $FreeBSD$
 
 PORTNAME=	trytond_stock_forecast
 PORTVERSION=	2.4.0
-PORTREVISION=	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 (Stock Forecast Module)
@@ -18,6 +17,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}date
 		trytond_stock>=2.4.0:${PORTSDIR}/finance/trytond_stock \
 		trytond_company>=2.4.0:${PORTSDIR}/finance/trytond_company
 
+CONFLICTS=	trytond_stock_forecast-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 

Modified: head/finance/trytond_stock_inventory_location/Makefile
==============================================================================
--- head/finance/trytond_stock_inventory_location/Makefile	Sun May 19 14:50:45 2013	(r318532)
+++ head/finance/trytond_stock_inventory_location/Makefile	Sun May 19 14:53:37 2013	(r318533)
@@ -1,10 +1,10 @@
-# Created by: Matthias Petermann<matthias at petermann.it>
 # $FreeBSD$
 
 PORTNAME=	trytond_stock_inventory_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 Inventory Location Module)
@@ -14,6 +14,8 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/finance/trytond \
 		trytond_stock>=2.4.0:${PORTSDIR}/finance/trytond_stock
 
+CONFLICTS=	trytond_stock_inventory_location-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 

Modified: head/finance/trytond_stock_location_sequence/Makefile
==============================================================================
--- head/finance/trytond_stock_location_sequence/Makefile	Sun May 19 14:50:45 2013	(r318532)
+++ head/finance/trytond_stock_location_sequence/Makefile	Sun May 19 14:53:37 2013	(r318533)
@@ -1,10 +1,10 @@
-# Created by: Matthias Petermann<matthias at petermann.it>
 # $FreeBSD$
 
 PORTNAME=	trytond_stock_location_sequence
 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 Location Sequence Module)
@@ -14,6 +14,8 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/finance/trytond \
 		trytond_stock>=2.4.0:${PORTSDIR}/finance/trytond_stock
 
+CONFLICTS=	trytond_stock_location_sequence-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 

Modified: head/finance/trytond_stock_lot/Makefile
==============================================================================
--- head/finance/trytond_stock_lot/Makefile	Sun May 19 14:50:45 2013	(r318532)
+++ head/finance/trytond_stock_lot/Makefile	Sun May 19 14:53:37 2013	(r318533)
@@ -1,10 +1,10 @@
-# Created by: Matthias Petermann<matthias at petermann.it>
 # $FreeBSD$
 
 PORTNAME=	trytond_stock_lot
 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 Lot 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_lot-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 

Modified: head/finance/trytond_stock_split/Makefile
==============================================================================
--- head/finance/trytond_stock_split/Makefile	Sun May 19 14:50:45 2013	(r318532)
+++ head/finance/trytond_stock_split/Makefile	Sun May 19 14:53:37 2013	(r318533)
@@ -1,10 +1,10 @@
-# Created by: Matthias Petermann<matthias at petermann.it>
 # $FreeBSD$
 
 PORTNAME=	trytond_stock_split
 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 Split Module)
@@ -14,6 +14,8 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/finance/trytond \
 		trytond_stock>=2.4.0:${PORTSDIR}/finance/trytond_stock
 
+CONFLICTS=	trytond_stock_split-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 

Modified: head/finance/trytond_stock_supply_forecast/Makefile
==============================================================================
--- head/finance/trytond_stock_supply_forecast/Makefile	Sun May 19 14:50:45 2013	(r318532)
+++ head/finance/trytond_stock_supply_forecast/Makefile	Sun May 19 14:53:37 2013	(r318533)
@@ -1,10 +1,10 @@
-# Created by: Matthias Petermann<matthias at petermann.it>
 # $FreeBSD$
 
 PORTNAME=	trytond_stock_supply_forecast
 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 Supply Forecast Module)
@@ -15,6 +15,8 @@ RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/
 		trytond_stock_supply>=2.4.0:${PORTSDIR}/finance/trytond_stock_supply \
 		trytond_stock_forecast>=2.4.0:${PORTSDIR}/finance/trytond_stock_forecast
 
+CONFLICTS=	trytond_stock_supply_forecast-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install