diff options
| author | jlam <jlam> | 2007-08-02 22:07:32 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2007-08-02 22:07:32 +0000 |
| commit | efe26c0283ccca55d70ba40ae547380b7a27286b (patch) | |
| tree | 16c99ceb6c46268f85f80bb64041a4670a184d84 /mail/courier-imap | |
| parent | 715b7f7f8ed466d50cf8fd4588055c0c3a1d37e9 (diff) | |
| download | pkgsrc-efe26c0283ccca55d70ba40ae547380b7a27286b.tar.gz | |
Fix botched migration of PKG_OPTIONS from courier-mta/Makefile.common
into the Makefiles of the packages that include it:
(1) PKGNAME and PKG_SUPPORTED_OPTIONS clearly no longer need to be
defined since the only code that used it in Makefile.common was
removed.
(2) Package Makefiles need to properly define PKG_OPTIONS_VAR and
PKG_SUPPORTED_OPTIONS prior to including bsd.options.mk. Set
them to the appropriate values to match the orginal names from
before the botched migration.
Diffstat (limited to 'mail/courier-imap')
| -rw-r--r-- | mail/courier-imap/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 86903933aab..0d4c1304981 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2007/06/07 07:50:57 schmonz Exp $ +# $NetBSD: Makefile,v 1.61 2007/08/02 22:07:32 jlam Exp $ DISTNAME= courier-imap-4.1.1 PKGREVISION= 3 @@ -17,7 +17,8 @@ USE_TOOLS+= env gmake openssl:run perl USE_LANGUAGES= c c++ USE_LIBTOOL= yes -PKG_SUPPORTED_OPTIONS+= fam +PKG_OPTIONS_VAR= PKG_OPTIONS.courier-imap +PKG_SUPPORTED_OPTIONS= fam .include "../../mk/bsd.options.mk" @@ -25,8 +26,6 @@ PKG_SUPPORTED_OPTIONS+= fam . include "../../mk/fam.buildlink3.mk" .endif -# PKGNAME is a parameter to the following file -PKGNAME= ${DISTNAME} .include "../../mail/courier-mta/Makefile.common" CONFIGURE_ARGS+= --datadir=${DATADIR:Q} |