svn commit: r318514 - in head: finance/trytond_carrier_weight finance/trytond_ldap_authentication finance/trytond_ldap_connection www/trytond_google_maps

[Wen Heping]

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 <matthias at petermann.it> (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<matthias at petermann.it>
-#
 # $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 at 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<matthias at petermann.it>
-#
 # $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 at 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<matthias at petermann.it>
-#
 # $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 at 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<matthias at petermann.it>
 # $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 at 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