diff options
| author | schmonz <schmonz@pkgsrc.org> | 2007-06-07 07:50:57 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2007-06-07 07:50:57 +0000 |
| commit | c0a6b738a9e93a19ae657fc0cb4a898dafebd59e (patch) | |
| tree | 69b79b71dfff1c87381e269759871ecba502e137 | |
| parent | c747a41c667c161897572bdbea077bdf72bb82ad (diff) | |
| download | pkgsrc-c0a6b738a9e93a19ae657fc0cb4a898dafebd59e.tar.gz | |
Move handling of the "fam" option directly into the Courier packages
which use it. This fixes the build of courier-maildir (which includes
courier-mta/Makefile.common) since -r1.60 of mk/bsd.options.mk.
| -rw-r--r-- | mail/courier-imap/Makefile | 8 | ||||
| -rw-r--r-- | mail/courier-mta/Makefile.common | 16 | ||||
| -rw-r--r-- | mail/sqwebmail/Makefile | 8 |
3 files changed, 15 insertions, 17 deletions
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index bde5b281afd..86903933aab 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2006/10/10 12:55:39 ben Exp $ +# $NetBSD: Makefile,v 1.60 2007/06/07 07:50:57 schmonz Exp $ DISTNAME= courier-imap-4.1.1 PKGREVISION= 3 @@ -19,6 +19,12 @@ USE_LIBTOOL= yes PKG_SUPPORTED_OPTIONS+= fam +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mfam) +. include "../../mk/fam.buildlink3.mk" +.endif + # PKGNAME is a parameter to the following file PKGNAME= ${DISTNAME} .include "../../mail/courier-mta/Makefile.common" diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common index 1dac3edebce..acc3a8dedf3 100644 --- a/mail/courier-mta/Makefile.common +++ b/mail/courier-mta/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2006/06/09 22:12:18 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2007/06/07 07:50:57 schmonz Exp $ # # Package Makefiles should include this file after setting PKGNAME and # PKG_SUPPORTED_OPTIONS. @@ -43,18 +43,4 @@ CONFIGURE_ARGS+= --with-db=db CONFIGURE_ENV+= SYSCONFTOOL_PERL=${PERL5:Q} -# Note: This expression is the same as ${PKGBASE}, but the latter is -# not defined yet, so we cannot use it here. -PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} -.include "../../mk/bsd.options.mk" - -# The maildir subdirectory can be built with a "fam" option, but it's only -# useful for the imap server and the webmail client. Handle the option -# here, but the corresponding package Makefiles should note that "fam" is -# a supported option on their own. -# -.if !empty(PKG_OPTIONS:Mfam) -. include "../../mk/fam.buildlink3.mk" -.endif - .include "../../devel/pcre/buildlink3.mk" diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 00b8092213b..d2a8868cdae 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2006/06/17 19:26:48 jlam Exp $ +# $NetBSD: Makefile,v 1.51 2007/06/07 07:50:57 schmonz Exp $ DISTNAME= sqwebmail-5.1.2 PKGREVISION= 1 @@ -19,6 +19,12 @@ USE_LIBTOOL= yes PKG_SUPPORTED_OPTIONS+= fam +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mfam) +. include "../../mk/fam.buildlink3.mk" +.endif + # PKGNAME is a parameter to the following file. PKGNAME= ${DISTNAME} .include "../../mail/courier-mta/Makefile.common" |