diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-02-11 06:58:29 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-02-11 06:58:29 +0000 |
| commit | 7c020a493911103728ea2b8d7f9ef98c9fe37cde (patch) | |
| tree | 3dedfca8a19eda661eff532e0574ae97c5dbc993 /devel/gamin/Makefile | |
| parent | Fix broken .elifdef. (diff) | |
* Restore the stale socket cleanup code from gamin 0.1.5 to ensure that even
if gamin crashes or is killed with SIGKILL, a leftover socket does not
prevent gam_server from starting.
* Revert to using the home-grown poller in gamin's kqueue backend instead
of gamin's built-in poller. The built-in poller can still be enabled if
desired via OPTIONS.
* If gamin's poller is used, make sure all local file systems are handled
by kqueue where as all remote file systems are handled by polling.
Reviewed by: jylefort
Diffstat (limited to 'devel/gamin/Makefile')
| -rw-r--r-- | devel/gamin/Makefile | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index b3bcdf34d15b..0c5398bf49f0 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -7,7 +7,7 @@ PORTNAME= gamin PORTVERSION= 0.1.7 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= devel MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/ @@ -19,8 +19,9 @@ USE_GNOME?= gnomehack glib20 INSTALLS_SHLIB= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} CONFLICTS= fam-[0-9]* @@ -28,6 +29,15 @@ CONFLICTS= fam-[0-9]* USE_AUTOTOOLS= libtool:15 .else USE_AUTOTOOLS= libtool:15:inc +OPTIONS= GAM_POLLER "Use gamin's poller instead of kqueue's" off +.endif + +.include <bsd.port.pre.mk> + +.if !defined(GAMIN_SLAVE) +.if defined(WITH_GAM_POLLER) +CPPFLAGS+= -DUSE_GAMIN_POLLER=1 +.endif .endif post-patch: @@ -43,4 +53,4 @@ post-install: @${CAT} ${PKGMESSAGE} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> |