git: acba4834ad6e - main - archivers/rpm4: Fix and clean port

The branch main has been updated by rodrigo:

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

commit acba4834ad6eb29cfd8afbd0d945faf7562bbc5f
Author:     Rodrigo Osorio <rodrigo@FreeBSD.org>
AuthorDate: 2023-07-21 21:07:49 +0000
Commit:     Rodrigo Osorio <rodrigo@FreeBSD.org>
CommitDate: 2023-07-21 21:15:56 +0000

    archivers/rpm4: Fix and clean port
    
    * Fix plist when compiling without python
    * install manpages without rebuilding it
    * remove unnecessary panadoc dependency
    
    Reported by: Vladimir Druzenko <vvd@freebsd.org>
---
 archivers/rpm4/Makefile                     |  8 +++-----
 archivers/rpm4/files/patch-docs_Makefile.am | 13 +++++++++++++
 archivers/rpm4/files/patch-docs_Makefile.in | 11 +++++++++++
 archivers/rpm4/pkg-plist                    |  2 +-
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index ac6005b2bd2b..a3e8898b6bb6 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	rpm
 PORTVERSION=	4.18.1
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://ftp.rpm.org/releases/rpm-${PORTVERSION:R}.x/
 PKGNAMESUFFIX=	4
@@ -12,8 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gsed:textproc/gsed \
-		${LOCALBASE}/lib/libelf.so:devel/elfutils \
-		pandoc:textproc/hs-pandoc
+		${LOCALBASE}/lib/libelf.so:devel/elfutils
 LIB_DEPENDS=	libpopt.so:devel/popt \
 		libnss3.so:security/nss \
 		libzstd.so:archivers/zstd \
@@ -56,9 +56,7 @@ BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 PLIST_SUB=	VERSION=${PORTVERSION} \
 		OPSYS=${OPSYS:tl}
 
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	PYTHON PLUGINS NLS DOCS
+OPTIONS_DEFINE=	PYTHON PLUGINS NLS
 OPTIONS_DEFAULT=PYTHON
 OPTIONS_SUB=	yes
 
diff --git a/archivers/rpm4/files/patch-docs_Makefile.am b/archivers/rpm4/files/patch-docs_Makefile.am
new file mode 100644
index 000000000000..26be700343f5
--- /dev/null
+++ b/archivers/rpm4/files/patch-docs_Makefile.am
@@ -0,0 +1,13 @@
+--- docs/Makefile.am.orig	2023-03-13 14:33:50 UTC
++++ docs/Makefile.am
+@@ -1,8 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-if PANDOC
++#if PANDOC
+ SUBDIRS = man
+-endif
++#endif
+ 
+ EXTRA_DIST =
+ 
diff --git a/archivers/rpm4/files/patch-docs_Makefile.in b/archivers/rpm4/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..ecdd91bd159d
--- /dev/null
+++ b/archivers/rpm4/files/patch-docs_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	2023-07-21 09:25:20 UTC
++++ docs/Makefile.in
+@@ -442,7 +442,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-@PANDOC_TRUE@SUBDIRS = man
++SUBDIRS = man
+ EXTRA_DIST = _layouts/default.html _layouts/favicon.ico index.md \
+ 	manual/index.md manual/arch_dependencies.md \
+ 	manual/autosetup.md manual/boolean_dependencies.md \
diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist
index 7b0656ed7a21..ad65f23362c8 100644
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@@ -64,7 +64,7 @@ lib/librpmsign.so.9.4.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py
-%%PYTHON_SITELIBDIR%%/rpm-%%VERSION%%-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm-%%VERSION%%-py%%PYTHON_VER%%.egg-info
 %%PLUGINS%%lib/rpm-plugins/dbus_announce.so
 %%PLUGINS%%lib/rpm-plugins/prioreset.so
 %%PLUGINS%%lib/rpm-plugins/syslog.so