CVS commit: pkgsrc/textproc/guile-syntax-highlight

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

Module Name:    pkgsrc
Committed By:   nikita
Date:           Mon Mar 14 15:29:16 UTC 2022

Modified Files:
        pkgsrc/textproc/guile-syntax-highlight: Makefile PLIST
Added Files:
        pkgsrc/textproc/guile-syntax-highlight/patches: patch-configure

Log Message:
guile-syntax-highligh: build with guile30


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/guile-syntax-highlight/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/guile-syntax-highlight/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/guile-syntax-highlight/patches/patch-configure

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

Modified files:

Index: pkgsrc/textproc/guile-syntax-highlight/Makefile
diff -u pkgsrc/textproc/guile-syntax-highlight/Makefile:1.2 pkgsrc/textproc/guile-syntax-highlight/Makefile:1.3
--- pkgsrc/textproc/guile-syntax-highlight/Makefile:1.2 Tue Apr 28 11:46:30 2020
+++ pkgsrc/textproc/guile-syntax-highlight/Makefile     Mon Mar 14 15:29:16 2022
@@ -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 @@ LICENSE=      gnu-lgpl-v3
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            pkg-config
 
-.include "../../lang/guile22/module.mk"
+.include "../../lang/guile30/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/guile-syntax-highlight/PLIST
diff -u pkgsrc/textproc/guile-syntax-highlight/PLIST:1.1 pkgsrc/textproc/guile-syntax-highlight/PLIST:1.2
--- pkgsrc/textproc/guile-syntax-highlight/PLIST:1.1    Wed Nov 13 13:19:39 2019
+++ pkgsrc/textproc/guile-syntax-highlight/PLIST        Mon Mar 14 15:29:16 2022
@@ -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

Added files:

Index: pkgsrc/textproc/guile-syntax-highlight/patches/patch-configure
diff -u /dev/null pkgsrc/textproc/guile-syntax-highlight/patches/patch-configure:1.1
--- /dev/null   Mon Mar 14 15:29:16 2022
+++ pkgsrc/textproc/guile-syntax-highlight/patches/patch-configure      Mon Mar 14 15:29:16 2022
@@ -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