<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/481120ec51a1b4f84dc4df13e489bd5c72c3b084">https://github.com/macports/macports-ports/commit/481120ec51a1b4f84dc4df13e489bd5c72c3b084</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 481120e cgit: Update to 1.1
</span>481120e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 481120ec51a1b4f84dc4df13e489bd5c72c3b084
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 1 11:21:11 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> cgit: Update to 1.1
</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/54106
</span>---
www/cgit/Portfile | 43 ++++++++++++++++++++++++--------------
www/cgit/files/cgit.conf | 2 +-
www/cgit/files/write_archive.patch | 24 +++++++++++++++++++++
3 files changed, 52 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/cgit/Portfile b/www/cgit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 50de5b6..0140069 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/cgit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/cgit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,36 +3,40 @@
</span> PortSystem 1.0
name cgit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.9.0.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_version 1.7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See Makefile GIT_VER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_version 2.11.0
</span> categories www devel
license GPL-2
maintainers nomaintainer
description A fast web interface for the git source code management system
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://hjemli.net/git/cgit/
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# change dist_subdir to 'git' with next version update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir git-core
</span>
long_description \
cgit is an attempt to create a fast web interface for the git scm, using a \
builtin cache to decrease server io-pressure. It can run on any \
CGI-capable web server.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://git.zx2c4.com/cgit/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}snapshot:cgit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://www.kernel.org/pub/software/scm/git:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span> set cgit_distfile ${distfiles}
set git_distname git-${git_version}
set git_distfile ${git_distname}${extract.suffix}
distfiles ${cgit_distfile}:cgit ${git_distfile}:git
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}snapshot:cgit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.kernel.org/pub/software/scm/git:git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${cgit_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a426468889aff48a19849acd01c9660b37cb0c0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 53ccf0c826f91c2184ec29b1b9ab8a6f42e0ef2e6fa9042c3759e2a2dc81baa5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${git_distfile} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a064d7a5b2d3fae6171ca91a03082eb46d7bb9b7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${cgit_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9ad96a56d17ae060b73e8d576d0c065aa590fcfb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 86268 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${git_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dc2c45d6763732129fb8e383877ee434972f79e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4197984
</span>
depends_lib port:git \
path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,10 +48,13 @@ post-extract {
</span> move ${workpath}/${git_distname} ${worksrcpath}/git
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles write_archive.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
file copy ${filespath}/cgit.conf ${worksrcpath}/cgit.conf
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cgit.conf
reinplace "s|@GIT_VER@|${git_version}|g" ${worksrcpath}/cgit.conf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@GIT_URL@|file://${distpath}/${git_distfile}|g" ${worksrcpath}/cgit.conf
</span> }
set user _www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +75,11 @@ use_configure no
</span> variant universal {}
configure.ldflags-append -liconv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC="${configure.cc} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args prefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC="${configure.cc} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_GETTEXT=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_LUA=1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ V=1
</span> build.env CFLAGS="${configure.cflags}" \
LDFLAGS="${configure.ldflags}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/cgit/files/cgit.conf b/www/cgit/files/cgit.conf
</span><span style='display:block; white-space:pre;color:#808080;'>index e072237..bc91f89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/cgit/files/cgit.conf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/cgit/files/cgit.conf
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,4 +2,4 @@ CGIT_CONFIG = @PREFIX@/etc/cgitrc
</span> CGIT_SCRIPT_PATH = @PREFIX@/www/data/cgit
CACHE_ROOT = @PREFIX@/var/cache/cgit
GIT_VER = @GIT_VER@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-GIT_URL = file://@PREFIX@/var/macports/distfiles/cgit/git-@GIT_VER@.tar.bz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GIT_URL = @GIT_URL@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/cgit/files/write_archive.patch b/www/cgit/files/write_archive.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f2db113
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/cgit/files/write_archive.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 91153fd02e62f2eaca8e6c140baa4f2abf39c40e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Christian Hesse <mail@eworm.de>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 30 Nov 2016 10:43:08 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: git: update to v2.11.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Update to git version v2.11.0. Function write_archive()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dropped argument (int setup_prefix).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui-snapshot.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(limited to 'ui-snapshot.c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ui-snapshot.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ui-snapshot.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* argv_array guarantees a trailing NULL entry. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = write_archive(argv.argc, nargv, NULL, NULL, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv_array_clear(&argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(nargv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result;
</span></pre><pre style='margin:0'>
</pre>