From owner-svn-ports-head@FreeBSD.ORG  Sun May 19 09:56:39 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 8211C1B0;
 Sun, 19 May 2013 09:56:39 +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 736AAFF1;
 Sun, 19 May 2013 09:56:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4J9uc5H001652;
 Sun, 19 May 2013 09:56:38 GMT (envelope-from wen@svn.freebsd.org)
Received: (from wen@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4J9ucw3001651;
 Sun, 19 May 2013 09:56:38 GMT (envelope-from wen@svn.freebsd.org)
Message-Id: <201305190956.r4J9ucw3001651@svn.freebsd.org>
From: Wen Heping <wen@FreeBSD.org>
Date: Sun, 19 May 2013 09:56:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r318510 - head/finance/trytond_company_work_time
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 09:56:39 -0000

Author: wen
Date: Sun May 19 09:56:38 2013
New Revision: 318510
URL: http://svnweb.freebsd.org/changeset/ports/318510

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

Modified:
  head/finance/trytond_company_work_time/Makefile

Modified: head/finance/trytond_company_work_time/Makefile
==============================================================================
--- head/finance/trytond_company_work_time/Makefile	Sun May 19 09:41:08 2013	(r318509)
+++ head/finance/trytond_company_work_time/Makefile	Sun May 19 09:56:38 2013	(r318510)
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	trytond_company_work_time
-# Date created:		08 September, 2012
-# Whom:			Matthias Petermann<matthias@petermann.it>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	trytond_company_work_time
 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 (Company Work Time Module)
@@ -18,6 +13,8 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	trytond>=2.4.0:${PORTSDIR}/finance/trytond \
 		trytond_company>=2.4.0:${PORTSDIR}/finance/trytond_company
 
+CONFLICTS=	trytond_company_work_time-2.[68].*
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install