From f81ae835adc78533f22ce227d12d3f56e6076f1a Mon Sep 17 00:00:00 2001
From: dillo <dillo@pkgsrc.org>
Date: Tue, 31 May 2005 10:01:36 +0000
Subject: Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a
 user settable variable.  Set PKG_SUGGESTED_OPTIONS instead.  Also, make use
 of PKG_OPTIONS_LEGACY_VARS.

Reviewed by wiz.
---
 mail/clamav/Makefile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'mail/clamav')

diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index b379989da66..2a6cd54ea8c 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/23 22:41:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/31 10:01:37 dillo Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -54,14 +54,10 @@ CONF_FILES_PERMS+=	${EGDIR}/${_file_} ${VIRUSDBDIR}/${_file_}	\
 
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
 
-PKG_DEFAULT_OPTIONS+=	curl
-
-.if defined(USE_MILTER) && !empty(USE_MILTER:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	milter
-.endif
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
 PKG_SUPPORTED_OPTIONS=	curl milter
+PKG_SUGGESTED_OPTIONS=	curl
+
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmilter)
-- 
cgit v1.2.3