diff options
| -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 | ||||
| -rw-r--r-- | security/courier-authlib/Makefile | 3 | ||||
| -rw-r--r-- | security/courier-authlib/options.mk | 4 | ||||
| -rw-r--r-- | security/cy2-sql/Makefile | 5 |
7 files changed, 18 insertions, 24 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 ### diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 84006cbd9ab..0473678dc13 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2006/01/03 03:50:45 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2006/01/10 12:39:04 ghen Exp $ .include "Makefile.common" DISTNAME= courier-authlib-0.58 +PKGREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/} EXTRACT_SUFX= .tar.bz2 diff --git a/security/courier-authlib/options.mk b/security/courier-authlib/options.mk index a9ddc9a3a70..1e31b31ceaf 100644 --- a/security/courier-authlib/options.mk +++ b/security/courier-authlib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2005/11/07 16:43:49 jlam Exp $ +# $NetBSD: options.mk,v 1.8 2006/01/10 12:39:04 ghen Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.courier-authlib PKG_SUPPORTED_OPTIONS= pam bdb ldap mysql pgsql @@ -84,7 +84,7 @@ CONFIGURE_ARGS+= --without-authldap ### MySQL authentication ### .if !empty(PKG_OPTIONS:Mmysql) -. include "../../databases/mysql4-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-authmysql AUTHLIB_PLIST+= ${AUTHLIBDIR}/libauthmysql.la AUTHLIB_PLIST+= ${AUTHEXAMPLEDIR}/authmysqlrc.dist diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile index d9f674dea66..a24c2703c92 100644 --- a/security/cy2-sql/Makefile +++ b/security/cy2-sql/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:17 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2006/01/10 12:39:04 ghen Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/} +PKGREVISION= 1 COMMENT= Cyrus SASL SQL authentication plugin SASL_PLUGIN= yes @@ -13,7 +14,7 @@ PKG_SUGGESTED_OPTIONS= mysql .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mmysql) -. include "../../databases/mysql4-client/buildlink3.mk" +. include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} .endif |