From owner-svn-ports-head@FreeBSD.ORG Sun May 19 11:55:10 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CA3B033D; Sun, 19 May 2013 11:55:10 +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 BAF925FF; Sun, 19 May 2013 11:55:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4JBtARD042964; Sun, 19 May 2013 11:55:10 GMT (envelope-from wen@svn.freebsd.org) Received: (from wen@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4JBtAba042960; Sun, 19 May 2013 11:55:10 GMT (envelope-from wen@svn.freebsd.org) Message-Id: <201305191155.r4JBtAba042960@svn.freebsd.org> From: Wen Heping Date: Sun, 19 May 2013 11:55:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318514 - in head: finance/trytond_carrier_weight finance/trytond_ldap_authentication finance/trytond_ldap_connection www/trytond_google_maps 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 May 2013 11:55:10 -0000 Author: wen Date: Sun May 19 11:55:09 2013 New Revision: 318514 URL: http://svnweb.freebsd.org/changeset/ports/318514 Log: - Update MASTER_SITES - Add CONFLICTS - Trim Makefile headers PR: 178161 Submitted by: Matthias Petermann (maintainer) Modified: head/finance/trytond_carrier_weight/Makefile head/finance/trytond_ldap_authentication/Makefile head/finance/trytond_ldap_connection/Makefile head/www/trytond_google_maps/Makefile Modified: head/finance/trytond_carrier_weight/Makefile ============================================================================== --- head/finance/trytond_carrier_weight/Makefile Sun May 19 10:13:03 2013 (r318513) +++ head/finance/trytond_carrier_weight/Makefile Sun May 19 11:55:09 2013 (r318514) @@ -1,14 +1,9 @@ -# New ports collection makefile for: trytond_carrier_weight -# Date created: 08 September, 2012 -# Whom: Matthias Petermann -# # $FreeBSD$ -# PORTNAME= trytond_carrier_weight 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 (Carrier Weight Module) @@ -19,6 +14,8 @@ RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/ trytond_product_measurements>=2.4.0:${PORTSDIR}/finance/trytond_product_measurements \ trytond_carrier>=2.4.1:${PORTSDIR}/finance/trytond_carrier +CONFLICTS= trytond_carrier_weight-2.[68].* + USE_PYTHON= yes USE_PYDISTUTILS=easy_install Modified: head/finance/trytond_ldap_authentication/Makefile ============================================================================== --- head/finance/trytond_ldap_authentication/Makefile Sun May 19 10:13:03 2013 (r318513) +++ head/finance/trytond_ldap_authentication/Makefile Sun May 19 11:55:09 2013 (r318514) @@ -1,14 +1,9 @@ -# New ports collection makefile for: trytond_ldap_authentication -# Date created: 09 September, 2012 -# Whom: Matthias Petermann -# # $FreeBSD$ -# PORTNAME= trytond_ldap_authentication 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 (LDAP Authentication Module) @@ -18,6 +13,8 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/finance/trytond \ trytond_ldap_connection>=2.4.0:${PORTSDIR}/finance/trytond_ldap_connection +CONFLICTS= trytond_ldap_authentication-2.[68].* + USE_PYTHON= yes USE_PYDISTUTILS=easy_install Modified: head/finance/trytond_ldap_connection/Makefile ============================================================================== --- head/finance/trytond_ldap_connection/Makefile Sun May 19 10:13:03 2013 (r318513) +++ head/finance/trytond_ldap_connection/Makefile Sun May 19 11:55:09 2013 (r318514) @@ -1,14 +1,9 @@ -# New ports collection makefile for: trytond_ldap_connection -# Date created: 09 September, 2012 -# Whom: Matthias Petermann -# # $FreeBSD$ -# PORTNAME= trytond_ldap_connection 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 (LDAP Connection Module) @@ -18,6 +13,8 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/finance/trytond \ ${PYTHON_PKGNAMEPREFIX}ldap2>=2.4.10:${PORTSDIR}/net/py-ldap2 +CONFLICTS= trytond_ldap_connection-2.[68].* + USE_PYTHON= yes USE_PYDISTUTILS=easy_install Modified: head/www/trytond_google_maps/Makefile ============================================================================== --- head/www/trytond_google_maps/Makefile Sun May 19 10:13:03 2013 (r318513) +++ head/www/trytond_google_maps/Makefile Sun May 19 11:55:09 2013 (r318514) @@ -1,10 +1,9 @@ -# Created by: Matthias Petermann # $FreeBSD$ PORTNAME= trytond_google_maps PORTVERSION= 2.4.0 CATEGORIES= www 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 (Google Maps Module) @@ -14,6 +13,8 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond>=2.4.0:${PORTSDIR}/finance/trytond \ trytond_party>=2.4.0:${PORTSDIR}/finance/trytond_party +CONFLICTS= trytond_google_maps-2.[68].* + USE_PYTHON= yes USE_PYDISTUTILS=easy_install