svn commit: r496238 - branches/2019Q1/print/lyx

[Yuri Victorovich]

Author: yuri
Date: Tue Mar 19 02:22:09 2019
New Revision: 496238
URL: https://svnweb.freebsd.org/changeset/ports/496238

Log:
  MFH: r496214
  
  print/lyx: Correct the python executable location in .py, .cpp, .lyx files; Add missing USExx clauses
  
  lyx was broken without being able to call the python executable.
  
  PR:		236619
  Approved by:	rakuco
  Approved by:	ports-secteam

Modified:
  branches/2019Q1/print/lyx/Makefile
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/print/lyx/Makefile
==============================================================================
--- branches/2019Q1/print/lyx/Makefile	Tue Mar 19 02:17:40 2019	(r496237)
+++ branches/2019Q1/print/lyx/Makefile	Tue Mar 19 02:22:09 2019	(r496238)
@@ -3,8 +3,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}
-DISTVERSIONSUFFIX=	-2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	print editors
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
 		http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
@@ -20,14 +19,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libmythes-1.2.so:textproc/mythes
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX}$$,,}
-
 MAJOR_VERSION=	2.3
-MINOR_VERSION=	1
+MINOR_VERSION=	2
 
 USES=		compiler:c++11-lang desktop-file-utils gmake iconv pkgconfig \
 		perl5 python:2.7 qt:5 shebangfix tar:xz
-USE_QT=		core concurrent gui svg widgets buildtools_build qmake_build
+USE_QT=		core concurrent gui svg widgets x11extras buildtools_build qmake_build
+USE_XORG=	xcb
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-boost \
 		--without-included-mythes \
@@ -57,5 +55,8 @@ HUNSPELL_CONFIGURE_OFF=	--without-hunspell
 HUNSPELL_LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell
 NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=		gettext
+
+post-patch:
+	@${GREP} -rl "python -tt" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -i '' 's|python -tt|${PYTHON_CMD} -tt|'
 
 .include <bsd.port.mk>