Sun Jun 3 02:28:08 2018 UTC ()
Fix PR 49680


(youri)
diff -r1.66 -r1.67 pkgsrc/editors/lyx/Makefile
diff -r1.11 -r1.12 pkgsrc/editors/lyx/PLIST
diff -r1.1 -r1.2 pkgsrc/editors/lyx/PLIST.Darwin
cvs diff -r1.66 -r1.67 pkgsrc/editors/lyx/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/lyx/Makefile 2018/04/29 21:31:35 1.66
+++ pkgsrc/editors/lyx/Makefile 2018/06/03 02:28:07 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.66 2018/04/29 21:31:35 adam Exp $ 1# $NetBSD: Makefile,v 1.67 2018/06/03 02:28:07 youri Exp $
2 2
3DISTNAME= lyx-2.2.2 3DISTNAME= lyx-2.2.2
4PKGREVISION= 6 4PKGREVISION= 6
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
@@ -48,57 +48,60 @@ DEPENDS+= tex-pst-node-[0-9]*:../../gra @@ -48,57 +48,60 @@ DEPENDS+= tex-pst-node-[0-9]*:../../gra
48DEPENDS+= tex-pstricks-[0-9]*:../../graphics/tex-pstricks 48DEPENDS+= tex-pstricks-[0-9]*:../../graphics/tex-pstricks
49DEPENDS+= tex-setspace-[0-9]*:../../print/tex-setspace 49DEPENDS+= tex-setspace-[0-9]*:../../print/tex-setspace
50DEPENDS+= tex-skak-[0-9]*:../../print/tex-skak 50DEPENDS+= tex-skak-[0-9]*:../../print/tex-skak
51DEPENDS+= tex-subfig-[0-9]*:../../print/tex-subfig 51DEPENDS+= tex-subfig-[0-9]*:../../print/tex-subfig
52DEPENDS+= tex-tools-[0-9]*:../../print/tex-tools 52DEPENDS+= tex-tools-[0-9]*:../../print/tex-tools
53DEPENDS+= tex-ulem-[0-9]*:../../print/tex-ulem 53DEPENDS+= tex-ulem-[0-9]*:../../print/tex-ulem
54DEPENDS+= tex-wasysym-[0-9]*:../../fonts/tex-wasysym 54DEPENDS+= tex-wasysym-[0-9]*:../../fonts/tex-wasysym
55DEPENDS+= tex-xargs-[0-9]*:../../print/tex-xargs 55DEPENDS+= tex-xargs-[0-9]*:../../print/tex-xargs
56DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor 56DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor
57DEPENDS+= tex-xypic-[0-9]*:../../graphics/tex-xypic 57DEPENDS+= tex-xypic-[0-9]*:../../graphics/tex-xypic
58 58
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 # not yet ported as of 1.6.10 66PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # 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 72CONFIGURE_ARGS+= --without-included-boost
73 73
74CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.qt4-libs} \ 74CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.qt4-libs} \
75 --with-qt4-dir=${QTDIR:Q} \ 75 --with-qt4-dir=${QTDIR:Q} \
76 --with-qt4-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include \ 76 --with-qt4-includes=${BUILDLINK_PREFIX.qt4-libs}/qt4/include \
77 --with-qt4-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib 77 --with-qt4-libraries=${BUILDLINK_PREFIX.qt4-libs}/qt4/lib
78 78
79.include "../../mk/bsd.prefs.mk" 79.include "../../mk/bsd.prefs.mk"
80 80
 81PLIST_VARS+= x11
 82
81.if ${OPSYS} == "Darwin" 83.if ${OPSYS} == "Darwin"
82GNU_CONFIGURE_PREFIX= ${PREFIX}/Applications/LyX.app 84GNU_CONFIGURE_PREFIX= ${PREFIX}/Applications/LyX.app
83PLIST_SUBST+= BIN_DIR=Applications/LyX.app/Contents/MacOS \ 85PLIST_SUBST+= BIN_DIR=Applications/LyX.app/Contents/MacOS \
84 LYX=LyX \ 86 LYX=LyX \
85 MAN_DIR=Applications/LyX.app/Contents/Resources/man \ 87 MAN_DIR=Applications/LyX.app/Contents/Resources/man \
86 SHARE_DIR=Applications/LyX.app/Contents/Resources 88 SHARE_DIR=Applications/LyX.app/Contents/Resources
87.else 89.else
88PLIST_SUBST+= BIN_DIR=bin \ 90PLIST_SUBST+= BIN_DIR=bin \
89 LYX=lyx \ 91 LYX=lyx \
90 MAN_DIR="${PKGMANDIR}" \ 92 MAN_DIR="${PKGMANDIR}" \
91 SHARE_DIR=share/lyx 93 SHARE_DIR=share/lyx
 94PLIST.x11= yes
92.endif 95.endif
93 96
94PRINT_PLIST_AWK+= { sub(/bin\//, "$${BIN_DIR}/"); \ 97PRINT_PLIST_AWK+= { sub(/bin\//, "$${BIN_DIR}/"); \
95 sub(/^share\/lyx\//, "$${SHARE_DIR}/"); \ 98 sub(/^share\/lyx\//, "$${SHARE_DIR}/"); \
96 gsub(/LC_MESSAGES\/lyx./, "LC_MESSAGES/$${LYX}."); \ 99 gsub(/LC_MESSAGES\/lyx./, "LC_MESSAGES/$${LYX}."); \
97 sub(/^${PKGMANDIR}\//, "$${MAN_DIR}/"); \ 100 sub(/^${PKGMANDIR}\//, "$${MAN_DIR}/"); \
98 print; next; } 101 print; next; }
99 102
100REPLACE_PYTHON= development/autotests/keytest.py \ 103REPLACE_PYTHON= development/autotests/keytest.py \
101 development/cmake/doc/ReplaceValues.py \ 104 development/cmake/doc/ReplaceValues.py \
102 development/cmake/po/cat.py \ 105 development/cmake/po/cat.py \
103 development/cmake/po/dos2unix.py \ 106 development/cmake/po/dos2unix.py \
104 development/cmake/po/unix2dos.py \ 107 development/cmake/po/unix2dos.py \
cvs diff -r1.11 -r1.12 pkgsrc/editors/lyx/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/lyx/PLIST 2016/12/02 19:07:16 1.11
+++ pkgsrc/editors/lyx/PLIST 2018/06/03 02:28:07 1.12
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1@comment $NetBSD: PLIST,v 1.11 2016/12/02 19:07:16 maya Exp $ 1@comment $NetBSD: PLIST,v 1.12 2018/06/03 02:28:07 youri Exp $
2${BIN_DIR}/lyx 2${BIN_DIR}/lyx
3${BIN_DIR}/lyxclient 3${BIN_DIR}/lyxclient
4${BIN_DIR}/tex2lyx 4${BIN_DIR}/tex2lyx
5${MAN_DIR}/man1/lyx.1 5${MAN_DIR}/man1/lyx.1
6${MAN_DIR}/man1/lyxclient.1 6${MAN_DIR}/man1/lyxclient.1
7${MAN_DIR}/man1/tex2lyx.1 7${MAN_DIR}/man1/tex2lyx.1
8share/applications/lyx.desktop 8${PLIST.x11}share/applications/lyx.desktop
9share/icons/hicolor/48x48/apps/lyx.png 9${PLIST.x11}share/icons/hicolor/48x48/apps/lyx.png
10share/icons/hicolor/scalable/apps/lyx.svg 10${PLIST.x11}share/icons/hicolor/scalable/apps/lyx.svg
11share/locale/ar/LC_MESSAGES/${LYX}.mo 11share/locale/ar/LC_MESSAGES/${LYX}.mo
12share/locale/ca/LC_MESSAGES/${LYX}.mo 12share/locale/ca/LC_MESSAGES/${LYX}.mo
13share/locale/cs/LC_MESSAGES/${LYX}.mo 13share/locale/cs/LC_MESSAGES/${LYX}.mo
14share/locale/da/LC_MESSAGES/${LYX}.mo 14share/locale/da/LC_MESSAGES/${LYX}.mo
15share/locale/de/LC_MESSAGES/${LYX}.mo 15share/locale/de/LC_MESSAGES/${LYX}.mo
16share/locale/el/LC_MESSAGES/${LYX}.mo 16share/locale/el/LC_MESSAGES/${LYX}.mo
17share/locale/en/LC_MESSAGES/${LYX}.mo 17share/locale/en/LC_MESSAGES/${LYX}.mo
18share/locale/es/LC_MESSAGES/${LYX}.mo 18share/locale/es/LC_MESSAGES/${LYX}.mo
19share/locale/eu/LC_MESSAGES/${LYX}.mo 19share/locale/eu/LC_MESSAGES/${LYX}.mo
20share/locale/fi/LC_MESSAGES/${LYX}.mo 20share/locale/fi/LC_MESSAGES/${LYX}.mo
21share/locale/fr/LC_MESSAGES/${LYX}.mo 21share/locale/fr/LC_MESSAGES/${LYX}.mo
22share/locale/gl/LC_MESSAGES/${LYX}.mo 22share/locale/gl/LC_MESSAGES/${LYX}.mo
23share/locale/he/LC_MESSAGES/${LYX}.mo 23share/locale/he/LC_MESSAGES/${LYX}.mo
cvs diff -r1.1 -r1.2 pkgsrc/editors/lyx/PLIST.Darwin (expand / switch to unified diff)

--- pkgsrc/editors/lyx/PLIST.Darwin 2011/03/09 18:48:51 1.1
+++ pkgsrc/editors/lyx/PLIST.Darwin 2018/06/03 02:28:07 1.2
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1@comment $NetBSD: PLIST.Darwin,v 1.1 2011/03/09 18:48:51 minskim Exp $ 1@comment $NetBSD: PLIST.Darwin,v 1.2 2018/06/03 02:28:07 youri Exp $
2Applications/LyX.app/Contents/Info.plist 2Applications/LyX.app/Contents/Info.plist
3Applications/LyX.app/Contents/Library/Spotlight/LyX-Metadata.mdimporter/Contents/Info.plist 3Applications/LyX.app/Contents/Library/Spotlight/LyX-Metadata.mdimporter/Contents/Info.plist
4Applications/LyX.app/Contents/MacOS/lyxeditor 4Applications/LyX.app/Contents/MacOS/lyxeditor
5Applications/LyX.app/Contents/PkgInfo 5Applications/LyX.app/Contents/PkgInfo
6Applications/LyX.app/Contents/Resources/COPYING 6Applications/LyX.app/Contents/Resources/COPYING
7Applications/LyX.app/Contents/Resources/LyX.icns 7Applications/LyX.app/Contents/Resources/LyX.icns
 8Applications/LyX.app/Contents/Resources/LyX.sdef
8Applications/LyX.app/Contents/Resources/LyXapp.icns 9Applications/LyX.app/Contents/Resources/LyXapp.icns
 10Applications/LyX.app/Contents/Resources/dmg-background.png
9Applications/LyX.app/Contents/Resources/lyxrc.dist 11Applications/LyX.app/Contents/Resources/lyxrc.dist