pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/guile-haunt guile-haunt: Build with lang/guile30



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b736f9bb7fa5
branches:  trunk
changeset: 375431:b736f9bb7fa5
user:      nikita <nikita%pkgsrc.org@localhost>
date:      Mon Mar 14 10:36:00 2022 +0000

description:
guile-haunt: Build with lang/guile30

diffstat:

 www/guile-haunt/Makefile                              |   9 +-
 www/guile-haunt/PLIST                                 |  92 +++++++++---------
 www/guile-haunt/distinfo                              |   5 +-
 www/guile-haunt/patches/patch-haunt_reader.scm        |  20 ----
 www/guile-haunt/patches/patch-haunt_reader_skribe.scm |  20 ----
 www/guile-haunt/patches/patch-haunt_ui.scm            |  20 ----
 6 files changed, 51 insertions(+), 115 deletions(-)

diffs (213 lines):

diff -r 6b374dc0e2b3 -r b736f9bb7fa5 www/guile-haunt/Makefile
--- a/www/guile-haunt/Makefile  Mon Mar 14 10:24:40 2022 +0000
+++ b/www/guile-haunt/Makefile  Mon Mar 14 10:36:00 2022 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2021/12/17 14:52:12 nikita Exp $
+# $NetBSD: Makefile,v 1.4 2022/03/14 10:36:00 nikita Exp $
 
 DISTNAME=      haunt-0.2.5
 PKGNAME=       guile-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  https://files.dthompson.us/haunt/
 
@@ -12,7 +13,7 @@
 
 GNU_CONFIGURE=         yes
 GUILE_NEED_BOOTSTRAP=  yes
-GNU_CONFIGURE_PREFIX=  ${PREFIX}/guile/2.2
+GNU_CONFIGURE_PREFIX=  ${PREFIX}/guile/3.0
 USE_TOOLS+=            pkg-config
 INFO_FILES=            yes
 
@@ -24,7 +25,7 @@
 SUBST_CLASSES+=                guile
 SUBST_STAGE.guile=     pre-configure
 SUBST_FILES.guile=     scripts/haunt.in
-SUBST_SED.guile+=      -e 's,@GUILE@,${PREFIX}/guile/2.2/bin/guile,g'
+SUBST_SED.guile+=      -e 's,@GUILE@,${PREFIX}/guile/3.0/bin/guile,g'
 
-.include "../../lang/guile22/module.mk"
+.include "../../lang/guile30/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6b374dc0e2b3 -r b736f9bb7fa5 www/guile-haunt/PLIST
--- a/www/guile-haunt/PLIST     Mon Mar 14 10:24:40 2022 +0000
+++ b/www/guile-haunt/PLIST     Mon Mar 14 10:36:00 2022 +0000
@@ -1,47 +1,45 @@
-@comment $NetBSD: PLIST,v 1.2 2021/12/17 14:52:12 nikita Exp $
-guile/2.2/bin/haunt
-guile/2.2/info/haunt.info
-guile/2.2/lib/guile/2.2/site-ccache/haunt/artifact.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/asset.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/builder/assets.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/builder/atom.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/builder/blog.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/builder/rss.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/config.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/html.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/page.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/post.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/reader.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/reader/commonmark.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/reader/texinfo.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/serve/mime-types.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/serve/web-server.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/site.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/ui.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/ui/build.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/ui/serve.go
-guile/2.2/lib/guile/2.2/site-ccache/haunt/utils.go
-guile/2.2/share/guile/site/2.2/haunt/artifact.scm
-guile/2.2/share/guile/site/2.2/haunt/asset.scm
-guile/2.2/share/guile/site/2.2/haunt/builder/assets.scm
-guile/2.2/share/guile/site/2.2/haunt/builder/atom.scm
-guile/2.2/share/guile/site/2.2/haunt/builder/blog.scm
-guile/2.2/share/guile/site/2.2/haunt/builder/rss.scm
-guile/2.2/share/guile/site/2.2/haunt/config.scm
-guile/2.2/share/guile/site/2.2/haunt/html.scm
-guile/2.2/share/guile/site/2.2/haunt/page.scm
-guile/2.2/share/guile/site/2.2/haunt/post.scm
-guile/2.2/share/guile/site/2.2/haunt/reader.scm
-guile/2.2/share/guile/site/2.2/haunt/reader/commonmark.scm
-guile/2.2/share/guile/site/2.2/haunt/reader/texinfo.scm
-guile/2.2/share/guile/site/2.2/haunt/serve/mime-types.scm
-guile/2.2/share/guile/site/2.2/haunt/serve/web-server.scm
-guile/2.2/share/guile/site/2.2/haunt/site.scm
-guile/2.2/share/guile/site/2.2/haunt/ui.scm
-guile/2.2/share/guile/site/2.2/haunt/ui/build.scm
-guile/2.2/share/guile/site/2.2/haunt/ui/serve.scm
-guile/2.2/share/guile/site/2.2/haunt/utils.scm
-guile/2.2/share/haunt/example/haunt.scm
-guile/2.2/share/haunt/example/images/guile-banner.small.png
-guile/2.2/share/haunt/example/posts/bar.html
-guile/2.2/share/haunt/example/posts/foo.sxml
+@comment $NetBSD: PLIST,v 1.3 2022/03/14 10:36:00 nikita Exp $
+guile/3.0/bin/haunt
+guile/3.0/info/haunt.info
+guile/3.0/lib/guile/3.0/site-ccache/haunt/artifact.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/asset.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/assets.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/atom.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/blog.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/builder/rss.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/config.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/html.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/page.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/post.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/reader.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/reader/texinfo.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/serve/mime-types.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/serve/web-server.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/site.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/ui.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/ui/build.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/ui/serve.go
+guile/3.0/lib/guile/3.0/site-ccache/haunt/utils.go
+guile/3.0/share/guile/site/3.0/haunt/artifact.scm
+guile/3.0/share/guile/site/3.0/haunt/asset.scm
+guile/3.0/share/guile/site/3.0/haunt/builder/assets.scm
+guile/3.0/share/guile/site/3.0/haunt/builder/atom.scm
+guile/3.0/share/guile/site/3.0/haunt/builder/blog.scm
+guile/3.0/share/guile/site/3.0/haunt/builder/rss.scm
+guile/3.0/share/guile/site/3.0/haunt/config.scm
+guile/3.0/share/guile/site/3.0/haunt/html.scm
+guile/3.0/share/guile/site/3.0/haunt/page.scm
+guile/3.0/share/guile/site/3.0/haunt/post.scm
+guile/3.0/share/guile/site/3.0/haunt/reader.scm
+guile/3.0/share/guile/site/3.0/haunt/reader/texinfo.scm
+guile/3.0/share/guile/site/3.0/haunt/serve/mime-types.scm
+guile/3.0/share/guile/site/3.0/haunt/serve/web-server.scm
+guile/3.0/share/guile/site/3.0/haunt/site.scm
+guile/3.0/share/guile/site/3.0/haunt/ui.scm
+guile/3.0/share/guile/site/3.0/haunt/ui/build.scm
+guile/3.0/share/guile/site/3.0/haunt/ui/serve.scm
+guile/3.0/share/guile/site/3.0/haunt/utils.scm
+guile/3.0/share/haunt/example/haunt.scm
+guile/3.0/share/haunt/example/images/guile-banner.small.png
+guile/3.0/share/haunt/example/posts/bar.html
+guile/3.0/share/haunt/example/posts/foo.sxml
diff -r 6b374dc0e2b3 -r b736f9bb7fa5 www/guile-haunt/distinfo
--- a/www/guile-haunt/distinfo  Mon Mar 14 10:24:40 2022 +0000
+++ b/www/guile-haunt/distinfo  Mon Mar 14 10:36:00 2022 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/12/17 14:52:12 nikita Exp $
+$NetBSD: distinfo,v 1.5 2022/03/14 10:36:00 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
-SHA1 (patch-haunt_reader.scm) = d4063e3e2f9c1ae781286ed6b9ff4338e47d53c9
-SHA1 (patch-haunt_reader_skribe.scm) = 60414d652e5ee9e796b88db34e80bd26bc4b787a
-SHA1 (patch-haunt_ui.scm) = 58129fcc3bc711d164f8fd56ce7ffd869e689a7f
diff -r 6b374dc0e2b3 -r b736f9bb7fa5 www/guile-haunt/patches/patch-haunt_reader.scm
--- a/www/guile-haunt/patches/patch-haunt_reader.scm    Mon Mar 14 10:24:40 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-haunt_reader.scm,v 1.1 2021/12/17 14:52:12 nikita Exp $
-
-Patch recommendation for version 0.2.5, next release will be backwards
-compatible again, by David Thompson (the developer of the software):
-"Haunt 0.2.5 only works on Guile 3. Guile 3 generated some new
-warnings and I fixed them, but it broke Guile 2 builds. You can patch
-out the #:declarative? lines in haunt/ui.scm, haunt/reader/skribe.scm,
-and haunt/reader.scm for now"
-
---- haunt/reader.scm.old       2021-12-17 15:21:11.706200803 +0100
-+++ haunt/reader.scm   2021-12-17 15:22:21.806275062 +0100
-@@ -23,7 +23,7 @@
- ;;; Code:
- 
- (define-module (haunt reader)
--  #:declarative? #f
-+  ;;#:declarative? #f
-   #:use-module (srfi srfi-1)
-   #:use-module (srfi srfi-9)
-   #:use-module (srfi srfi-11)
diff -r 6b374dc0e2b3 -r b736f9bb7fa5 www/guile-haunt/patches/patch-haunt_reader_skribe.scm
--- a/www/guile-haunt/patches/patch-haunt_reader_skribe.scm     Mon Mar 14 10:24:40 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-haunt_reader_skribe.scm,v 1.1 2021/12/17 14:52:12 nikita Exp $
-
-Patch recommendation for version 0.2.5, next release will be backwards
-compatible again, by David Thompson (the developer of the software):
-"Haunt 0.2.5 only works on Guile 3. Guile 3 generated some new
-warnings and I fixed them, but it broke Guile 2 builds. You can patch
-out the #:declarative? lines in haunt/ui.scm, haunt/reader/skribe.scm,
-and haunt/reader.scm for now"
-
---- haunt/reader/skribe.scm.old        2021-12-17 15:21:01.200114859 +0100
-+++ haunt/reader/skribe.scm    2021-12-17 15:21:56.121640403 +0100
-@@ -23,7 +23,7 @@
- ;;; Code:
- 
- (define-module (haunt reader skribe)
--  #:declarative? #f
-+  ;;#:declarative? #f
-   #:use-module (haunt reader)
-   #:use-module (haunt skribe)
-   #:use-module (haunt skribe utils)
diff -r 6b374dc0e2b3 -r b736f9bb7fa5 www/guile-haunt/patches/patch-haunt_ui.scm
--- a/www/guile-haunt/patches/patch-haunt_ui.scm        Mon Mar 14 10:24:40 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-haunt_ui.scm,v 1.1 2021/12/17 14:52:12 nikita Exp $
-
-Patch recommendation for version 0.2.5, next release will be backwards
-compatible again, by David Thompson (the developer of the software):
-"Haunt 0.2.5 only works on Guile 3. Guile 3 generated some new
-warnings and I fixed them, but it broke Guile 2 builds. You can patch
-out the #:declarative? lines in haunt/ui.scm, haunt/reader/skribe.scm,
-and haunt/reader.scm for now"
-
---- haunt/ui.scm.old   2021-12-17 15:20:48.001274203 +0100
-+++ haunt/ui.scm       2021-12-17 15:21:41.448705517 +0100
-@@ -23,7 +23,7 @@
- ;;; Code:
- 
- (define-module (haunt ui)
--  #:declarative? #f
-+  ;;#:declarative? #f
-   #:use-module (ice-9 format)
-   #:use-module (ice-9 ftw)
-   #:use-module (ice-9 match)



Home | Main Index | Thread Index | Old Index