[Midnightbsd-cvs] mports [17497] trunk/Mk: move fam into its own file

[laffer1 at midnightbsd.org]

Revision: 17497
          http://svnweb.midnightbsd.org/mports/?rev=17497
Author:   laffer1
Date:     2014-09-26 17:27:00 -0400 (Fri, 26 Sep 2014)
Log Message:
-----------
move fam into its own file

Modified Paths:
--------------
    trunk/Mk/bsd.mport.mk

Added Paths:
-----------
    trunk/Mk/extensions/fam.mk

Modified: trunk/Mk/bsd.mport.mk
===================================================================
--- trunk/Mk/bsd.mport.mk	2014-09-26 11:26:06 UTC (rev 17496)
+++ trunk/Mk/bsd.mport.mk	2014-09-26 21:27:00 UTC (rev 17497)
@@ -364,7 +364,7 @@
 		linux_rpm linux_apps xorg fortran \
 		gcc fmake fpc gmake bison local perl5 openssl \
 		apache autotools bdb cmake cpe display dos2unix \
-		efl emacs execinfo fuse \
+		efl emacs execinfo fam fuse \
 		gecko gettext gnome gnustep gstreamer iconv imake \
 		ldap libtool lua makeself motif mysql ncurses ocaml openal \
 		pgsql php python java qt ruby scons sdl sqlite \
@@ -649,47 +649,6 @@
 WANT_OPENLDAP_VER=	${USE_OPENLDAP_VER}
 .endif
 
-.if defined(USE_FAM)
-DEFAULT_FAM_SYSTEM=	gamin
-# Currently supported FAM systems
-FAM_SYSTEM_FAM=		fam.0:${PORTSDIR}/devel/fam
-FAM_SYSTEM_GAMIN=	fam.0:${PORTSDIR}/devel/gamin
-
-.if exists(${LOCALBASE}/libexec/gam_server)
-_HAVE_FAM_SYSTEM=	gamin
-.elif exists(${LOCALBASE}/bin/fam)
-_HAVE_FAM_SYSTEM=	fam
-.endif
-
-.if defined(WANT_FAM_SYSTEM)
-.if defined(WITH_FAM_SYSTEM) && ${WITH_FAM_SYSTEM}!=${WANT_FAM_SYSTEM}
-IGNORE=		wants to use ${WANT_FAM_SYSTEM} as its FAM system, while you wish to use ${WITH_FAM_SYSTEM}
-.endif
-FAM_SYSTEM=	${WANT_FAM_SYSTEM}
-.elif defined(WITH_FAM_SYSTEM)
-FAM_SYSTEM=	${WITH_FAM_SYSTEM}
-.else
-.if defined(_HAVE_FAM_SYSTEM)
-FAM_SYSTEM=	${_HAVE_FAM_SYSTEM}
-.else
-FAM_SYSTEM=	${DEFAULT_FAM_SYSTEM}
-.endif
-.endif # WANT_FAM_SYSTEM
-
-.if defined(_HAVE_FAM_SYSTEM)
-.if ${_HAVE_FAM_SYSTEM}!= ${FAM_SYSTEM}
-BROKEN=	FAM system mismatch: ${_HAVE_FAM_SYSTEM} is installed and desired FAM system is ${FAM_SYSTEM}
-.endif
-.endif
-
-.if defined(FAM_SYSTEM_${FAM_SYSTEM:tu})
-LIB_DEPENDS+=	${FAM_SYSTEM_${FAM_SYSTEM:tu}}
-.else
-IGNORE=		cannot be built with unknown FAM system: ${FAM_SYSTEM}
-.endif
-.endif # USE_FAM
-
-
 .if defined(USE_RC_SUBR) || defined(USE_RCORDER)
 RC_SUBR=	/etc/rc.subr
 SUB_LIST+=	RC_SUBR=${RC_SUBR}

Added: trunk/Mk/extensions/fam.mk
===================================================================
--- trunk/Mk/extensions/fam.mk	                        (rev 0)
+++ trunk/Mk/extensions/fam.mk	2014-09-26 21:27:00 UTC (rev 17497)
@@ -0,0 +1,61 @@
+# $MidnightBSD$
+# $FreeBSD: head/Mk/Uses/fam.mk 348308 2014-03-15 10:31:54Z gerald $
+#
+# 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
+#
+# Handle dependency on File Alteration Monitor
+
+.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


Property changes on: trunk/Mk/extensions/fam.mk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property