Tue May 16 15:29:38 2023 UTC ()
guile-haunt: fix build on systems (Linux) which have inotify available.


(nikita)
diff -r1.7 -r1.8 pkgsrc/www/guile-haunt/Makefile
diff -r1.4 -r1.5 pkgsrc/www/guile-haunt/PLIST
cvs diff -r1.7 -r1.8 pkgsrc/www/guile-haunt/Makefile (expand / switch to unified diff)

--- pkgsrc/www/guile-haunt/Makefile 2022/03/15 11:21:02 1.7
+++ pkgsrc/www/guile-haunt/Makefile 2023/05/16 15:29:38 1.8
@@ -1,31 +1,39 @@ @@ -1,31 +1,39 @@
1# $NetBSD: Makefile,v 1.7 2022/03/15 11:21:02 nikita Exp $ 1# $NetBSD: Makefile,v 1.8 2023/05/16 15:29:38 nikita Exp $
2 2
3DISTNAME= haunt-0.2.6 3DISTNAME= haunt-0.2.6
4PKGNAME= guile-${DISTNAME} 4PKGNAME= guile-${DISTNAME}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://files.dthompson.us/haunt/ 7MASTER_SITES= https://files.dthompson.us/haunt/
8 8
9MAINTAINER= nikita@NetBSD.org 9MAINTAINER= nikita@NetBSD.org
10HOMEPAGE= https://files.dthompson.us/haunt/ 10HOMEPAGE= https://files.dthompson.us/haunt/
11COMMENT= Functional static web site generator 11COMMENT= Functional static web site generator
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15GUILE_NEED_BOOTSTRAP= yes 15GUILE_NEED_BOOTSTRAP= yes
16GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/3.0 16GNU_CONFIGURE_PREFIX= ${PREFIX}/guile/3.0
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18INFO_FILES= yes 18INFO_FILES= yes
19 19
20# \todo: add guile-reader, for Skribe support 20# TODO: add guile-reader, for Skribe support
21DEPENDS+= guile-commonmark-[0-9]*:../../textproc/guile-commonmark 21DEPENDS+= guile-commonmark-[0-9]*:../../textproc/guile-commonmark
22 22
 23.include "../../mk/bsd.prefs.mk"
 24
 25PLIST_VARS+= inotify
 26
 27.if ${OPSYS} == "Linux"
 28PLIST.inotify= yes
 29.endif
 30
23# There is no check for guile scripts, the @GUILE@ ends up 31# There is no check for guile scripts, the @GUILE@ ends up
24# in the package with the WRKSRC/BL3 location of guile. 32# in the package with the WRKSRC/BL3 location of guile.
25SUBST_CLASSES+= guile 33SUBST_CLASSES+= guile
26SUBST_STAGE.guile= pre-configure 34SUBST_STAGE.guile= pre-configure
27SUBST_FILES.guile= scripts/haunt.in 35SUBST_FILES.guile= scripts/haunt.in
28SUBST_SED.guile+= -e 's,@GUILE@,${PREFIX}/guile/3.0/bin/guile,g' 36SUBST_SED.guile+= -e 's,@GUILE@,${PREFIX}/guile/3.0/bin/guile,g'
29 37
30.include "../../lang/guile30/module.mk" 38.include "../../lang/guile30/module.mk"
31.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/www/guile-haunt/PLIST (expand / switch to unified diff)

--- pkgsrc/www/guile-haunt/PLIST 2022/03/14 15:13:26 1.4
+++ pkgsrc/www/guile-haunt/PLIST 2023/05/16 15:29:38 1.5
@@ -1,44 +1,46 @@ @@ -1,44 +1,46 @@
1@comment $NetBSD: PLIST,v 1.4 2022/03/14 15:13:26 nikita Exp $ 1@comment $NetBSD: PLIST,v 1.5 2023/05/16 15:29:38 nikita Exp $
2guile/3.0/bin/haunt 2guile/3.0/bin/haunt
3guile/3.0/info/haunt.info 3guile/3.0/info/haunt.info
4guile/3.0/lib/guile/3.0/site-ccache/haunt/artifact.go 4guile/3.0/lib/guile/3.0/site-ccache/haunt/artifact.go
5guile/3.0/lib/guile/3.0/site-ccache/haunt/asset.go 5guile/3.0/lib/guile/3.0/site-ccache/haunt/asset.go
6guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/assets.go 6guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/assets.go
7guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/atom.go 7guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/atom.go
8guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/blog.go 8guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/blog.go
9guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/rss.go 9guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/rss.go
10guile/3.0/lib/guile/3.0/site-ccache/haunt/config.go 10guile/3.0/lib/guile/3.0/site-ccache/haunt/config.go
11guile/3.0/lib/guile/3.0/site-ccache/haunt/html.go 11guile/3.0/lib/guile/3.0/site-ccache/haunt/html.go
 12${PLIST.inotify}guile/3.0/lib/guile/3.0/site-ccache/haunt/inotify.go
12guile/3.0/lib/guile/3.0/site-ccache/haunt/page.go 13guile/3.0/lib/guile/3.0/site-ccache/haunt/page.go
13guile/3.0/lib/guile/3.0/site-ccache/haunt/post.go 14guile/3.0/lib/guile/3.0/site-ccache/haunt/post.go
14guile/3.0/lib/guile/3.0/site-ccache/haunt/reader.go 15guile/3.0/lib/guile/3.0/site-ccache/haunt/reader.go
15guile/3.0/lib/guile/3.0/site-ccache/haunt/reader/commonmark.go 16guile/3.0/lib/guile/3.0/site-ccache/haunt/reader/commonmark.go
16guile/3.0/lib/guile/3.0/site-ccache/haunt/reader/texinfo.go 17guile/3.0/lib/guile/3.0/site-ccache/haunt/reader/texinfo.go
17guile/3.0/lib/guile/3.0/site-ccache/haunt/serve/mime-types.go 18guile/3.0/lib/guile/3.0/site-ccache/haunt/serve/mime-types.go
18guile/3.0/lib/guile/3.0/site-ccache/haunt/serve/web-server.go 19guile/3.0/lib/guile/3.0/site-ccache/haunt/serve/web-server.go
19guile/3.0/lib/guile/3.0/site-ccache/haunt/site.go 20guile/3.0/lib/guile/3.0/site-ccache/haunt/site.go
20guile/3.0/lib/guile/3.0/site-ccache/haunt/ui.go 21guile/3.0/lib/guile/3.0/site-ccache/haunt/ui.go
21guile/3.0/lib/guile/3.0/site-ccache/haunt/ui/build.go 22guile/3.0/lib/guile/3.0/site-ccache/haunt/ui/build.go
22guile/3.0/lib/guile/3.0/site-ccache/haunt/ui/serve.go 23guile/3.0/lib/guile/3.0/site-ccache/haunt/ui/serve.go
23guile/3.0/lib/guile/3.0/site-ccache/haunt/utils.go 24guile/3.0/lib/guile/3.0/site-ccache/haunt/utils.go
24guile/3.0/share/guile/site/3.0/haunt/artifact.scm 25guile/3.0/share/guile/site/3.0/haunt/artifact.scm
25guile/3.0/share/guile/site/3.0/haunt/asset.scm 26guile/3.0/share/guile/site/3.0/haunt/asset.scm
26guile/3.0/share/guile/site/3.0/haunt/builder/assets.scm 27guile/3.0/share/guile/site/3.0/haunt/builder/assets.scm
27guile/3.0/share/guile/site/3.0/haunt/builder/atom.scm 28guile/3.0/share/guile/site/3.0/haunt/builder/atom.scm
28guile/3.0/share/guile/site/3.0/haunt/builder/blog.scm 29guile/3.0/share/guile/site/3.0/haunt/builder/blog.scm
29guile/3.0/share/guile/site/3.0/haunt/builder/rss.scm 30guile/3.0/share/guile/site/3.0/haunt/builder/rss.scm
30guile/3.0/share/guile/site/3.0/haunt/config.scm 31guile/3.0/share/guile/site/3.0/haunt/config.scm
31guile/3.0/share/guile/site/3.0/haunt/html.scm 32guile/3.0/share/guile/site/3.0/haunt/html.scm
 33${PLIST.inotify}guile/3.0/share/guile/site/3.0/haunt/inotify.scm
32guile/3.0/share/guile/site/3.0/haunt/page.scm 34guile/3.0/share/guile/site/3.0/haunt/page.scm
33guile/3.0/share/guile/site/3.0/haunt/post.scm 35guile/3.0/share/guile/site/3.0/haunt/post.scm
34guile/3.0/share/guile/site/3.0/haunt/reader.scm 36guile/3.0/share/guile/site/3.0/haunt/reader.scm
35guile/3.0/share/guile/site/3.0/haunt/reader/commonmark.scm 37guile/3.0/share/guile/site/3.0/haunt/reader/commonmark.scm
36guile/3.0/share/guile/site/3.0/haunt/reader/texinfo.scm 38guile/3.0/share/guile/site/3.0/haunt/reader/texinfo.scm
37guile/3.0/share/guile/site/3.0/haunt/serve/mime-types.scm 39guile/3.0/share/guile/site/3.0/haunt/serve/mime-types.scm
38guile/3.0/share/guile/site/3.0/haunt/serve/web-server.scm 40guile/3.0/share/guile/site/3.0/haunt/serve/web-server.scm
39guile/3.0/share/guile/site/3.0/haunt/site.scm 41guile/3.0/share/guile/site/3.0/haunt/site.scm
40guile/3.0/share/guile/site/3.0/haunt/ui.scm 42guile/3.0/share/guile/site/3.0/haunt/ui.scm
41guile/3.0/share/guile/site/3.0/haunt/ui/build.scm 43guile/3.0/share/guile/site/3.0/haunt/ui/build.scm
42guile/3.0/share/guile/site/3.0/haunt/ui/serve.scm 44guile/3.0/share/guile/site/3.0/haunt/ui/serve.scm
43guile/3.0/share/guile/site/3.0/haunt/utils.scm 45guile/3.0/share/guile/site/3.0/haunt/utils.scm
44guile/3.0/share/haunt/example/haunt.scm 46guile/3.0/share/haunt/example/haunt.scm