diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-29 16:09:36 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-29 16:09:36 +0800 |
| commit | 3bb76a3d8136f7ea64ac8b79f2555efee1616c3d (patch) | |
| tree | c26f1471d1135df20eef8fedbc1430ddd8e0e4e4 | |
| parent | 04c1c479bc38ccdf00aed37ac5754e8fe29f0c41 (diff) | |
| download | marcuscom-ports-3bb76a3d8136f7ea64ac8b79f2555efee1616c3d.tar marcuscom-ports-3bb76a3d8136f7ea64ac8b79f2555efee1616c3d.tar.gz marcuscom-ports-3bb76a3d8136f7ea64ac8b79f2555efee1616c3d.tar.bz2 marcuscom-ports-3bb76a3d8136f7ea64ac8b79f2555efee1616c3d.tar.lz marcuscom-ports-3bb76a3d8136f7ea64ac8b79f2555efee1616c3d.tar.xz marcuscom-ports-3bb76a3d8136f7ea64ac8b79f2555efee1616c3d.tar.zst marcuscom-ports-3bb76a3d8136f7ea64ac8b79f2555efee1616c3d.zip | |
Sync with ports, add libinotify support. Add a clang fix.
While here convert to optionsNG
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16971 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/gamin/Makefile | 23 | ||||
| -rw-r--r-- | devel/gamin/files/patch-server_gam_eq.c | 11 |
2 files changed, 27 insertions, 7 deletions
diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index 8ad41210c..63d42db70 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gamin/Makefile,v 1.8 2011/09/17 09:24:14 kwm Exp $ +# $MCom: ports/devel/gamin/Makefile,v 1.9 2012/01/17 04:02:05 ahze Exp $ # PORTNAME= gamin @@ -22,24 +22,33 @@ USE_GNOME?= gnomehack _glib20 pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --without-python -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -DHAVE_LINUX -I${LOCALBASE}/include ${PTHREAD_CFLAGS} CONFLICTS= fam-[0-9]* GNU_CONFIGURE= yes .if !defined(GAMIN_SLAVE) -OPTIONS= GAM_POLLER "Use gamin's poller instead of kqueue's" off +OPTIONS_DEFINE= GAM_POLLER LIBINOTIFY +GAM_POLLER_DESC=Use gamin's poller instead of kqueue's +LIBINOTIFY_DESC=Use libinotify as the FAM backend .endif .include <bsd.port.pre.mk> -.if !defined(GAMIN_SLAVE) -.if defined(WITH_GAM_POLLER) +.if !defined(GAM_SLAVE) +.if ${PORT_OPTIONS:MGAM_POLLER} CPPFLAGS+= -DUSE_GAMIN_POLLER=1 .endif + +.if ${PORT_OPTIONS:MLIBINOTIFY} +CONFIGURE_ARGS+=--enable-inotify +LDFLAGS+= -L${LOCALBASE}/lib -linotify +LIB_DEPENDS+= inotify:${PORTSDIR}/devel/libinotify +.else +CONFIGURE_ARGS+=--disable-inotify +.endif .endif post-patch: diff --git a/devel/gamin/files/patch-server_gam_eq.c b/devel/gamin/files/patch-server_gam_eq.c new file mode 100644 index 000000000..6dfb7c975 --- /dev/null +++ b/devel/gamin/files/patch-server_gam_eq.c @@ -0,0 +1,11 @@ +--- server/gam_eq.c.orig 2012-05-13 19:42:20.257794534 +0400 ++++ server/gam_eq.c 2012-05-13 19:44:41.228799909 +0400 +@@ -124,7 +124,7 @@ gam_eq_flush (gam_eq_t *eq, GamConnDataP + { + gboolean done_work = FALSE; + if (!eq) +- return; ++ return FALSE; + + #ifdef GAM_EQ_VERBOSE + GAM_DEBUG(DEBUG_INFO, "gam_eq: Flushing event queue for %s\n", gam_connection_get_pidname (conn)); |