From owner-svn-ports-head@freebsd.org Thu Feb 1 15:28:26 2018 Return-Path: Delivered-To: svn-ports-head@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 20027ED7E4E; Thu, 1 Feb 2018 15:28:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C4F557185C; Thu, 1 Feb 2018 15:28:25 +0000 (UTC) (envelope-from amdmi3@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 BFEE36C23; Thu, 1 Feb 2018 15:28:25 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w11FSPSv083238; Thu, 1 Feb 2018 15:28:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w11FSPf8083235; Thu, 1 Feb 2018 15:28:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201802011528.w11FSPf8083235@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 1 Feb 2018 15:28:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460612 - in head/deskutils/recoll: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/deskutils/recoll: . files X-SVN-Commit-Revision: 460612 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2018 15:28:26 -0000 Author: amdmi3 Date: Thu Feb 1 15:28:25 2018 New Revision: 460612 URL: https://svnweb.freebsd.org/changeset/ports/460612 Log: Bring back compiled python files, and add a way to handle them correctyly wrt. python 3 Modified: head/deskutils/recoll/Makefile head/deskutils/recoll/files/patch-Makefile.in head/deskutils/recoll/pkg-plist Modified: head/deskutils/recoll/Makefile ============================================================================== --- head/deskutils/recoll/Makefile Thu Feb 1 15:23:57 2018 (r460611) +++ head/deskutils/recoll/Makefile Thu Feb 1 15:28:25 2018 (r460612) @@ -3,7 +3,7 @@ PORTNAME= recoll PORTVERSION= 1.23.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://www.lesbonscomptes.com/recoll/ @@ -27,6 +27,7 @@ SHEBANG_FILES= filters/*.py desktop/hotrecoll.py \ filters/rclics filters/rclinfo filters/rclkar \ filters/rclpython filters/rclrar filters/rcltar \ filters/rclwar filters/rclzip +USE_PYTHON= py3kplist USE_GNOME= libxslt:run GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-pic Modified: head/deskutils/recoll/files/patch-Makefile.in ============================================================================== --- head/deskutils/recoll/files/patch-Makefile.in Thu Feb 1 15:23:57 2018 (r460611) +++ head/deskutils/recoll/files/patch-Makefile.in Thu Feb 1 15:28:25 2018 (r460612) @@ -5,7 +5,7 @@ @MAKEPYTHON_TRUE@ fi; \ @MAKEPYTHON_TRUE@ set -x; \ -@MAKEPYTHON_TRUE@ python setup.py install \ -+@MAKEPYTHON_TRUE@ ${PYTHON_CMD} setup.py install --no-compile \ ++@MAKEPYTHON_TRUE@ ${PYTHON_CMD} setup.py install \ @MAKEPYTHON_TRUE@ --prefix=${prefix} --root=$${DESTDIR:-/} $${OPTSFORPYTHON}) @MAKEPYTHON_TRUE@clean-local: recollpython-clean @MAKEPYTHON_TRUE@recollpython-clean: Modified: head/deskutils/recoll/pkg-plist ============================================================================== --- head/deskutils/recoll/pkg-plist Thu Feb 1 15:23:57 2018 (r460611) +++ head/deskutils/recoll/pkg-plist Thu Feb 1 15:28:25 2018 (r460612) @@ -2,7 +2,9 @@ bin/recollindex %%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% %%PYTHON_SITELIBDIR%%/recoll/__init__.py +%%PYTHON_SITELIBDIR%%/recoll/__init__.pyc %%PYTHON_SITELIBDIR%%/recoll/rclconfig.py +%%PYTHON_SITELIBDIR%%/recoll/rclconfig.pyc %%PYTHON_SITELIBDIR%%/recoll/rclextract.so %%PYTHON_SITELIBDIR%%/recoll/recoll.so lib/recoll/librecoll-%%VERSION%%.so