git: 468b96cf50e2 - main - archivers/rpm4: Update to 4.17.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Rodrigo Osorio <rodrigo_at_FreeBSD.org>
Date: Wed, 23 Feb 2022 07:58:07 UTC
The branch main has been updated by rodrigo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=468b96cf50e2b1ee6d555a0e6582e8a1d7f41eef

commit 468b96cf50e2b1ee6d555a0e6582e8a1d7f41eef
Author:     Rodrigo Osorio <rodrigo@FreeBSD.org>
AuthorDate: 2021-10-29 15:06:16 +0000
Commit:     Rodrigo Osorio <rodrigo@FreeBSD.org>
CommitDate: 2022-02-23 07:48:32 +0000

    archivers/rpm4: Update to 4.17.0
    
    Python helpers and scripts used for python packaging was removed
    from RPM, comunity-driven files should be used instead.
    
    Release note: https://rpm.org/wiki/Releases/4.17.0
---
 archivers/rpm4/Makefile  | 25 +++++++++----------------
 archivers/rpm4/distinfo  |  6 +++---
 archivers/rpm4/pkg-plist | 26 ++++++++++----------------
 3 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index 3a4204c240bb..e2f4f48220dd 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -1,10 +1,9 @@
 # Created by: Greg Lewis <glewis@FreeBSD.org>
 
 PORTNAME=	rpm
-PORTVERSION=	4.16.1.3
-PORTREVISION=	1
+PORTVERSION=	4.17.0
 CATEGORIES=	archivers
-MASTER_SITES=	http://ftp.rpm.org/releases/rpm-4.16.x/
+MASTER_SITES=	http://ftp.rpm.org/releases/rpm-4.17.x/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	rodrigo@FreeBSD.org
@@ -22,16 +21,15 @@ RUN_DEPENDS=	bash:shells/bash \
 		gxargs:misc/findutils
 
 USES=		alias bdb sqlite cpe gmake iconv libarchive libtool \
-		lua:52+ pathfix pkgconfig shebangfix tar:bzip2
+		lua:53+ pathfix pkgconfig shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
-SHEBANG_FILES=	scripts/brp-python-bytecompile scripts/check-prereqs \
+SHEBANG_FILES=	scripts/check-prereqs \
 		scripts/check-rpaths-worker scripts/pkgconfigdeps.sh \
 		scripts/fontconfig.prov scripts/perl.prov scripts/perl.req  \
-		scripts/pythondistdeps.py scripts/find-lang.sh scripts/ocamldeps.sh \
-		scripts/find-debuginfo.sh
+		scripts/find-lang.sh scripts/ocamldeps.sh
 CONFIGURE_ARGS=	--enable-sqlite=yes\
 		--with-popt-prefix="${LOCALBASE}" \
 		--sysconfdir=${PREFIX}/etc \
@@ -60,13 +58,12 @@ OPTIONS_DEFINE=	PYTHON PLUGINS NLS DOCS
 OPTIONS_DEFAULT=PYTHON
 OPTIONS_SUB=	yes
 
-PYTHON_CONFIGURE_ENABLE=python
-PYTHON_USES=		python
-
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 NLS_LIBS=		-lintl
 
+PYTHON_RUN_DEPENDS=    ${LOCALBASE}/lib/rpm/pythondistdeps.py:archivers/py-python-rpm-packaging
+
 PLUGINS_CONFIGURE_ENABLE=plugins
 PLUGINS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 
@@ -74,18 +71,14 @@ 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 \
+	@${REINPLACE_CMD} -e 's/\<xargs\>/gxargs/g' \
 		${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
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/archivers/rpm4/distinfo b/archivers/rpm4/distinfo
index 116a89b63844..7182e2187e9c 100644
--- a/archivers/rpm4/distinfo
+++ b/archivers/rpm4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619221631
-SHA256 (rpm-4.16.1.3.tar.bz2) = 513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d
-SIZE (rpm-4.16.1.3.tar.bz2) = 4354652
+TIMESTAMP = 1635434706
+SHA256 (rpm-4.17.0.tar.bz2) = 2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a
+SIZE (rpm-4.17.0.tar.bz2) = 4514138
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index 67761b39552f..46ffa8e077c5 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -48,26 +48,21 @@ include/rpm/rpmutil.h
 include/rpm/rpmver.h
 lib/librpm.so
 lib/librpm.so.9
-lib/librpm.so.9.1.3
+lib/librpm.so.9.2.0
 lib/librpmbuild.so
 lib/librpmbuild.so.9
-lib/librpmbuild.so.9.1.3
+lib/librpmbuild.so.9.2.0
 lib/librpmio.so
 lib/librpmio.so.9
-lib/librpmio.so.9.1.3
+lib/librpmio.so.9.2.0
 lib/librpmsign.so
 lib/librpmsign.so.9
-lib/librpmsign.so.9.1.3
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
+lib/librpmsign.so.9.2.0
+lib/rpm/brp-elfperms
 lib/rpm/brp-compress
-lib/rpm/brp-java-gcjcompile
-lib/rpm/brp-python-bytecompile
-lib/rpm/brp-python-hardlink
+lib/rpm/brp-remove-la-files
 lib/rpm/brp-strip
 lib/rpm/brp-strip-comment-note
-lib/rpm/brp-strip-shared
 lib/rpm/brp-strip-static-archive
 lib/rpm/check-buildroot
 lib/rpm/check-files
@@ -78,20 +73,16 @@ lib/rpm/fileattrs/debuginfo.attr
 lib/rpm/fileattrs/desktop.attr
 lib/rpm/fileattrs/elf.attr
 lib/rpm/fileattrs/font.attr
-lib/rpm/fileattrs/libtool.attr
 lib/rpm/fileattrs/metainfo.attr
 lib/rpm/fileattrs/ocaml.attr
 lib/rpm/fileattrs/perl.attr
 lib/rpm/fileattrs/perllib.attr
 lib/rpm/fileattrs/pkgconfig.attr
-lib/rpm/fileattrs/python.attr
-lib/rpm/fileattrs/pythondist.attr
 lib/rpm/fileattrs/script.attr
 lib/rpm/find-lang.sh
 lib/rpm/find-provides
 lib/rpm/find-requires
 lib/rpm/fontconfig.prov
-lib/rpm/libtooldeps.sh
 lib/rpm/macros
 lib/rpm/mkinstalldirs
 lib/rpm/ocamldeps.sh
@@ -164,7 +155,6 @@ lib/rpm/platform/sparcv8-%%OPSYS%%/macros
 lib/rpm/platform/sparcv9-%%OPSYS%%/macros
 lib/rpm/platform/sparcv9v-%%OPSYS%%/macros
 lib/rpm/platform/x86_64-%%OPSYS%%/macros
-%%PYTHON%%lib/rpm/pythondistdeps.py
 lib/rpm/rpm.daily
 lib/rpm/rpm.log
 lib/rpm/rpm.supp
@@ -217,6 +207,8 @@ man/sk/man8/rpm.8.gz
 %%NLS%%share/locale/es/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/he/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/id/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/is/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/it/LC_MESSAGES/rpm.mo
@@ -225,10 +217,12 @@ man/sk/man8/rpm.8.gz
 %%NLS%%share/locale/ms/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/rpm.mo
+%%NLS%%share/locale/si/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/rpm.mo