svn commit: r472466 - head/archivers/rpm4

[Dmitry Marakasov]

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/