pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/erlang-idna erlang-idna: Install unicode_compat_ut...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd554b04b24c
branches:  trunk
changeset: 453843:cd554b04b24c
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Jun 03 12:34:28 2021 +0000

description:
erlang-idna: Install unicode_compat_util (which was built)

idna uses unicode_compat_util, and downloads it from the net and
builds it.  This wasn't installed, and thus any attempt to use idna
failed at runtime, breaking s2s in ejabberd with earlier erlang-xmpp,
and probably breaking everything with current erlang-xmpp.

The idna library has removed this library, but doesn't have a release
yet.  So this problem should go away soonish.  For now, accept the ick
to (very likely) unbreak ejabberd.

(This commit does not increase the use of the net during the build; it
merely uses the build products that already happened.)

diffstat:

 net/erlang-idna/Makefile |  11 +++++++++--
 net/erlang-idna/PLIST    |   5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 5f7631e5a531 -r cd554b04b24c net/erlang-idna/Makefile
--- a/net/erlang-idna/Makefile  Thu Jun 03 11:08:51 2021 +0000
+++ b/net/erlang-idna/Makefile  Thu Jun 03 12:34:28 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2021/04/07 13:34:41 triaxx Exp $
+# $NetBSD: Makefile,v 1.4 2021/06/03 12:34:28 gdt Exp $
 
 DISTNAME=      idna-6.1.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=benoitc/}
 
@@ -21,6 +21,13 @@
 
 pre-install:
        ${MV} ${WRKSRC}/_build/default/lib/idna/ebin ${WRKSRC}
+       # Apparently this package depends on unicode_util_compat, but
+       # doesn't say that in the README.md, and includes (by
+       # downloading from the net at build time) a version.  Rather
+       # than fixing this, wait until the next release which will no
+       # longer have this problem.
+       # https://github.com/benoitc/erlang-idna/issues/39
+       ${MV} ${WRKSRC}/_build/default/lib/unicode_util_compat/ebin/* ${WRKSRC}/ebin
        ${RM} -rf ${WRKSRC}/_build
 
 .include "../../lang/erlang/module.mk"
diff -r 5f7631e5a531 -r cd554b04b24c net/erlang-idna/PLIST
--- a/net/erlang-idna/PLIST     Thu Jun 03 11:08:51 2021 +0000
+++ b/net/erlang-idna/PLIST     Thu Jun 03 12:34:28 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/01/15 23:20:36 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/06/03 12:34:28 gdt Exp $
 lib/erlang/lib/idna-${PKGVERSION}/ebin/idna.app
 lib/erlang/lib/idna-${PKGVERSION}/ebin/idna.beam
 lib/erlang/lib/idna-${PKGVERSION}/ebin/idna_bidi.beam
@@ -8,3 +8,6 @@
 lib/erlang/lib/idna-${PKGVERSION}/ebin/idna_table.beam
 lib/erlang/lib/idna-${PKGVERSION}/ebin/idna_ucs.beam
 lib/erlang/lib/idna-${PKGVERSION}/ebin/punycode.beam
+lib/erlang/lib/idna-${PKGVERSION}/ebin/string_compat.beam
+lib/erlang/lib/idna-${PKGVERSION}/ebin/unicode_util_compat.app
+lib/erlang/lib/idna-${PKGVERSION}/ebin/unicode_util_compat.beam



Home | Main Index | Thread Index | Old Index