Thu Mar 12 17:18:30 2020 UTC ()
luatex: fix unportable test(1) operator


(wiz)
diff -r1.92 -r1.93 pkgsrc/print/luatex/Makefile
diff -r1.35 -r1.36 pkgsrc/print/luatex/distinfo
diff -r0 -r1.5 pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in
cvs diff -r1.92 -r1.93 pkgsrc/print/luatex/Makefile (expand / switch to unified diff)

--- pkgsrc/print/luatex/Makefile 2020/03/04 22:07:27 1.92
+++ pkgsrc/print/luatex/Makefile 2020/03/12 17:18:30 1.93
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.92 2020/03/04 22:07:27 wiz Exp $ 1# $NetBSD: Makefile,v 1.93 2020/03/12 17:18:30 wiz Exp $
2 2
3PKGREVISION= 6 3PKGREVISION= 6
4.include "../../print/texlive/Makefile.common" 4.include "../../print/texlive/Makefile.common"
5 5
6PKGNAME= luatex-1.10.0 6PKGNAME= luatex-1.10.0
7CATEGORIES= print 7CATEGORIES= print
8 8
9HOMEPAGE= https://www.tug.org/web2c/ 9HOMEPAGE= https://www.tug.org/web2c/
10COMMENT= Extended version of pdfTeX using Lua 10COMMENT= Extended version of pdfTeX using Lua
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13EXTRACT_ELEMENTS+= ${DISTNAME}/libs/lua53 13EXTRACT_ELEMENTS+= ${DISTNAME}/libs/lua53
14EXTRACT_ELEMENTS+= ${DISTNAME}/libs/luajit 14EXTRACT_ELEMENTS+= ${DISTNAME}/libs/luajit
@@ -55,26 +55,29 @@ CONFIGURE_ARGS+= --with-gmp-includes=${B @@ -55,26 +55,29 @@ CONFIGURE_ARGS+= --with-gmp-includes=${B
55CONFIGURE_ARGS+= --with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib 55CONFIGURE_ARGS+= --with-gmp-libdir=${BUILDLINK_PREFIX.gmp}/lib
56CONFIGURE_ARGS+= --without-x 56CONFIGURE_ARGS+= --without-x
57 57
58CONFIGURE_DIRS= libs/lua53 58CONFIGURE_DIRS= libs/lua53
59CONFIGURE_DIRS+= texk/web2c 59CONFIGURE_DIRS+= texk/web2c
60 60
61INSTALLATION_DIRS+= bin lib 61INSTALLATION_DIRS+= bin lib
62 62
63SUBST_CLASSES+= prefix 63SUBST_CLASSES+= prefix
64SUBST_STAGE.prefix= post-configure 64SUBST_STAGE.prefix= post-configure
65SUBST_FILES.prefix= libs/lua53/lua53-src/src/luaconf.h 65SUBST_FILES.prefix= libs/lua53/lua53-src/src/luaconf.h
66SUBST_VARS.prefix= PREFIX 66SUBST_VARS.prefix= PREFIX
67 67
 68# patched in Makefile.in
 69CHECK_PORTABILITY_SKIP+= libs/luajit/Makefile.am
 70
68CPPFLAGS.SunOS+= -D_XOPEN_SOURCE_EXTENDED=0 71CPPFLAGS.SunOS+= -D_XOPEN_SOURCE_EXTENDED=0
69 72
70pre-configure: 73pre-configure:
71 # Ensure we generate our patched version 74 # Ensure we generate our patched version
72 ${RM} -f libs/luajit/lj_vm_asm.S 75 ${RM} -f libs/luajit/lj_vm_asm.S
73 76
74do-install: 77do-install:
75 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/lua53/libtexlua53.la ${DESTDIR}${PREFIX}/lib 78 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/lua53/libtexlua53.la ${DESTDIR}${PREFIX}/lib
76 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin 79 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin
77 ${LN} -f -s luatex ${DESTDIR}${PREFIX}/bin/texlua 80 ${LN} -f -s luatex ${DESTDIR}${PREFIX}/bin/texlua
78 ${LN} -f -s luatex ${DESTDIR}${PREFIX}/bin/texluac 81 ${LN} -f -s luatex ${DESTDIR}${PREFIX}/bin/texluac
79 82
80.include "../../archivers/zziplib/buildlink3.mk" 83.include "../../archivers/zziplib/buildlink3.mk"
cvs diff -r1.35 -r1.36 pkgsrc/print/luatex/distinfo (expand / switch to unified diff)

--- pkgsrc/print/luatex/distinfo 2019/05/09 09:47:35 1.35
+++ pkgsrc/print/luatex/distinfo 2020/03/12 17:18:30 1.36
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.35 2019/05/09 09:47:35 adam Exp $ 1$NetBSD: distinfo,v 1.36 2020/03/12 17:18:30 wiz Exp $
2 2
3SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675 3SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
4RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b 4RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
5SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e 5SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
6Size (texlive-20190410-source.tar.xz) = 53783408 bytes 6Size (texlive-20190410-source.tar.xz) = 53783408 bytes
7SHA1 (patch-libs_lua53_lua53-src_src_luaconf.h) = 824ee4ba2c324e1e01967b82a54621b6b6f3edd3 7SHA1 (patch-libs_lua53_lua53-src_src_luaconf.h) = 824ee4ba2c324e1e01967b82a54621b6b6f3edd3
8SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69 8SHA1 (patch-libs_luajit_LuaJIT-src_src_host_buildvm__asm.c) = 34fa742ed696f97df637c5086bf1faf3d718cb69
9SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f 9SHA1 (patch-libs_luajit_LuaJIT-src_src_vm__x86.dasc) = 491d33adbbaab8b2b81a65a8d7ba30aee775b75f
 10SHA1 (patch-libs_luajit_Makefile.in) = 810cac28910bf1887828ea29140759747e5a043e
File Added: pkgsrc/print/luatex/patches/Attic/patch-libs_luajit_Makefile.in
$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