6 files changed, 6 insertions, 12 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index bd70d9d7b627..ae64aae5d4ca 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell
 BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_FAM=	yes
-USES=		gettext gmake iconv ncurses perl5
+USES=		fam gettext gmake iconv ncurses perl5
 USE_GNOME=	libxml2
 
 USE_BZIP2=	yes
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 4941f5769321..10e7c3e1fb8e 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -35,6 +35,7 @@ NO_STAGE=	yes
 OPTIONS_DEFINE=	FAM TRASHQUOTA GDBM IPV6
 FAM_DESC=	Fam support for IDLE command
 TRASHQUOTA_DESC=	Include deleted mails in the quota
+FAM_USES=	fam
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
@@ -86,7 +87,6 @@ CONFIGURE_ARGS+=--with-trashquota
 .if ${PORT_OPTIONS:MFAM}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_FAM=	yes
 .endif
 
 MAN1=		couriertcpd.1 maildiracl.1 maildirkw.1 \
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index c5e7b00a5139..985c0f12a601 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -61,8 +61,7 @@ USE_AUTOTOOLS=	libtool aclocal automake
 AUTOMAKE_ARGS=	--add-missing
 USE_BZIP2=	yes
 USE_GCC=	any
-USE_FAM=	yes
-USES=		gettext pkgconfig gmake perl5
+USES=		fam gettext gmake perl5 pkgconfig
 USE_OPENSSL=	yes
 USE_SUBMAKE=	yes
 
diff --git a/mail/gnubiff/Makefile b/mail/gnubiff/Makefile
index bb06f9bfcf93..908b4cbd8b0f 100644
--- a/mail/gnubiff/Makefile
+++ b/mail/gnubiff/Makefile
@@ -15,8 +15,7 @@ OPTIONS_DEFINE=	NLS
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_GNOME=	intlhack libglade2 esound
-USES=		gmake pkgconfig
-USE_FAM=	yes
+USES=		fam gmake pkgconfig
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 71853a3648b6..bdeae6d5ee73 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -93,7 +93,7 @@ CONFIGURE_ARGS+=	--enable-sendmail=/usr/sbin/sendmail
 .endif
 
 .if ${PORT_OPTIONS:MFAM} || exists(${LOCALBASE}/lib/libfam.so.0)
-USE_FAM=	yes
+USES+=			fam
 .endif
 
 .if defined(MAILDROP_TRUSTED_USERS)
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 7bf763b5883f..ab02259dea9a 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -27,6 +27,7 @@ HTTPS_LOGIN_DESC=	Generate https:// URLs only for login
 MIMETYPES_DESC=	search for a mime.types file
 SENTRENAME_DESC=	Periodic rename the Sent folder
 CHARSET_DESC=	charsets
+FAM_USES=	fam
 
 NO_STAGE=	yes
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
@@ -88,10 +89,6 @@ INSTALL_TARGET=	install-strip install-configure
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
-.if ${PORT_OPTIONS:MFAM}
-USE_FAM=	yes
-.endif
-
 .if ! ${PORT_OPTIONS:MCACHEDIR}
 PLIST_SUB+=		CACHE="@comment "
 CONFIGURE_ARGS+=	--without-cachedir