From owner-svn-ports-head@FreeBSD.ORG Mon Nov 18 09:43:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 523F519A; Mon, 18 Nov 2013 09:43:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F85E2B6C; Mon, 18 Nov 2013 09:43:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAI9hT0O023757; Mon, 18 Nov 2013 09:43:29 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAI9hG3p023680; Mon, 18 Nov 2013 09:43:16 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201311180943.rAI9hG3p023680@svn.freebsd.org> From: Boris Samorodov Date: Mon, 18 Nov 2013 09:43:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334164 - in head: finance/tryton finance/trytond finance/trytond_account finance/trytond_account_be finance/trytond_account_invoice finance/trytond_account_invoice_history finance/tryt... 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.16 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: Mon, 18 Nov 2013 09:43:29 -0000 Author: bsam Date: Mon Nov 18 09:43:15 2013 New Revision: 334164 URL: http://svnweb.freebsd.org/changeset/ports/334164 Log: Support STAGE (in preparation to commit PR/181691).. PR: ports/181691 Submitted by: Matthias Petermann (maintainer) Patch by: bsam (me) Approved by: Matthias Petermann (maintainer) Modified: head/finance/tryton/Makefile head/finance/trytond/Makefile head/finance/trytond_account/Makefile head/finance/trytond_account_be/Makefile head/finance/trytond_account_invoice/Makefile head/finance/trytond_account_invoice_history/Makefile head/finance/trytond_account_invoice_line_standalone/Makefile head/finance/trytond_account_product/Makefile head/finance/trytond_account_statement/Makefile head/finance/trytond_account_stock_anglo_saxon/Makefile head/finance/trytond_account_stock_continental/Makefile head/finance/trytond_analytic_account/Makefile head/finance/trytond_analytic_invoice/Makefile head/finance/trytond_analytic_purchase/Makefile head/finance/trytond_analytic_sale/Makefile head/finance/trytond_calendar/Makefile head/finance/trytond_calendar_classification/Makefile head/finance/trytond_calendar_scheduling/Makefile head/finance/trytond_calendar_todo/Makefile head/finance/trytond_carrier/Makefile head/finance/trytond_carrier_percentage/Makefile head/finance/trytond_carrier_weight/Makefile head/finance/trytond_company/Makefile head/finance/trytond_company_work_time/Makefile head/finance/trytond_country/Makefile head/finance/trytond_currency/Makefile head/finance/trytond_dashboard/Makefile head/finance/trytond_ldap_authentication/Makefile head/finance/trytond_ldap_connection/Makefile head/finance/trytond_party/Makefile head/finance/trytond_party_siret/Makefile head/finance/trytond_party_vcarddav/Makefile head/finance/trytond_product/Makefile head/finance/trytond_product_cost_fifo/Makefile head/finance/trytond_product_cost_history/Makefile head/finance/trytond_product_measurements/Makefile head/finance/trytond_product_price_list/Makefile head/finance/trytond_production/Makefile head/finance/trytond_project/Makefile head/finance/trytond_project_plan/Makefile head/finance/trytond_project_revenue/Makefile head/finance/trytond_purchase/Makefile head/finance/trytond_purchase_invoice_line_standalone/Makefile head/finance/trytond_purchase_shipment_cost/Makefile head/finance/trytond_sale/Makefile head/finance/trytond_sale_opportunity/Makefile head/finance/trytond_sale_price_list/Makefile head/finance/trytond_sale_shipment_cost/Makefile head/finance/trytond_stock/Makefile head/finance/trytond_stock_forecast/Makefile head/finance/trytond_stock_inventory_location/Makefile head/finance/trytond_stock_location_sequence/Makefile head/finance/trytond_stock_lot/Makefile head/finance/trytond_stock_product_location/Makefile head/finance/trytond_stock_split/Makefile head/finance/trytond_stock_supply/Makefile head/finance/trytond_stock_supply_day/Makefile head/finance/trytond_stock_supply_forecast/Makefile head/finance/trytond_stock_supply_production/Makefile head/finance/trytond_timesheet/Makefile head/french/trytond_account_fr/Makefile head/german/trytond_account_de_skr03/Makefile head/www/trytond_google_maps/Makefile Modified: head/finance/tryton/Makefile ============================================================================== --- head/finance/tryton/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/tryton/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,11 +19,10 @@ CONFLICTS= tryton-2.[68].* USES= desktop-file-utils gettext USE_PYTHON= -2.7 USE_PYDISTUTILS=easy_install -USE_GNOME= gtk20 desktopfileutils pygtk2 +USE_GNOME= gtk20 pygtk2 -NO_STAGE= yes post-install: - ${INSTALL_DATA} ${WRKSRC}/tryton.desktop ${PREFIX}/share/applications/tryton.desktop - ${INSTALL_DATA} ${WRKSRC}/share/pixmaps/tryton/tryton-icon.png ${PREFIX}/share/pixmaps/tryton-icon.png + ${INSTALL_DATA} ${WRKSRC}/tryton.desktop ${STAGEDIR}${PREFIX}/share/applications/tryton.desktop + ${INSTALL_DATA} ${WRKSRC}/share/pixmaps/tryton/tryton-icon.png ${STAGEDIR}${PREFIX}/share/pixmaps/tryton-icon.png .include Modified: head/finance/trytond/Makefile ============================================================================== --- head/finance/trytond/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -44,7 +44,6 @@ LOGDIR?= /var/log USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|%%PIDDIR%%|${PIDDIR}|g' -e 's|%%LOGDIR%%|${LOGDIR}|g' \ ${WRKSRC}/etc/${PORTNAME}.conf @@ -68,11 +67,6 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyt .endif post-install: - ${CP} -p ${WRKSRC}/etc/${PORTNAME}.conf ${PREFIX}/etc/${PORTNAME}.conf.sample - @if [ ! -f ${PREFIX}/etc/${PORTNAME}.conf ]; then \ - ${CP} -p ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf ; \ - fi - - @${CAT} ${PKGMESSAGE} + ${CP} -p ${WRKSRC}/etc/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample .include Modified: head/finance/trytond_account/Makefile ============================================================================== --- head/finance/trytond_account/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_account/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_account-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_account_be/Makefile ============================================================================== --- head/finance/trytond_account_be/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_account_be/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_account-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_account_invoice/Makefile ============================================================================== --- head/finance/trytond_account_invoice/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_account_invoice/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_account_invoice-2.[68 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_account_invoice_history/Makefile ============================================================================== --- head/finance/trytond_account_invoice_history/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_account_invoice_history/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_account_invoice_histo USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_account_invoice_line_standalone/Makefile ============================================================================== --- head/finance/trytond_account_invoice_line_standalone/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_account_invoice_line_standalone/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_account_invoice_line_ USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_account_product/Makefile ============================================================================== --- head/finance/trytond_account_product/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_account_product/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_account_product-2.[68 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_account_statement/Makefile ============================================================================== --- head/finance/trytond_account_statement/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_account_statement/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_account_statement-2.[ USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_account_stock_anglo_saxon/Makefile ============================================================================== --- head/finance/trytond_account_stock_anglo_saxon/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_account_stock_anglo_saxon/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_account_stock_anglo_s USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_account_stock_continental/Makefile ============================================================================== --- head/finance/trytond_account_stock_continental/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_account_stock_continental/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_account_stock_contine USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_analytic_account/Makefile ============================================================================== --- head/finance/trytond_analytic_account/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_analytic_account/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -21,5 +21,4 @@ CONFLICTS= trytond_analytic_account-2.[6 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_analytic_invoice/Makefile ============================================================================== --- head/finance/trytond_analytic_invoice/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_analytic_invoice/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_analytic_invoice-2.[6 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_analytic_purchase/Makefile ============================================================================== --- head/finance/trytond_analytic_purchase/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_analytic_purchase/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_analytic_purchase-2.[ USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_analytic_sale/Makefile ============================================================================== --- head/finance/trytond_analytic_sale/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_analytic_sale/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_analytic_sale-2.[68]. USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_calendar/Makefile ============================================================================== --- head/finance/trytond_calendar/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_calendar/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -21,5 +21,4 @@ CONFLICTS= trytond_calendar-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_calendar_classification/Makefile ============================================================================== --- head/finance/trytond_calendar_classification/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_calendar_classification/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_calendar_classificati USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_calendar_scheduling/Makefile ============================================================================== --- head/finance/trytond_calendar_scheduling/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_calendar_scheduling/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_calendar_scheduling-2 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_calendar_todo/Makefile ============================================================================== --- head/finance/trytond_calendar_todo/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_calendar_todo/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_calendar_todo-2.[68]. USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_carrier/Makefile ============================================================================== --- head/finance/trytond_carrier/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_carrier/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_carrier-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_carrier_percentage/Makefile ============================================================================== --- head/finance/trytond_carrier_percentage/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_carrier_percentage/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_carrier_percentage-2. USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_carrier_weight/Makefile ============================================================================== --- head/finance/trytond_carrier_weight/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_carrier_weight/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_carrier_weight-2.[68] USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_company/Makefile ============================================================================== --- head/finance/trytond_company/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_company/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_company-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_company_work_time/Makefile ============================================================================== --- head/finance/trytond_company_work_time/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_company_work_time/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_company_work_time-2.[ USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_country/Makefile ============================================================================== --- head/finance/trytond_country/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_country/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -17,5 +17,4 @@ CONFLICTS= trytond_country-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_currency/Makefile ============================================================================== --- head/finance/trytond_currency/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_currency/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -17,5 +17,4 @@ CONFLICTS= trytond_currency-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_dashboard/Makefile ============================================================================== --- head/finance/trytond_dashboard/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_dashboard/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -17,5 +17,4 @@ CONFLICTS= trytond_dashboard-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_ldap_authentication/Makefile ============================================================================== --- head/finance/trytond_ldap_authentication/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_ldap_authentication/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_ldap_authentication-2 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_ldap_connection/Makefile ============================================================================== --- head/finance/trytond_ldap_connection/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_ldap_connection/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_ldap_connection-2.[68 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_party/Makefile ============================================================================== --- head/finance/trytond_party/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_party/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_party-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_party_siret/Makefile ============================================================================== --- head/finance/trytond_party_siret/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_party_siret/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_party_siret-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_party_vcarddav/Makefile ============================================================================== --- head/finance/trytond_party_vcarddav/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_party_vcarddav/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -21,5 +21,4 @@ CONFLICTS= trytond_party_vcarddav-2.[68] USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_product/Makefile ============================================================================== --- head/finance/trytond_product/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_product/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -17,5 +17,4 @@ CONFLICTS= trytond_product-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_product_cost_fifo/Makefile ============================================================================== --- head/finance/trytond_product_cost_fifo/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_product_cost_fifo/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_product_cost_fifo-2.[ USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_product_cost_history/Makefile ============================================================================== --- head/finance/trytond_product_cost_history/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_product_cost_history/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_product_cost_history- USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_product_measurements/Makefile ============================================================================== --- head/finance/trytond_product_measurements/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_product_measurements/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_product_measurements- USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_product_price_list/Makefile ============================================================================== --- head/finance/trytond_product_price_list/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_product_price_list/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_product_price_list-2. USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_production/Makefile ============================================================================== --- head/finance/trytond_production/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_production/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -21,5 +21,4 @@ CONFLICTS= trytond_production-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_project/Makefile ============================================================================== --- head/finance/trytond_project/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_project/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_project-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_project_plan/Makefile ============================================================================== --- head/finance/trytond_project_plan/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_project_plan/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_project_plan-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_project_revenue/Makefile ============================================================================== --- head/finance/trytond_project_revenue/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_project_revenue/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_project_revenue-2.[68 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_purchase/Makefile ============================================================================== --- head/finance/trytond_purchase/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_purchase/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_purchase-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_purchase_invoice_line_standalone/Makefile ============================================================================== --- head/finance/trytond_purchase_invoice_line_standalone/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_purchase_invoice_line_standalone/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_purchase_invoice_line USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_purchase_shipment_cost/Makefile ============================================================================== --- head/finance/trytond_purchase_shipment_cost/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_purchase_shipment_cost/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -21,5 +21,4 @@ CONFLICTS= trytond_purchase_shipment_cos USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_sale/Makefile ============================================================================== --- head/finance/trytond_sale/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_sale/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_sale-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_sale_opportunity/Makefile ============================================================================== --- head/finance/trytond_sale_opportunity/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_sale_opportunity/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_sale_opportunity-2.[6 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_sale_price_list/Makefile ============================================================================== --- head/finance/trytond_sale_price_list/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_sale_price_list/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_sale_price_list-2.[68 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_sale_shipment_cost/Makefile ============================================================================== --- head/finance/trytond_sale_shipment_cost/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_sale_shipment_cost/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -22,5 +22,4 @@ CONFLICTS= trytond_sale_shipment_cost-2. USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock/Makefile ============================================================================== --- head/finance/trytond_stock/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -22,5 +22,4 @@ CONFLICTS= trytond_stock-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_forecast/Makefile ============================================================================== --- head/finance/trytond_stock_forecast/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_forecast/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -22,5 +22,4 @@ CONFLICTS= trytond_stock_forecast-2.[68] USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_inventory_location/Makefile ============================================================================== --- head/finance/trytond_stock_inventory_location/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_inventory_location/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_stock_inventory_locat USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_location_sequence/Makefile ============================================================================== --- head/finance/trytond_stock_location_sequence/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_location_sequence/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_stock_location_sequen USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_lot/Makefile ============================================================================== --- head/finance/trytond_stock_lot/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_lot/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_stock_lot-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_product_location/Makefile ============================================================================== --- head/finance/trytond_stock_product_location/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_product_location/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_stock_product_locatio USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_split/Makefile ============================================================================== --- head/finance/trytond_stock_split/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_split/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_stock_split-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_supply/Makefile ============================================================================== --- head/finance/trytond_stock_supply/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_supply/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_stock_supply-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_supply_day/Makefile ============================================================================== --- head/finance/trytond_stock_supply_day/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_supply_day/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_stock_supply_day-2.[6 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_supply_forecast/Makefile ============================================================================== --- head/finance/trytond_stock_supply_forecast/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_supply_forecast/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -20,5 +20,4 @@ CONFLICTS= trytond_stock_supply_forecast USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_stock_supply_production/Makefile ============================================================================== --- head/finance/trytond_stock_supply_production/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_stock_supply_production/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_stock_supply_producti USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/finance/trytond_timesheet/Makefile ============================================================================== --- head/finance/trytond_timesheet/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/finance/trytond_timesheet/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -19,5 +19,4 @@ CONFLICTS= trytond_timesheet-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/french/trytond_account_fr/Makefile ============================================================================== --- head/french/trytond_account_fr/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/french/trytond_account_fr/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_account_fr-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/german/trytond_account_de_skr03/Makefile ============================================================================== --- head/german/trytond_account_de_skr03/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/german/trytond_account_de_skr03/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_account_de_skr03-2.[6 USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include Modified: head/www/trytond_google_maps/Makefile ============================================================================== --- head/www/trytond_google_maps/Makefile Mon Nov 18 09:40:02 2013 (r334163) +++ head/www/trytond_google_maps/Makefile Mon Nov 18 09:43:15 2013 (r334164) @@ -18,5 +18,4 @@ CONFLICTS= trytond_google_maps-2.[68].* USE_PYTHON= yes USE_PYDISTUTILS=easy_install -NO_STAGE= yes .include