Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1584033510274850"
MIME-Version: 1.0
Date: Thu, 12 Mar 2020 17:18:30 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/print/luatex
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20200312171830.5C861FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1584033510274850
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Thu Mar 12 17:18:30 UTC 2020

Modified Files:
	pkgsrc/print/luatex: Makefile distinfo
Added Files:
	pkgsrc/print/luatex/patches: patch-libs_luajit_Makefile.in

Log Message:
luatex: fix unportable test(1) operator


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/print/luatex/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/print/luatex/distinfo
cvs rdiff -u -r0 -r1.5 \
    pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in

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


--_----------=_1584033510274850
Content-Disposition: inline
Content-Length: 2563
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/print/luatex/Makefile
diff -u pkgsrc/print/luatex/Makefile:1.92 pkgsrc/print/luatex/Makefile:1.93
--- pkgsrc/print/luatex/Makefile:1.92	Wed Mar  4 22:07:27 2020
+++ pkgsrc/print/luatex/Makefile	Thu Mar 12 17:18:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2020/03/04 22:07:27 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2020/03/12 17:18:30 wiz Exp $
 
 PKGREVISION= 6
 .include "../../print/texlive/Makefile.common"
@@ -65,6 +65,9 @@ SUBST_STAGE.prefix=	post-configure
 SUBST_FILES.prefix=	libs/lua53/lua53-src/src/luaconf.h
 SUBST_VARS.prefix=	PREFIX
 
+# patched in Makefile.in
+CHECK_PORTABILITY_SKIP+=	libs/luajit/Makefile.am
+
 CPPFLAGS.SunOS+=	-D_XOPEN_SOURCE_EXTENDED=0
 
 pre-configure:

Index: pkgsrc/print/luatex/distinfo
diff -u pkgsrc/print/luatex/distinfo:1.35 pkgsrc/print/luatex/distinfo:1.36
--- pkgsrc/print/luatex/distinfo:1.35	Thu May  9 09:47:35 2019
+++ pkgsrc/print/luatex/distinfo	Thu Mar 12 17:18:30 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2019/05/09 09:47:35 adam Exp $
+$NetBSD: distinfo,v 1.36 2020/03/12 17:18:30 wiz Exp $
 
 SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
 RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
@@ -7,3 +7,4 @@ Size (texlive-20190410-source.tar.xz) = 
 SHA1 (patch-libs_lua53_lua53-src_src_luaconf.h) = 824ee4ba2c324e1e01967b82a54621b6b6f3edd3
 SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69
 SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f
+SHA1 (patch-libs_luajit_Makefile.in) = 810cac28910bf1887828ea29140759747e5a043e

Added files:

Index: pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in
diff -u /dev/null pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in:1.5
--- /dev/null	Thu Mar 12 17:18:30 2020
+++ pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in	Thu Mar 12 17:18:30 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_luajit_Makefile.in,v 1.5 2020/03/12 17:18:30 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- libs/luajit/Makefile.in.orig	2018-05-14 18:07:32.000000000 +0000
++++ libs/luajit/Makefile.in
+@@ -2039,7 +2039,7 @@ lj_vm_obj.o lj_vm_asm.S: native/buildvm-
+ 
+ lj_vm_obj.lo: lj_vm_obj.o lib_base.lo
+ 	$(AM_V_GEN)sed 's/lib_base/lj_vm_obj/' lib_base.lo >$@ \
+-	  && . ./$@ && test x"$$pic_object" == xnone \
++	  && . ./$@ && test x"$$pic_object" = xnone \
+ 	  || cp lj_vm_obj.o .libs/lj_vm_obj.o
+ 
+ $(ljlib_sources) lj_opt_fold.c: config.force


--_----------=_1584033510274850--