pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/intellij-fsnotifier
Module Name: pkgsrc
Committed By: ryoon
Date: Thu Dec 12 15:21:58 UTC 2024
Modified Files:
pkgsrc/sysutils/intellij-fsnotifier: Makefile PLIST distinfo
pkgsrc/sysutils/intellij-fsnotifier/patches: patch-main.c
Added Files:
pkgsrc/sysutils/intellij-fsnotifier/patches: patch-inotify.c
Removed Files:
pkgsrc/sysutils/intellij-fsnotifier/patches: patch-Makefile
Log Message:
sysutils/intellij-fsnotifier: Update to 20230725
* Really working properly for NetBSD now.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/intellij-fsnotifier/Makefile \
pkgsrc/sysutils/intellij-fsnotifier/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/intellij-fsnotifier/PLIST
cvs rdiff -u -r1.1 -r0 \
pkgsrc/sysutils/intellij-fsnotifier/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 \
pkgsrc/sysutils/intellij-fsnotifier/patches/patch-inotify.c
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/sysutils/intellij-fsnotifier/patches/patch-main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/intellij-fsnotifier/Makefile
diff -u pkgsrc/sysutils/intellij-fsnotifier/Makefile:1.3 pkgsrc/sysutils/intellij-fsnotifier/Makefile:1.4
--- pkgsrc/sysutils/intellij-fsnotifier/Makefile:1.3 Mon Sep 11 13:50:33 2023
+++ pkgsrc/sysutils/intellij-fsnotifier/Makefile Thu Dec 12 15:21:57 2024
@@ -1,18 +1,23 @@
-# $NetBSD: Makefile,v 1.3 2023/09/11 13:50:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2024/12/12 15:21:57 ryoon Exp $
-DISTNAME= fsnotifier-0.0.20190228
-PKGNAME= intellij-${DISTNAME}
-PKGREVISION= 2
+DISTNAME= fsnotifier
+PKGNAME= intellij-${DISTNAME}-20230725
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=idea4bsd/}
-GITHUB_PROJECT= fsnotifier
-GITHUB_TAG= bb7815166319ba46c27809ed8fc0c6b5fa14f869
+MASTER_SITES= ${MASTER_SITE_GITLAB:=worthwhileit/bsd/}
+GITLAB_PROJECT= fsnotifier
+GITLAB_TAG= b96f269f637058461df482f4cf55037a5968d7a8
MAINTAINER= ryoon%NetBSD.org@localhost
-HOMEPAGE= https://github.com/idea4bsd/fsnotifier
+HOMEPAGE= https://gitlab.com/worthwhileit/bsd/fsnotifier
COMMENT= File system monitoring utility for IntelliJ IDEA IDE
LICENSE= apache-2.0
+WRKSRC= ${WRKDIR}/${DISTNAME}-${GITLAB_TAG}
+
+USE_TOOLS+= pkg-config
+
+CMAKE_CONFIGURE_ARGS+= -DVERSION=1
+
INTELLIJCEDIR= intellij-ce-bin
PYCHARMCEDIR= pycharm-bin
INSTALLATION_DIRS= ${INTELLIJCEDIR}/bin ${PYCHARMCEDIR}/bin
@@ -20,11 +25,6 @@ INSTALLATION_DIRS= ${INTELLIJCEDIR}/bin
PLIST_SUBST+= INTELLIJCEDIR=${INTELLIJCEDIR}
PLIST_SUBST+= PYCHARMCEDIR=${PYCHARMCEDIR}
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/fsnotifier \
- ${DESTDIR}${PREFIX}/${INTELLIJCEDIR}/bin/fsnotifier
- ${INSTALL_PROGRAM} ${WRKSRC}/fsnotifier \
- ${DESTDIR}${PREFIX}/${PYCHARMCEDIR}/bin/fsnotifier
-
.include "../../devel/libinotify/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/intellij-fsnotifier/distinfo
diff -u pkgsrc/sysutils/intellij-fsnotifier/distinfo:1.3 pkgsrc/sysutils/intellij-fsnotifier/distinfo:1.4
--- pkgsrc/sysutils/intellij-fsnotifier/distinfo:1.3 Tue Oct 26 11:19:43 2021
+++ pkgsrc/sysutils/intellij-fsnotifier/distinfo Thu Dec 12 15:21:57 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:19:43 nia Exp $
+$NetBSD: distinfo,v 1.4 2024/12/12 15:21:57 ryoon Exp $
-BLAKE2s (fsnotifier-0.0.20190228-bb7815166319ba46c27809ed8fc0c6b5fa14f869.tar.gz) = b636826431b6e93f892cd7a92ea589f66f25352fa881537b85cbff1356499d47
-SHA512 (fsnotifier-0.0.20190228-bb7815166319ba46c27809ed8fc0c6b5fa14f869.tar.gz) =
7aa052076784f97936a75dce3ed4a89b41f388675fee484ec63481dd00d27b8373bb9ad5cdc185e3eb4e4263154ed319e70b332e8253e76836a85f85c75c110b
-Size (fsnotifier-0.0.20190228-bb7815166319ba46c27809ed8fc0c6b5fa14f869.tar.gz) = 12933 bytes
-SHA1 (patch-Makefile) = 8d3fb94a6ed0411bf12e01f3db216633b7c8d535
-SHA1 (patch-main.c) = 45504b3d11700b479230b9b07413457beaa392af
+BLAKE2s (fsnotifier-b96f269f637058461df482f4cf55037a5968d7a8.tar.gz) = d1da6c0fb626a80a9c64c3d7a266987a5dafac9186096acd6cc742ea0c9c0469
+SHA512 (fsnotifier-b96f269f637058461df482f4cf55037a5968d7a8.tar.gz) = c21860dd1163c4dffff275caf0bfcef486513096c12f1bf1efa4c5d0d68a4a61c90fa94711ef7550e1baf86cb2ee0801311cd3e18925f73fffe8623083054d05
+Size (fsnotifier-b96f269f637058461df482f4cf55037a5968d7a8.tar.gz) = 14932 bytes
+SHA1 (patch-inotify.c) = 8a3714dbd8706ab3c41dee72edd513a2ddbf8882
+SHA1 (patch-main.c) = 87ded462a7f383b11f4da7ae99e7a2a95f0e6484
Index: pkgsrc/sysutils/intellij-fsnotifier/PLIST
diff -u pkgsrc/sysutils/intellij-fsnotifier/PLIST:1.1 pkgsrc/sysutils/intellij-fsnotifier/PLIST:1.2
--- pkgsrc/sysutils/intellij-fsnotifier/PLIST:1.1 Tue Mar 5 11:24:01 2019
+++ pkgsrc/sysutils/intellij-fsnotifier/PLIST Thu Dec 12 15:21:57 2024
@@ -1,3 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/05 11:24:01 ryoon Exp $
-${INTELLIJCEDIR}/bin/fsnotifier
-${PYCHARMCEDIR}/bin/fsnotifier
+@comment $NetBSD: PLIST,v 1.2 2024/12/12 15:21:57 ryoon Exp $
+bin/fsnotifier
+bin/fsnotifier-static
+include/fsnotifier.h
+lib/fsnotifier/cmake/fsnotifierConfig.cmake
+lib/fsnotifier/cmake/fsnotifierConfigVersion.cmake
+lib/fsnotifier/cmake/fsnotifierTargets-noconfig.cmake
+lib/fsnotifier/cmake/fsnotifierTargets.cmake
+lib/libfsnotifier.a
+lib/libfsnotifier.so
+lib/libfsnotifier.so.1
Index: pkgsrc/sysutils/intellij-fsnotifier/patches/patch-main.c
diff -u pkgsrc/sysutils/intellij-fsnotifier/patches/patch-main.c:1.1 pkgsrc/sysutils/intellij-fsnotifier/patches/patch-main.c:1.2
--- pkgsrc/sysutils/intellij-fsnotifier/patches/patch-main.c:1.1 Tue Mar 5 11:24:01 2019
+++ pkgsrc/sysutils/intellij-fsnotifier/patches/patch-main.c Thu Dec 12 15:21:57 2024
@@ -1,65 +1,48 @@
-$NetBSD: patch-main.c,v 1.1 2019/03/05 11:24:01 ryoon Exp $
+$NetBSD: patch-main.c,v 1.2 2024/12/12 15:21:57 ryoon Exp $
* Fix build on NetBSD
---- main.c.orig 2016-11-18 15:38:37.000000000 +0000
+--- main.c.orig 2023-07-24 21:16:54.000000000 +0000
+++ main.c
-@@ -429,17 +429,31 @@ static bool register_roots(array* new_ro
+@@ -10,7 +10,11 @@
+ #include <string.h>
+ #include <sys/inotify.h>
+ #include <sys/select.h>
++#if !defined(__NetBSD__)
+ #include <sys/stat.h>
++#else
++#include <sys/statvfs.h>
++#endif
+ #include <unistd.h>
+
#if defined(__BSD__)
+@@ -316,17 +320,29 @@ static bool register_roots(array* new_ro
- static array* unwatchable_mounts() {
-+#if defined(__NetBSD__)
-+ int fsCount = getvfsstat(NULL, 0, MNT_WAIT);
-+#else
+ #if defined(__BSD__)
+ static array* unwatchable_mounts(void) {
++# if !defined(__NetBSD__)
int fsCount = getfsstat(NULL, 0, MNT_WAIT);
-+#endif
if (fsCount > 0) {
-+#if defined(__NetBSD__)
-+ struct statvfs fs[fsCount];
-+ fsCount = getvfsstat(fs, (int)(sizeof(struct statvfs) * fsCount), MNT_NOWAIT);
-+#else
struct statfs fs[fsCount];
fsCount = getfsstat(fs, (int)(sizeof(struct statfs) * fsCount), MNT_NOWAIT);
++#else
++ int fsCount = getvfsstat(NULL, 0, MNT_WAIT);
++ if (fsCount > 0) {
++ struct statvfs fs[fsCount];
++ fsCount = getvfsstat(fs, (int)(sizeof(struct statvfs) * fsCount), MNT_NOWAIT);
+#endif
if (fsCount > 0) {
array* mounts = array_create(fsCount);
CHECK_NULL(mounts, NULL);
for (int i=0; i<fsCount; i++) {
-+#if defined(__NetBSD__)
-+ userlog(LOG_DEBUG, "mtab: %s : %s (%d)", fs[i].f_mntonname, fs[i].f_fstypename, fs[i].f_flag);
-+ if ((fs[i].f_flag & MNT_LOCAL) != MNT_LOCAL) {
-+#else
- userlog(LOG_DEBUG, "mtab: %s : %s (%d)", fs[i].f_mntonname, fs[i].f_fstypename, fs[i].f_flags);
++#if !defined(__NetBSD__)
+ userlog(LOG_INFO, "mtab: %s : %s (%d)", fs[i].f_mntonname, fs[i].f_fstypename, fs[i].f_flags);
if ((fs[i].f_flags & MNT_LOCAL) != MNT_LOCAL) {
++#else
++ userlog(LOG_INFO, "mtab: %s : %s (%d)", fs[i].f_mntonname, fs[i].f_fstypename, fs[i].f_flag);
++ if ((fs[i].f_flag & MNT_LOCAL) != MNT_LOCAL) {
+#endif
CHECK_NULL(array_push(mounts, strdup(fs[i].f_mntonname)), NULL);
}
}
-@@ -512,8 +526,14 @@ static void inotify_callback(const char*
- static void report_event(const char* event, const char* path) {
- userlog(LOG_DEBUG, "%s: %s", event, path);
-
-+#if defined(__clang__)
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wincompatible-pointer-types"
-+#elif defined(__GNUC__)
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
-+#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
-+#endif
- char* copy = path, *p;
- for (p = copy; *p != '\0'; ++p) {
- if (*p == '\n') {
-@@ -524,7 +544,11 @@ static void report_event(const char* eve
- *p = '\0';
- }
- }
-+#if defined(__clang__)
- #pragma clang diagnostic pop
-+#elif defined(__GNUC__)
-+#pragma GCC diagnostic pop
-+#endif
-
- fputs(event, stdout);
- fputc('\n', stdout);
Added files:
Index: pkgsrc/sysutils/intellij-fsnotifier/patches/patch-inotify.c
diff -u /dev/null pkgsrc/sysutils/intellij-fsnotifier/patches/patch-inotify.c:1.1
--- /dev/null Thu Dec 12 15:21:58 2024
+++ pkgsrc/sysutils/intellij-fsnotifier/patches/patch-inotify.c Thu Dec 12 15:21:57 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-inotify.c,v 1.1 2024/12/12 15:21:57 ryoon Exp $
+
+--- inotify.c.orig 2023-07-24 21:16:54.000000000 +0000
++++ inotify.c
+@@ -45,7 +45,12 @@ static void watch_limit_reached(void);
+ static bool watch_count_initialised = false;
+ static void init_watch_count(void) {
+ size_t len = 4;
++#if !defined(__NetBSD__)
+ sysctlbyname("kern.maxfilesperproc", &watch_count, &len, NULL, 0);
++#else
++ sysctlbyname("kern.maxfiles", &watch_count, &len, NULL, 0);
++ watch_count = watch_count / 100;
++#endif
+ userlog(LOG_INFO, "kern.maxfilesperproc=%d", watch_count);
+
+ userlog(LOG_INFO,
Home |
Main Index |
Thread Index |
Old Index