Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Mar 2020 16:05:51 +0000 (UTC)
From:      Rodrigo Osorio <rodrigo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r528924 - head/archivers/rpm4
Message-ID:  <202003221605.02MG5pRm095163@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rodrigo
Date: Sun Mar 22 16:05:50 2020
New Revision: 528924
URL: https://svnweb.freebsd.org/changeset/ports/528924

Log:
  archivers/rpm4: Replace calls to xargs by gxargs
  
  Latest version of archivers/rpm4 uses GNU specific option
  when calls xargs. This causes the proccess to fail.
  
  This commit adds misc/findutils as a run dependency and
  replaces xargs calls by its GNU variant gxargs.
  
  Also Bump portrevision.
  
  PR:		244606
  Reported by:	Brian Zou <zoujiaqing@gmail.com>

Modified:
  head/archivers/rpm4/Makefile

Modified: head/archivers/rpm4/Makefile
==============================================================================
--- head/archivers/rpm4/Makefile	Sun Mar 22 15:39:54 2020	(r528923)
+++ head/archivers/rpm4/Makefile	Sun Mar 22 16:05:50 2020	(r528924)
@@ -3,6 +3,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	4.15.1
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://ftp.rpm.org/releases/rpm-4.15.x/
 PKGNAMESUFFIX=	4
@@ -16,7 +17,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpopt.so:devel/popt \
 		libnss3.so:security/nss \
 		libzstd.so:archivers/zstd
-RUN_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash \
+		gxargs:misc/findutils
 
 USES=		alias bdb compiler:openmp gmake iconv libarchive libtool \
 		lua:52+ pathfix pkgconfig shebangfix tar:bzip2
@@ -70,6 +72,12 @@ post-patch:
 	@${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \
 		${WRKSRC}/system.h
+	@${REINPLACE_CMD} -e 's/\<xargs\>/gxargs/g' ${WRKSRC}/scripts/brp-python-bytecompile \
+		${WRKSRC}/scripts/brp-strip-static-archive \
+		${WRKSRC}/scripts/check-buildroot \
+		${WRKSRC}/scripts/check-rpaths \
+		${WRKSRC}/scripts/find-debuginfo.sh \
+		${WRKSRC}/scripts/vpkg-provides.sh
 
 post-install-PYTHON-off:
 	@${RM} ${STAGEDIR}${PREFIX}/lib/rpm/pythondistdeps.py



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