After unlock, I'd like to propose to switch sysutils/inotify-tools to
its new github organization and update to the latest release ... I'll
be test-driving it for a while, and maybe others are interested, too
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/inotify-tools/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 11 Mar 2022 19:57:32 -0000 1.4
+++ Makefile 31 Mar 2025 22:06:28 -0000
@@ -1,11 +1,10 @@
COMMENT = programs providing a simple interface to inotify
-DISTNAME = inotify-tools-3.14pl0
CATEGORIES = sysutils
-GH_ACCOUNT = rvoicilas
+GH_ACCOUNT = inotify-tools
GH_PROJECT = inotify-tools
-GH_COMMIT = 1df9af4d6cd0f4af4b1b19254bcf056aed4ae395
-SHARED_LIBS = inotifytools 0.0 # 4.1
+GH_TAGNAME = 4.23.9.0
+SHARED_LIBS = inotifytools 1.0 # 4.1
# GPLv2
PERMIT_PACKAGE = Yes
@@ -20,12 +19,17 @@ LIB_DEPENDS = devel/libinotify
BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
-WANTLIB += lib/inotify/inotify c pthread
+
+WANTLIB += ${COMPILER_LIBCXX} c m lib/inotify/inotify
pre-configure:
cd ${WRKSRC} && \
libtoolize && \
env AUTOMAKE_VERSION=${AUTOMAKE_VERSION} AUTOCONF_VERSION=${AUTOCONF_VERSION} \
autoreconf -fi
+
+post-install:
+ # Both are linux-only and not actually installed
+ rm ${PREFIX}/man/man1/fsnotify{wait.1,watch.1}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/inotify-tools/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 6 May 2017 15:10:18 -0000 1.2
+++ distinfo 31 Mar 2025 22:06:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (inotify-tools-3.14pl0-1df9af4d.tar.gz) = YouO+rtlpznddH/kO3OymmCbXPqWKMqhJ3ZO13dmpuE=
-SIZE (inotify-tools-3.14pl0-1df9af4d.tar.gz) = 70066
+SHA256 (inotify-tools-4.23.9.0.tar.gz) = Hfoz+Atnl84vbAH0VP1IbTC+TcobDFwuqbo8MKXDmFU=
+SIZE (inotify-tools-4.23.9.0.tar.gz) = 93281
Index: patches/patch-libinotifytools_src_Makefile_am
===================================================================
RCS file: /cvs/ports/sysutils/inotify-tools/patches/patch-libinotifytools_src_Makefile_am,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libinotifytools_src_Makefile_am
--- patches/patch-libinotifytools_src_Makefile_am 11 Mar 2022 19:57:32 -0000 1.2
+++ patches/patch-libinotifytools_src_Makefile_am 31 Mar 2025 22:06:28 -0000
@@ -1,7 +1,8 @@
---- libinotifytools/src/Makefile.am.orig Sat Jan 23 13:07:29 2016
-+++ libinotifytools/src/Makefile.am Sat Jan 23 13:07:42 2016
-@@ -21,7 +21,7 @@ if DOXYGEN_ENABLE
- doc/html/*: inotifytools.c Doxyfile
+Index: libinotifytools/src/Makefile.am
+--- libinotifytools/src/Makefile.am.orig
++++ libinotifytools/src/Makefile.am
+@@ -30,7 +30,7 @@ if DOXYGEN_ENABLE
+ doc/html/*: inotifytools.cpp Doxyfile
$(DOXYGEN)
-shareddocdir = $(datadir)/doc
Index: patches/patch-libinotifytools_src_inotifytools_c
===================================================================
RCS file: patches/patch-libinotifytools_src_inotifytools_c
diff -N patches/patch-libinotifytools_src_inotifytools_c
--- patches/patch-libinotifytools_src_inotifytools_c 11 Mar 2022 19:57:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
---- libinotifytools/src/inotifytools.c.orig Sun Nov 9 21:57:04 2014
-+++ libinotifytools/src/inotifytools.c Sat Jan 23 12:50:01 2016
-@@ -1314,14 +1314,14 @@ int inotifytools_watch_recursively_with_exclude( char
-
- static struct dirent * ent;
- char * next_file;
-- static struct stat64 my_stat;
-+ static struct stat my_stat;
- ent = readdir( dir );
- // Watch each directory within this directory
- while ( ent ) {
- if ( (0 != strcmp( ent->d_name, "." )) &&
- (0 != strcmp( ent->d_name, ".." )) ) {
- nasprintf(&next_file,"%s%s", my_path, ent->d_name);
-- if ( -1 == lstat64( next_file, &my_stat ) ) {
-+ if ( -1 == lstat( next_file, &my_stat ) ) {
- error = errno;
- free( next_file );
- if ( errno != EACCES ) {
-@@ -1600,9 +1600,9 @@ int inotifytools_error() {
- * @internal
- */
- static int isdir( char const * path ) {
-- static struct stat64 my_stat;
-+ static struct stat my_stat;
-
-- if ( -1 == lstat64( path, &my_stat ) ) {
-+ if ( -1 == lstat( path, &my_stat ) ) {
- if (errno == ENOENT) return 0;
- fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
- return 0;
Index: patches/patch-libinotifytools_src_inotifytools_cpp
===================================================================
RCS file: patches/patch-libinotifytools_src_inotifytools_cpp
diff -N patches/patch-libinotifytools_src_inotifytools_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libinotifytools_src_inotifytools_cpp 31 Mar 2025 22:06:28 -0000
@@ -0,0 +1,12 @@
+Index: libinotifytools/src/inotifytools.cpp
+--- libinotifytools/src/inotifytools.cpp.orig
++++ libinotifytools/src/inotifytools.cpp
+@@ -36,7 +36,7 @@
+
+ #include "inotifytools/inotify.h"
+
+-#ifdef __FreeBSD__
++#ifdef __OpenBSD__
+ struct fanotify_event_fid;
+
+ #define FAN_EVENT_INFO_TYPE_FID 1
Index: patches/patch-src_Makefile_am
===================================================================
RCS file: patches/patch-src_Makefile_am
diff -N patches/patch-src_Makefile_am
--- patches/patch-src_Makefile_am 11 Mar 2022 19:57:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig Mon Apr 24 03:20:56 2017
-+++ src/Makefile.am Mon Apr 24 03:21:02 2017
-@@ -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 -Wpointer-arith -std=c99 -I../libinotifytools/src -L../libinotifytools/src
- AM_CPPFLAGS = -I$(top_srcdir)/libinotifytools/src
- LDADD = ../libinotifytools/src/libinotifytools.la
-
Index: patches/patch-src_common_c
===================================================================
RCS file: patches/patch-src_common_c
diff -N patches/patch-src_common_c
--- patches/patch-src_common_c 11 Mar 2022 19:57:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- src/common.c.orig Sun Nov 9 21:57:04 2014
-+++ src/common.c Sat Jan 23 12:49:21 2016
-@@ -44,9 +44,9 @@ void print_event_descriptions() {
- }
-
- int isdir( char const * path ) {
-- static struct stat64 my_stat;
-+ static struct stat my_stat;
-
-- if ( -1 == lstat64( path, &my_stat ) ) {
-+ if ( -1 == lstat( path, &my_stat ) ) {
- if (errno == ENOENT) return 0;
- fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
- return 0;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/inotify-tools/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 11 Mar 2022 19:57:32 -0000 1.2
+++ pkg/PLIST 31 Mar 2025 22:06:28 -0000
@@ -1,10 +1,12 @@
@bin bin/inotifywait
@bin bin/inotifywatch
include/inotifytools/
+include/inotifytools/fanotify-dfid-name.h
+include/inotifytools/fanotify.h
include/inotifytools/inotify-nosys.h
include/inotifytools/inotify.h
include/inotifytools/inotifytools.h
-lib/libinotifytools.a
+@static-lib lib/libinotifytools.a
lib/libinotifytools.la
@lib lib/libinotifytools.so.${LIBinotifytools_VERSION}
@man man/man1/inotifywait.1
