<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/d7d6acf56e6253c875959db9c4c962c45683059e">https://github.com/macports/macports-ports/commit/d7d6acf56e6253c875959db9c4c962c45683059e</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 d7d6acf56e6 wordgrinder: Update to 0.8
</span>d7d6acf56e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d7d6acf56e6253c875959db9c4c962c45683059e
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Nov 7 01:03:49 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> wordgrinder: Update to 0.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update to 0.8, overhaul build system, add xwordgrinder subport.
</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/61413
</span>---
editors/wordgrinder/Portfile | 116 ++++++++++++++++++++++------
editors/wordgrinder/files/Makefile.patch | 12 +++
editors/wordgrinder/files/patch-pmfile.diff | 58 --------------
3 files changed, 104 insertions(+), 82 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/wordgrinder/Portfile b/editors/wordgrinder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13454c5c1ac..e4ed910b762 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/wordgrinder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/wordgrinder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup davidgiven wordgrinder 0.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2624730aa538162f134f80ece6804e2435c7fa8c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 856cbed2b4ccd5127f61c4997a30e642d414247970f69932f25b4b5a81b18d3f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2015849
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name wordgrinder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> categories editors
license MIT
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,26 +18,87 @@ description WordGrinder, lightweight character-cell word processor desig
</span> long_description WordGrinder is a light-weight character-cell word processor designed for text\
entry on the console, supporting Unicode and styled text. It provides a clean,\
easy-to-use interface that gets out of your way and get the job done.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://wordgrinder.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:wordgrinder
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 1ae3bcf2fc4ee027bdd9518a73733505 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 8a15b99872ffd7317e0c654ab74157c0bc1164fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 939dde7b35964e7ba41898eee5fdedaa5396d60d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:lua \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lua-luafilesystem \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-pmfile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@DESTROOT@@|${destroot}|g" ${worksrcpath}/pmfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/pmfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://cowlark.com/wordgrinder/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:ninja \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Setting SOURCE_DATE_EPOCH requires GNU date.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/davidgiven/wordgrinder/issues/150
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:coreutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:minizip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ncurses \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Base doesn't set SOURCE_DATE_EPOCH so we have to.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/59672
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set latest 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse i [list ${worksrcpath}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isfile ${i}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set t [file mtime ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${t} > ${latest}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set latest ${t}
</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:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ./pm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args -v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#build.env-append LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open $env(TMPDIR)/SOURCE_DATE_EPOCH w]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts -nonewline ${fp} ${latest}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</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;'>+patchfiles Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CURSES_PACKAGE=ncursesw \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LPEG_PACKAGE=builtin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LUA_PACKAGE=builtin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LUABITOP_PACKAGE=builtin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MINIZIP_PACKAGE=minizip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UTHASH_PACKAGE=builtin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XFT_PACKAGE=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable silent rules.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append hide=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The value of DESTDIR gets baked in at build time.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/davidgiven/wordgrinder/issues/41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append DESTDIR=${destroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fp [open $env(TMPDIR)/SOURCE_DATE_EPOCH r]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set latest [read ${fp}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${fp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCE_DATE_EPOCH=${latest}
</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;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Delete the files that aren't for this subport.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set isxwordgrinder [expr {${subport} eq {xwordgrinder}}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse i [list ${destroot}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file isdirectory ${i}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match xwordgrinder* [file tail ${i}]] != ${isxwordgrinder}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${i}
</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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport xwordgrinder {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:Xft2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XFT_PACKAGE=none \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "XFT_PACKAGE=--cflags={-I${prefix}/include/X11} --libs={-lX11 -lXft}"
</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;'>+if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/wordgrinder/files/Makefile.patch b/editors/wordgrinder/files/Makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..be9727859b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/wordgrinder/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/davidgiven/wordgrinder/issues/150
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2020-10-23 16:48:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2020-11-06 23:52:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILEFORMAT := 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifdef SOURCE_DATE_EPOCH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DATE := $(shell LC_ALL date --utc --date="@$(SOURCE_DATE_EPOCH)" +'%-d %B %Y')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DATE := $(shell LC_ALL=C gdate --utc --date="@$(SOURCE_DATE_EPOCH)" +'%-d %B %Y')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DATE := $(shell date +'%-d %B %Y')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/wordgrinder/files/patch-pmfile.diff b/editors/wordgrinder/files/patch-pmfile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b7c622e495a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/wordgrinder/files/patch-pmfile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pmfile.orig 2010-01-30 16:19:08.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pmfile 2010-01-30 16:20:40.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- Where do you want WordGrinder installed? By default, it goes into your
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- home directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX = HOME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX = "@@DESTROOT@@@@PREFIX@@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- PREFIX = "/usr/local"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -- What build flags do you want to use? (Not including -g or -Os, which are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,7 +27,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CBUILDFLAGS = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-Wall',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '--std=c99'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '--std=c99',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '-L@@PREFIX@@/lib'
</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;'>- -- Any other build options go in these three sections. Note the lack of -l, -D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,8 +46,9 @@
</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;'>- CINCLUDES = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@@PREFIX@@/include",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "/usr/include/ncursesw",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "/usr/include/lua5.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@@PREFIX@@/include/ncursesw",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@@PREFIX@@/include/lua5.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "src/c"
</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;'>-@@ -215,7 +216,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLIBRARIES = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PARENT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'ncursesw',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'lua5.1'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'lua'
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -369,9 +370,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install = simple {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- outputs = {"dummy"},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- command = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "install -D -m 755 %in[1]% %PREFIX%/bin/wordgrinder",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "install -D -m 644 %in[2]% %PREFIX%/man/man1/wordgrinder.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "install -D -m 644 %in[3]% %PREFIX%/share/doc/wordgrinder/README.wg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "install -d -m 755 %PREFIX%/bin",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "install -m 755 %in[1]% %PREFIX%/bin/wordgrinder",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "install -d -m 755 %PREFIX%/share/man/man1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "install -m 644 %in[2]% %PREFIX%/share/man/man1/wordgrinder.1",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "install -d -m 755 %PREFIX%/share/doc/wordgrinder",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "install -m 644 %in[3]% %PREFIX%/share/doc/wordgrinder/README.wg"
</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;'>- wordgrinder_release_exe,
</span></pre><pre style='margin:0'>
</pre>