Sun Apr 10 07:34:39 2016 UTC ()
remove unnecessary X11 dependency by specifying --with-x=no
this is an improved fix for PR 50582


(dbj)
diff -r1.43 -r1.44 pkgsrc/print/luatex/Makefile
cvs diff -r1.43 -r1.44 pkgsrc/print/luatex/Makefile (expand / switch to unified diff)

--- pkgsrc/print/luatex/Makefile 2016/01/27 10:31:31 1.43
+++ pkgsrc/print/luatex/Makefile 2016/04/10 07:34:39 1.44
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.43 2016/01/27 10:31:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2016/04/10 07:34:39 dbj Exp $
2 2
3DISTNAME= texlive-20150521-source 3DISTNAME= texlive-20150521-source
4PKGNAME= luatex-0.80.0 4PKGNAME= luatex-0.80.0
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/ 7MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= minskim@NetBSD.org 10MAINTAINER= minskim@NetBSD.org
11HOMEPAGE= http://www.luatex.org/ 11HOMEPAGE= http://www.luatex.org/
12COMMENT= Extended version of pdfTeX using Lua 12COMMENT= Extended version of pdfTeX using Lua
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ 15EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \
16 ${DISTNAME}/libs/lua52 \ 16 ${DISTNAME}/libs/lua52 \
17 ${DISTNAME}/texk/web2c 17 ${DISTNAME}/texk/web2c
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22USE_TOOLS+= gmake lex perl pkg-config yacc 22USE_TOOLS+= gmake lex perl pkg-config yacc
23CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \ 23CONFIGURE_ARGS+= --disable-aleph --disable-etex --disable-pdftex \
24 --enable-luatex --disable-mf --disable-mf-nowin \ 24 --enable-luatex --disable-mf --disable-mf-nowin \
 25 --with-x=no \
25 --disable-luajittex \ 26 --disable-luajittex \
26 --disable-mp --disable-pmp --disable-upmp \ 27 --disable-mp --disable-pmp --disable-upmp \
27 --disable-ptex --disable-eptex --disable-uptex --disable-euptex \ 28 --disable-ptex --disable-eptex --disable-uptex --disable-euptex \
28 --disable-web-progs \ 29 --disable-web-progs \
29 --enable-web2c --disable-xetex 30 --enable-web2c --disable-xetex
30CONFIGURE_ARGS+= --with-system-poppler 31CONFIGURE_ARGS+= --with-system-poppler
31CONFIGURE_ARGS+= --with-system-xpdf 32CONFIGURE_ARGS+= --with-system-xpdf
32CONFIGURE_ARGS+= \ 33CONFIGURE_ARGS+= \
33 --with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \ 34 --with-fontconfig-includes=${BUILDLINK_PREFIX.fontconfig}/include \
34 --with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib 35 --with-fontconfig-libdir=${BUILDLINK_PREFIX.fontconfig}/lib
35CONFIGURE_ARGS+= --with-system-kpathsea 36CONFIGURE_ARGS+= --with-system-kpathsea
36CONFIGURE_ARGS+= --with-system-zlib \ 37CONFIGURE_ARGS+= --with-system-zlib \
37 --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \ 38 --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
@@ -59,25 +60,23 @@ SUBST_FILES.prefix= libs/lua52/lua-5.2.4 @@ -59,25 +60,23 @@ SUBST_FILES.prefix= libs/lua52/lua-5.2.4
59SUBST_VARS.prefix= PREFIX 60SUBST_VARS.prefix= PREFIX
60 61
61CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE_EXTENDED=0 62CFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE_EXTENDED=0
62 63
63.include "../../archivers/zziplib/buildlink3.mk" 64.include "../../archivers/zziplib/buildlink3.mk"
64.include "../../devel/zlib/buildlink3.mk" 65.include "../../devel/zlib/buildlink3.mk"
65.include "../../graphics/cairo/buildlink3.mk" 66.include "../../graphics/cairo/buildlink3.mk"
66.include "../../graphics/png/buildlink3.mk" 67.include "../../graphics/png/buildlink3.mk"
67.include "../../math/mpfr/buildlink3.mk" 68.include "../../math/mpfr/buildlink3.mk"
68BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1 69BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.2.1
69.include "../../print/kpathsea/buildlink3.mk" 70.include "../../print/kpathsea/buildlink3.mk"
70.include "../../print/poppler/buildlink3.mk" 71.include "../../print/poppler/buildlink3.mk"
71.include "../../print/poppler-includes/buildlink3.mk" 72.include "../../print/poppler-includes/buildlink3.mk"
72BUILDLINK_DEPMETHOD.libX11?= build 
73.include "../../x11/libX11/buildlink3.mk"  
74.include "../../x11/pixman/buildlink3.mk" 73.include "../../x11/pixman/buildlink3.mk"
75 74
76do-install: 75do-install:
77 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/lua52/libtexlua52.la ${DESTDIR}${PREFIX}/lib 76 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libs/lua52/libtexlua52.la ${DESTDIR}${PREFIX}/lib
78 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin 77 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/texk/web2c/luatex ${DESTDIR}${PREFIX}/bin
79.for f in texlua texluac 78.for f in texlua texluac
80 ${LN} -s luatex ${DESTDIR}${PREFIX}/bin/${f} 79 ${LN} -s luatex ${DESTDIR}${PREFIX}/bin/${f}
81.endfor 80.endfor
82 81
83.include "../../mk/bsd.pkg.mk" 82.include "../../mk/bsd.pkg.mk"