[pkgsrc/trunk]: pkgsrc/mail Move handling of the "fam" option directly into t...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b65c8066ee2f
branches:  trunk
changeset: 529534:b65c8066ee2f
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Jun 07 07:50:57 2007 +0000

description:
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.

diffstat:

 mail/courier-imap/Makefile       |   8 +++++++-
 mail/courier-mta/Makefile.common |  16 +---------------
 mail/sqwebmail/Makefile          |   8 +++++++-
 3 files changed, 15 insertions(+), 17 deletions(-)

diffs (72 lines):

diff -r 5ded0303e263 -r b65c8066ee2f mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile        Thu Jun 07 07:27:09 2007 +0000
+++ b/mail/courier-imap/Makefile        Thu Jun 07 07:50:57 2007 +0000
@@ -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 @@
 
 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 -r 5ded0303e263 -r b65c8066ee2f mail/courier-mta/Makefile.common
--- a/mail/courier-mta/Makefile.common  Thu Jun 07 07:27:09 2007 +0000
+++ b/mail/courier-mta/Makefile.common  Thu Jun 07 07:50:57 2007 +0000
@@ -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_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 -r 5ded0303e263 -r b65c8066ee2f mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile   Thu Jun 07 07:27:09 2007 +0000
+++ b/mail/sqwebmail/Makefile   Thu Jun 07 07:50:57 2007 +0000
@@ -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 @@
 
 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"