CVS commit: pkgsrc/net/erlang-idna

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Jun  3 12:34:29 UTC 2021

Modified Files:
        pkgsrc/net/erlang-idna: Makefile PLIST

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


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/erlang-idna/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/erlang-idna/PLIST

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

Modified files:

Index: pkgsrc/net/erlang-idna/Makefile
diff -u pkgsrc/net/erlang-idna/Makefile:1.3 pkgsrc/net/erlang-idna/Makefile:1.4
--- pkgsrc/net/erlang-idna/Makefile:1.3 Wed Apr  7 13:34:41 2021
+++ pkgsrc/net/erlang-idna/Makefile     Thu Jun  3 12:34:28 2021
@@ -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 @@ do-build:
 
 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"

Index: pkgsrc/net/erlang-idna/PLIST
diff -u pkgsrc/net/erlang-idna/PLIST:1.1 pkgsrc/net/erlang-idna/PLIST:1.2
--- pkgsrc/net/erlang-idna/PLIST:1.1    Fri Jan 15 23:20:36 2021
+++ pkgsrc/net/erlang-idna/PLIST        Thu Jun  3 12:34:28 2021
@@ -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/i
 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