Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Jan 2021 08:19:47 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r560931 - head/databases/py-xapian
Message-ID:  <202101100819.10A8Jldm010240@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101100819.10A8Jldm010240>