From c05d170d22ff6156dfbdaeda333ef9be320af1aa Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 2 Aug 2007 22:07:32 +0000 Subject: 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. --- mail/sqwebmail/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mail/sqwebmail') diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 2526ee927c8..b16d6998aaa 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2007/06/15 18:30:31 jlam Exp $ +# $NetBSD: Makefile,v 1.54 2007/08/02 22:07:32 jlam Exp $ DISTNAME= sqwebmail-5.1.2 PKGREVISION= 1 @@ -17,7 +17,8 @@ USE_TOOLS+= env gmake gzip:run perl:run USE_LANGUAGES= c c++ USE_LIBTOOL= yes -PKG_SUPPORTED_OPTIONS+= fam +PKG_OPTIONS_VAR= PKG_OPTIONS.sqwebmail +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" INSTALL_AM_MAKEFLAGS= sysconfdir=${EGDIR} -- cgit v1.2.3