From owner-svn-ports-head@FreeBSD.ORG  Sun May 19 15:13:48 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1591288E;
 Sun, 19 May 2013 15:13:48 +0000 (UTC) (envelope-from wen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0893EDBA;
 Sun, 19 May 2013 15:13:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4JFDl7u013905;
 Sun, 19 May 2013 15:13:47 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4JFDlFH013904;
 Sun, 19 May 2013 15:13:47 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201305191513.r4JFDlFH013904@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Sun, 19 May 2013 15:13:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r318535 - head/finance/trytond_stock_product_location
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 May 2013 15:13:48 -0000

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@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@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@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