diff options
| author | ghen <ghen@pkgsrc.org> | 2006-01-10 12:39:03 +0000 |
|---|---|---|
| committer | ghen <ghen@pkgsrc.org> | 2006-01-10 12:39:03 +0000 |
| commit | 9598e449425323360646c5dc79018509c7b71c59 (patch) | |
| tree | 30ec85db3466793d59d841a92bdcd532d742e45e /mail | |
| parent | 685ad55c1d3d004c1c35df8e111829c976039e75 (diff) | |
| download | pkgsrc-9598e449425323360646c5dc79018509c7b71c59.tar.gz | |
Use mk/mysql.buildlink3.mk instead of databases/mysqlX-client/bl3.mk,
same for pgsql.bl3.mk. Bump PKGREVISION. Ok by wiz.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/dbmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/dbmail/options.mk | 18 | ||||
| -rw-r--r-- | mail/dovecot/Makefile | 4 | ||||
| -rw-r--r-- | mail/dovecot/options.mk | 4 |
4 files changed, 11 insertions, 19 deletions
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index 94aca8715fc..2f463112448 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2005/12/29 06:21:48 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2006/01/10 12:39:03 ghen Exp $ # DISTNAME= dbmail-2.0.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.dbmail.org/download/ EXTRACT_SUFX= .tgz diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk index 428ee126c8b..1bb933d6edb 100644 --- a/mail/dbmail/options.mk +++ b/mail/dbmail/options.mk @@ -1,24 +1,17 @@ -# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $ +# $NetBSD: options.mk,v 1.3 2006/01/10 12:39:04 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dbmail -PKG_SUPPORTED_OPTIONS= mysql pgsql +PKG_OPTIONS_REQUIRED_GROUPS= sql +PKG_OPTIONS_GROUP.sql= mysql pgsql PKG_SUGGESTED_OPTIONS= mysql .include "../../mk/bsd.options.mk" ### -### We can't compile support for both MySQL and PostgreSQL. -### -.if !empty(PKG_OPTIONS:Mmysql) && !empty(PKG_OPTIONS:Mpgsql) -PKG_FAIL_REASON+= "MySQL and PostgreSQL cannot both be compiled in." \ - "Please change ${PKG_OPTIONS_VAR} to one or the other." -.endif - -### ### MySQL database support ### .if !empty(PKG_OPTIONS:Mmysql) -.include "../../databases/mysql4-client/buildlink3.mk" +.include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-mysql SQLDB= mysql .endif @@ -27,8 +20,7 @@ SQLDB= mysql ### PostgreSQL database support ### .if !empty(PKG_OPTIONS:Mpgsql) -DEPENDS+= postgresql74-client-[0-9]*:../../databases/postgresql74-client -.include "../../databases/postgresql74-lib/buildlink3.mk" +.include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --with-pgsql SQLDB= pgsql .endif diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index caf52b5c59f..b29f82a2a55 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2005/12/29 06:21:48 jlam Exp $ +# $NetBSD: Makefile,v 1.41 2006/01/10 12:39:04 ghen Exp $ DISTNAME= dovecot-0.99.14 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.dovecot.org/releases/ diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk index f16d3abed3e..36d1f33e06a 100644 --- a/mail/dovecot/options.mk +++ b/mail/dovecot/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2005/08/29 13:15:34 tv Exp $ +# $NetBSD: options.mk,v 1.10 2006/01/10 12:39:04 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot PKG_SUPPORTED_OPTIONS= inet6 ldap mysql pam pgsql sasl ssl @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --disable-ssl ### .if !empty(PKG_OPTIONS:Mmysql) CONFIGURE_ARGS+= --with-mysql -. include "../../databases/mysql4-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" .endif ### |