<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e2f49db31f165508b784f792abc8e87427a7c43">https://github.com/macports/macports-ports/commit/7e2f49db31f165508b784f792abc8e87427a7c43</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7e2f49db31f165508b784f792abc8e87427a7c43
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri Sep 21 11:20:46 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> rpm2html: update to version 1.11.2, remove variant +template
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Dependency libtemplate no longer available upstream.
</span>---
sysutils/rpm2html/Portfile | 36 ++++++++-------------------------
sysutils/rpm2html/files/patch-rpmopen.c | 15 +++-----------
2 files changed, 11 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rpm2html/Portfile b/sysutils/rpm2html/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d4909d4..b4d0b6a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/rpm2html/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rpm2html/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name rpm2html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.9.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.11.2
</span> platforms darwin freebsd
license mit
categories sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +18,10 @@ long_description The rpm2html utility automatically generates web pages that
</span>
homepage https://www.nongnu.org/rpm2html/
master_sites https://savannah.nongnu.org/download/rpm2html/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 15ffa538f6fe3d6080bfd4e68b3e67e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4b27da6930825dc45c01640e62b74faa2049ed01 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a7725cc9d0ac41659d07ece6752885ce0cbada6a3071c5209fb9db12ead69f2d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 201286
</span>
depends_lib lib:librpm:rpm \
lib:libxml2:libxml2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,30 +33,8 @@ depends_build port:autoconf \
</span>
patchfiles patch-rpmopen.c \
patch-memory.c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-rpmdata.c \
</span> patch-rpm2html.config
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|" ${worksrcpath}/configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && ./autogen.sh --version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-rpm-prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set config ${destroot}${prefix}/etc/rpm2html.config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/src/redhat|${prefix}/src/macports|" ${config}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/i386/RedHat/RPMS/|ftp=http://macports.org/packages/${os.platform}/${os.arch}/RPMS/|" ${config}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|ftpsrc=ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/i386/SRPMS/|ftpsrc=http://macports.org/packages/SRPMS/|" ${config}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/var/www/html|${prefix}/www|" ${destroot}${prefix}/etc/rpm2html.config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant template description "Use separate template file instead of hard-coded markup" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append lib:template:libtemplate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-template
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure { reinplace "s|^;html_template=rpm2html.tpl|html_template=${prefix}/etc/rpm2html.tpl|g" rpm2html.config }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot { xinstall -m 644 ${worksrcpath}/rpm2html.tpl ${destroot}${prefix}/etc/rpm2html.tpl }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-rpm-prefix=${prefix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rpm2html/files/patch-rpmopen.c b/sysutils/rpm2html/files/patch-rpmopen.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a25b34..61886b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/rpm2html/files/patch-rpmopen.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rpm2html/files/patch-rpmopen.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- rpmopen.c.orig 2007-04-14 19:21:50.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ rpmopen.c 2007-06-25 14:07:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- rpmopen.c.orig 2010-11-09 13:57:42.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ rpmopen.c 2018-09-21 00:08:40.000000000 -0700
</span> @@ -29,6 +29,7 @@
#ifdef HAVE_RPM42
#include <rpm/rpmfi.h>
#endif
+#include <rpm/rpmevr.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef HAVE_RPM_RPMLEGACY_H
</span> int readLead(FD_t fd, /*@out@*/struct rpmlead *lead);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_RPM42
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -642,7 +642,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rpm->extra->packager = xmlStrdup(protectEmail((char *) p));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENTRY_CLEANUP(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!headerGetEntry(h, RPMTAG_COPYRIGHT, &type, &p, &count) || !p ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!headerGetEntry(h, RPMTAG_LICENSE, &type, &p, &count) || !p ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (type != RPM_STRING_TYPE)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rpm->extra->copyright = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span></pre><pre style='margin:0'>
</pre>