Thu Apr 14 12:03:47 2016 UTC ()
SunOS needs an explicit -liconv.


(jperkin)
diff -r1.51 -r1.52 pkgsrc/editors/lyx/Makefile
cvs diff -r1.51 -r1.52 pkgsrc/editors/lyx/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/lyx/Makefile 2016/03/27 19:52:32 1.51
+++ pkgsrc/editors/lyx/Makefile 2016/04/14 12:03:47 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.51 2016/03/27 19:52:32 joerg Exp $ 1# $NetBSD: Makefile,v 1.52 2016/04/14 12:03:47 jperkin Exp $
2 2
3DISTNAME= lyx-2.1.2.2 3DISTNAME= lyx-2.1.2.2
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= editors 5CATEGORIES= editors
6MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/ \ 6MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/ \
7 http://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.1.x/ \ 7 http://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.1.x/ \
8 ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.1.x/ \ 8 ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.1.x/ \
9 ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.1.x/ \ 9 ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.1.x/ \
10 ftp://ftp.lip6.fr/pub/lyx/stable/2.1.x/ \ 10 ftp://ftp.lip6.fr/pub/lyx/stable/2.1.x/ \
11 ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.1.x/ 11 ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.1.x/
12EXTRACT_SUFX= .tar.xz 12EXTRACT_SUFX= .tar.xz
13 13
14MAINTAINER= reed@reedmedia.net 14MAINTAINER= reed@reedmedia.net
@@ -58,26 +58,27 @@ DEPENDS+= tex-xargs-[0-9]*:../../print/ @@ -58,26 +58,27 @@ DEPENDS+= tex-xargs-[0-9]*:../../print/
58DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor 58DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor
59DEPENDS+= tex-xypic-[0-9]*:../../graphics/tex-xypic 59DEPENDS+= tex-xypic-[0-9]*:../../graphics/tex-xypic
60 60
61UNLIMIT_RESOURCES+= datasize 61UNLIMIT_RESOURCES+= datasize
62 62
63USE_LANGUAGES= c c++ 63USE_LANGUAGES= c c++
64GNU_CONFIGURE= YES 64GNU_CONFIGURE= YES
65USE_TOOLS+= gmake perl:run pkg-config 65USE_TOOLS+= gmake perl:run pkg-config
66USE_LIBTOOL= YES 66USE_LIBTOOL= YES
67USE_PKGLOCALEDIR= YES 67USE_PKGLOCALEDIR= YES
68PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 1.6.10 68PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 1.6.10
69 69
70CXXFLAGS.Linux+= -fpermissive 70CXXFLAGS.Linux+= -fpermissive
 71LDFLAGS.SunOS+= -liconv
71 72
72CONFIGURE_ARGS+= --without-included-mythes 73CONFIGURE_ARGS+= --without-included-mythes
73CONFIGURE_ARGS+= --without-included-boost 74CONFIGURE_ARGS+= --without-included-boost
74 75
75CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.qt4-libs} \ 76CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.qt4-libs} \
76 --with-qt4-dir=${QTDIR:Q} \ 77 --with-qt4-dir=${QTDIR:Q} \
77 --with-qt4-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include \ 78 --with-qt4-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include \
78 --with-qt4-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib 79 --with-qt4-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib
79 80
80.include "../../mk/bsd.prefs.mk" 81.include "../../mk/bsd.prefs.mk"
81 82
82.if ${OPSYS} == "Darwin" 83.if ${OPSYS} == "Darwin"
83GNU_CONFIGURE_PREFIX= ${PREFIX}/Applications/LyX.app 84GNU_CONFIGURE_PREFIX= ${PREFIX}/Applications/LyX.app