From owner-svn-ports-all@freebsd.org Sun Jan 10 08:19:51 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FED24BA304; Sun, 10 Jan 2021 08:19:51 +0000 (UTC) (envelope-from sunpoet@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4DD8s20MJMz3QJJ; Sun, 10 Jan 2021 08:19:49 +0000 (UTC) (envelope-from sunpoet@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 DCA1B25112; Sun, 10 Jan 2021 08:19:47 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10A8Jlne010241; Sun, 10 Jan 2021 08:19:47 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10A8Jldm010240; Sun, 10 Jan 2021 08:19:47 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202101100819.10A8Jldm010240@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 10 Jan 2021 08:19:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560931 - head/databases/py-xapian X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/databases/py-xapian X-SVN-Commit-Revision: 560931 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 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: Sun, 10 Jan 2021 08:19:52 -0000 Author: sunpoet Date: Sun Jan 10 08:19:47 2021 New Revision: 560931 URL: https://svnweb.freebsd.org/changeset/ports/560931 Log: Remove PYTHON_REL check after r559531 (USES=python:3.6+) Modified: head/databases/py-xapian/Makefile Modified: head/databases/py-xapian/Makefile ============================================================================== --- head/databases/py-xapian/Makefile Sun Jan 10 08:19:42 2021 (r560930) +++ head/databases/py-xapian/Makefile Sun Jan 10 08:19:47 2021 (r560931) @@ -19,23 +19,26 @@ BUILD_DEPENDS= xapian-core>=${PORTVERSION}:databases/x LIB_DEPENDS= libxapian.so:databases/xapian-core USES= compiler:c++11-lang libtool python:3.6+ tar:xz +USE_PYTHON= flavors CONFIGURE_ARGS= --datarootdir=${DATADIR} \ --docdir=${DOCSDIR} \ --enable-shared \ --enable-static \ + --with-python3 \ --without-csharp \ --without-java \ --without-lua \ --without-perl \ --without-php \ --without-php7 \ + --without-python \ --without-ruby \ --without-tcl +CONFIGURE_ENV= PYTHON3=${PYTHON_CMD} GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_CXXSTD= c++11 -USE_PYTHON= flavors PORTDOCS= * @@ -47,22 +50,10 @@ OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PY_SPHINX} -.include - -.if ${PYTHON_REL} > 3000 -CONFIGURE_ARGS+=--with-python3 \ - --without-python -CONFIGURE_ENV+= PYTHON3=${PYTHON_CMD} -.else -CONFIGURE_ARGS+=--with-python \ - --without-python3 -CONFIGURE_ENV+= PYTHON2=${PYTHON_CMD} -.endif - post-patch: @${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure post-patch-DOCS-off: @${REINPLACE_CMD} -e 's| all-local||; s| install-data-local install-dist_exampledataDATA||' ${WRKSRC}/python/Makefile.in ${WRKSRC}/python3/Makefile.in -.include +.include