[pkgsrc/trunk]: pkgsrc/lang/guile22 guile22: build fix for most Linux distrib...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83c038dd7b7b
branches:  trunk
changeset: 339003:83c038dd7b7b
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Tue Sep 03 13:20:06 2019 +0000

description:
guile22: build fix for most Linux distributions and Darwin

The file charset.alias is not defined as part of the installation
target if this is being built on Linux+glibc or Darwin, handle
accordingly.

diffstat:

 lang/guile22/Makefile |  11 ++++++++++-
 lang/guile22/PLIST    |   4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r aa268010b181 -r 83c038dd7b7b lang/guile22/Makefile
--- a/lang/guile22/Makefile     Tue Sep 03 13:19:12 2019 +0000
+++ b/lang/guile22/Makefile     Tue Sep 03 13:20:06 2019 +0000
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2019/07/20 21:01:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/09/03 13:20:06 gutteridge Exp $
 
+PKGREVISION=   1
 DISTNAME=      guile-2.2.6
 PKGNAME=       ${DISTNAME:S/guile/guile22/}
 CATEGORIES=    lang
@@ -61,6 +62,14 @@
 PLIST_SUBST+=          GUILE_LIBNAME=${GUILE_LIBNAME}
 PRINT_PLIST_AWK+=      {gsub(/${GUILE_LIBNAME}/, "$${GUILE_LIBNAME}");}
 
+.include "../../mk/bsd.prefs.mk"
+
+# If not Linux+glibc or Darwin, an extra charset.alias file is installed
+PLIST_VARS+=   charset
+.if (${OPSYS} != "Linux" || !defined(GLIBC_VERSION)) && ${OPSYS} != "Darwin"
+PLIST.charset= yes
+.endif
+
 # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24002
 post-configure:
        ${ECHO} '#define FLEXIBLE_ARRAY_MEMBER /**/' >> ${WRKSRC}/config.h
diff -r aa268010b181 -r 83c038dd7b7b lang/guile22/PLIST
--- a/lang/guile22/PLIST        Tue Sep 03 13:19:12 2019 +0000
+++ b/lang/guile22/PLIST        Tue Sep 03 13:20:06 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2019/07/20 21:01:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/09/03 13:20:06 gutteridge Exp $
 guile/2.2/bin/guild
 guile/2.2/bin/guile
 guile/2.2/bin/guile-config
@@ -131,7 +131,7 @@
 guile/2.2/include/guile/2.2/readline.h
 guile/2.2/info/guile.info
 guile/2.2/info/r5rs.info
-guile/2.2/lib/charset.alias
+${PLIST.charset}guile/2.2/lib/charset.alias
 guile/2.2/lib/guile/2.2/ccache/ice-9/and-let-star.go
 guile/2.2/lib/guile/2.2/ccache/ice-9/arrays.go
 guile/2.2/lib/guile/2.2/ccache/ice-9/atomic.go