From owner-svn-ports-head@FreeBSD.ORG Sat Jan 4 23:36:50 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA8877A5; Sat, 4 Jan 2014 23:36:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7C47C1B13; Sat, 4 Jan 2014 23:36:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04NaoZI059986; Sat, 4 Jan 2014 23:36:50 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04NaoUX059985; Sat, 4 Jan 2014 23:36:50 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401042336.s04NaoUX059985@svn.freebsd.org> From: Antoine Brodin Date: Sat, 4 Jan 2014 23:36:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338687 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 23:36:50 -0000 Author: antoine Date: Sat Jan 4 23:36:50 2014 New Revision: 338687 URL: http://svnweb.freebsd.org/changeset/ports/338687 Log: Add new USES=fam that will replace USE_FAM=yes The conversion is easy: USE_FAM=yes -> USES=fam USE_FAM=yes and WANT_FAM_SYSTEM=fam -> USES=fam:fam USE_FAM=yes and WANT_FAM_SYSTEM=gamin -> USES=fam:gamin Approved by: portmgr (bapt) Added: head/Mk/Uses/fam.mk (contents, props changed) Added: head/Mk/Uses/fam.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/fam.mk Sat Jan 4 23:36:50 2014 (r338687) @@ -0,0 +1,63 @@ +# $FreeBSD$ +# +# Handle dependency on File Alteration Monitor +# +# MAINTAINER: portmgr@FreeBSD.org +# +# Feature: fam +# Usage: USES=fam or USES=fam:ARG +# Valid ARG: gamin, fam +# +# User-specified File Alteration Monitor wish: +# Usage: WITH_FAM_SYSTEM=ARG +# Valid ARG: gamin (default), fam +# +# +.if !defined(_INCLUDE_USES_FAM_MK) +_INCLUDE_USES_FAM_MK= yes + +_fam_DEPENDS= libfam.so.0:${PORTSDIR}/devel/fam +_gamin_DEPENDS= libfam.so.0:${PORTSDIR}/devel/gamin + +_FAM_SYSTEMS= fam gamin +_DEFAULT_FAM= gamin + +.if exists(${LOCALBASE}/libexec/gam_server) +_HAVE_FAM= gamin +.elif exists(${LOCALBASE}/bin/fam) +_HAVE_FAM= fam +.endif + +# Sanity checks +.if defined(WITH_FAM_SYSTEM) && defined(_HAVE_FAM) && ${_HAVE_FAM} != ${WITH_FAM_SYSTEM} +IGNORE= FAM mismatch: ${_HAVE_FAM} is installed, but ${WITH_FAM_SYSTEM} desired +.endif + +.if defined(fam_ARGS) +.for _fam_ARGS in ${fam_ARGS} +. if ! ${_FAM_SYSTEMS:M${_fam_ARGS}} +IGNORE= Incorrect 'USES+= fam:${fam_ARGS}' usage: argument [${_fam_ARGS}] is not recognized +. endif +.endfor +. if defined(_HAVE_FAM) && ${_HAVE_FAM} != ${fam_ARGS} +IGNORE= FAM mismatch: port wants to use ${fam_ARGS} while you have ${_HAVE_FAM} +. endif +. if defined(WITH_FAM_SYSTEM) && ${WITH_FAM_SYSTEM} != ${fam_ARGS} +IGNORE= FAM mismatch: port wants to use ${fam_ARGS} while you wish to use ${WITH_FAM_SYSTEM} +. endif +.endif + +# Proceed +.if defined(fam_ARGS) +_USE_FAM= ${fam_ARGS} +.elif defined(_HAVE_FAM) +_USE_FAM= ${_HAVE_FAM} +.elif defined(WITH_FAM_SYSTEM) +_USE_FAM= ${WITH_FAM_SYSTEM} +.else +_USE_FAM= ${_DEFAULT_FAM} +.endif + +LIB_DEPENDS+= ${_${_USE_FAM}_DEPENDS} + +.endif