Sun Dec 30 15:55:56 2018 UTC ()
lyx: temporarily use the built-in boost

because the pkgsrc version has removed the deprecated boost/signal.hpp.
To be reverted when upstream LyX fixes this.


(rhialto)
diff -r1.71 -r1.72 pkgsrc/editors/lyx/Makefile
cvs diff -r1.71 -r1.72 pkgsrc/editors/lyx/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/lyx/Makefile 2018/12/13 19:51:50 1.71
+++ pkgsrc/editors/lyx/Makefile 2018/12/30 15:55:56 1.72
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.71 2018/12/13 19:51:50 adam Exp $ 1# $NetBSD: Makefile,v 1.72 2018/12/30 15:55:56 rhialto Exp $
2 2
3DISTNAME= lyx-2.2.2 3DISTNAME= lyx-2.2.2
4PKGREVISION= 9 4PKGREVISION= 10
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/ 6MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/
7MASTER_SITES+= ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.2.x/ 7MASTER_SITES+= ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.2.x/
8MASTER_SITES+= ftp://ftp.lip6.fr/pub/lyx/stable/2.2.x/ 8MASTER_SITES+= ftp://ftp.lip6.fr/pub/lyx/stable/2.2.x/
9MASTER_SITES+= ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.2.x/ 9MASTER_SITES+= ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.2.x/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= reed@reedmedia.net 12MAINTAINER= reed@reedmedia.net
13HOMEPAGE= http://www.lyx.org/ 13HOMEPAGE= http://www.lyx.org/
14COMMENT= Document processor and graphical frontend for LaTeX 14COMMENT= Document processor and graphical frontend for LaTeX
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17CONFLICTS+= lyx-xforms-[0-9]* lyx-qt-[0-9]* 17CONFLICTS+= lyx-xforms-[0-9]* lyx-qt-[0-9]*
@@ -59,27 +59,28 @@ DEPENDS+= tex-xypic-[0-9]*:../../graphi @@ -59,27 +59,28 @@ DEPENDS+= tex-xypic-[0-9]*:../../graphi
59UNLIMIT_RESOURCES+= datasize 59UNLIMIT_RESOURCES+= datasize
60 60
61USE_LANGUAGES= c c++ 61USE_LANGUAGES= c c++
62GNU_CONFIGURE= YES 62GNU_CONFIGURE= YES
63USE_TOOLS+= gmake perl:run pkg-config xgettext 63USE_TOOLS+= gmake perl:run pkg-config xgettext
64USE_LIBTOOL= YES 64USE_LIBTOOL= YES
65USE_PKGLOCALEDIR= YES 65USE_PKGLOCALEDIR= YES
66PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # not yet ported as of 1.6.10 66PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # not yet ported as of 1.6.10
67 67
68CXXFLAGS.Linux+= -fpermissive 68CXXFLAGS.Linux+= -fpermissive
69LDFLAGS.SunOS+= -liconv 69LDFLAGS.SunOS+= -liconv
70 70
71CONFIGURE_ARGS+= --without-included-mythes 71CONFIGURE_ARGS+= --without-included-mythes
72CONFIGURE_ARGS+= --without-included-boost 72# XXX Uncomment this after updating LyX to latest:
 73#CONFIGURE_ARGS+= --without-included-boost
73 74
74CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.qt4-libs} \ 75CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.qt4-libs} \
75 --with-qt4-dir=${QTDIR:Q} \ 76 --with-qt4-dir=${QTDIR:Q} \
76 --with-qt4-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include \ 77 --with-qt4-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include \
77 --with-qt4-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib 78 --with-qt4-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib
78 79
79.include "../../mk/bsd.prefs.mk" 80.include "../../mk/bsd.prefs.mk"
80 81
81PLIST_VARS+= x11 82PLIST_VARS+= x11
82 83
83.if ${OPSYS} == "Darwin" 84.if ${OPSYS} == "Darwin"
84GNU_CONFIGURE_PREFIX= ${PREFIX}/Applications/LyX.app 85GNU_CONFIGURE_PREFIX= ${PREFIX}/Applications/LyX.app
85PLIST_SUBST+= BIN_DIR=Applications/LyX.app/Contents/MacOS \ 86PLIST_SUBST+= BIN_DIR=Applications/LyX.app/Contents/MacOS \
@@ -174,19 +175,19 @@ SUBST_FILES.python+= src/graphics/Graphi @@ -174,19 +175,19 @@ SUBST_FILES.python+= src/graphics/Graphi
174SUBST_SED.python+= -e "s,\#!/usr/bin/env python,\#!${PYTHONBIN}," 175SUBST_SED.python+= -e "s,\#!/usr/bin/env python,\#!${PYTHONBIN},"
175SUBST_FILES.python+= lib/scripts/lyxpak.py 176SUBST_FILES.python+= lib/scripts/lyxpak.py
176SUBST_SED.python+= -e "s, = 'python, = '${PYTHONBIN}," 177SUBST_SED.python+= -e "s, = 'python, = '${PYTHONBIN},"
177SUBST_FILES.python+= src/support/os.cpp 178SUBST_FILES.python+= src/support/os.cpp
178SUBST_SED.python+= -e 's,command("python -tt,command("${PYTHONBIN} -tt,' 179SUBST_SED.python+= -e 's,command("python -tt,command("${PYTHONBIN} -tt,'
179 180
180.include "../../converters/libiconv/buildlink3.mk" 181.include "../../converters/libiconv/buildlink3.mk"
181.include "../../devel/gettext-lib/buildlink3.mk" 182.include "../../devel/gettext-lib/buildlink3.mk"
182.include "../../lang/python/application.mk" 183.include "../../lang/python/application.mk"
183.include "../../textproc/aspell/buildlink3.mk" 184.include "../../textproc/aspell/buildlink3.mk"
184.include "../../x11/qt4-libs/buildlink3.mk" 185.include "../../x11/qt4-libs/buildlink3.mk"
185.include "../../x11/qt4-tools/buildlink3.mk" 186.include "../../x11/qt4-tools/buildlink3.mk"
186.include "../../textproc/mythes/buildlink3.mk" 187.include "../../textproc/mythes/buildlink3.mk"
187.include "../../devel/boost-libs/buildlink3.mk" 188#.include "../../devel/boost-libs/buildlink3.mk"
188 189
189.include "../../sysutils/desktop-file-utils/desktopdb.mk" 190.include "../../sysutils/desktop-file-utils/desktopdb.mk"
190.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 191.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
191.include "../../mk/pthread.buildlink3.mk" 192.include "../../mk/pthread.buildlink3.mk"
192.include "../../mk/bsd.pkg.mk" 193.include "../../mk/bsd.pkg.mk"