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-mta | |
| 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-mta')
| -rw-r--r-- | mail/courier-mta/Makefile | 4 | ||||
| -rw-r--r-- | mail/courier-mta/Makefile.common | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile index ed0009a131b..c533307f158 100644 --- a/mail/courier-mta/Makefile +++ b/mail/courier-mta/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2007/07/28 01:37:23 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2007/08/02 22:07:32 jlam Exp $ DISTNAME= courier-${COURIER_VERSION} PKGREVISION= 4 @@ -19,8 +19,6 @@ DEPENDS+= maildrop>=2.0.2:../../mail/maildrop USE_TOOLS+= gmake openssl:run perl:run USE_LANGUAGES= c c++ -PKGNAME= ${DISTNAME:S/-/-mta-/} -# PKGNAME is a parameter to the following file. .include "Makefile.common" PLIST_SRC+= ${PKGDIR}/PLIST diff --git a/mail/courier-mta/Makefile.common b/mail/courier-mta/Makefile.common index 0ed0675b47d..47fe4dd2992 100644 --- a/mail/courier-mta/Makefile.common +++ b/mail/courier-mta/Makefile.common @@ -1,14 +1,7 @@ -# $NetBSD: Makefile.common,v 1.4 2007/07/04 20:54:41 jlam Exp $ -# -# Package Makefiles should include this file after setting PKGNAME and -# PKG_SUPPORTED_OPTIONS. +# $NetBSD: Makefile.common,v 1.5 2007/08/02 22:07:32 jlam Exp $ COURIER_VERSION= 0.53.2 -.if !defined(PKGNAME) -PKG_FAIL_REASON+= "[courier/Makefile.common] PKGNAME must be set." -.endif - .include "../../mk/bsd.prefs.mk" DATADIR= ${PREFIX}/share/courier |