[pkgsrc/trunk]: pkgsrc/textproc/guile-syntax-highlight guile-syntax-highligh:...

[nikita <nikita%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b12253d7b16a
branches:  trunk
changeset: 375483:b12253d7b16a
user:      nikita <nikita%pkgsrc.org@localhost>
date:      Mon Mar 14 15:29:16 2022 +0000

description:
guile-syntax-highligh: build with guile30

diffstat:

 textproc/guile-syntax-highlight/Makefile                |   5 +-
 textproc/guile-syntax-highlight/PLIST                   |  26 ++++++++--------
 textproc/guile-syntax-highlight/patches/patch-configure |  15 +++++++++
 3 files changed, 31 insertions(+), 15 deletions(-)

diffs (68 lines):

diff -r caf93503045d -r b12253d7b16a textproc/guile-syntax-highlight/Makefile
--- a/textproc/guile-syntax-highlight/Makefile  Mon Mar 14 15:22:00 2022 +0000
+++ b/textproc/guile-syntax-highlight/Makefile  Mon Mar 14 15:29:16 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/04/28 11:46:30 nikita Exp $
+# $NetBSD: Makefile,v 1.3 2022/03/14 15:29:16 nikita Exp $
 
 DISTNAME=      guile-syntax-highlight-0.1
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  https://files.dthompson.us/guile-syntax-highlight/
 
@@ -12,5 +13,5 @@
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            pkg-config
 
-.include "../../lang/guile22/module.mk"
+.include "../../lang/guile30/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r caf93503045d -r b12253d7b16a textproc/guile-syntax-highlight/PLIST
--- a/textproc/guile-syntax-highlight/PLIST     Mon Mar 14 15:22:00 2022 +0000
+++ b/textproc/guile-syntax-highlight/PLIST     Mon Mar 14 15:29:16 2022 +0000
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2019/11/13 13:19:39 ng0 Exp $
-guile/2.2/lib/guile/2.2/site-ccache/syntax-highlight.go
-guile/2.2/lib/guile/2.2/site-ccache/syntax-highlight/c.go
-guile/2.2/lib/guile/2.2/site-ccache/syntax-highlight/lexers.go
-guile/2.2/lib/guile/2.2/site-ccache/syntax-highlight/scheme.go
-guile/2.2/lib/guile/2.2/site-ccache/syntax-highlight/utils.go
-guile/2.2/lib/guile/2.2/site-ccache/syntax-highlight/xml.go
-guile/2.2/share/guile/site/2.2/syntax-highlight.scm
-guile/2.2/share/guile/site/2.2/syntax-highlight/c.scm
-guile/2.2/share/guile/site/2.2/syntax-highlight/lexers.scm
-guile/2.2/share/guile/site/2.2/syntax-highlight/scheme.scm
-guile/2.2/share/guile/site/2.2/syntax-highlight/utils.scm
-guile/2.2/share/guile/site/2.2/syntax-highlight/xml.scm
+@comment $NetBSD: PLIST,v 1.2 2022/03/14 15:29:16 nikita Exp $
+guile/3.0/lib/guile/3.0/site-ccache/syntax-highlight.go
+guile/3.0/lib/guile/3.0/site-ccache/syntax-highlight/c.go
+guile/3.0/lib/guile/3.0/site-ccache/syntax-highlight/lexers.go
+guile/3.0/lib/guile/3.0/site-ccache/syntax-highlight/scheme.go
+guile/3.0/lib/guile/3.0/site-ccache/syntax-highlight/utils.go
+guile/3.0/lib/guile/3.0/site-ccache/syntax-highlight/xml.go
+guile/3.0/share/guile/site/3.0/syntax-highlight.scm
+guile/3.0/share/guile/site/3.0/syntax-highlight/c.scm
+guile/3.0/share/guile/site/3.0/syntax-highlight/lexers.scm
+guile/3.0/share/guile/site/3.0/syntax-highlight/scheme.scm
+guile/3.0/share/guile/site/3.0/syntax-highlight/utils.scm
+guile/3.0/share/guile/site/3.0/syntax-highlight/xml.scm
diff -r caf93503045d -r b12253d7b16a textproc/guile-syntax-highlight/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/guile-syntax-highlight/patches/patch-configure   Mon Mar 14 15:29:16 2022 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2022/03/14 15:29:16 nikita Exp $
+
+Fix build with Guile 3.0.
+
+--- configure.orig     2022-03-14 16:25:35.441584594 +0100
++++ configure  2022-03-14 16:25:51.169293193 +0100
+@@ -2498,7 +2498,7 @@
+               PKG_CONFIG=""
+       fi
+ fi
+-  _guile_versions_to_search="2.2 2.0"
++  _guile_versions_to_search="3.0 2.2 2.0"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do