CVS commit: pkgsrc/lang/guile22

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Sep  3 13:20:06 UTC 2019

Modified Files:
        pkgsrc/lang/guile22: Makefile PLIST

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/guile22/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/guile22/PLIST

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.11 pkgsrc/lang/guile22/Makefile:1.12
--- pkgsrc/lang/guile22/Makefile:1.11   Sat Jul 20 21:01:19 2019
+++ pkgsrc/lang/guile22/Makefile        Tue Sep  3 13:20:06 2019
@@ -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 @@ GUILE_LIBNAME.*=     so.22.8.1
 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

Index: pkgsrc/lang/guile22/PLIST
diff -u pkgsrc/lang/guile22/PLIST:1.6 pkgsrc/lang/guile22/PLIST:1.7
--- pkgsrc/lang/guile22/PLIST:1.6       Sat Jul 20 21:01:19 2019
+++ pkgsrc/lang/guile22/PLIST   Tue Sep  3 13:20:06 2019
@@ -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/libguile/wea
 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