From a126bc9403271cc431f79182ee264d975a0131c5 Mon Sep 17 00:00:00 2001 From: Wen Heping Date: Sun, 19 May 2013 13:30:14 +0000 Subject: [PATCH] - Update MASTER_SITES - Add CONFLICTS - Trim Makefile headers PR: 178161 Submitted by: Matthias Petermann (maintainer) --- finance/trytond_product_cost_fifo/Makefile | 6 ++++-- finance/trytond_product_cost_history/Makefile | 6 ++++-- finance/trytond_product_measurements/Makefile | 9 +++------ finance/trytond_product_price_list/Makefile | 9 +++------ 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/finance/trytond_product_cost_fifo/Makefile b/finance/trytond_product_cost_fifo/Makefile index ffcd45d1b4ee..b83f7c5e9442 100644 --- a/finance/trytond_product_cost_fifo/Makefile +++ b/finance/trytond_product_cost_fifo/Makefile @@ -1,10 +1,10 @@ -# Created by: Matthias Petermann # $FreeBSD$ PORTNAME= trytond_product_cost_fifo 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@petermann.it COMMENT= Tryton Application Platform (Product Cost Fifo Module) @@ -15,6 +15,8 @@ RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/finance/trytond \ trytond_product>=2.4.0:${PORTSDIR}/finance/trytond_product \ trytond_stock>=2.4.0:${PORTSDIR}/finance/trytond_stock +CONFLICTS= trytond_product_cost_fifo-2.[68].* + USE_PYTHON= yes USE_PYDISTUTILS=easy_install diff --git a/finance/trytond_product_cost_history/Makefile b/finance/trytond_product_cost_history/Makefile index 813a2c6922e1..e08cdfda5189 100644 --- a/finance/trytond_product_cost_history/Makefile +++ b/finance/trytond_product_cost_history/Makefile @@ -1,10 +1,10 @@ -# Created by: Matthias Petermann # $FreeBSD$ PORTNAME= trytond_product_cost_history 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@petermann.it COMMENT= Tryton Application Platform (Product Cost History Module) @@ -14,6 +14,8 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/finance/trytond \ trytond_product>=2.4.0:${PORTSDIR}/finance/trytond_product +CONFLICTS= trytond_product_cost_history-2.[68].* + USE_PYTHON= yes USE_PYDISTUTILS=easy_install diff --git a/finance/trytond_product_measurements/Makefile b/finance/trytond_product_measurements/Makefile index 0eac974b04df..7dcd16fb6ee4 100644 --- a/finance/trytond_product_measurements/Makefile +++ b/finance/trytond_product_measurements/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: trytond_product_measurements -# Date created: 07 September, 2012 -# Whom: Matthias Petermann -# # $FreeBSD$ -# PORTNAME= trytond_product_measurements PORTVERSION= 2.4.0 CATEGORIES= finance python -MASTER_SITES= http://downloads2.tryton.org/${PORTVERSION:R}/ +MASTER_SITES= http://downloads.tryton.org/${PORTVERSION:R}/ MAINTAINER= matthias@petermann.it COMMENT= Tryton Application Platform (Product Measurements Module) @@ -18,6 +13,8 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/finance/trytond \ trytond_product>=2.4.0:${PORTSDIR}/finance/trytond_product +CONFLICTS= trytond_product_measurements-2.[68].* + USE_PYTHON= yes USE_PYDISTUTILS=easy_install diff --git a/finance/trytond_product_price_list/Makefile b/finance/trytond_product_price_list/Makefile index ebd5e9b48596..4d447fb15044 100644 --- a/finance/trytond_product_price_list/Makefile +++ b/finance/trytond_product_price_list/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: trytond_product_price_list -# Date created: 07 September, 2012 -# Whom: Matthias Petermann -# # $FreeBSD$ -# PORTNAME= trytond_product_price_list PORTVERSION= 2.4.0 CATEGORIES= finance python -MASTER_SITES= http://downloads2.tryton.org/${PORTVERSION:R}/ +MASTER_SITES= http://downloads.tryton.org/${PORTVERSION:R}/ MAINTAINER= matthias@petermann.it COMMENT= Tryton Application Platform (Product Price List Module) @@ -20,6 +15,8 @@ RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/finance/trytond \ trytond_party>=2.4.0:${PORTSDIR}/finance/trytond_party \ trytond_company>=2.4.0:${PORTSDIR}/finance/trytond_company +CONFLICTS= trytond_product_price_list-2.[68].* + USE_PYTHON= yes USE_PYDISTUTILS=easy_install