guile22: further packaging fixes

My earlier try at fixing Linux only worked with particular distros. To
get around this, just install a stub charset.alias file universally on
Linux. This is the simplest thing to do for now. While here, this is
also breaking on recent Darwin releases because the build scripting
expects GNU sed.

3 files changed, 42 insertions, 5 deletions

diff --git a/lang/guile22/Makefile b/lang/guile22/Makefile
index 1ffd515ded1..3629cb0aa65 100644
--- a/lang/guile22/Makefile
+++ b/lang/guile22/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2019/09/03 13:20:06 gutteridge Exp $
+# $NetBSD: Makefile,v 1.13 2019/09/10 03:47:27 gutteridge Exp $
 
-PKGREVISION=	1
 DISTNAME=	guile-2.2.6
 PKGNAME=	${DISTNAME:S/guile/guile22/}
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.gnu.org/gnu/guile/
 
@@ -39,6 +39,7 @@ CONFIGURE_ARGS+=		--mandir=${PREFIX}/${PKGMANDIR}
 INFO_FILES=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
+USE_TOOLS.Darwin+=	gsed
 
 PKGCONFIG_OVERRIDE+=	meta/guile-2.2.pc.in
 # known broken: test-loose-ends on NetBSD/current
@@ -64,9 +65,9 @@ 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
+# If not Darwin, an extra charset.alias file is installed
 PLIST_VARS+=	charset
-.if (${OPSYS} != "Linux" || !defined(GLIBC_VERSION)) && ${OPSYS} != "Darwin"
+.if ${OPSYS} != "Darwin"
 PLIST.charset=	yes
 .endif
 
diff --git a/lang/guile22/distinfo b/lang/guile22/distinfo
index 008a9f79dc8..7505cfdc2dd 100644
--- a/lang/guile22/distinfo
+++ b/lang/guile22/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2019/07/20 21:01:19 wiz Exp $
+$NetBSD: distinfo,v 1.8 2019/09/10 03:47:27 gutteridge Exp $
 
 SHA1 (guile-2.2.6.tar.gz) = 3e77ee0e5af2a9926fb04f43838e17c9323222ae
 RMD160 (guile-2.2.6.tar.gz) = 2f322d124a9c8eecd00f6b6288771c648639e3ed
 SHA512 (guile-2.2.6.tar.gz) = 6a9264c2e10def5e69a0e755fb28a5f09b98bc202660d742b0ee144d4f486b049dcbce8bcece79c3af9421d43df6eca36adf82798520f75b09303f5e8c2092af
 Size (guile-2.2.6.tar.gz) = 18132818 bytes
+SHA1 (patch-lib_Makefile.in) = ae3428997a653d89cef9bd51f52b57b64431b753
 SHA1 (patch-libguile_loader.c) = 32b012d095c343995f93d0c8160411c4b0cfbee1
diff --git a/lang/guile22/patches/patch-lib_Makefile.in b/lang/guile22/patches/patch-lib_Makefile.in
new file mode 100644
index 00000000000..b61d025d0f5
--- /dev/null
+++ b/lang/guile22/patches/patch-lib_Makefile.in
@@ -0,0 +1,35 @@
+$NetBSD: patch-lib_Makefile.in,v 1.1 2019/09/10 03:47:28 gutteridge Exp $
+
+Install a (stub) charset.alias file unconditionally on Linux, to work
+around mismatches between pkgsrc's means of identifying glibc vs. this
+package's tools. This is the simplest fix for PLIST issues, for now...
+
+--- lib/Makefile.in.orig	2019-06-30 20:06:43.000000000 +0000
++++ lib/Makefile.in
+@@ -2969,18 +2969,14 @@ langinfo.h: langinfo.in.h $(top_builddir
+ all-local: charset.alias ref-add.sed ref-del.sed
+ install-exec-local: install-exec-localcharset
+ install-exec-localcharset: all-local
+-	if test $(GLIBC21) = no; then \
+-	  case '$(host_os)' in \
+-	    darwin[56]*) \
+-	      need_charset_alias=true ;; \
+-	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+-	      need_charset_alias=false ;; \
+-	    *) \
+-	      need_charset_alias=true ;; \
+-	  esac ; \
+-	else \
+-	  need_charset_alias=false ; \
+-	fi ; \
++	case '$(host_os)' in \
++	  darwin[56]*) \
++	    need_charset_alias=true ;; \
++	  darwin* | cygwin* | mingw* | pw32* | cegcc*) \
++	    need_charset_alias=false ;; \
++	  *) \
++	    need_charset_alias=true ;; \
++	esac ; \
+ 	if $$need_charset_alias; then \
+ 	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+ 	fi ; \