CVS commit: pkgsrc/www/guile-haunt

["Nikita" <nikita%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nikita
Date:           Mon Mar 14 11:17:22 UTC 2022

Modified Files:
        pkgsrc/www/guile-haunt: Makefile distinfo
Added Files:
        pkgsrc/www/guile-haunt/patches: patch-Makefile.am patch-configure.ac
            patch-haunt_ui_serve.scm

Log Message:
guile-haunt: Update to 2.6


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/guile-haunt/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/guile-haunt/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/guile-haunt/patches/patch-Makefile.am \
    pkgsrc/www/guile-haunt/patches/patch-configure.ac \
    pkgsrc/www/guile-haunt/patches/patch-haunt_ui_serve.scm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/guile-haunt/Makefile
diff -u pkgsrc/www/guile-haunt/Makefile:1.4 pkgsrc/www/guile-haunt/Makefile:1.5
--- pkgsrc/www/guile-haunt/Makefile:1.4 Mon Mar 14 10:36:00 2022
+++ pkgsrc/www/guile-haunt/Makefile     Mon Mar 14 11:17:22 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2022/03/14 10:36:00 nikita Exp $
+# $NetBSD: Makefile,v 1.5 2022/03/14 11:17:22 nikita Exp $
 
-DISTNAME=      haunt-0.2.5
+DISTNAME=      haunt-0.2.6
 PKGNAME=       guile-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://files.dthompson.us/haunt/
 

Index: pkgsrc/www/guile-haunt/distinfo
diff -u pkgsrc/www/guile-haunt/distinfo:1.5 pkgsrc/www/guile-haunt/distinfo:1.6
--- pkgsrc/www/guile-haunt/distinfo:1.5 Mon Mar 14 10:36:00 2022
+++ pkgsrc/www/guile-haunt/distinfo     Mon Mar 14 11:17:22 2022
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2022/03/14 10:36:00 nikita Exp $
+$NetBSD: distinfo,v 1.6 2022/03/14 11:17:22 nikita Exp $
 
-BLAKE2s (haunt-0.2.5.tar.gz) = da7977b49d7211ad90e8fc7cf3cc6ab811820450f715492339ef3453659e0d2c
-SHA512 (haunt-0.2.5.tar.gz) = f969da9fa008d88b2f7b6fb1c14333cdf701173177a2fd2ff35a731509c97ac33d23e7f5d3fcd5caf4c80475c790ebd76473d34ddfb0ab3590524dac6ddd15f0
-Size (haunt-0.2.5.tar.gz) = 301320 bytes
+BLAKE2s (haunt-0.2.6.tar.gz) = c4922f4a7be105806f8deccb970a1130e9bf3a0db849299096fddc20964d5223
+SHA512 (haunt-0.2.6.tar.gz) = 214d1a843385aeb428fecc45ee1f1f0c4e7024e80dd4092dbc17f3f7e8e5ab01d75b6bb4415719685b1162193381db5e5e7b91ac5d5178238ed8c856bf8fad55
+Size (haunt-0.2.6.tar.gz) = 311986 bytes
+SHA1 (patch-Makefile.am) = b87ddbb7b507bc638478d908437ef2dacf606bd9
+SHA1 (patch-configure.ac) = 823f155adabdca01d6531d9aa8220ad2ca709464
+SHA1 (patch-haunt_ui_serve.scm) = 8e99f1995cc54ac78c9e457eed7631d56cd5264d

Added files:

Index: pkgsrc/www/guile-haunt/patches/patch-Makefile.am
diff -u /dev/null pkgsrc/www/guile-haunt/patches/patch-Makefile.am:1.1
--- /dev/null   Mon Mar 14 11:17:22 2022
+++ pkgsrc/www/guile-haunt/patches/patch-Makefile.am    Mon Mar 14 11:17:22 2022
@@ -0,0 +1,28 @@
+$NetBSD: patch-Makefile.am,v 1.1 2022/03/14 11:17:22 nikita Exp $
+
+Taken from upstream commit ab0b722b0719e3370a21359e4d511af9c4f14e60
+by the upstream developer. Fix build without inotify.
+
+--- Makefile.am.orig   2022-03-14 11:50:45.022482834 +0100
++++ Makefile.am        2022-03-14 11:52:42.154492010 +0100
+@@ -46,7 +46,6 @@
+ SOURCES =                                     \
+   haunt/config.scm                            \
+   haunt/utils.scm                             \
+-  haunt/inotify.scm                           \
+   haunt/post.scm                              \
+   haunt/page.scm                              \
+   haunt/asset.scm                             \
+@@ -81,6 +80,12 @@
+ 
+ endif
+ 
++if HAVE_INOTIFY
++SOURCES+=                                     \
++  haunt/inotify.scm
++
++endif
++
+ TESTS =                                               \
+   tests/helper.scm                            \
+   tests/post.scm                              \
Index: pkgsrc/www/guile-haunt/patches/patch-configure.ac
diff -u /dev/null pkgsrc/www/guile-haunt/patches/patch-configure.ac:1.1
--- /dev/null   Mon Mar 14 11:17:22 2022
+++ pkgsrc/www/guile-haunt/patches/patch-configure.ac   Mon Mar 14 11:17:22 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure.ac,v 1.1 2022/03/14 11:17:22 nikita Exp $
+
+Taken from upstream commit 7d0b71f6a3f0e714da5a5c43e52408e27f44c383
+by the upstream developer. Fix building without inotify.
+
+--- configure.ac.orig  2022-03-14 11:49:23.183233537 +0100
++++ configure.ac       2022-03-14 11:50:23.094966055 +0100
+@@ -21,4 +21,6 @@
+ GUILE_MODULE_AVAILABLE([have_guile_commonmark], [(commonmark)])
+ AM_CONDITIONAL([HAVE_GUILE_COMMONMARK], [test "x$have_guile_commonmark" = "xyes"])
+ 
++AC_CHECK_FUNC([inotify_init], [AM_CONDITIONAL(HAVE_INOTIFY, true)], [AM_CONDITIONAL(HAVE_INOTIFY, false)])
++
+ AC_OUTPUT
Index: pkgsrc/www/guile-haunt/patches/patch-haunt_ui_serve.scm
diff -u /dev/null pkgsrc/www/guile-haunt/patches/patch-haunt_ui_serve.scm:1.1
--- /dev/null   Mon Mar 14 11:17:22 2022
+++ pkgsrc/www/guile-haunt/patches/patch-haunt_ui_serve.scm     Mon Mar 14 11:17:22 2022
@@ -0,0 +1,38 @@
+$NetBSD: patch-haunt_ui_serve.scm,v 1.1 2022/03/14 11:17:22 nikita Exp $
+
+From upstream ab0b722b0719e3370a21359e4d511af9c4f14e60
+and 1a91f3d0568fc095d8b0875c6553ef15b76efa4c by the upstream developer.
+Do not compile or load inotify module when inotify is not available.
+
+--- haunt/ui/serve.scm.orig    2022-03-14 12:07:00.344862709 +0100
++++ haunt/ui/serve.scm 2022-03-14 12:09:45.775494633 +0100
+@@ -30,7 +30,6 @@
+   #:use-module (ice-9 ftw)
+   #:use-module (ice-9 threads)
+   #:use-module (haunt config)
+-  #:use-module (haunt inotify)
+   #:use-module (haunt serve web-server)
+   #:use-module (haunt site)
+   #:use-module (haunt ui)
+@@ -90,6 +89,21 @@
+ 
+ ;; TODO: Detect new directories and watch them, too.
+ (define (watch/linux config-file check-dir? check-file?)
++  ;; Lazy load inotify module.  Requiring the module in the
++  ;; define-module definition would cause crashes on non-Linux
++  ;; platforms where the FFI cannot bind to inotify functions.
++  (define inotify-module (resolve-module '(haunt inotify)))
++  (define make-inotify (module-ref inotify-module 'make-inotify))
++  (define inotify-add-watch! (module-ref inotify-module 'inotify-add-watch!))
++  (define inotify-pending-events?
++    (module-ref inotify-module 'inotify-pending-events?))
++  (define inotify-read-event (module-ref inotify-module 'inotify-read-event))
++  (define inotify-watch-file-name
++    (module-ref inotify-module 'inotify-watch-file-name))
++  (define inotify-event-watch (module-ref inotify-module 'inotify-event-watch))
++  (define inotify-event-file-name
++    (module-ref inotify-module 'inotify-event-file-name))
++  (define inotify-event-type (module-ref inotify-module 'inotify-event-type))
+   (let ((inotify (make-inotify)))
+     (define (no-op name stat result) result)
+     (define (watch-directory name stat result)