erlang-fs: Update to 6.1

4 files changed, 15 insertions, 24 deletions

diff --git a/devel/erlang-fs/Makefile b/devel/erlang-fs/Makefile
index 0bbe32b44c9..f850a6c15a7 100644
--- a/devel/erlang-fs/Makefile
+++ b/devel/erlang-fs/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 23:30:27 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2022/10/15 17:42:05 triaxx Exp $
 
-DISTNAME=	fs-2.12.0
-PKGNAME=	erlang-${DISTNAME}
-PKGREVISION=	1
+DISTNAME=	fs-6.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=synrc/}
 
@@ -12,11 +10,18 @@ LICENSE=	isc
 
 GITHUB_PROJECT=	fs
 
+BUILD_DEPENDS+=	rebar3-[0-9]*:../../devel/rebar3
+REBAR=		${PREFIX}/bin/rebar3
+
 post-extract:
 	${RM} -f ${WRKSRC}/priv/inotifywait.exe
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${REBAR} compile
 
+pre-install:
+	${MV} ${WRKSRC}/_build/default/lib/fs/ebin ${WRKSRC}
+	${RM} -rf ${WRKSRC}/_build
+
 .include "../../lang/erlang/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/erlang-fs/PLIST b/devel/erlang-fs/PLIST
index a16a0d41054..fd658fef95f 100644
--- a/devel/erlang-fs/PLIST
+++ b/devel/erlang-fs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/12/14 20:58:26 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/10/15 17:42:05 triaxx Exp $
 lib/erlang/lib/fs-${PKGVERSION}/ebin/fs.app
 lib/erlang/lib/fs-${PKGVERSION}/ebin/fs.beam
 lib/erlang/lib/fs-${PKGVERSION}/ebin/fs_app.beam
@@ -10,3 +10,4 @@ lib/erlang/lib/fs-${PKGVERSION}/ebin/inotifywait.beam
 lib/erlang/lib/fs-${PKGVERSION}/ebin/inotifywait_win32.beam
 lib/erlang/lib/fs-${PKGVERSION}/ebin/kqueue.beam
 lib/erlang/lib/fs-${PKGVERSION}/include/api.hrl
+lib/erlang/lib/fs-${PKGVERSION}/priv/mac_listener
diff --git a/devel/erlang-fs/distinfo b/devel/erlang-fs/distinfo
index d2c50f0ef62..607d0c87313 100644
--- a/devel/erlang-fs/distinfo
+++ b/devel/erlang-fs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:14:37 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/10/15 17:42:05 triaxx Exp $
 
-BLAKE2s (fs-2.12.0.tar.gz) = 05fee2c498e2dff64b8c8c3c9518162e1c22b3045ec02a5f382d5d32a6f6f699
-SHA512 (fs-2.12.0.tar.gz) = a5a708a9570417359bd4d3d34c26925c09453108fc4fdc8a9f8fbb59a5fa7e0dd4c60a30ebf4c4a2289a2b25a289cb731990600f78eedc4fb8a66ee9bfe2e221
-Size (fs-2.12.0.tar.gz) = 21410 bytes
+BLAKE2s (fs-6.1.tar.gz) = 66a80a402b64e77e365e26617f1a36fd7e44720c65d826e502d41c635a4e2548
+SHA512 (fs-6.1.tar.gz) = 67c2e82891e05eedef1709ff15d8d5d98feff67ae5cdda0abd4a82960aaca4b62c79de89b1a14c517072bfd6e600423a7d54cca4bcc42c32bc7b76b48a438837
+Size (fs-6.1.tar.gz) = 24465 bytes
 SHA1 (patch-src_fs__sup.erl) = 468aadce60bd9beaaa47aff3942006527b127908
diff --git a/devel/erlang-fs/patches/patch-src_fs__sup.erl b/devel/erlang-fs/patches/patch-src_fs__sup.erl
deleted file mode 100644
index e59fd20cbab..00000000000
--- a/devel/erlang-fs/patches/patch-src_fs__sup.erl
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_fs__sup.erl,v 1.1 2018/01/03 20:46:55 fhajny Exp $
-
-Properly return "unsupported" on SunOS platforms.
-Merged upstream via https://github.com/synrc/fs/pull/54
-
---- src/fs_sup.erl.orig	2016-12-20 00:10:23.000000000 +0000
-+++ src/fs_sup.erl
-@@ -10,6 +10,7 @@ init([EventHandler, FileHandler, Path])
-     Backend = case os:type() of
-         {unix, darwin} -> fsevents;
-         {unix, linux} -> inotifywait;
-+        {unix, sunos} -> undefined;
-         {unix, _} -> kqueue;
-         {win32, nt} -> inotifywait_win32;
-         _ -> undefined end,