CVS commit: pkgsrc/print/luatex

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Tue Jul  5 01:17:23 UTC 2016

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

Log Message:
remove gratuitous use of sed -i (related to PR 51304)


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/print/luatex/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/luatex/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.

Modified files:

Index: pkgsrc/print/luatex/Makefile
diff -u pkgsrc/print/luatex/Makefile:1.48 pkgsrc/print/luatex/Makefile:1.49
--- pkgsrc/print/luatex/Makefile:1.48   Sun Jul  3 11:19:50 2016
+++ pkgsrc/print/luatex/Makefile        Tue Jul  5 01:17:23 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2016/07/03 11:19:50 markd Exp $
+# $NetBSD: Makefile,v 1.49 2016/07/05 01:17:23 dholland Exp $
 
 DISTNAME=      texlive-20160523-source
 PKGNAME=       luatex-0.95
@@ -20,7 +20,7 @@ EXTRACT_ELEMENTS=     ${DISTNAME}/build-aux 
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake gsed lex perl pkg-config yacc
+USE_TOOLS+=    gmake lex perl pkg-config yacc
 CONFIGURE_ARGS+=       --disable-aleph --disable-etex --disable-pdftex \
                        --enable-luatex --disable-mf --disable-mf-nowin \
                        --with-x=no \

Index: pkgsrc/print/luatex/distinfo
diff -u pkgsrc/print/luatex/distinfo:1.19 pkgsrc/print/luatex/distinfo:1.20
--- pkgsrc/print/luatex/distinfo:1.19   Sun Jul  3 11:19:50 2016
+++ pkgsrc/print/luatex/distinfo        Tue Jul  5 01:17:23 2016
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2016/07/03 11:19:50 markd Exp $
+$NetBSD: distinfo,v 1.20 2016/07/05 01:17:23 dholland Exp $
 
 SHA1 (texlive-20160523-source.tar.xz) = 8cdcc00492fc642db59a9a07f9ea080ff6765460
 RMD160 (texlive-20160523-source.tar.xz) = 4ffc4d92f8c6408c23a34815e2d4b0f4877d9c3f
 SHA512 (texlive-20160523-source.tar.xz) = 9fdd69d237238385240e918456f54791a38e57b573edf5df839c57e56a0009012b68b7b92298c3e137181325e2be84d7a84e9c7cf41ae9739bb3329d84194564
 Size (texlive-20160523-source.tar.xz) = 258176464 bytes
 SHA1 (patch-ac) = 1ee83833a03eace2eada892130ddb2198e829f3d
-SHA1 (patch-libs_luajit_Makefile.in) = 9d1120c3a27b5668c027b236cae7df3bf76585b5
+SHA1 (patch-libs_luajit_Makefile.in) = 2a125881a2fac96c06561274610854406df967a7

Index: pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in
diff -u pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in:1.1 pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in:1.2
--- pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in:1.1       Sun Jul  3 11:19:51 2016
+++ pkgsrc/print/luatex/patches/patch-libs_luajit_Makefile.in   Tue Jul  5 01:17:23 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-libs_luajit_Makefile.in,v 1.1 2016/07/03 11:19:51 markd Exp $
+$NetBSD: patch-libs_luajit_Makefile.in,v 1.2 2016/07/05 01:17:23 dholland Exp $
 
 Ensure that the luajit generated asm file is PIC for libtool use, particularly
 important when linking under SunOS... appending @PLT seems to workaround the
@@ -6,11 +6,12 @@ issue with generated PC relative calls.
 
 --- libs/luajit/Makefile.in.orig       2016-03-21 20:23:37.000000000 +0000
 +++ libs/luajit/Makefile.in
-@@ -1827,6 +1827,7 @@ lj_folddef.h: native/buildvm-stamp
+@@ -1827,6 +1827,8 @@ lj_folddef.h: native/buildvm-stamp
  
  lj_vm_obj.o lj_vm_asm.S: native/buildvm-stamp
        $(AM_V_GEN)native/buildvm -m $(LJVM_MODE) -o $@
-+      test lj_vm_asm.S && $(SED) -i.orig 's/\(call lj_.*\)$$/\1@PLT/' lj_vm_asm.S
++      mv -f lj_vm_asm.S lj_vm_asm.S.orig
++      $(SED) < lj_vm_asm.S.orig > lj_vm_asm.S -e 's/\(call lj_.*\)$$/\1@PLT/'
  
  lj_vm_obj.lo: lj_vm_obj.o lib_base.lo
        $(AM_V_GEN)sed 's/lib_base/lj_vm_obj/' lib_base.lo >$@ \