<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/31f87f5ae644dc7b5b21bad29f485ea57f5ec94f">https://github.com/macports/macports-ports/commit/31f87f5ae644dc7b5b21bad29f485ea57f5ec94f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 31f87f5 cfengine: update to 2.2.10
</span>31f87f5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 31f87f5ae644dc7b5b21bad29f485ea57f5ec94f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Dec 22 23:36:52 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> cfengine: update to 2.2.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also use db48.
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/57707
</span>---
sysutils/cfengine/Portfile | 27 ++++++++---------
sysutils/cfengine/files/configure.patch | 46 +++++++++++++++++++++++++++++
sysutils/cfengine/files/patch-pub__getopt.c | 11 -------
3 files changed, 58 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/cfengine/Portfile b/sysutils/cfengine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e0518d..37d70b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/cfengine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/cfengine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,7 @@
</span> PortSystem 1.0
name cfengine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.10
</span> categories sysutils
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,18 +11,18 @@ long_description Cfengine, or the configuration engine is an \
</span> policy language for building expert systems \
which administrate and configure large computer \
networks.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.cfengine.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ftp://ftp.iu.hio.no/pub/cfengine/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://sunsite.uio.no/pub/cfengine/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://ftp.us.xemacs.org/ftp/pub/cfengine/cfengine-ftp/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 ce4954174110c43541d25775747ae65ada30063d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.cfengine.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://s3.amazonaws.com/cfengine-package-repos/tarballs/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 3b90ff8bf2ec941cd33cfb65f5012f16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 032bec0bc59ffee7179422e96dfd902afbf94340 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 67fd3dc80270dc000887e3dbf26f372338e2600f
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:db44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:db48 \
</span> path:lib/libssl.dylib:openssl \
port:pcre
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-pub__getopt.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles configure.patch
</span> post-patch {
foreach manfile [glob ${worksrcpath}/doc/*.8] {
reinplace "s|/usr/local|${prefix}|g" $manfile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +32,6 @@ post-patch {
</span>
set cfworkdir ${prefix}/var/cfengine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags -I${prefix}/include/db44 -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags -L${prefix}/lib/db44 -L${prefix}/lib
</span> configure.args --mandir='\${prefix}/share/man' \
--infodir='\${prefix}/share/info' \
--with-workdir="${cfworkdir}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +40,8 @@ configure.args --mandir='\${prefix}/share/man' \
</span> --with-pcre=default \
--with-docs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args ps_DATA=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args ps_DATA=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args doc_DATA= html_DATA=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args doc_DATA= html_DATA=
</span>
pre-destroot {
if {[geteuid] != 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,8 +130,8 @@ post-activate {
</span> variant psdocs {
depends_build bin:tex:texlive \
bin:texinfo:texinfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-delete ps_DATA=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-delete ps_DATA=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-delete doc_DATA= html_DATA=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-delete doc_DATA= html_DATA=
</span> }
platform darwin {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/cfengine/files/configure.patch b/sysutils/cfengine/files/configure.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c331f1a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/cfengine/files/configure.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2009-04-12 05:59:34.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-12-22 23:20:09.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15938,22 +15938,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "$as_me: error: This release of cfengine requires a version of BerkeleyDB 4.4 or later" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { (exit 1); exit 1; }; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "x$BERKELEY_DB_DIR" = "xdefault" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for v in BerkeleyDB.4.2 BerkeleyDB.4.3 BerkeleyDB.4.4 BerkeleyDB.4.5 BerkeleyDB.4.6 BerkeleyDB.4.7; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for d in $prefix /opt /usr/local /usr; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test -d "$d/$v" && BERKELEY_DB_DIR="$d/$v"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$BERKELEY_DB_DIR" = "xdefault" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for d in $prefix /opt /usr/local /usr; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for v in db-4 db4 db3 db db40; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for v in db48; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -f "$d/include/$v/db.h" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Found header in $d/include/$v "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test "x$d" != "x/usr" && BERKELEY_DB_LDFLAGS="-L$d/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test "x$d" != "x/usr" && BERKELEY_DB_LDFLAGS="-L$d/lib/$v"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BERKELEY_DB_CFLAGS="-I$d/include/$v"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ late_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # In RedHat 8, for instance, we have /usr/include/db4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16054,7 +16047,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="$save_CFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="$save_LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BERKELEY_DB_LIB="-l$v"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BERKELEY_DB_LIB="-ldb-4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS=$late_LIBS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:$LINENO: result: $d" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20368,6 +20361,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $ac_includes_default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_TIME_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/cfengine/files/patch-pub__getopt.c b/sysutils/cfengine/files/patch-pub__getopt.c
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9e53163..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/cfengine/files/patch-pub__getopt.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pub/getopt.c 2005-02-08 11:48:47.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pub/getopt.c.new 2007-06-13 11:57:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -156,7 +156,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Value of POSIXLY_CORRECT environment variable. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char *posixly_correct;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __GNU_LIBRARY__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__GNU_LIBRARY__) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* We want to avoid inclusion of string.h with non-GNU libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- because there are many ways it can cause trouble.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- On some systems, it contains special magic macros that don't work
</span></pre><pre style='margin:0'>
</pre>