Date: Wed, 18 May 2005 18:05:19 +0200 From: Jose M Rodriguez <josemi@freebsd.jazztel.es> To: freebsd-ports-bugs@freebsd.org Subject: Re: ports/81168: [PATCH] Add flexible FAM support to bsd.port.mk Message-ID: <200505181805.20592.josemi@freebsd.jazztel.es> In-Reply-To: <428A66E7.3070907@FreeBSD.org> References: <200505171820.j4HIK58a031140@freefall.freebsd.org> <428A66E7.3070907@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
El Martes, 17 de Mayo de 2005 23:49, Joe Marcus Clarke escribi=F3:
> Here is a new version of the bsd.port.mk patch that simplifies the
> dependency (along the lines of the OpenLDAP dependencies).
>
> Joe
Allthough this is working well, this can't be merged on ports like=20
courier-imap.
This is what I'm testing now, that also uses gamin as fam default.
courier-imap (IDLE) / gnome 2.10 / kde 3.4 workiing well.
But there are things that must be polited.
=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 15:49:22 -0000
@@ -304,11 +304,20 @@
# 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
+# 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.
@@ -1085,11 +1094,10 @@
.endif
OPTIONSFILE?=3D ${PORT_DBDIR}/${UNIQUENAME}/options
_OPTIONSFILE!=3D ${ECHO_CMD} "${OPTIONSFILE}"
=2D.if defined(OPTIONS)
+.if !defined(NO_OPTIONS) && defined(OPTIONS)
. if defined(PACKAGE_BUILDING) || (defined(BATCH)=20
&& !exists(${_OPTIONSFILE}))
WITHOUT:=3D
WITH:=3D
=2D. if defined(OPTIONS)
REALOPTIONS=3D${OPTIONS:C/".*"//g}
. for O in ${REALOPTIONS}
RO:=3D${O}
@@ -1101,7 +1109,6 @@
. endif
OPT:=3D${RO}
. endfor
=2D. endif
. for W in ${WITH}
WITH_${W}:=3D true
. endfor
@@ -1347,6 +1354,21 @@
=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/libfam.so) && !=20
exists(${LOCALBASE}/lib/libgamin-1.so)
+WANT_FAM_SYSTEM=3D fam
+.else
+WANT_FAM_SYSTEM?=3D gamin
+.endif
+
+.if ${WANT_FAM_SYSTEM} =3D=3D fam
+FAM_PORT?=3D ${PORTSDIR}/devel/fam
+.else
+FAM_PORT?=3D ${PORTSDIR}/devel/gamin
+.endif
+FAM_LIB?=3D fam.0
+
# Owner and group of the WWW user
WWWOWN?=3D www
WWWGRP?=3D www
@@ -1462,6 +1484,18 @@
.endif
.endif
=20
+.if defined(USE_FAM)
+.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
+.elif ! defined(FAM_PORT)
+BROKEN=3D "unknown FAM system: ${WANT_FAM_SYSTEM}"
+.endif
+FAM_LIB?=3D fam.0
+LIB_DEPENDS+=3D ${FAM_LIB}:${FAM_PORT}
+.endif
+
.if defined(USE_GETOPT_LONG)
.if ${OSVERSION} < 500041
LIB_DEPENDS+=3D gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
@@ -1786,23 +1820,19 @@
# compatible functionality.
.if !defined(WITHOUT_X11)
.if defined(WITH_GHOSTSCRIPT_AFPL)
=2D.if ${WITH_GHOSTSCRIPT_AFPL} =3D=3D yes
GHOSTSCRIPT_PORT?=3D print/ghostscript-afpl
=2D.else
+.elif defined(WITH_GHOSTSCRIPT_GNU)
GHOSTSCRIPT_PORT?=3D print/ghostscript-gnu
=2D.endif
.else
=2DGHOSTSCRIPT_PORT?=3D print/ghostscript-gnu
+GHOSTSCRIPT_PORT?=3D print/ghostscript-gpl
.endif
.else
.if defined(WITH_GHOSTSCRIPT_AFPL)
=2D.if ${WITH_GHOSTSCRIPT_AFPL} =3D=3D yes
GHOSTSCRIPT_PORT?=3D print/ghostscript-afpl-nox11
=2D.else
+.elif defined(WITH_GHOSTSCRIPT_GNU)
GHOSTSCRIPT_PORT?=3D print/ghostscript-gnu-nox11
=2D.endif
.else
=2DGHOSTSCRIPT_PORT?=3D print/ghostscript-gnu-nox11
+GHOSTSCRIPT_PORT?=3D print/ghostscript-gpl-nox11
.endif
.endif
=20
@@ -2898,6 +2928,7 @@
################################################################
.if (!defined(OPTIONS) || defined(CONFIG_DONE) || \
defined(PACKAGE_BUILDING) || defined(BATCH) || \
+ defined(NO_OPTIONS) || \
exists(${_OPTIONSFILE}) || exists(${_OPTIONSFILE}.local))
_OPTIONS_OK=3Dyes
.endif
@@ -4991,7 +5022,7 @@
=20
.if !target(config)
config:
=2D.if !defined(OPTIONS)
+.if defined(NO_OPTIONS) || !defined(OPTIONS)
@${ECHO_MSG} "=3D=3D=3D> No options to configure"
.else
.if ${OPTIONSFILE} !=3D ${_OPTIONSFILE}
@@ -5078,14 +5109,14 @@
=20
.if !target(config-conditional)
config-conditional:
=2D.if defined(OPTIONS) && !exists(${_OPTIONSFILE})
+.if !defined(NO_OPTIONS) && defined(OPTIONS)=20
&& !exists(${_OPTIONSFILE})
cd ${.CURDIR} && ${MAKE} config;
.endif
.endif
=20
.if !target(showconfig)
showconfig:
=2D.if defined(OPTIONS) && exists(${_OPTIONSFILE})
+.if !defined(NO_OPTIONS) && defined(OPTIONS) && exists(${_OPTIONSFILE})
@${ECHO_MSG} "=3D=3D=3D> The following configuration options are set for=
=20
${PKGNAME}:"
-@if [ -e ${_OPTIONSFILE} ]; then \
. ${_OPTIONSFILE}; \
@@ -5117,7 +5148,7 @@
=20
.if !target(rmconfig)
rmconfig:
=2D.if defined(OPTIONS) && exists(${_OPTIONSFILE})
+.if !defined(NO_OPTIONS) && defined(OPTIONS) && exists(${_OPTIONSFILE})
-@${ECHO_MSG} "=3D=3D=3D> Removing user-configured options for ${PKGNAME}=
";=20
\
if [ `${ID} -u` !=3D 0 -a "x${INSTALL_AS_USER}" =3D "x" ]; then \
${ECHO_MSG} "=3D=3D=3D> Switching to root credentials to remove=20
${_OPTIONSFILE} and `${DIRNAME} ${_OPTIONSFILE}`"; \
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 15:52:51 -0000
@@ -115,7 +115,7 @@
CONFIGURE_ENV=3D CPPFLAGS=3D"-I${LOCALBASE}/include" \
LDFLAGS=3D"${LDFLAGS}"
LDFLAGS+=3D -L${LOCALBASE}/lib
=2DLIB_DEPENDS+=3D fam.0:${PORTSDIR}/devel/fam
+LIB_DEPENDS+=3D ${FAM_LIB}:${FAM_PORT}
.endif
=20
.if defined(WITH_DRAC)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505181805.20592.josemi>