Convert the tree to USES=fam

Approved by:	portmgr (bapt)

32 files changed, 42 insertions, 80 deletions

diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile
index debfa8d1e934..38cf9ca2fb9c 100644
--- a/audio/xmms2/Makefile
+++ b/audio/xmms2/Makefile
@@ -140,9 +140,8 @@ EXCLUDE+=	--without-plugins="faad" --without-plugins="mp4"
 PLIST_SUB+=	FAAD="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDAM}
-USE_FAM=	yes
-WANT_FAM_SYSTEM=gamin
+.if ${PORT_OPTIONS:MFAM}
+USES+=		fam:gamin
 PLIST_SUB+=	FAM=""
 .else
 EXCLUDE+=	--without-optionals="medialib-updater"
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 06d4d5c8d3f6..cfc668138710 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -83,7 +83,7 @@ INSTALLS_ICONS=	yes
 
 .if ${PORT_OPTIONS:MX11MON}
 USE_XORG+=	ice sm x11
-USE_FAM=	yes
+USES+=		fam
 CONFIGURE_ARGS+=--with-fam
 .endif
 
diff --git a/deskutils/strigidaemon/Makefile b/deskutils/strigidaemon/Makefile
index 7855dc426a57..29f81a3e0734 100644
--- a/deskutils/strigidaemon/Makefile
+++ b/deskutils/strigidaemon/Makefile
@@ -12,8 +12,7 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 		libstreams.so:${PORTSDIR}/deskutils/libstreams \
 		libstreamanalyzer.so:${PORTSDIR}/deskutils/libstreamanalyzer
 
-USES=		pkgconfig
-USE_FAM=	yes
+USES=		fam pkgconfig
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 76fe3e93668d..91b49510f04f 100644
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
 		librsync.so:${PORTSDIR}/net/librsync
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
-USES=		pkgconfig
-USE_FAM=	yes
+USES=		fam pkgconfig
 USE_WX=		2.8
 WANT_UNICODE=	yes
 USE_GNOME=	gnomehack desktopfileutils
diff --git a/devel/fampp/Makefile b/devel/fampp/Makefile
index 582d03b61a1a..fd726061d20a 100644
--- a/devel/fampp/Makefile
+++ b/devel/fampp/Makefile
@@ -11,8 +11,7 @@ COMMENT=	A C++ wrapper for fam from SGI
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
-USE_FAM=	yes
-WANT_FAM_SYSTEM=fam
+USES=		fam:fam
 
 NO_STAGE=	yes
 do-install:
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile
index 6e88d2e644df..b7e517cfa249 100644
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://people.gnome.org/~veillard/gamin/sources/
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	A file and directory monitoring system
 
-USES=		gettext gmake pathfix pkgconfig
+USES+=		gettext gmake pathfix pkgconfig
 USE_AUTOTOOLS=	libtool
 USE_GNOME?=	glib20
 USE_LDCONFIG=	yes
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 409aecf8e19d..5c52aa58a6a7 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -48,7 +48,7 @@ NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
-USE_FAM=	yes
+USES+=		fam
 .endif
 
 .if exists(${LOCALBASE}/lib/libkrb5.so)
diff --git a/devel/py-fam/Makefile b/devel/py-fam/Makefile
index 3de8ca25624b..7d8a0fb2cfbc 100644
--- a/devel/py-fam/Makefile
+++ b/devel/py-fam/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	python-fam-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Interface to the File Alteration Monitor
 
-USE_FAM=	yes
+USES=		fam
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
diff --git a/devel/py-gamin/Makefile b/devel/py-gamin/Makefile
index 62d970bc0627..ecb2487da212 100644
--- a/devel/py-gamin/Makefile
+++ b/devel/py-gamin/Makefile
@@ -13,12 +13,10 @@ BUILD_WRKSRC=	${WRKSRC}/python
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-USE_FAM=	yes
-WANT_FAM_SYSTEM=gamin
 
 GAMIN_SLAVE=	yes
 
-USES=	pathfix
+USES=		fam:gamin
 USE_PYTHON=	yes
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD} \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc
diff --git a/ftp/pureadmin/Makefile b/ftp/pureadmin/Makefile
index 1d0350e33bfd..a0a0f89e6d9a 100644
--- a/ftp/pureadmin/Makefile
+++ b/ftp/pureadmin/Makefile
@@ -10,10 +10,8 @@ MASTER_SITES=	SF/purify/Default/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Management utility for the PureFTPd
 
-USES=		pkgconfig gettext
-USE_GNOME=	gnomehack libglade2
-USE_FAM=	yes
-USE_GMAKE=	yes
+USES=		fam gettext gmake pathfix pkgconfig
+USE_GNOME=	libglade2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index b9bcc49266cf..2d4c596672ea 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -28,14 +28,9 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAN1=		xml2ps.1 passepartout.1x
 
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libfam.a)
-WITH_FAM=	yes
+.if exists(${LOCALBASE}/lib/libfam.a) || defined(WITH_FAM)
+USES+=		fam
 .endif
 
-.if defined(WITH_FAM)
-USE_FAM=	yes
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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
diff --git a/net-p2p/museekplus/Makefile b/net-p2p/museekplus/Makefile
index 0dd88d4b42fb..83199c483c6d 100644
--- a/net-p2p/museekplus/Makefile
+++ b/net-p2p/museekplus/Makefile
@@ -14,10 +14,9 @@ COMMENT=	SoulSeek client with separate terminal and Qt based interface
 LIB_DEPENDS=	xml\\+\\+:${PORTSDIR}/textproc/libxml++26
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 
-USES=		pkgconfig
+USES=		fam pkgconfig
 USE_BZIP2=	yes
 USE_SCONS=	yes
-USE_FAM=	yes
 
 SCONS_ARGS=	QTDIR=${QT_PREFIX} QT_LIB=qt-mt PREFIX=${PREFIX} VORBIS=yes
 DATADIR=	share/museek
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 84d125b8ae3e..6de04f7564e1 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -239,7 +239,7 @@ WANT_EXP_MODULES+=	vfs_cacheprime vfs_catia vfs_commit vfs_dirsort \
 .endif
 
 .if ${PORT_OPTIONS:MFAM_SUPPORT}
-USE_FAM=		yes
+USES+=			fam
 WANT_EXP_MODULES+=	vfs_notify_fam
 CONFIGURE_ARGS+=	--enable-fam
 .else
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 45090e03df92..60b550541327 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -133,6 +133,8 @@ QUOTAS_DESC=		Disk quota support
 SWAT_DESC=		SWAT WebGUI
 UTMP_DESC=		UTMP accounting support
 WINBIND_DESC=		WinBIND support
+
+FAM_SUPPORT_USES=	fam
 ##############################################################################
 OPTIONS_DEFINE+=	DEVELOPER MANPAGES EXP_MODULES
 
@@ -288,7 +290,6 @@ CONFIGURE_ARGS+=	--without-dnsupdate
 
 # https://bugzilla.samba.org/show_bug.cgi?id=9545
 .if ${PORT_OPTIONS:MFAM_SUPPORT}
-USE_FAM=		yes
 CONFIGURE_ARGS+=	--with-fam
 WANT_EXP_MODULES+=	vfs_notify_fam
 SAMBA4_MODULES+=	vfs_notify_fam
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 9a36c35c1b21..c9ef2ca35d43 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -28,16 +28,10 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 USES=		charsetfix gettext iconv pkgconfig
 
 OPTIONS_DEFINE=	FAM
+FAM_CONFIGURE_ENABLE=	fam
+FAM_USES=	fam
 
 NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFAM}
-USE_FAM=	yes
-CONFIGURE_ARGS+=	--enable-fam
-.else
-CONFIGURE_ARGS+=	--disable-fam
-.endif
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/prelude-lml/prelude-lml.conf ]; then \
diff --git a/sysutils/fileschanged/Makefile b/sysutils/fileschanged/Makefile
index 248b019204d1..98b8444017e3 100644
--- a/sysutils/fileschanged/Makefile
+++ b/sysutils/fileschanged/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS=	libargp.so:${PORTSDIR}/devel/argp-standalone
 BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
 
 GNU_CONFIGURE=	yes
-USES=		gmake
-USE_FAM=	yes
+USES=		fam gmake
 CONFIGURE_ENV+=	LIBS="-largp"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/p5-Sys-Gamin/Makefile b/sysutils/p5-Sys-Gamin/Makefile
index 37e8e8b20f6e..bb35f838a619 100644
--- a/sysutils/p5-Sys-Gamin/Makefile
+++ b/sysutils/p5-Sys-Gamin/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl interface to Gamin (File Access Monitor implementation)
 
-USES=		perl5
+USES=		fam perl5
 USE_PERL5=	configure
-USE_FAM=	yes
 
 pre-configure:
 	# Pass in include in LOCALBASE
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index eb5952a7c4bb..91b959fcd97a 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -31,11 +31,9 @@ RUN_DEPENDS=	xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \
 		w3m:${PORTSDIR}/www/w3m
 
 USE_BZIP2=	yes
-USE_FAM=	yes
-WANT_FAM_SYSTEM=gamin
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomehack gnomeprefix ltasneededhack intltool ltverhack
-USES=		gettext gmake pkgconfig
+USES=		fam:gamin gettext gmake pkgconfig
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	core
 INSTALLS_ICONS=	yes
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index ab77513e5528..3e3509ea5da0 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	lthack
-USE_GMAKE=	yes
-USES=		pkgconfig
+USES=		gmake pkgconfig
 
 #.if !defined(_BUILDING_LIGHTTPD_MODULE)
 #USE_AUTOTOOLS=	libtool
@@ -56,6 +55,10 @@ SPAWNFCGI_DESC=	Depend on spawn-fcgi utility
 VALGRIND_DESC=	valgrind support
 WEBDAV_DESC=	WebDAV support
 
+FAM_USES=	fam
+FAM_CONFIGURE_ON=	--with-fam
+FAM_CONFIGURE_ENV=	FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
+
 LIGHTTPD_CONF_FILES=	lighttpd.conf modules.conf
 
 LIGHTTPD_CONF_D_FILES=	access_log.conf \
@@ -103,12 +106,6 @@ CONFIGURE_ARGS+=	--with-openssl \
 CONFIGURE_ARGS+=	--with-bzip2
 .endif
 
-.if ${PORT_OPTIONS:MFAM}
-USE_FAM=		yes
-CONFIGURE_ARGS+=	--with-fam
-CONFIGURE_ENV+=		FAM_CFLAGS="-I${LOCALBASE}/include" FAM_LIBS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${PORT_OPTIONS:MGDBM}
 LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
 CONFIGURE_ARGS+=	--with-gdbm
diff --git a/x11-fm/emelfm2/Makefile b/x11-fm/emelfm2/Makefile
index bda3bcec253a..96118a0a1283 100644
--- a/x11-fm/emelfm2/Makefile
+++ b/x11-fm/emelfm2/Makefile
@@ -38,8 +38,7 @@ MAK_ENV+=	DEBUG=1
 .endif
 
 .if ${PORT_OPTIONS:MGAMIN}
-USE_FAM=	yes
-WANT_FAM_SYSTEM=gamin
+USES+=		fam:gamin
 MAKE_ENV+=	USE_GAMIN=1
 .endif
 
diff --git a/x11-fm/gentoo/Makefile b/x11-fm/gentoo/Makefile
index b862427c67c2..f578ab0be658 100644
--- a/x11-fm/gentoo/Makefile
+++ b/x11-fm/gentoo/Makefile
@@ -27,7 +27,7 @@ NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFAM}
-USE_FAM=	yes
+USES+=		fam
 .else
 CONFIGURE_ARGS+=	--disable-fam
 .endif
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 70f1e7c90c8f..4e0f28941d7e 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -15,10 +15,9 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
 		libfm-gtk.so.4:${PORTSDIR}/x11/libfm
 
-USES=		gmake pkgconfig
+USES=		fam gmake pkgconfig
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	libtool
-USE_FAM=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 378cb2c3b69a..5995cbe4bcf8 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -30,9 +30,8 @@ OPTIONS_DEFINE=	HAL
 HAL_DESC=	Enable HAL support
 
 USE_XORG=	xcomposite xft xinerama xpm xrandr
-USES=	pathfix gettext pkgconfig
+USES=		fam gettext pathfix pkgconfig
 USE_PYTHON=	yes
-USE_FAM=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-edelib_path=${EDELIB_WRKSRC} \
 		--with-fltk-path=${LOCALBASE}
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 80e68e4bcce4..eab70b5677a6 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -39,11 +39,10 @@ CONFLICTS=	kdebase-runtime-4.5.[0-5]
 LATEST_LINK=	${PORTNAME}4
 
 USE_XZ=		yes
-USE_FAM=	yes
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdehier kdeprefix oxygen \
 		attica automoc4 ontologies sharedmime soprano strigi
-USES=		cmake:outsource gettext perl5
+USES=		cmake:outsource fam gettext perl5
 USE_OPENSSL=	yes
 USE_QT4=	corelib dbus declarative designer_build gui \
 		network opengl phonon qt3support \
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index f40f100fe56a..258c4dd0933e 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -16,11 +16,10 @@ BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
 		libexif.so:${PORTSDIR}/graphics/libexif
 
-USES=		gmake pkgconfig
+USES=		fam gmake pkgconfig
 USE_GNOME=	gnomehack gtk20
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS+=--sysconfdir=${LOCALBASE}/etc
-USE_FAM=	yes
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11/menu-cache/Makefile b/x11/menu-cache/Makefile
index d355f473fe20..42bb02ee9b27 100644
--- a/x11/menu-cache/Makefile
+++ b/x11/menu-cache/Makefile
@@ -9,11 +9,10 @@ MASTER_SITES=	SF/lxde/menu-cache/menu-cache%20$${PORTVERSION:R}.x/
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	The menu-cache portion of LXDE
 
-USES=		gmake pkgconfig
+USES=		fam gmake pkgconfig
 USE_GNOME=	gnomehack glib20
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_FAM=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib