From marcus@gyros.marcuscom.com  Tue May 17 18:17:33 2005
Return-Path: <marcus@gyros.marcuscom.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DD89816A4D7
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 May 2005 18:17:32 +0000 (GMT)
Received: from av-tac-rtp.cisco.com (hen.cisco.com [64.102.19.198])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1DFC543D93
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 May 2005 18:17:32 +0000 (GMT)
	(envelope-from marcus@gyros.marcuscom.com)
Received: from rooster.cisco.com (localhost [127.0.0.1])
	by av-tac-rtp.cisco.com (8.11.7p1+Sun/8.11.7) with ESMTP id j4HIHTY12206
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 May 2005 14:17:29 -0400 (EDT)
Received: from gyros.marcuscom.com (dhcp-64-102-51-213.cisco.com [64.102.51.213])
	by rooster.cisco.com (8.11.7p1+Sun/8.11.7) with ESMTP id j4HIHTM12202
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 May 2005 14:17:29 -0400 (EDT)
Received: from gyros.marcuscom.com (localhost [127.0.0.1])
	by gyros.marcuscom.com (8.13.3/8.13.3) with ESMTP id j4HIDjnY011572
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 May 2005 14:13:45 -0400 (EDT)
	(envelope-from marcus@gyros.marcuscom.com)
Received: (from marcus@localhost)
	by gyros.marcuscom.com (8.13.3/8.13.3/Submit) id j4HIDiLs011571;
	Tue, 17 May 2005 14:13:44 -0400 (EDT)
	(envelope-from marcus)
Message-Id: <200505171813.j4HIDiLs011571@gyros.marcuscom.com>
Date: Tue, 17 May 2005 14:13:44 -0400 (EDT)
From: Joe Marcus Clarke <marcus@freebsd.org>
Reply-To: Joe Marcus Clarke <marcus@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Add flexible FAM support to bsd.port.mk
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         81168
>Category:       ports
>Synopsis:       [PATCH] Add flexible FAM support to bsd.port.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 17 18:20:05 GMT 2005
>Closed-Date:    Thu Jun 09 20:47:22 GMT 2005
>Last-Modified:  Thu Jun 09 20:47:22 GMT 2005
>Originator:     Joe Marcus Clarke
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD gyros.marcuscom.com 5.4-STABLE FreeBSD 5.4-STABLE #6: Mon May 16 15:56:02 EDT 2005 marcus@gyros.marcuscom.com:/usr/obj/usr/src/sys/GYROS i386


	
>Description:
We now have two File Alteration Monitor suites in the tree: fam and gamin.
Gamin is gaining popularity since it features kqueue support on FreeBSD.
However, there are many ports that statically code a dependency on
devel/fam.
>How-To-Repeat:
	
>Fix:

These patches add a USE_FAM knob to bsd.port.mk, and a WANT_FAM_SYSTEM
macro for specifying a FAM system to use (defaults to devel/fam).  I've
also included two proof-of-concept ports to test this patch.  Once it's
committed, I will complete the migration to USE_FAM.


--- bsd.port.mk.diff begins here ---
--- bsd.port.mk.orig	Tue May 17 14:09:55 2005
+++ bsd.port.mk	Tue May 17 14:07:13 2005
@@ -309,6 +309,12 @@
 #				- If set, the system should use OpenLDAP libraries
 #				  with SASL support.
 ##
+# USE_FAM		- If set, this port uses the File Alteration Monitor.
+#
+# WANT_FAM_SYSTEM
+# 				- Legal values are: fam (default), gamin
+# 				  If set to an unknown value, the port is marked BROKEN.
+##
 # USE_AUTOTOOLS	- If set, this port uses various GNU autotools
 #				  (libtool, autoconf, autoheader, automake et al.)
 #				  See bsd.autotools.mk for more details.
@@ -1347,6 +1353,8 @@
 
 WANT_OPENLDAP_VER?=	22
 
+WANT_FAM_SYSTEM?=	fam
+
 # Owner and group of the WWW user
 WWWOWN?=	www
 WWWGRP?=	www
@@ -1460,6 +1468,17 @@
 .else
 BROKEN=				"unknown OpenLDAP version: ${WANT_OPENLDAP_VER}"
 .endif
+.endif
+
+.if defined(USE_FAM)
+.if ${WANT_FAM_SYSTEM} == fam
+FAM_PORT=		${PORTSDIR}/devel/fam
+.elif ${WANT_FAM_SYSTEM} == gamin
+FAM_PORT=		${PORTSDIR}/devel/gamin
+.else
+BROKEN=			"unknown FAM system: ${WANT_FAM_SYSTEM}"
+.endif
+LIB_DEPENDS+=	fam.0:${FAM_PORT}
 .endif
 
 .if defined(USE_GETOPT_LONG)
--- bsd.port.mk.diff ends here ---

--- gnomevfs2.diff begins here ---
diff -ruN gnomevfs2.orig/Makefile gnomevfs2/Makefile
--- gnomevfs2.orig/Makefile	Tue May 17 14:09:09 2005
+++ gnomevfs2/Makefile	Tue May 17 14:07:24 2005
@@ -23,6 +23,7 @@
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
 		libbonobo
+USE_FAM=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
@@ -67,14 +68,6 @@
 PLIST_SUB+=	CDPARANOIA=""
 .else
 PLIST_SUB+=	CDPARANOIA="@comment "
-.endif
-
-.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
-FAM_DEPENDS=	${PORTSDIR}/devel/fam
-.if exists(${LOCALBASE}/lib/libgamin-1.so)
-FAM_DEPENDS=	${PORTSDIR}/devel/gamin
-.endif
-LIB_DEPENDS+=	fam.0:${FAM_DEPENDS}
 .endif
 
 .if exists(${LOCALBASE}/lib/libkrb5.so)
--- gnomevfs2.diff ends here ---

--- kdelibs3.diff begins here ---
diff -ruN kdelibs3.orig/Makefile kdelibs3/Makefile
--- kdelibs3.orig/Makefile	Tue May 17 14:09:17 2005
+++ kdelibs3/Makefile	Tue May 17 14:07:59 2005
@@ -24,7 +24,6 @@
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		artsc.0:${PORTSDIR}/audio/arts \
 		aspell:${PORTSDIR}/textproc/aspell \
-		fam.0:${PORTSDIR}/devel/fam \
 		dns_sd:${PORTSDIR}/net/mDNSResponder \
 		idn:${PORTSDIR}/devel/libidn \
 		jasper:${PORTSDIR}/graphics/jasper \
@@ -43,6 +42,7 @@
 .endif
 
 USE_GETTEXT=	yes
+USE_FAM=	yes
 USE_QT_VER=	3
 PREFIX=		${KDE_PREFIX}
 USE_OPENSSL=	yes
--- kdelibs3.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Tue May 17 18:22:12 GMT 2005 
Responsible-Changed-Why:  
Over to portmgr. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81168 

From: Jose M Rodriguez <josemi@freebsd.jazztel.es>
To: bug-followup@FreeBSD.org
Cc: marcus@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Tue, 17 May 2005 23:38:53 +0200

 One minor tweak.
 This add support for predefined FAM_LIB and FAM_PORT, with may easy 
 tests of future new versions or other fam impl.
 Can you work this as?
 
 .if defined(USE_FAM)
 .if ${WANT_FAM_SYSTEM} == fam
 FAM_PORT?=	${PORTSDIR}/devel/fam
 .elif ${WANT_FAM_SYSTEM} == gamin
 FAM_PORT?=	${PORTSDIR}/devel/gamin
 .elif ! defined(FAM_PORT)
 BROKEN=		"unknown FAM system: ${WANT_FAM_SYSTEM}"
 .endif
 FAM_LIB?=	fam.0
 LIB_DEPENDS+=	${FAM_LIB}:${FAM_PORT}
 .endif

From: Joe Marcus Clarke <marcus@FreeBSD.org>
To: Jose M Rodriguez <josemi@freebsd.jazztel.es>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Tue, 17 May 2005 17:45:22 -0400

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Jose M Rodriguez wrote:
 | One minor tweak.
 | This add support for predefined FAM_LIB and FAM_PORT, with may easy
 | tests of future new versions or other fam impl.
 | Can you work this as?
 |
 | .if defined(USE_FAM)
 | .if ${WANT_FAM_SYSTEM} == fam
 | FAM_PORT?=	${PORTSDIR}/devel/fam
 | .elif ${WANT_FAM_SYSTEM} == gamin
 | FAM_PORT?=	${PORTSDIR}/devel/gamin
 | .elif ! defined(FAM_PORT)
 | BROKEN=		"unknown FAM system: ${WANT_FAM_SYSTEM}"
 | .endif
 | FAM_LIB?=	fam.0
 | LIB_DEPENDS+=	${FAM_LIB}:${FAM_PORT}
 | .endif
 |
 
 I don't like this.  I'll rework it.
 
 Joe
 
 
 - --
 Joe Marcus Clarke
 FreeBSD GNOME Team	::	gnome@FreeBSD.org
 FreeNode / #freebsd-gnome
 http://www.FreeBSD.org/gnome
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (Darwin)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFCimXyb2iPiv4Uz4cRAsm3AJ4uwUuFmY0rjWwu9OVa8Wm15k75fACfaqEL
 rYiWmt8y20Uz1O/ZjrIx9w8=
 =MUem
 -----END PGP SIGNATURE-----

From: Jose M Rodriguez <josemi@freebsd.jazztel.es>
To: bug-followup@FreeBSD.org, marcus@FreeBSD.org
Cc:  
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 18:31:54 +0200

 I polite and clean bsd.port.mk
 
 --
   josemi
 
 ===========
 Index: Mk/bsd.port.mk
 ===================================================================
 RCS file: /home/cvs/freebsd/ports/Mk/bsd.port.mk,v
 retrieving revision 1.511
 diff -u -r1.511 bsd.port.mk
 --- Mk/bsd.port.mk	17 Mar 2005 23:22:07 -0000	1.511
 +++ Mk/bsd.port.mk	18 May 2005 16:22:43 -0000
 @@ -304,11 +304,20 @@
  #				  Implies: WANT_OPENLDAP_VER?=22
  # WANT_OPENLDAP_VER
  #				- Legal values are: 21, 22
 -#				  If set to an unkown value, the port is marked BROKEN.
 +#				  If set to an unknown value, the port is marked BROKEN.
  # WANT_OPENLDAP_SASL
  #				- If set, the system should use OpenLDAP libraries
  #				  with SASL support.
  ##
 +# USE_FAM		- If set, this port uses the File Alteration Monitor
 +# 				  libray.
 +# WANT_FAM_SYSTEM
 +# 				- Legal values are: fam, gamin
 +# 				  Default value is gamin
 +# 				  If set to an unknown value, the port is marked as BROKEN
 +# FAM_PORT		- fam port to be used, mainly a test aid.
 +# FAM_LIB		- fam lib to be used, mainly a test aid.
 +##
  # USE_AUTOTOOLS	- If set, this port uses various GNU autotools
  #				  (libtool, autoconf, autoheader, automake et al.)
  #				  See bsd.autotools.mk for more details.
 @@ -1347,6 +1354,15 @@
  
  WANT_OPENLDAP_VER?=	22
  
 +# default File Alteration Monitor system
 +# there are ports like courier-imap that need some special handling
 +.if exists(${LOCALBASE}/lib/libfam.so) && ! 
 exists(${LOCALBASE}/lib/libgamin-1.so)
 +WANT_FAM_SYSTEM?=	fam
 +.else
 +WANT_FAM_SYSTEM?=	gamin
 +.endif
 +FAM_LIB?=			fam.0
 +
  # Owner and group of the WWW user
  WWWOWN?=	www
  WWWGRP?=	www
 @@ -1462,6 +1478,19 @@
  .endif
  .endif
  
 +.if ${WANT_FAM_SYSTEM} == fam
 +FAM_PORT?=  ${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} == gamin
 +FAM_PORT?=  ${PORTSDIR}/devel/gamin
 +.endif
 +.if defined(USE_FAM)
 +.if ! defined(FAM_PORT)
 +BROKEN=				"unknown FAM system: ${WANT_FAM_SYSTEM}"
 +.else
 +LIB_DEPENDS+=		${FAM_LIB}:${FAM_PORT}
 +.endif
 +.endif
 +
  .if defined(USE_GETOPT_LONG)
  .if ${OSVERSION} < 500041
  LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt

From: Joe Marcus Clarke <marcus@FreeBSD.org>
To: Jose M Rodriguez <josemi@freebsd.jazztel.es>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 12:39:25 -0400

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Jose M Rodriguez wrote:
 | I polite and clean bsd.port.mk
 
 I don't want FAM_LIB and FAM_PORT to be user-visible.  I sent another
 patch yesterday that added more flexibility with the library.
 
 Joe
 
 - --
 Joe Marcus Clarke
 FreeBSD GNOME Team	::	gnome@FreeBSD.org
 FreeNode / #freebsd-gnome
 http://www.FreeBSD.org/gnome
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (Darwin)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFCi2+9b2iPiv4Uz4cRAvJqAJ9P7dNqDqM9VTPAnom5dhUyvR1LTQCaAlyo
 +jyD83DNJki/A1ChLmitMk4=
 =v0yT
 -----END PGP SIGNATURE-----

From: Joe Marcus Clarke <marcus@FreeBSD.org>
To: marcus@FreeBSD.org, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 12:45:01 -0400

 --=-YKCjhafcQGet/x1g0yT/
 Content-Type: text/plain
 Content-Transfer-Encoding: 7bit
 
 Here is a new, more flexible, patch.
 
 Joe
 
 -- 
 Joe Marcus Clarke
 FreeBSD GNOME Team      ::      marcus@FreeBSD.org
 gnome@FreeBSD.org
 FreeNode / #freebsd-gnome
 http://www.FreeBSD.org/gnome
 
 --=-YKCjhafcQGet/x1g0yT/
 Content-Disposition: attachment; filename=bsd.port.mk.diff
 Content-Type: text/x-patch; name=bsd.port.mk.diff; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 --- bsd.port.mk.orig	Tue May 17 14:09:55 2005
 +++ bsd.port.mk	Tue May 17 17:46:13 2005
 @@ -309,6 +309,12 @@
  #				- If set, the system should use OpenLDAP libraries
  #				  with SASL support.
  ##
 +# USE_FAM		- If set, this port uses the File Alteration Monitor.
 +#
 +# WANT_FAM_SYSTEM
 +# 				- Legal values are: fam (default), gamin
 +# 				  If set to an unknown value, the port is marked BROKEN.
 +##
  # USE_AUTOTOOLS	- If set, this port uses various GNU autotools
  #				  (libtool, autoconf, autoheader, automake et al.)
  #				  See bsd.autotools.mk for more details.
 @@ -1347,6 +1353,8 @@
  
  WANT_OPENLDAP_VER?=	22
  
 +WANT_FAM_SYSTEM?=	fam
 +
  # Owner and group of the WWW user
  WWWOWN?=	www
  WWWGRP?=	www
 @@ -1459,6 +1467,16 @@
  LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap21${_OPENLDAP_FLAVOUR}-client
  .else
  BROKEN=				"unknown OpenLDAP version: ${WANT_OPENLDAP_VER}"
 +.endif
 +.endif
 +
 +.if defined(USE_FAM)
 +.if ${WANT_FAM_SYSTEM} == fam
 +LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} == gamin
 +LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/gamin
 +.else
 +BROKEN=			"unknown FAM system: ${WANT_FAM_SYSTEM}"
  .endif
  .endif
  
 
 --=-YKCjhafcQGet/x1g0yT/--
 

From: Jose M Rodriguez <josemi@freebsd.jazztel.es>
To: Joe Marcus Clarke <marcus@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 18:53:49 +0200

 El Mi=E9rcoles, 18 de Mayo de 2005 18:39, Joe Marcus Clarke escribi=F3:
 > Jose M Rodriguez wrote:
 > | I polite and clean bsd.port.mk
 >
 > I don't want FAM_LIB and FAM_PORT to be user-visible.  I sent another
 > patch yesterday that added more flexibility with the library.
 >
 > Joe
 
 Yes, I know this. But this is what I tested.  I can't manage a cluster=20
 build in a moment.
 
 But without that, we must merge part of this in ports like=20
 mail/courier-imap, that can't define USE_FAM but must detect fam 'on=20
 the fly'.
 
 I'm posting this in mainly for the fam -> gamin change. I can make the=20
 few ports like courier-imap directy use WITH_FAM_SYSTEM without too=20
 much effort.
 
 I'll work an alternate patchset based in your latest post.
 
 =2D-
   josemi

From: Joe Marcus Clarke <marcus@FreeBSD.org>
To: Jose M Rodriguez <josemi@freebsd.jazztel.es>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 12:59:59 -0400

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Jose M Rodriguez wrote:
 | El Mircoles, 18 de Mayo de 2005 18:39, Joe Marcus Clarke escribi:
 |
 |>Jose M Rodriguez wrote:
 |>| I polite and clean bsd.port.mk
 |>
 |>I don't want FAM_LIB and FAM_PORT to be user-visible.  I sent another
 |>patch yesterday that added more flexibility with the library.
 |>
 |>Joe
 |
 |
 | Yes, I know this. But this is what I tested.  I can't manage a cluster
 | build in a moment.
 |
 | But without that, we must merge part of this in ports like
 | mail/courier-imap, that can't define USE_FAM but must detect fam 'on
 | the fly'.
 
 No, courier-imap _can_ use USE_FAM.  Both gamin and fam install
 libfam.so.  All they need to do is change the LIB_DEPENDS line to
 USE_FAM, and they're done.
 
 |
 | I'm posting this in mainly for the fam -> gamin change. I can make the
 | few ports like courier-imap directy use WITH_FAM_SYSTEM without too
 | much effort.
 
 Like I said, I don't see any problem since gamin is a drop-in
 replacement for FAM.  Nothing needs to be recompiled.  The only thing
 that presents a problem right now is dependencies.
 
 Joe
 
 |
 | I'll work an alternate patchset based in your latest post.
 |
 | --
 |   josemi
 |
 |
 
 
 - --
 Joe Marcus Clarke
 FreeBSD GNOME Team	::	gnome@FreeBSD.org
 FreeNode / #freebsd-gnome
 http://www.FreeBSD.org/gnome
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (Darwin)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFCi3SOb2iPiv4Uz4cRAv+MAJ9DAQ/KyZOcp+oGkEtCODCS04+zggCbBDs5
 /j5mW8M8tw9SABaSvMrnTyQ=
 =iwG7
 -----END PGP SIGNATURE-----

From: Jose M Rodriguez <josemi@freebsd.jazztel.es>
To: Joe Marcus Clarke <marcus@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 19:23:36 +0200

 El Mi=E9rcoles, 18 de Mayo de 2005 18:59, Joe Marcus Clarke escribi=F3:
 > Jose M Rodriguez wrote:
 > | El Mi=C3=A9rcoles, 18 de Mayo de 2005 18:39, Joe Marcus Clarke=20
 escribi=C3=B3:
 > |>Jose M Rodriguez wrote:
 > |>| I polite and clean bsd.port.mk
 > |>
 > |>I don't want FAM_LIB and FAM_PORT to be user-visible.  I sent
 > |> another patch yesterday that added more flexibility with the
 > |> library.
 > |>
 > |>Joe
 > |
 > | Yes, I know this. But this is what I tested.  I can't manage a
 > | cluster build in a moment.
 > |
 > | But without that, we must merge part of this in ports like
 > | mail/courier-imap, that can't define USE_FAM but must detect fam
 > | 'on the fly'.
 >
 > No, courier-imap _can_ use USE_FAM.  Both gamin and fam install
 > libfam.so.  All they need to do is change the LIB_DEPENDS line to
 > USE_FAM, and they're done.
 
 This is a not solved problem with autoconf.  It gets fam support with=20
 just the presence of the lib while configure and no --without-fam=20
 option.
 
 But the port pretend not have fam as a pedend.
 
 And this must be done after including <bsd.port.pre.mk>
 
 In any case, this can be solved in the port makefile using only=20
 WANT_FAM_SYSTEM.
 
 I'll work those patches for courier-imap and maildrop, and the patch in=20
 the line of your latest post ASAP.  But, using gamin as default fam=20
 system.  You can revert this easy.
 
 >
 > | I'm posting this in mainly for the fam -> gamin change. I can make
 > | the few ports like courier-imap directy use WITH_FAM_SYSTEM without
 > | too much effort.
 >
 > Like I said, I don't see any problem since gamin is a drop-in
 > replacement for FAM.  Nothing needs to be recompiled.  The only thing
 > that presents a problem right now is dependencies.
 >
 
 I can see problems in having fam as default:
 =2D you must setup fam, but not gamin (inetd)
 =2D our fam port have very well known problems with nfs that gamin doesn't=
 =20
 have.
 
 If this can be tested in the package cluster as I do (with the=20
 bsd.port.mk you like), I think it's time to swith to gamin.
 
 To be honest, I'll be really glad of see FreeBSD-6-RELEASE with gamin as=20
 system fam. And we have time now to ironing any problems may arise.
 
 =2D-
   josemi

From: Joe Marcus Clarke <marcus@FreeBSD.org>
To: Jose M Rodriguez <josemi@freebsd.jazztel.es>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 13:50:55 -0400

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Jose M Rodriguez wrote:
 | El Mircoles, 18 de Mayo de 2005 18:59, Joe Marcus Clarke escribi:
 |
 |>Jose M Rodriguez wrote:
 |>| El Miércoles, 18 de Mayo de 2005 18:39, Joe Marcus Clarke
 |
 | escribió:
 |
 |>|>Jose M Rodriguez wrote:
 |>|>| I polite and clean bsd.port.mk
 |>|>
 |>|>I don't want FAM_LIB and FAM_PORT to be user-visible.  I sent
 |>|> another patch yesterday that added more flexibility with the
 |>|> library.
 |>|>
 |>|>Joe
 |>|
 |>| Yes, I know this. But this is what I tested.  I can't manage a
 |>| cluster build in a moment.
 |>|
 |>| But without that, we must merge part of this in ports like
 |>| mail/courier-imap, that can't define USE_FAM but must detect fam
 |>| 'on the fly'.
 |>
 |>No, courier-imap _can_ use USE_FAM.  Both gamin and fam install
 |>libfam.so.  All they need to do is change the LIB_DEPENDS line to
 |>USE_FAM, and they're done.
 |
 |
 | This is a not solved problem with autoconf.  It gets fam support with
 | just the presence of the lib while configure and no --without-fam
 | option.
 |
 | But the port pretend not have fam as a pedend.
 |
 | And this must be done after including <bsd.port.pre.mk>
 |
 | In any case, this can be solved in the port makefile using only
 | WANT_FAM_SYSTEM.
 |
 | I'll work those patches for courier-imap and maildrop, and the patch in
 | the line of your latest post ASAP.  But, using gamin as default fam
 | system.  You can revert this easy.
 |
 |
 |>| I'm posting this in mainly for the fam -> gamin change. I can make
 |>| the few ports like courier-imap directy use WITH_FAM_SYSTEM without
 |>| too much effort.
 |>
 |>Like I said, I don't see any problem since gamin is a drop-in
 |>replacement for FAM.  Nothing needs to be recompiled.  The only thing
 |>that presents a problem right now is dependencies.
 |>
 |
 |
 | I can see problems in having fam as default:
 | - you must setup fam, but not gamin (inetd)
 | - our fam port have very well known problems with nfs that gamin doesn't
 | have.
 
 FAM should be the default as kqueue is still quite limited, and gamin is
 still fairly young.  This can be re-evaluated later.
 
 |
 | If this can be tested in the package cluster as I do (with the
 | bsd.port.mk you like), I think it's time to swith to gamin.
 
 Not yet.  Once kqueue is moved out of UFS, gamin may be become a better
 choice.
 
 |
 | To be honest, I'll be really glad of see FreeBSD-6-RELEASE with gamin as
 | system fam. And we have time now to ironing any problems may arise.
 
 Feel free to test gamin all you want.  I've been doing it for a while now.
 
 Joe
 
 |
 | --
 |   josemi
 |
 |
 
 
 - --
 Joe Marcus Clarke
 FreeBSD GNOME Team	::	gnome@FreeBSD.org
 FreeNode / #freebsd-gnome
 http://www.FreeBSD.org/gnome
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (Darwin)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFCi4B+b2iPiv4Uz4cRAsVvAKCtY+rMo7N6ZI5KP8gjWSZOngkfeACfVgL/
 S5Ng57ugUXDjdpWjtn29TLM=
 =2SAr
 -----END PGP SIGNATURE-----

From: Jose M Rodriguez <josemi@freebsd.jazztel.es>
To: Joe Marcus Clarke <marcus@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 20:49:49 +0200

 El Mi=E9rcoles, 18 de Mayo de 2005 19:50, Joe Marcus Clarke escribi=F3:
 > Jose M Rodriguez wrote:
 > | El Mi=C3=A9rcoles, 18 de Mayo de 2005 18:59, Joe Marcus Clarke=20
 escribi=C3=B3:
 > |>Jose M Rodriguez wrote:
 > |>| El Mi=C3=83=C2=A9rcoles, 18 de Mayo de 2005 18:39, Joe Marcus Clarke
 > <snip/>
 >
 > FAM should be the default as kqueue is still quite limited, and gamin
 > is still fairly young.  This can be re-evaluated later.
 >
 
 Whatever is better than a non-working fam, but I won't spend more time=20
 on this.
 
 But attached are a modified Mk/bsd.port.mk and the rest of patches (not=20
 tested) to make the USE_FAM switch.
 
 =2D-
 josemi
 
 Index: Mk/bsd.port.mk
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/Mk/bsd.port.mk,v
 retrieving revision 1.511
 diff -u -r1.511 bsd.port.mk
 =2D-- Mk/bsd.port.mk	17 Mar 2005 23:22:07 -0000	1.511
 +++ Mk/bsd.port.mk	18 May 2005 18:33:38 -0000
 @@ -304,11 +304,18 @@
  #				  Implies: WANT_OPENLDAP_VER?=3D22
  # WANT_OPENLDAP_VER
  #				- Legal values are: 21, 22
 =2D#				  If set to an unkown value, the port is marked BROKEN.
 +#				  If set to an unknown value, the port is marked BROKEN.
  # WANT_OPENLDAP_SASL
  #				- If set, the system should use OpenLDAP libraries
  #				  with SASL support.
  ##
 +# USE_FAM		- If set, this port uses the File Alteration Monitor
 +# 				  library.
 +# WANT_FAM_SYSTEM
 +# 				- Legal values are: fam, gamin
 +# 				  Default value is fam
 +# 				  If set to an unknown value, the port is marked as BROKEN
 +##
  # USE_AUTOTOOLS	- If set, this port uses various GNU autotools
  #				  (libtool, autoconf, autoheader, automake et al.)
  #				  See bsd.autotools.mk for more details.
 @@ -1347,6 +1352,14 @@
 =20
  WANT_OPENLDAP_VER?=3D	22
 =20
 +# default File Alteration Monitor system
 +# there are ports like courier-imap that need some special handling
 +.if exists(${LOCALBASE}/lib/libgamin-1.so)
 +WANT_FAM_SYSTEM?=3D	gamin
 +.else
 +WANT_FAM_SYSTEM?=3D	fam
 +.endif
 +
  # Owner and group of the WWW user
  WWWOWN?=3D	www
  WWWGRP?=3D	www
 @@ -1462,6 +1475,21 @@
  .endif
  .endif
 =20
 +.if ${WANT_FAM_SYSTEM} =3D=3D fam
 +FAM_PORT?=3D  ${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} =3D=3D gamin
 +FAM_PORT?=3D  ${PORTSDIR}/devel/gamin
 +.endif
 +.if defined(USE_FAM)
 +.if ${WANT_FAM_SYSTEM} =3D=3D fam
 +LIB_DEPENDS+=3D		fam.0:${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} =3D=3D gamin
 +LIB_DEPENDS+=3D		fam.0:${PORTSDIR}/devel/gamin
 +.else
 +BROKEN=3D				"unknown FAM system: ${WANT_FAM_SYSTEM}"
 +.endif
 +.endif
 +
  .if defined(USE_GETOPT_LONG)
  .if ${OSVERSION} < 500041
  LIB_DEPENDS+=3D	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 Index: devel/fampp/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/devel/fampp/Makefile,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile
 =2D-- devel/fampp/Makefile	20 Feb 2003 17:06:44 -0000	1.7
 +++ devel/fampp/Makefile	18 May 2005 17:42:43 -0000
 @@ -14,7 +14,7 @@
  MAINTAINER=3D	ports@FreeBSD.org
  COMMENT=3D	A C++ wrapper for fam from SGI
 =20
 =2DLIB_DEPENDS=3D	fam.0:${PORTSDIR}/devel/fam
 +USE_FAM=3D	yes
 =20
  # This isn't required to utilize full functionality
  #USE_GNOME=3D	yes
 Index: devel/py-fam/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/devel/py-fam/Makefile,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile
 =2D-- devel/py-fam/Makefile	6 Feb 2004 13:11:11 -0000	1.4
 +++ devel/py-fam/Makefile	18 May 2005 17:43:36 -0000
 @@ -15,9 +15,9 @@
  MAINTAINER=3D	perky@FreeBSD.org
  COMMENT=3D	Python Interface to the File Alteration Monitor
 =20
 =2DLIB_DEPENDS=3D	fam.0:${PORTSDIR}/devel/fam
 =20
  PLIST_FILES=3D	%%PYTHON_SITELIBDIR%%/_fam.so
 +USE_FAM=3D	yes
  USE_PYTHON=3D	yes
  USE_PYDISTUTILS=3D	yes
 =20
 Index: devel/ruby-fam/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/devel/ruby-fam/Makefile,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile
 =2D-- devel/ruby-fam/Makefile	13 Jul 2004 18:07:11 -0000	1.5
 +++ devel/ruby-fam/Makefile	18 May 2005 18:38:53 -0000
 @@ -16,10 +16,10 @@
  MAINTAINER=3D	knu@FreeBSD.org
  COMMENT=3D	FAM bindings for Ruby
 =20
 =2DLIB_DEPENDS=3D	fam.0:${PORTSDIR}/devel/fam
 =20
  USE_RUBY=3D	yes
  USE_RUBY_EXTCONF=3D	yes
 +USE_FAM=3D	yes
 =20
  INSTALL_TARGET=3D	site-install
 =20
 Index: dns/posadis/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/dns/posadis/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 =2D-- dns/posadis/Makefile	12 Apr 2005 03:25:20 -0000	1.13
 +++ dns/posadis/Makefile	18 May 2005 18:30:12 -0000
 @@ -24,10 +24,17 @@
  CONFIGURE_TARGET=3D	--build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}
  CONFIGURE_ENV=3D	CPPFLAGS=3D"-I${LOCALBASE}/include"=20
 LDFLAGS=3D"-L${LOCALBASE}/lib"
 =20
 +.include <bsd.port.pre.mk>
 +
  .if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so)
  CONFIGURE_ARGS=3D	--enable-fam
 =2DBUILD_DEPENDS=3D	${LOCALBASE}/include/fam.h:${PORTSDIR}/devel/fam
 =2DRUN_DEPENDS=3D	${LOCALBASE}/bin/fam:${PORTSDIR}/devel/fam
 +.if ${WANT_FAM_SYSTEM} =3D=3D fam
 +LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} =3D=3D gamin
 +LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/gamin
 +.else
 +BROKEN=3D		"unknown FAM system: ${WANT_FAM_SYSTEM}"
 +.endif
  PLIST_SUB=3D	FAM=3D""
  .else
  CONFIGURE_ARGS=3D	--disable-fam
 @@ -46,4 +53,4 @@
  	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
  .endif
 =20
 =2D.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 Index: ftp/pureadmin/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/ftp/pureadmin/Makefile,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile
 =2D-- ftp/pureadmin/Makefile	4 Apr 2005 08:44:40 -0000	1.5
 +++ ftp/pureadmin/Makefile	18 May 2005 17:47:11 -0000
 @@ -15,10 +15,9 @@
  MAINTAINER=3D	ports@FreeBSD.org
  COMMENT=3D	Management utility for the PureFTPd
 =20
 =2DLIB_DEPENDS=3D	fam.0:${PORTSDIR}/devel/fam
 =2D
  USE_X_PREFIX=3D	yes
  USE_GNOME=3D	gnomehack gnomeprefix gtk20
 +USE_FAM=3D	yes
  USE_REINPLACE=3D	yes
  GNU_CONFIGURE=3D	yes
  CONFIGURE_ENV=3D	CPPFLAGS=3D"-I${LOCALBASE}/include" \
 Index: graphics/passepartout/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/graphics/passepartout/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 =2D-- graphics/passepartout/Makefile	12 Mar 2005 10:53:04 -0000	1.13
 +++ graphics/passepartout/Makefile	18 May 2005 17:52:31 -0000
 @@ -40,7 +40,13 @@
  .endif
 =20
  .if defined(WITH_FAM)
 =2DLIB_DEPENDS+=3D   fam.0:${PORTSDIR}/devel/fam
 +.if ${WANT_FAM_SYSTEM} =3D=3D fam
 +LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} =3D=3D gamin
 +LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/gamin
 +.else
 +BROKEN=3D		"unknown FAM system: ${WANT_FAM_SYSTEM}"
 +.endif
  .endif
 =20
  .include <bsd.port.post.mk>
 Index: mail/cone/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/mail/cone/Makefile,v
 retrieving revision 1.14
 diff -u -r1.14 Makefile
 =2D-- mail/cone/Makefile	12 Apr 2005 03:25:54 -0000	1.14
 +++ mail/cone/Makefile	18 May 2005 17:53:36 -0000
 @@ -18,13 +18,13 @@
  COMMENT=3D	Console based mail client with POP3/IMAP/SMAP support
 =20
  LIB_DEPENDS=3D	xml2.5:${PORTSDIR}/textproc/libxml2 \
 =2D		aspell.16:${PORTSDIR}/textproc/aspell \
 =2D		fam.0:${PORTSDIR}/devel/fam
 +		aspell.16:${PORTSDIR}/textproc/aspell
  BUILD_DEPENDS=3D	gpg:${PORTSDIR}/security/gnupg
  RUN_DEPENDS=3D	${BUILD_DEPENDS}
 =20
  USE_GETTEXT=3D	yes
  USE_ICONV=3D	yes
 +USE_FAM=3D	yes
 =20
  USE_BZIP2=3D	yes
  USE_PERL5=3D	yes
 Index: mail/courier/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/mail/courier/Makefile,v
 retrieving revision 1.33
 diff -u -r1.33 Makefile
 =2D-- mail/courier/Makefile	12 Apr 2005 03:25:55 -0000	1.33
 +++ mail/courier/Makefile	18 May 2005 17:58:35 -0000
 @@ -20,7 +20,6 @@
  		sendmail-8.* sendmail-*-8.* \
  		smail-3.* sqwebmail-3.* zmailer-2.*
 =20
 =2DLIB_DEPENDS=3D	fam.0:${PORTSDIR}/devel/fam
  RUN_DEPENDS=3D	${LOCALBASE}/share/sysconftool/sysconftool:
 ${PORTSDIR}/devel/sysconftool \
  		${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net-mgmt/p5-Net-CIDR
 =20
 @@ -58,6 +57,7 @@
  MIMETYPES=3D	${LOCALBASE}/etc/apache/mime.types:
 ${LOCALBASE}/etc/apache2/mime.types
  WITH_TRANSPORT=3D	local esmtp dsn
 =20
 +USE_FAM=3D	yes
  USE_BZIP2=3D	yes
  USE_SUBMAKE=3D	yes
  USE_PERL5=3D	yes
 Index: mail/courier-imap/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/mail/courier-imap/Makefile,v
 retrieving revision 1.98
 diff -u -r1.98 Makefile
 =2D-- mail/courier-imap/Makefile	16 May 2005 17:20:34 -0000	1.98
 +++ mail/courier-imap/Makefile	18 May 2005 17:57:37 -0000
 @@ -115,7 +115,13 @@
  CONFIGURE_ENV=3D	CPPFLAGS=3D"-I${LOCALBASE}/include" \
  		LDFLAGS=3D"${LDFLAGS}"
  LDFLAGS+=3D	-L${LOCALBASE}/lib
 +.if ${WANT_FAM_SYSTEM} =3D=3D fam
  LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} =3D=3D gamin
 +LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/gamin
 +.else
 +BROKEN=3D		"unknown FAM system: ${WANT_FAM_SYSTEM}"
 +.endif
  .endif
 =20
  .if defined(WITH_DRAC)
 Index: mail/gnubiff/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/mail/gnubiff/Makefile,v
 retrieving revision 1.16
 diff -u -r1.16 Makefile
 =2D-- mail/gnubiff/Makefile	11 Apr 2005 12:54:41 -0000	1.16
 +++ mail/gnubiff/Makefile	18 May 2005 18:00:06 -0000
 @@ -15,11 +15,11 @@
  MAINTAINER=3D	tim@bishnet.net
  COMMENT=3D	A mail notification program for Gnome
 =20
 =2DLIB_DEPENDS=3D	popt.0:${PORTSDIR}/devel/popt \
 =2D		fam.0:${PORTSDIR}/devel/fam
 +LIB_DEPENDS=3D	popt.0:${PORTSDIR}/devel/popt
 =20
  USE_X_PREFIX=3D	yes
  USE_GNOME=3D	intlhack libglade2 esound
 +USE_FAM=3D	yes
  USE_GMAKE=3D	yes
  GNU_CONFIGURE=3D	yes
  CONFIGURE_ENV=3D	CPPFLAGS=3D"-I${LOCALBASE}/include" \
 Index: mail/maildrop/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/mail/maildrop/Makefile,v
 retrieving revision 1.42
 diff -u -r1.42 Makefile
 =2D-- mail/maildrop/Makefile	26 Apr 2005 19:22:11 -0000	1.42
 +++ mail/maildrop/Makefile	18 May 2005 18:15:03 -0000
 @@ -69,7 +69,13 @@
  .endif
 =20
  .if exists(${LOCALBASE}/lib/libfam.so.0)
 +.if ${WANT_FAM_SYSTEM} =3D=3D fam
  LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} =3D=3D gamin
 +LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/gamin
 +.else
 +BROKEN=3D		"unknown FAM system: ${WANT_FAM_SYSTEM}"
 +.endif
  .endif
 =20
  .if defined(MAILDROP_TRUSTED_USERS)
 Index: sysutils/apachetop/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/sysutils/apachetop/Makefile,v
 retrieving revision 1.13
 diff -u -r1.13 Makefile
 =2D-- sysutils/apachetop/Makefile	16 Sep 2004 02:27:05 -0000	1.13
 +++ sysutils/apachetop/Makefile	18 May 2005 18:20:45 -0000
 @@ -33,7 +33,13 @@
  .endif
 =20
  .if defined(WITH_FAM)
 +.if ${WANT_FAM_SYSTEM} =3D=3D fam
  LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} =3D=3D gamin
 +LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/gamin
 +.else
 +BROKEN=3D		"unknown FAM system: ${WANT_FAM_SYSTEM}"
 +.endif
  CONFIGURE_ARGS+=3D--with-fam=3D${LOCALBASE}
  .endif
 =20
 Index: sysutils/fileschanged/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/sysutils/fileschanged/Makefile,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile
 =2D-- sysutils/fileschanged/Makefile	15 Jul 2004 22:59:10 -0000	1.3
 +++ sysutils/fileschanged/Makefile	18 May 2005 18:21:21 -0000
 @@ -15,12 +15,12 @@
  MAINTAINER=3D	ports@FreeBSD.org
  COMMENT=3D	Utility that reports when files have been altered
 =20
 =2DLIB_DEPENDS=3D	fam.0:${PORTSDIR}/devel/fam
  BUILD_DEPENDS=3D	${LOCALBASE}/include/argp.h:
 ${PORTSDIR}/devel/argp-standalone \
  		help2man:${PORTSDIR}/misc/help2man
 =20
  GNU_CONFIGURE=3D	yes
  USE_GMAKE=3D	yes
 +USE_FAM=3D	yes
  CONFIGURE_ENV=3D	CPPFLAGS=3D"-I${LOCALBASE}/include"=20
 LDFLAGS=3D"-L${LOCALBASE}/lib" \
  		LIBS=3D"-largp"
 =20
 Index: x11-fm/gentoo/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/x11-fm/gentoo/Makefile,v
 retrieving revision 1.47
 diff -u -r1.47 Makefile
 =2D-- x11-fm/gentoo/Makefile	8 Jan 2005 17:50:18 -0000	1.47
 +++ x11-fm/gentoo/Makefile	18 May 2005 18:24:18 -0000
 @@ -39,7 +39,13 @@
  .endif
 =20
  .if defined(WITH_FAM)
 +.if ${WANT_FAM_SYSTEM} =3D=3D fam
  LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/fam
 +.elif ${WANT_FAM_SYSTEM} =3D=3D gamin
 +LIB_DEPENDS+=3D	fam.0:${PORTSDIR}/devel/gamin
 +.else
 +BROKEN=3D		"unknown FAM system: ${WANT_FAM_SYSTEM}"
 +.endif
  .else
  CONFIGURE_ARGS+=3D	--disable-fam
  .endif
 Index: x11-fm/gnome-commander/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /home/cvs/freebsd/ports/x11-fm/gnome-commander/Makefile,v
 retrieving revision 1.15
 diff -u -r1.15 Makefile
 =2D-- x11-fm/gnome-commander/Makefile	15 Jun 2004 02:31:13 -0000	1.15
 +++ x11-fm/gnome-commander/Makefile	18 May 2005 18:25:47 -0000
 @@ -16,7 +16,7 @@
  COMMENT=3D	File manager for Gnome
 =20
  .if defined(WITH_FAM)
 =2DLIB_DEPENDS=3D	fam.0:${PORTSDIR}/devel/fam
 +USE_FAM=3D	yes
  .else
  CONFIGURE_ARGS=3D	--without-fam
  .endif

From: Joe Marcus Clarke <marcus@FreeBSD.org>
To: Jose M Rodriguez <josemi@freebsd.jazztel.es>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 14:54:19 -0400

 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
 Jose M Rodriguez wrote:
 | El Mircoles, 18 de Mayo de 2005 19:50, Joe Marcus Clarke escribi:
 |
 |>Jose M Rodriguez wrote:
 |>| El Miércoles, 18 de Mayo de 2005 18:59, Joe Marcus Clarke
 |
 | escribió:
 |
 |>|>Jose M Rodriguez wrote:
 |>|>| El Mi?©rcoles, 18 de Mayo de 2005 18:39, Joe Marcus Clarke
 |><snip/>
 |>
 |>FAM should be the default as kqueue is still quite limited, and gamin
 |>is still fairly young.  This can be re-evaluated later.
 |>
 |
 |
 | Whatever is better than a non-working fam, but I won't spend more time
 | on this.
 |
 | But attached are a modified Mk/bsd.port.mk and the rest of patches (not
 | tested) to make the USE_FAM switch.
 
 NO!  FAM_PORT should not be overridable.  The only way to control the
 FAM system is with WANT_FAM_SYSTEM.  The detection portion is okay, but
 the rest is not.
 
 Joe
 
 - --
 Joe Marcus Clarke
 FreeBSD GNOME Team	::	gnome@FreeBSD.org
 FreeNode / #freebsd-gnome
 http://www.FreeBSD.org/gnome
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (Darwin)
 Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
 
 iD8DBQFCi49bb2iPiv4Uz4cRAmGAAKCwOF8jD5tOhgXHK8ctzefdsdQXNQCeIwAT
 V96QL4kykFvdA5wPGRI1uEg=
 =KiUQ
 -----END PGP SIGNATURE-----

From: Jose M Rodriguez <josemi@freebsd.jazztel.es>
To: Joe Marcus Clarke <marcus@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk
Date: Wed, 18 May 2005 21:07:05 +0200

 El Mi=E9rcoles, 18 de Mayo de 2005 20:54, Joe Marcus Clarke escribi=F3:
 > Jose M Rodriguez wrote:
 > | El Mi=E9rcoles, 18 de Mayo de 2005 19:50, Joe Marcus Clarke escribi=F3:
 > |>Jose M Rodriguez wrote:
 > |>| El Mi=C3=A9rcoles, 18 de Mayo de 2005 18:59, Joe Marcus Clarke
 > |
 > | escribi=C3=B3:
 > |>|>Jose M Rodriguez wrote:
 > |>|>| El Mi=C3?=C2=A9rcoles, 18 de Mayo de 2005 18:39, Joe Marcus Clarke
 > |>
 > |><snip/>
 > |>
 > |>FAM should be the default as kqueue is still quite limited, and
 > |> gamin is still fairly young.  This can be re-evaluated later.
 > |
 > | Whatever is better than a non-working fam, but I won't spend more
 > | time on this.
 > |
 > | But attached are a modified Mk/bsd.port.mk and the rest of patches
 > | (not tested) to make the USE_FAM switch.
 >
 > NO!  FAM_PORT should not be overridable.  The only way to control the
 > FAM system is with WANT_FAM_SYSTEM.  The detection portion is okay,
 > but the rest is not.
 >
 > Joe
 
 Maybe I missed anything. I'm not using FAM_PORT anymore.
 
 You're rigth. I forgot delete some lines in Mk/bsd.port.mk
 
 sorry.
 
 The FAM_PORT thing is not used any more
 
 =2D.if ${WANT_FAM_SYSTEM} =3D=3D fam
 =2DFAM_PORT?=3D  ${PORTSDIR}/devel/fam
 =2D.elif ${WANT_FAM_SYSTEM} =3D=3D gamin
 =2DFAM_PORT?=3D  ${PORTSDIR}/devel/gamin
 =2D.endif
 
 =2D-
   josemi
 
 
State-Changed-From-To: open->analyzed 
State-Changed-By: krion 
State-Changed-When: Fri Jun 3 17:27:44 GMT 2005 
State-Changed-Why:  
Scheduled for the next exp. build. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81168 
State-Changed-From-To: analyzed->closed 
State-Changed-By: krion 
State-Changed-When: Thu Jun 9 20:47:15 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81168 
>Unformatted:
