diff --git a/sysutils/inotify-tools/Makefile b/sysutils/inotify-tools/Makefile index 1a1be48fa229..3e5c665e71b1 100644 --- a/sysutils/inotify-tools/Makefile +++ b/sysutils/inotify-tools/Makefile @@ -1,49 +1,49 @@ PORTNAME= inotify-tools -DISTVERSION= 4.23.8.0 +DISTVERSION= 4.23.9.0 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org COMMENT= Command-line utilities to watch for file events WWW= https://github.com/inotify-tools/inotify-tools/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libinotify.so:devel/libinotify TEST_DEPENDS= bash:shells/bash USES= autoreconf compiler:c11 gmake libtool localbase shebangfix USE_GITHUB= yes USE_LDCONFIG= yes SHEBANG_GLOB= *.t *.sh GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen INSTALL_TARGET= install-strip OPTIONS_DEFINE= STATIC OPTIONS_SUB= yes post-patch: @${REINPLACE_CMD} \ -e 's|SHELL_PATH ?= /bin/bash|SHELL_PATH ?= ${LOCALBASE}/bin/bash|' \ ${WRKSRC}/t/Makefile post-build-STATIC-on: @cd ${WRKSRC}/src && \ ${CC} -pthread ${LDFLAGS} -static -o inotifywait.static inotifywait.o common.o ../libinotifytools/src/.libs/libinotifytools.a ${LOCALBASE}/lib/libinotify.a && \ ${CC} -pthread ${LDFLAGS} -static -o inotifywatch.static inotifywatch.o common.o ../libinotifytools/src/.libs/libinotifytools.a ${LOCALBASE}/lib/libinotify.a 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 diff --git a/sysutils/inotify-tools/distinfo b/sysutils/inotify-tools/distinfo index ceabaaecce2a..fa30f9ecc37f 100644 --- a/sysutils/inotify-tools/distinfo +++ b/sysutils/inotify-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692682288 -SHA256 (inotify-tools-inotify-tools-4.23.8.0_GH0.tar.gz) = 8ad8b72a146af57688f3289b33b92a026915fc677997147071887b65b603d20a -SIZE (inotify-tools-inotify-tools-4.23.8.0_GH0.tar.gz) = 93265 +TIMESTAMP = 1703113035 +SHA256 (inotify-tools-inotify-tools-4.23.9.0_GH0.tar.gz) = 1dfa33f80b6797ce2f6c01f454fd486d30be4dca1b0c5c2ea9ba3c30a5c39855 +SIZE (inotify-tools-inotify-tools-4.23.9.0_GH0.tar.gz) = 93281 diff --git a/sysutils/inotify-tools/files/patch-src_Makefile.am b/sysutils/inotify-tools/files/patch-src_Makefile.am index 96f6b8cd3c84..2c99329855fe 100644 --- a/sysutils/inotify-tools/files/patch-src_Makefile.am +++ b/sysutils/inotify-tools/files/patch-src_Makefile.am @@ -1,15 +1,17 @@ ---- src/Makefile.am.orig 2023-08-21 19:51:56 UTC +--- src/Makefile.am.orig 2023-09-12 16:26:42 UTC +++ src/Makefile.am -@@ -12,10 +12,10 @@ fsnotifywatch_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_FANOT +@@ -12,11 +12,11 @@ fsnotifywatch_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_FANOT endif if IS_CLANG --AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument -I../libinotifytools/src -+AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument - AM_CPPFLAGS = -std=c++17 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument -I../libinotifytools/src +-AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument -I../libinotifytools/src -I$(srcdir)/../libinotifytools/src ++AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument -I../libinotifytools/src + AM_CPPFLAGS = -std=c++17 -fno-exceptions -Wall -Wextra -Wshadow -Werror -Wno-unused-command-line-argument -I../libinotifytools/src -I$(srcdir)/../libinotifytools/src else --AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src -+AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror - AM_CPPFLAGS = -std=c++17 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src +-AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src -I$(srcdir)/../libinotifytools/src +-AM_CPPFLAGS = -std=c++17 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src -I$(srcdir)/../libinotifytools/src ++AM_CFLAGS = -std=c99 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src ++AM_CPPFLAGS = -std=c++17 -fno-exceptions -Wall -Wextra -Wshadow -Werror -I../libinotifytools/src endif + LDADD = ../libinotifytools/src/libinotifytools.la