From owner-svn-ports-head@freebsd.org Fri Jun 15 17:30:12 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 9F6B310154A2; Fri, 15 Jun 2018 17:30:12 +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 5513579DA9; Fri, 15 Jun 2018 17:30:12 +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 3632F1A720; Fri, 15 Jun 2018 17:30:12 +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 w5FHUCe4043022; Fri, 15 Jun 2018 17:30:12 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5FHUB1N043020; Fri, 15 Jun 2018 17:30:11 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201806151730.w5FHUB1N043020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 15 Jun 2018 17:30:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472466 - head/archivers/rpm4 X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/archivers/rpm4 X-SVN-Commit-Revision: 472466 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.26 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: Fri, 15 Jun 2018 17:30:12 -0000 Author: amdmi3 Date: Fri Jun 15 17:30:11 2018 New Revision: 472466 URL: https://svnweb.freebsd.org/changeset/ports/472466 Log: - Fix python 3 support While rpm does support python3, the port does not configure with python 3 because it tries to detect incorrect python library (-lpython3.6, while it should be -lpython3.6m, where m is some kind of python abi flags). Shove python version with ABI flag added through, which fixes build. I've looked at rpm4 git master and it seems that they have changed the python detection there, so newer versions of rpm4 may no longer need this hack. - Update WWW Approved by: portmgr blanket Modified: head/archivers/rpm4/Makefile head/archivers/rpm4/pkg-descr Modified: head/archivers/rpm4/Makefile ============================================================================== --- head/archivers/rpm4/Makefile Fri Jun 15 17:26:05 2018 (r472465) +++ head/archivers/rpm4/Makefile Fri Jun 15 17:30:11 2018 (r472466) @@ -3,6 +3,7 @@ PORTNAME= rpm PORTVERSION= 4.13.1 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= http://ftp.rpm.org/releases/rpm-${PORTVERSION:R}.x/ PKGNAMESUFFIX= 4 @@ -32,7 +33,8 @@ CONFIGURE_ARGS= --with-external-db \ --with-popt-prefix="${LOCALBASE}" \ --sysconfdir=${PREFIX}/etc \ --localstatedir=/var \ - --without-javaglue + --without-javaglue \ + am_cv_python_version=${PYTHON_VER}${PYTHON_ABIVER} CONFIGURE_ENV= LUA_CFLAGS=-I${LUA_INCDIR} \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm" INSTALL_TARGET= install-strip @@ -53,7 +55,7 @@ OPTIONS_DEFAULT=PYTHON OPTIONS_SUB= yes PYTHON_CONFIGURE_ENABLE=python -PYTHON_USES= python:2.7 +PYTHON_USES= python NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext Modified: head/archivers/rpm4/pkg-descr ============================================================================== --- head/archivers/rpm4/pkg-descr Fri Jun 15 17:26:05 2018 (r472465) +++ head/archivers/rpm4/pkg-descr Fri Jun 15 17:30:11 2018 (r472466) @@ -7,4 +7,4 @@ is also a related API ("Application Program Interface" advanced developers to bypass 'shelling out' to a command line, and to manage such transactions from within a native coding language. -WWW: http://www.rpm.org/ +WWW: http://rpm.org/