From nobody Fri Jul 21 21:29:48 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R72l11TMGz4dXB8; Fri, 21 Jul 2023 21:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R72l10XYDz40gr; Fri, 21 Jul 2023 21:29:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689974989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+E/yEeOvTj2fT0RUmfqJ/EN2d28p+lpTrNOssTRxCg=; b=hFNZbspmvyREDKrX7jeYO/jQe90o6HEypw3eTEbQXMSOZusj9SG7T4AciwplP3BULe5je4 z+bJMOcP++8khi/bxaNOZOhwA2OFuXNoGNR7qE8zTqhUDqXp3coxHRhY+RvaXojb+crJ4l TMC7d2K7cBcWZ6YwquzIKdfr9QQGtXeJIwizIN/mR7hHRDjvPg10SMCUVIX7d6Ro5XePm7 5SrTJHjW317kiKFnPVaBol4AbwopjisYKx1kh7DMBLX7bcrdp5nh8068UnKSO77L/48BgZ jDyb9rFy83cHQEaKSoULhgip5LvbLDLReJ0gGcr6O4c2YnNIZPY7zJWWdMcWrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689974989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c+E/yEeOvTj2fT0RUmfqJ/EN2d28p+lpTrNOssTRxCg=; b=WW9F2ycwso3c2/aYMC/nHp3yAU1QcpwBHOYtNM2eOVon8uiPHcju8sxj6umXYH49ND2crv R6WQ7vMi+AXIfnp4pKy/7vbQhEUCeWAKDd5PbUS+52NZJ9bKW1SPF2ax+TicrK+alCC1Pu BY2gDo89+zoDkChQkNdKjWEMf3tMQBva+8oVApg+V5XXqaO81LabBjeAjmzKwWUikXS1gT +8v0ACDcOBIPL2LfNPFjvP3DpvPvD2wvMuqCY91wpFogO84T9cQ0uNGbVx2bUXYGQL3cR7 mALEAYHtmxKWK1pTai9QcQ1vYBzCCObO1kRtCW/o6tmIYpUn7tqfs3+AQzysWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689974989; a=rsa-sha256; cv=none; b=v0D+o/iZFyboH7LSBKF9tmGgvbLqLKLFKU75IIRwOKVq29+KqzMvsBFzU8+5OTtwGVA1o9 wbHyn8IwhXr7YXhFL5jYqRZzTsrXynMN6dFMvrmJ2Mw+SX9Pqyv9ksR3IcIL3KIMF0iOE1 kGMMZARrb98tyJl3MNJQJ4UacxffbPR52Sui+urOtB7nA2n78odVqHRNRxIh/1JTDFNKmZ JDrQ8bp298WlWIP/lC9KrLac91IPghb3UElZCjaflXhHjWhvIrDHMv1zYI5YhLmalQSW2h +b0Ptf6GKFWv3w1GinoAL29B1rg1emlHqgQ6/8YdGlhJe5FPq2hYEggPhfXnqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R72l06dKXzSLG; Fri, 21 Jul 2023 21:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36LLTmhp090158; Fri, 21 Jul 2023 21:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36LLTm29090157; Fri, 21 Jul 2023 21:29:48 GMT (envelope-from git) Date: Fri, 21 Jul 2023 21:29:48 GMT Message-Id: <202307212129.36LLTm29090157@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: acba4834ad6e - main - archivers/rpm4: Fix and clean port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: acba4834ad6eb29cfd8afbd0d945faf7562bbc5f Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=acba4834ad6eb29cfd8afbd0d945faf7562bbc5f commit acba4834ad6eb29cfd8afbd0d945faf7562bbc5f Author: Rodrigo Osorio AuthorDate: 2023-07-21 21:07:49 +0000 Commit: Rodrigo Osorio 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 --- 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