CVS commit: pkgsrc/editors/lyx

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Sun Jun  3 02:28:08 UTC 2018

Modified Files:
        pkgsrc/editors/lyx: Makefile PLIST PLIST.Darwin

Log Message:
Fix PR 49680


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/editors/lyx/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/editors/lyx/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/lyx/PLIST.Darwin

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/lyx/Makefile
diff -u pkgsrc/editors/lyx/Makefile:1.66 pkgsrc/editors/lyx/Makefile:1.67
--- pkgsrc/editors/lyx/Makefile:1.66    Sun Apr 29 21:31:35 2018
+++ pkgsrc/editors/lyx/Makefile Sun Jun  3 02:28:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2018/04/29 21:31:35 adam Exp $
+# $NetBSD: Makefile,v 1.67 2018/06/03 02:28:07 youri Exp $
 
 DISTNAME=              lyx-2.2.2
 PKGREVISION=           6
@@ -58,11 +58,11 @@ DEPENDS+=           tex-xypic-[0-9]*:../../graphi
 
 UNLIMIT_RESOURCES+=    datasize
 
-USE_LANGUAGES=         c c++
-GNU_CONFIGURE=         YES
-USE_TOOLS+=            gmake perl:run pkg-config xgettext
-USE_LIBTOOL=           YES
-USE_PKGLOCALEDIR=      YES
+USE_LANGUAGES=                 c c++
+GNU_CONFIGURE=                 YES
+USE_TOOLS+=                    gmake perl:run pkg-config xgettext
+USE_LIBTOOL=                   YES
+USE_PKGLOCALEDIR=              YES
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 1.6.10
 
 CXXFLAGS.Linux+=       -fpermissive
@@ -78,6 +78,8 @@ CONFIGURE_ARGS+=      --with-extra-prefix=${B
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=           x11
+
 .if ${OPSYS} == "Darwin"
 GNU_CONFIGURE_PREFIX=  ${PREFIX}/Applications/LyX.app
 PLIST_SUBST+=          BIN_DIR=Applications/LyX.app/Contents/MacOS \
@@ -89,6 +91,7 @@ PLIST_SUBST+=         BIN_DIR=bin \
                        LYX=lyx \
                        MAN_DIR="${PKGMANDIR}" \
                        SHARE_DIR=share/lyx
+PLIST.x11=             yes
 .endif
 
 PRINT_PLIST_AWK+=      { sub(/bin\//, "$${BIN_DIR}/"); \

Index: pkgsrc/editors/lyx/PLIST
diff -u pkgsrc/editors/lyx/PLIST:1.11 pkgsrc/editors/lyx/PLIST:1.12
--- pkgsrc/editors/lyx/PLIST:1.11       Fri Dec  2 19:07:16 2016
+++ pkgsrc/editors/lyx/PLIST    Sun Jun  3 02:28:07 2018
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.11 2016/12/02 19:07:16 maya Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/06/03 02:28:07 youri Exp $
 ${BIN_DIR}/lyx
 ${BIN_DIR}/lyxclient
 ${BIN_DIR}/tex2lyx
 ${MAN_DIR}/man1/lyx.1
 ${MAN_DIR}/man1/lyxclient.1
 ${MAN_DIR}/man1/tex2lyx.1
-share/applications/lyx.desktop
-share/icons/hicolor/48x48/apps/lyx.png
-share/icons/hicolor/scalable/apps/lyx.svg
+${PLIST.x11}share/applications/lyx.desktop
+${PLIST.x11}share/icons/hicolor/48x48/apps/lyx.png
+${PLIST.x11}share/icons/hicolor/scalable/apps/lyx.svg
 share/locale/ar/LC_MESSAGES/${LYX}.mo
 share/locale/ca/LC_MESSAGES/${LYX}.mo
 share/locale/cs/LC_MESSAGES/${LYX}.mo

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