CVS commit: pkgsrc/textproc/guile-commonmark

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

Module Name:    pkgsrc
Committed By:   nikita
Date:           Mon Mar 14 11:46:29 UTC 2022

Modified Files:
        pkgsrc/textproc/guile-commonmark: Makefile PLIST distinfo
Added Files:
        pkgsrc/textproc/guile-commonmark/patches: patch-configure

Log Message:
guile-commonmark: Build with guile30.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/guile-commonmark/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/guile-commonmark/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/guile-commonmark/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/guile-commonmark/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-commonmark/Makefile
diff -u pkgsrc/textproc/guile-commonmark/Makefile:1.2 pkgsrc/textproc/guile-commonmark/Makefile:1.3
--- pkgsrc/textproc/guile-commonmark/Makefile:1.2       Tue Apr 28 11:46:30 2020
+++ pkgsrc/textproc/guile-commonmark/Makefile   Mon Mar 14 11:46:28 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 11:46:28 nikita Exp $
 
 DISTNAME=              guile-commonmark-0.1.2
+PKGREVISION=           1
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=OrangeShark/}
 GITHUB_RELEASE=                v0.1.2
@@ -13,5 +14,5 @@ USE_TOOLS+=           pkg-config
 
 GNU_CONFIGURE=         yes
 
-.include "../../lang/guile22/module.mk"
+.include "../../lang/guile30/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/guile-commonmark/PLIST
diff -u pkgsrc/textproc/guile-commonmark/PLIST:1.1 pkgsrc/textproc/guile-commonmark/PLIST:1.2
--- pkgsrc/textproc/guile-commonmark/PLIST:1.1  Tue Nov 26 16:52:25 2019
+++ pkgsrc/textproc/guile-commonmark/PLIST      Mon Mar 14 11:46:28 2022
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2019/11/26 16:52:25 ng0 Exp $
-guile/2.2/lib/guile/2.2/site-ccache/commonmark.go
-guile/2.2/lib/guile/2.2/site-ccache/commonmark/blocks.go
-guile/2.2/lib/guile/2.2/site-ccache/commonmark/common.go
-guile/2.2/lib/guile/2.2/site-ccache/commonmark/entities.go
-guile/2.2/lib/guile/2.2/site-ccache/commonmark/inlines.go
-guile/2.2/lib/guile/2.2/site-ccache/commonmark/node.go
-guile/2.2/lib/guile/2.2/site-ccache/commonmark/sxml.go
-guile/2.2/lib/guile/2.2/site-ccache/commonmark/utils.go
-guile/2.2/share/guile/site/2.2/commonmark.scm
-guile/2.2/share/guile/site/2.2/commonmark/blocks.scm
-guile/2.2/share/guile/site/2.2/commonmark/common.scm
-guile/2.2/share/guile/site/2.2/commonmark/entities.scm
-guile/2.2/share/guile/site/2.2/commonmark/inlines.scm
-guile/2.2/share/guile/site/2.2/commonmark/node.scm
-guile/2.2/share/guile/site/2.2/commonmark/sxml.scm
-guile/2.2/share/guile/site/2.2/commonmark/utils.scm
+@comment $NetBSD: PLIST,v 1.2 2022/03/14 11:46:28 nikita Exp $
+guile/3.0/lib/guile/3.0/site-ccache/commonmark.go
+guile/3.0/lib/guile/3.0/site-ccache/commonmark/blocks.go
+guile/3.0/lib/guile/3.0/site-ccache/commonmark/common.go
+guile/3.0/lib/guile/3.0/site-ccache/commonmark/entities.go
+guile/3.0/lib/guile/3.0/site-ccache/commonmark/inlines.go
+guile/3.0/lib/guile/3.0/site-ccache/commonmark/node.go
+guile/3.0/lib/guile/3.0/site-ccache/commonmark/sxml.go
+guile/3.0/lib/guile/3.0/site-ccache/commonmark/utils.go
+guile/3.0/share/guile/site/3.0/commonmark.scm
+guile/3.0/share/guile/site/3.0/commonmark/blocks.scm
+guile/3.0/share/guile/site/3.0/commonmark/common.scm
+guile/3.0/share/guile/site/3.0/commonmark/entities.scm
+guile/3.0/share/guile/site/3.0/commonmark/inlines.scm
+guile/3.0/share/guile/site/3.0/commonmark/node.scm
+guile/3.0/share/guile/site/3.0/commonmark/sxml.scm
+guile/3.0/share/guile/site/3.0/commonmark/utils.scm

Index: pkgsrc/textproc/guile-commonmark/distinfo
diff -u pkgsrc/textproc/guile-commonmark/distinfo:1.3 pkgsrc/textproc/guile-commonmark/distinfo:1.4
--- pkgsrc/textproc/guile-commonmark/distinfo:1.3       Tue Oct 26 11:21:56 2021
+++ pkgsrc/textproc/guile-commonmark/distinfo   Mon Mar 14 11:46:28 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:21:56 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/03/14 11:46:28 nikita Exp $
 
 BLAKE2s (guile-commonmark-0.1.2.tar.gz) = 4915d2302739c512aae0a2d38fa2ea8bd2d5da018c57c6b5935614fb2b094876
 SHA512 (guile-commonmark-0.1.2.tar.gz) = a2ed34bb4bc5d7b33875beff7eb959c0119fa62950c8f9de2c5c59ef85301e47354af3d2b38990802389e6b9c94653b927d380c6918feaeb82099ad92a91bf07
 Size (guile-commonmark-0.1.2.tar.gz) = 243029 bytes
+SHA1 (patch-configure) = 03cb37912e6e159c35054f3d36cb0886e2aa8a4c

Added files:

Index: pkgsrc/textproc/guile-commonmark/patches/patch-configure
diff -u /dev/null pkgsrc/textproc/guile-commonmark/patches/patch-configure:1.1
--- /dev/null   Mon Mar 14 11:46:29 2022
+++ pkgsrc/textproc/guile-commonmark/patches/patch-configure    Mon Mar 14 11:46:29 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2022/03/14 11:46:29 nikita Exp $
+
+Fix Guile 3.0 detection.
+
+--- configure.orig     2022-03-14 12:42:00.824030369 +0100
++++ configure  2022-03-14 12:42:23.915545954 +0100
+@@ -2455,7 +2455,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