From 1c46f2e33a3bee58bcdd58efde8376d4b6ff1f57 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Mon, 20 Jun 2011 05:19:26 +0000 Subject: [PATCH] No need to repeat the same things over and over again for all modules. Introduce a TRYTOND_MODULE variable and factorize common variables. --- productivity/tryton/Makefile.inc | 9 ++++++++- productivity/tryton/calendar/Makefile | 11 ++++------- productivity/tryton/country/Makefile | 10 +++------- productivity/tryton/currency/Makefile | 10 +++------- productivity/tryton/dashboard/Makefile | 10 +++------- productivity/tryton/ldap_authentication/Makefile | 11 ++++------- productivity/tryton/ldap_connection/Makefile | 11 ++++------- productivity/tryton/product/Makefile | 10 +++------- 8 files changed, 32 insertions(+), 50 deletions(-) diff --git a/productivity/tryton/Makefile.inc b/productivity/tryton/Makefile.inc index b9abd0cec9a..d2123bd363e 100644 --- a/productivity/tryton/Makefile.inc +++ b/productivity/tryton/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2011/06/13 17:07:45 ajacoutot Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2011/06/20 05:19:26 ajacoutot Exp $ MODPY_EGG_VERSION ?= 2.0.1 @@ -27,3 +27,10 @@ REGRESS_DEPENDS ?= ${RUN_DEPENDS} # Some regression tests need read access to /etc/trytond.conf (not # available for unprivilege users) and a trytond server running. REGRESS_IS_INTERACTIVE= Yes + +.if defined(TRYTOND_MODULE) +COMMENT ?= trytond ${TRYTOND_MODULE} account +DISTNAME ?= trytond_${TRYTOND_MODULE}-${MODPY_EGG_VERSION} +PKGNAME ?= trytond-module-${TRYTOND_MODULE}-${MODPY_EGG_VERSION} +RUN_DEPENDS += productivity/tryton/trytond +.endif diff --git a/productivity/tryton/calendar/Makefile b/productivity/tryton/calendar/Makefile index cea0de96299..b8974224ead 100644 --- a/productivity/tryton/calendar/Makefile +++ b/productivity/tryton/calendar/Makefile @@ -1,12 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/06/13 17:08:33 ajacoutot Exp $ - -COMMENT = trytond calendar module +# $OpenBSD: Makefile,v 1.2 2011/06/20 05:19:26 ajacoutot Exp $ MODPY_EGG_VERSION = 2.0.0 -DISTNAME = trytond_calendar-${MODPY_EGG_VERSION} -PKGNAME = trytond-module-calendar-${MODPY_EGG_VERSION} +TRYTOND_MODULE = calendar +REVISION = 0 -RUN_DEPENDS = productivity/tryton/trytond \ - textproc/py-vobject +RUN_DEPENDS = textproc/py-vobject .include diff --git a/productivity/tryton/country/Makefile b/productivity/tryton/country/Makefile index 0f0b08ce575..583ab59ef07 100644 --- a/productivity/tryton/country/Makefile +++ b/productivity/tryton/country/Makefile @@ -1,11 +1,7 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/06/13 17:09:29 ajacoutot Exp $ - -COMMENT = trytond country module +# $OpenBSD: Makefile,v 1.2 2011/06/20 05:19:26 ajacoutot Exp $ MODPY_EGG_VERSION = 2.0.0 -DISTNAME = trytond_country-${MODPY_EGG_VERSION} -PKGNAME = trytond-module-country-${MODPY_EGG_VERSION} - -RUN_DEPENDS = productivity/tryton/trytond +TRYTOND_MODULE = country +REVISION = 0 .include diff --git a/productivity/tryton/currency/Makefile b/productivity/tryton/currency/Makefile index d2d293f223f..794b7275f3c 100644 --- a/productivity/tryton/currency/Makefile +++ b/productivity/tryton/currency/Makefile @@ -1,10 +1,6 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/06/13 17:10:16 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.2 2011/06/20 05:19:26 ajacoutot Exp $ -COMMENT = trytond currency module - -DISTNAME = trytond_currency-${MODPY_EGG_VERSION} -PKGNAME = trytond-module-currency-${MODPY_EGG_VERSION} - -RUN_DEPENDS = productivity/tryton/trytond +TRYTOND_MODULE = currency +REVISION = 0 .include diff --git a/productivity/tryton/dashboard/Makefile b/productivity/tryton/dashboard/Makefile index a236a9e36bb..332b37145f9 100644 --- a/productivity/tryton/dashboard/Makefile +++ b/productivity/tryton/dashboard/Makefile @@ -1,11 +1,7 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/06/13 17:13:37 ajacoutot Exp $ - -COMMENT = trytond dashboard module +# $OpenBSD: Makefile,v 1.2 2011/06/20 05:19:26 ajacoutot Exp $ MODPY_EGG_VERSION = 2.0.0 -DISTNAME = trytond_dashboard-${MODPY_EGG_VERSION} -PKGNAME = trytond-module-dashboard-${MODPY_EGG_VERSION} - -RUN_DEPENDS = productivity/tryton/trytond +TRYTOND_MODULE = dashboard +REVISION = 0 .include diff --git a/productivity/tryton/ldap_authentication/Makefile b/productivity/tryton/ldap_authentication/Makefile index 43e6d3f0841..c2348e98061 100644 --- a/productivity/tryton/ldap_authentication/Makefile +++ b/productivity/tryton/ldap_authentication/Makefile @@ -1,12 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/06/13 17:14:37 ajacoutot Exp $ - -COMMENT = trytond ldap_authentication module +# $OpenBSD: Makefile,v 1.2 2011/06/20 05:19:26 ajacoutot Exp $ MODPY_EGG_VERSION = 2.0.0 -DISTNAME = trytond_ldap_authentication-${MODPY_EGG_VERSION} -PKGNAME = trytond-module-ldap_authentication-${MODPY_EGG_VERSION} +TRYTOND_MODULE = ldap_authentication +REVISION = 0 -RUN_DEPENDS = productivity/tryton/trytond \ - databases/py-ldap +RUN_DEPENDS = databases/py-ldap .include diff --git a/productivity/tryton/ldap_connection/Makefile b/productivity/tryton/ldap_connection/Makefile index 4679279fcb2..6ae6d4b1d2b 100644 --- a/productivity/tryton/ldap_connection/Makefile +++ b/productivity/tryton/ldap_connection/Makefile @@ -1,12 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/06/13 17:15:31 ajacoutot Exp $ - -COMMENT = trytond ldap_connection module +# $OpenBSD: Makefile,v 1.2 2011/06/20 05:19:26 ajacoutot Exp $ MODPY_EGG_VERSION = 2.0.0 -DISTNAME = trytond_ldap_connection-${MODPY_EGG_VERSION} -PKGNAME = trytond-module-ldap_connection-${MODPY_EGG_VERSION} +TRYTOND_MODULE = ldap_connection +REVISION = 0 -RUN_DEPENDS = productivity/tryton/trytond \ - databases/py-ldap +RUN_DEPENDS = databases/py-ldap .include diff --git a/productivity/tryton/product/Makefile b/productivity/tryton/product/Makefile index 4ca139f0efe..2cb94637046 100644 --- a/productivity/tryton/product/Makefile +++ b/productivity/tryton/product/Makefile @@ -1,10 +1,6 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/06/13 17:16:22 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.2 2011/06/20 05:19:26 ajacoutot Exp $ -COMMENT = trytond product module - -DISTNAME = trytond_product-${MODPY_EGG_VERSION} -PKGNAME = trytond-module-product-${MODPY_EGG_VERSION} - -RUN_DEPENDS = productivity/tryton/trytond +TRYTOND_MODULE = product +REVISION = 0 .include