pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Switch to gamin as the default FAM implementation.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/13f7b1c3b4c2
branches:  trunk
changeset: 556011:13f7b1c3b4c2
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sun Mar 15 21:47:44 2009 +0000

description:
Switch to gamin as the default FAM implementation.

diffstat:

 mk/fam.buildlink3.mk |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r 8a69fdbc1bdb -r 13f7b1c3b4c2 mk/fam.buildlink3.mk
--- a/mk/fam.buildlink3.mk      Sun Mar 15 21:42:05 2009 +0000
+++ b/mk/fam.buildlink3.mk      Sun Mar 15 21:47:44 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fam.buildlink3.mk,v 1.5 2006/11/04 22:18:58 rillig Exp $
+# $NetBSD: fam.buildlink3.mk,v 1.6 2009/03/15 21:47:44 jmcneill Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a FAM implementation.  fam.buildlink3.mk will:
@@ -6,7 +6,7 @@
 #      * set FAMBASE to the base directory of the FAM files;
 #      * set FAM_TYPE to the FAM implementation used.
 #
-# There are two variables that can be used to tweak the selection of
+# There are three variables that can be used to tweak the selection of
 # the FAM implementation:
 #
 # FAM_DEFAULT is a user-settable variable whose value is the default
@@ -14,13 +14,16 @@
 #
 # FAM_ACCEPTED is a package-settable list of FAM implementations that
 #      may be used by the package.
+#
+# FAM_SERVER is a package-settable flag whose value determines whether
+#      or not the server and library are both required.
 
 MK_FAM_BUILDLINK3_MK:= ${MK_FAM_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MK_FAM_BUILDLINK3_MK:M+)
-FAM_DEFAULT?=  fam
+FAM_DEFAULT?=  gamin
 FAM_ACCEPTED?= ${_FAM_PKGS}
 
 # This is an exhaustive list of all of the FAM implementations that may
@@ -44,11 +47,16 @@
 BUILD_DEFS_EFFECTS+=   FAMBASE FAM_TYPE
 .endif # MK_FAM_BUILDLINK3_MK
 
+FAM_SERVER?=   yes
+
 .if ${FAM_TYPE} == "none"
 PKG_FAIL_REASON=       \
        "${_FAM_TYPE} is not an acceptable FAM type for ${PKGNAME}."
 .elif ${FAM_TYPE} == "fam"
 .  include "../../sysutils/fam/buildlink3.mk"
 .elif ${FAM_TYPE} == "gamin"
-.  include "../../sysutils/gamin/buildlink3.mk"
+.  include "../../sysutils/libgamin/buildlink3.mk"
+.  if !empty(FAM_SERVER:M[Yy][Ee][Ss])
+DEPENDS+=      gamin>=0.1.10nb1:../../sysutils/gamin
+.  endif
 .endif



Home | Main Index | Thread Index | Old Index