<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/db7e7aa85dce9427131f9ea2cc3a549bfb7849d0">https://github.com/macports/macports-ports/commit/db7e7aa85dce9427131f9ea2cc3a549bfb7849d0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit db7e7aa85dce9427131f9ea2cc3a549bfb7849d0
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Sat Sep 30 19:27:29 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> rpm54: change to use xar; add missing deps; add patch to allow building
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Note it seems that a lot of commands abend/core dump - it seems that
</span><span style='display:block; white-space:pre;color:#404040;'> rpm4 also does not work on some commands. Add conflict with rpm and
</span><span style='display:block; white-space:pre;color:#404040;'> enable tests (2 aborts/failures).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I attempted to upgrade this port to the 2016 and 2017 versions without
</span><span style='display:block; white-space:pre;color:#404040;'> any success.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> maintainer timeout
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/54776
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/51676
</span>---
sysutils/rpm54/Portfile | 15 ++++++++++++---
sysutils/rpm54/files/patch-rpmuuid.c.diff | 11 +++++++++++
2 files changed, 23 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rpm54/Portfile b/sysutils/rpm54/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 379ee16..855e1e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/rpm54/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rpm54/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,14 @@ PortGroup perl5 1.0
</span>
name rpm54
version 5.4.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> set date 20140824
set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin freebsd linux
license LGPL-2.1
categories sysutils archivers
maintainers afb
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts rpm
</span> description The RPM package management system.
long_description The RPM Package Manager (RPM) is a powerful command line driven \
package management system capable of installing, uninstalling, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +27,15 @@ checksums md5 d53782842ac11b3100a43fb2958c9bc0 \
</span> rmd160 1b4af6831b864e485e6f9d9bee2c99f294e62cd8
worksrcdir rpm-${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-rpmuuid.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:gawk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span> depends_lib port:beecrypt port:readline port:gettext port:libiconv \
port:expat port:neon \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 port:popt port:sqlite3 port:xar-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python27 port:popt port:sqlite3 port:xar \
</span> port:xz port:pcre port:ossp-uuid \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:db60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:db60 port:libmagic
</span>
depends_run path:lib/libssl.dylib:openssl \
bin:gzip:gzip \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,6 +139,10 @@ variant docs description "API documentation" {
</span> configure.args-append --with-apidocs
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
# get the last modified tarball
livecheck.url ${master_sites}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/rpm54/files/patch-rpmuuid.c.diff b/sysutils/rpm54/files/patch-rpmuuid.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f1c7893
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/rpm54/files/patch-rpmuuid.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- rpmio/rpmuuid.c 2011-03-26 09:03:53.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ rpmio/rpmuuid.c 2017-09-30 18:25:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,6 +2,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * \file rpmio/rpmuuid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _XOPEN_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* workaround for "uuid_t" type conflict, between <unistd.h> and "uuid.h" */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _UUID_T
</span></pre><pre style='margin:0'>
</pre>