diff options
| -rw-r--r-- | sysutils/inotify-tools/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/inotify-tools/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/inotify-tools/files/patch-src_Makefile.am | 13 | ||||
| -rw-r--r-- | sysutils/inotify-tools/files/patch-src_inotifywatch.c | 9 | ||||
| -rw-r--r-- | sysutils/inotify-tools/pkg-descr | 2 |
5 files changed, 20 insertions, 21 deletions
diff --git a/sysutils/inotify-tools/Makefile b/sysutils/inotify-tools/Makefile index 9e94a59050d1..27baa1153b7d 100644 --- a/sysutils/inotify-tools/Makefile +++ b/sysutils/inotify-tools/Makefile @@ -1,8 +1,8 @@ # Created by: Yuri Victorovich <yuri@rawbw.com> # $FreeBSD$ -PORTNAME= inotify-tools -DISTVERSION= 3.20.1 +PORTNAME= inotify-tools # new fork https://github.com/ericcurtin/inotify-tools +DISTVERSION= 3.20.2 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org @@ -15,7 +15,6 @@ LIB_DEPENDS= libinotify.so:devel/libinotify USES= autoreconf gmake libtool localbase USE_GITHUB= yes -GH_ACCOUNT= rvoicilas GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen USE_LDCONFIG= yes @@ -38,4 +37,10 @@ post-install-STATIC-on: ${INSTALL_PROGRAM} ${WRKSRC}/src/inotifywait.static ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/src/inotifywatch.static ${STAGEDIR}${PREFIX}/bin +do-test: # Some tests are known to fail: https://github.com/inotify-tools/inotify-tools/issues/108 + @${ECHO} "unit test" + @cd ${WRKSRC}/libinotifytools/src && ${GMAKE} test && ./test + @${ECHO} "integration test" + @cd ${WRKSRC}/t && ${GMAKE} + .include <bsd.port.mk> diff --git a/sysutils/inotify-tools/distinfo b/sysutils/inotify-tools/distinfo index 07d9153435b3..60de5f97225a 100644 --- a/sysutils/inotify-tools/distinfo +++ b/sysutils/inotify-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1517817616 -SHA256 (rvoicilas-inotify-tools-3.20.1_GH0.tar.gz) = a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac -SIZE (rvoicilas-inotify-tools-3.20.1_GH0.tar.gz) = 79564 +TIMESTAMP = 1580350866 +SHA256 (inotify-tools-inotify-tools-3.20.2_GH0.tar.gz) = 5ef0519934ac99f58c217fce259832a4ed51e25ded64c8aaf1149791b2c9b2c7 +SIZE (inotify-tools-inotify-tools-3.20.2_GH0.tar.gz) = 80938 diff --git a/sysutils/inotify-tools/files/patch-src_Makefile.am b/sysutils/inotify-tools/files/patch-src_Makefile.am index 50da9fa71b6b..aa6effcfc478 100644 --- a/sysutils/inotify-tools/files/patch-src_Makefile.am +++ b/sysutils/inotify-tools/files/patch-src_Makefile.am @@ -1,16 +1,11 @@ ---- src/Makefile.am.orig 2014-11-09 20:57:04 UTC +--- src/Makefile.am.orig 2020-01-30 00:04:48 UTC +++ src/Makefile.am -@@ -2,10 +2,11 @@ bin_PROGRAMS = inotifywait inotifywatch +@@ -2,7 +2,7 @@ bin_PROGRAMS = inotifywait inotifywatch inotifywait_SOURCES = inotifywait.c common.c common.h inotifywatch_SOURCES = inotifywatch.c common.c common.h --AM_CFLAGS = -Wall -Werror -Wpointer-arith -std=c99 -I../libinotifytools/src -L../libinotifytools/src -+AM_CFLAGS = -Wall -Werror -Wpointer-arith -std=c99 +-AM_CFLAGS = -Wall -Wextra -Wpointer-arith -Werror -std=c99 -I../libinotifytools/src ++AM_CFLAGS = -Wall -Wextra -Wpointer-arith -Werror -std=c99 AM_CPPFLAGS = -I$(top_srcdir)/libinotifytools/src LDADD = ../libinotifytools/src/libinotifytools.la -+AM_LDFLAGS = -L$(top_srcdir)/libinotifytools/src - if STATIC_BINARY_ENABLE --AM_LDFLAGS = -static-libtool-libs -+AM_LDFLAGS += -static-libtool-libs - endif diff --git a/sysutils/inotify-tools/files/patch-src_inotifywatch.c b/sysutils/inotify-tools/files/patch-src_inotifywatch.c index 4e9004713a42..dfc768d6c927 100644 --- a/sysutils/inotify-tools/files/patch-src_inotifywatch.c +++ b/sysutils/inotify-tools/files/patch-src_inotifywatch.c @@ -1,4 +1,4 @@ ---- src/inotifywatch.c.orig 2018-01-06 11:10:51 UTC +--- src/inotifywatch.c.orig 2020-01-30 00:04:48 UTC +++ src/inotifywatch.c @@ -12,6 +12,9 @@ #include <errno.h> @@ -21,7 +21,7 @@ signal(SIGINT, handle_impatient_user); // Parse commandline options, aborting if something goes wrong -@@ -110,11 +117,27 @@ int main(int argc, char **argv) { +@@ -110,10 +117,26 @@ int main(int argc, char **argv) { return EXIT_FAILURE; } @@ -41,11 +41,10 @@ warn_inotify_init_error(); return EXIT_FAILURE; } - ++ +#ifdef __FreeBSD__ + pthread_sigmask(SIG_SETMASK, &oset, NULL); +#endif // __FreeBSD__ -+ + // Attempt to watch file // If events is still 0, make it all events. - if (!events) diff --git a/sysutils/inotify-tools/pkg-descr b/sysutils/inotify-tools/pkg-descr index a1d00f85a01f..a6ebac01b68b 100644 --- a/sysutils/inotify-tools/pkg-descr +++ b/sysutils/inotify-tools/pkg-descr @@ -1,4 +1,4 @@ The set of command-line programs providing a simple interface to file system events to shell scripts. -WWW: https://github.com/rvoicilas/inotify-tools/ +WWW: https://github.com/inotify-tools/inotify-tools/ |