From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 17 18:20:10 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55FB216A4CE for ; Tue, 17 May 2005 18:20:10 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8182543D7F for ; Tue, 17 May 2005 18:20:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4HIK5Ko031147 for ; Tue, 17 May 2005 18:20:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4HIK5lp031146; Tue, 17 May 2005 18:20:05 GMT (envelope-from gnats) Resent-Date: Tue, 17 May 2005 18:20:05 GMT Resent-Message-Id: <200505171820.j4HIK5lp031146@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joe Marcus Clarke Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD89816A4D7 for ; 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 ; 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])j4HIHTY12206 for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Joe Marcus Clarke List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2005 18:20:10 -0000 >Number: 81168 >Category: ports >Synopsis: [PATCH] Add flexible FAM support to bsd.port.mk >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue May 17 18:20:05 GMT 2005 >Closed-Date: >Last-Modified: >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: >Unformatted: