CVS commit: pkgsrc/print/web2c

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Mar 29 01:02:57 UTC 2020

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

Log Message:
Try to fix the root cause of the parallel build failures


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/print/web2c/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/print/web2c/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/web2c/patches/patch-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/web2c/Makefile
diff -u pkgsrc/print/web2c/Makefile:1.95 pkgsrc/print/web2c/Makefile:1.96
--- pkgsrc/print/web2c/Makefile:1.95    Tue Mar 24 20:42:23 2020
+++ pkgsrc/print/web2c/Makefile Sun Mar 29 01:02:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2020/03/24 20:42:23 joerg Exp $
+# $NetBSD: Makefile,v 1.96 2020/03/29 01:02:57 joerg Exp $
 
 PKGREVISION= 5
 .include "../../print/texlive/Makefile.common"
@@ -19,9 +19,6 @@ USE_TOOLS+=           gmake lex yacc
 GNU_CONFIGURE_STRICT=  no # texk/web2c/web2c doesn't know the options
 PKGCONFIG_OVERRIDE=    synctexdir/synctex.pc.in
 
-# broken dependencies
-BUILD_TARGET=  mplib.h all
-
 INFO_FILES=            yes
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/texk/web2c
 

Index: pkgsrc/print/web2c/distinfo
diff -u pkgsrc/print/web2c/distinfo:1.36 pkgsrc/print/web2c/distinfo:1.37
--- pkgsrc/print/web2c/distinfo:1.36    Thu Mar  5 06:21:42 2020
+++ pkgsrc/print/web2c/distinfo Sun Mar 29 01:02:57 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.36 2020/03/05 06:21:42 wiz Exp $
+$NetBSD: distinfo,v 1.37 2020/03/29 01:02:57 joerg Exp $
 
 SHA1 (texlive-20190410-source.tar.xz) = d700878d3e19b6ad1313791dd5cef4bf0acfd675
 RMD160 (texlive-20190410-source.tar.xz) = a0cbe56b19b1f3d064315c37f8b5a4b04f82678b
 SHA512 (texlive-20190410-source.tar.xz) = 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 Size (texlive-20190410-source.tar.xz) = 53783408 bytes
-SHA1 (patch-Makefile.in) = ec3cc8f935d7365c90aabcd68be431eb706d970e
+SHA1 (patch-Makefile.in) = e4446fc146b419ca5f2105d2a78c7789149b40ea
 SHA1 (patch-man_Makefile.in) = 8d0cbcd73f113135ea400c0491a4c0cbd0b07c73
 SHA1 (patch-pdftexdir_pdftex-common.h) = 0f82056b5431c0a4718ab8609967f2ec9aeca3a9
 SHA1 (patch-pdftexdir_pdftoepdf-poppler0.75.0.cc) = 58bcae1a76696178c3f7a2e4e050306e56bdc0f9

Index: pkgsrc/print/web2c/patches/patch-Makefile.in
diff -u pkgsrc/print/web2c/patches/patch-Makefile.in:1.2 pkgsrc/print/web2c/patches/patch-Makefile.in:1.3
--- pkgsrc/print/web2c/patches/patch-Makefile.in:1.2    Tue May 14 13:23:10 2019
+++ pkgsrc/print/web2c/patches/patch-Makefile.in        Sun Mar 29 01:02:57 2020
@@ -1,16 +1,13 @@
-$NetBSD: patch-Makefile.in,v 1.2 2019/05/14 13:23:10 adam Exp $
-
-Remove a race condition. $(nodist_libmplibbackends_a_SOURCES) should't
-be compiled before mplib.h is created.
+$NetBSD: patch-Makefile.in,v 1.3 2020/03/29 01:02:57 joerg Exp $
 
 --- Makefile.in.orig   2019-02-20 21:54:28.000000000 +0000
 +++ Makefile.in
-@@ -18394,7 +18394,7 @@ $(nodist_libmplibcore_a_SOURCES): $(mpma
- 
- $(libmplibcore_a_OBJECTS): $(nodist_libmplibcore_a_SOURCES) $(KPATHSEA_DEPEND)  
- $(libmplibextramath_a_OBJECTS): $(nodist_libmplibextramath_a_SOURCES) $(KPATHSEA_DEPEND)  $(MPFR_DEPEND)
--$(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
-+$(libmplibbackends_a_OBJECTS): $(nodist_libmplibbackends_a_SOURCES) mplib.h $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
- $(etex_OBJECTS): $(etex_prereq)
+@@ -2799,7 +2799,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
+ AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
+ AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
+ version = $(WEB2CVERSION)
+-SUBDIRS = doc lib man web2c . window omegafonts otps
++SUBDIRS = doc lib man web2c window omegafonts otps
+ proglib = lib/lib.a
  
- $(etex_c_h): etex-web2c
+ #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a