CVS commit: pkgsrc/lang/guile22

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

Module Name:    pkgsrc
Committed By:   nikita
Date:           Thu May 14 14:28:04 UTC 2020

Modified Files:
        pkgsrc/lang/guile22: Makefile distinfo
Added Files:
        pkgsrc/lang/guile22/patches: patch-modules_system_base_target.scm

Log Message:
lang/guile22: crude but working patch to make target-vendor check conforming


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/guile22/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/guile22/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/guile22/patches/patch-modules_system_base_target.scm

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

Modified files:

Index: pkgsrc/lang/guile22/Makefile
diff -u pkgsrc/lang/guile22/Makefile:1.20 pkgsrc/lang/guile22/Makefile:1.21
--- pkgsrc/lang/guile22/Makefile:1.20   Thu Mar 19 14:15:17 2020
+++ pkgsrc/lang/guile22/Makefile        Thu May 14 14:28:04 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2020/03/19 14:15:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2020/05/14 14:28:04 nikita Exp $
 
 DISTNAME=      guile-2.2.7
 PKGNAME=       ${DISTNAME:S/guile/guile22/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  ftp://ftp.gnu.org/gnu/guile/
 

Index: pkgsrc/lang/guile22/distinfo
diff -u pkgsrc/lang/guile22/distinfo:1.9 pkgsrc/lang/guile22/distinfo:1.10
--- pkgsrc/lang/guile22/distinfo:1.9    Tue Mar 10 22:43:27 2020
+++ pkgsrc/lang/guile22/distinfo        Thu May 14 14:28:04 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2020/03/10 22:43:27 wiz Exp $
+$NetBSD: distinfo,v 1.10 2020/05/14 14:28:04 nikita Exp $
 
 SHA1 (guile-2.2.7.tar.gz) = 4e4a5b1d1ccfaee887dc4ff63c088e9452715ab2
 RMD160 (guile-2.2.7.tar.gz) = 8c3dba807c4d236da81373e593d61007812ae236
@@ -6,3 +6,4 @@ SHA512 (guile-2.2.7.tar.gz) = ad11885ffe
 Size (guile-2.2.7.tar.gz) = 18129833 bytes
 SHA1 (patch-lib_Makefile.in) = ae3428997a653d89cef9bd51f52b57b64431b753
 SHA1 (patch-libguile_loader.c) = 32b012d095c343995f93d0c8160411c4b0cfbee1
+SHA1 (patch-modules_system_base_target.scm) = 84b204ac5c739e7a85aab325901ace84c7ae061a

Added files:

Index: pkgsrc/lang/guile22/patches/patch-modules_system_base_target.scm
diff -u /dev/null pkgsrc/lang/guile22/patches/patch-modules_system_base_target.scm:1.1
--- /dev/null   Thu May 14 14:28:05 2020
+++ pkgsrc/lang/guile22/patches/patch-modules_system_base_target.scm    Thu May 14 14:28:04 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-modules_system_base_target.scm,v 1.1 2020/05/14 14:28:04 nikita Exp $
+
+Crude patch to make target.scm conform to vendor field of gnu-tripplet
+being optional.
+
+Tested with GnuTLS Guile bindings, where the current implementation
+prevents building on any platform which isn't conforming to having a
+vendor part.
+
+--- module/system/base/target.scm.orig  2018-06-18 14:14:47.000000000 +0200
++++ module/system/base/target.scm       2020-05-14 15:51:14.664581289 +0200
+@@ -46,7 +46,7 @@
+           (let ((parts (string-split target #\-)))
+             (or (< (length parts) 3)
+                 (or-map string-null? parts))))
+-      (error "invalid target" target)))
++      (string-append "invalid target" target)))
+ 
+ (define (with-target target thunk)
+   (validate-target target)