diff options
| author | youri <youri@pkgsrc.org> | 2018-06-03 02:28:07 +0000 |
|---|---|---|
| committer | youri <youri@pkgsrc.org> | 2018-06-03 02:28:07 +0000 |
| commit | ee6d47b87c2c05ecc492c2d8a12d0bcbba2e6648 (patch) | |
| tree | df4235eceb38ea438e70536e8ecd42fb3b7c0114 /editors | |
| parent | 4aa2509c755d02df9287a46c40ebe52c76e69b4d (diff) | |
| download | pkgsrc-ee6d47b87c2c05ecc492c2d8a12d0bcbba2e6648.tar.gz | |
Fix PR 49680
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/lyx/Makefile | 15 | ||||
| -rw-r--r-- | editors/lyx/PLIST | 8 | ||||
| -rw-r--r-- | editors/lyx/PLIST.Darwin | 4 |
3 files changed, 16 insertions, 11 deletions
diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile index 2c533fc6698..c230e8982d0 100644 --- a/editors/lyx/Makefile +++ b/editors/lyx/Makefile @@ -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]*:../../graphics/tex-xypic 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=${BUILDLINK_PREFIX.qt4-libs} \ .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}/"); \ diff --git a/editors/lyx/PLIST b/editors/lyx/PLIST index b97b7da64cc..07e54f4e4af 100644 --- a/editors/lyx/PLIST +++ b/editors/lyx/PLIST @@ -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 diff --git a/editors/lyx/PLIST.Darwin b/editors/lyx/PLIST.Darwin index ed15c95a6ba..d789a2c3089 100644 --- a/editors/lyx/PLIST.Darwin +++ b/editors/lyx/PLIST.Darwin @@ -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 |