CVS commit: pkgsrc/lang/guile30

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu May 22 09:22:00 UTC 2025

Modified Files:
        pkgsrc/lang/guile30: Makefile PLIST buildlink3.mk

Log Message:
guile30: fix PLIST for Darwin; make pkglint happier by the way


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/guile30/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/guile30/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/guile30/buildlink3.mk

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

Modified files:

Index: pkgsrc/lang/guile30/Makefile
diff -u pkgsrc/lang/guile30/Makefile:1.12 pkgsrc/lang/guile30/Makefile:1.13
--- pkgsrc/lang/guile30/Makefile:1.12   Sun Mar 30 07:49:12 2025
+++ pkgsrc/lang/guile30/Makefile        Thu May 22 09:22:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2025/03/30 07:49:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2025/05/22 09:22:00 adam Exp $
 
 DISTNAME=      guile-3.0.10
 PKGNAME=       ${DISTNAME:S/guile/guile30/}
@@ -16,11 +16,10 @@ LICENSE=    gnu-lgpl-v3
 
 # Currently, all versions are namespaced.
 GUILE_SUBDIR=  guile/3.0
-#GUILE_SUBDIR= # empty
 
 # guile does not like the --build and --host triplets on NetBSD
 HAS_CONFIGURE=         yes
-CONFIGURE_ARGS+=       SHELL=${CONFIG_SHELL}
+CONFIGURE_ARGS+=       SHELL=${CONFIG_SHELL:Q}
 # Needed to work around broken configure check for accept4()
 LDFLAGS.SunOS+=                -lsocket -lnsl
 
@@ -67,21 +66,20 @@ SUBST_MESSAGE.tools=        Fixing path to pkg-
 
 OPSYSVARS+=            GUILE_LIBNAME
 GUILE_LIBNAME.Darwin=  a
-GUILE_LIBNAME.*=       so.1.4.1
-
+GUILE_LIBNAME.*=       so.1.7.0
 PLIST_SUBST+=          GUILE_LIBNAME=${GUILE_LIBNAME}
 PRINT_PLIST_AWK+=      {gsub(/${GUILE_LIBNAME}/, "$${GUILE_LIBNAME}");}
 
-.include "../../mk/pax.mk"
-.include "../../devel/gmp/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../textproc/libunistring/buildlink3.mk"
 # needs threaded boehm-gc
 BUILDLINK_API_DEPENDS.boehm-gc+=       boehm-gc>=8.0.4nb1
 .include "../../devel/boehm-gc/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.include "../../textproc/libunistring/buildlink3.mk"
+.include "../../mk/pax.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/guile30/PLIST
diff -u pkgsrc/lang/guile30/PLIST:1.4 pkgsrc/lang/guile30/PLIST:1.5
--- pkgsrc/lang/guile30/PLIST:1.4       Wed Jun 26 22:49:10 2024
+++ pkgsrc/lang/guile30/PLIST   Thu May 22 09:22:00 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2024/06/26 22:49:10 gdt Exp $
+@comment $NetBSD: PLIST,v 1.5 2025/05/22 09:22:00 adam Exp $
 guile/3.0/bin/guild
 guile/3.0/bin/guile
 guile/3.0/bin/guile-config
@@ -473,8 +473,8 @@ guile/3.0/lib/guile/3.0/ccache/web/serve
 guile/3.0/lib/guile/3.0/ccache/web/server/http.go
 guile/3.0/lib/guile/3.0/ccache/web/uri.go
 guile/3.0/lib/guile/3.0/extensions/guile-readline.la
+guile/3.0/lib/libguile-3.0.${GUILE_LIBNAME}-gdb.scm
 guile/3.0/lib/libguile-3.0.la
-guile/3.0/lib/libguile-3.0.so.1.7.0-gdb.scm
 guile/3.0/lib/pkgconfig/guile-3.0.pc
 guile/3.0/man/man1/guile.1
 guile/3.0/share/aclocal/guile.m4

Index: pkgsrc/lang/guile30/buildlink3.mk
diff -u pkgsrc/lang/guile30/buildlink3.mk:1.2 pkgsrc/lang/guile30/buildlink3.mk:1.3
--- pkgsrc/lang/guile30/buildlink3.mk:1.2       Wed Oct 26 10:31:04 2022
+++ pkgsrc/lang/guile30/buildlink3.mk   Thu May 22 09:22:00 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/10/26 10:31:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2025/05/22 09:22:00 adam Exp $
 
 BUILDLINK_TREE+=       guile30
 
@@ -6,15 +6,15 @@ BUILDLINK_TREE+=      guile30
 GUILE30_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.guile30+=        guile30>=3.0
-BUILDLINK_ABI_DEPENDS.guile30?=        guile30>=3.0.8nb1
+BUILDLINK_ABI_DEPENDS.guile30+=        guile30>=3.0.8nb1
 BUILDLINK_PKGSRCDIR.guile30?=  ../../lang/guile30
 
-BUILDLINK_PASSTHRU_DIRS=               ${PREFIX}/guile/3.0
+BUILDLINK_PASSTHRU_DIRS+=              ${PREFIX}/guile/3.0
 BUILDLINK_FILES.guile30+=              guile/3.0/bin/*
 BUILDLINK_FNAME_TRANSFORM.guile30+=    -e s,guile/3.0/bin,bin,
 BUILDLINK_FNAME_TRANSFORM.guile30+=    -e s,guile/3.0/lib/pkgconfig,lib/pkgconfig,
 
-GUILE30_SUBDIR=                                guile/3.0
+GUILE30_SUBDIR=                guile/3.0
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"