From owner-svn-ports-all@freebsd.org Tue Mar 19 02:22:10 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22CE61537D77; Tue, 19 Mar 2019 02:22:10 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B65F98D0DE; Tue, 19 Mar 2019 02:22:09 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 916992820; Tue, 19 Mar 2019 02:22:09 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2J2M9WH079199; Tue, 19 Mar 2019 02:22:09 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2J2M9B6079198; Tue, 19 Mar 2019 02:22:09 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201903190222.x2J2M9B6079198@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 19 Mar 2019 02:22:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r496238 - branches/2019Q1/print/lyx X-SVN-Group: ports-branches X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: branches/2019Q1/print/lyx X-SVN-Commit-Revision: 496238 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B65F98D0DE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Mar 2019 02:22:10 -0000 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