<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/d5a2a26c198073694c5b00a124738e139c8c02e1">https://github.com/macports/macports-ports/commit/d5a2a26c198073694c5b00a124738e139c8c02e1</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 d5a2a26 fortune: improve handling of offensive fortunes
</span>d5a2a26 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d5a2a26c198073694c5b00a124738e139c8c02e1
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Dec 7 21:23:26 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> fortune: improve handling of offensive fortunes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now installing all the potentially offensive fortunes in the
</span><span style='display:block; white-space:pre;color:#404040;'> recommended way, with a suffix of -o on the filename so they are only
</span><span style='display:block; white-space:pre;color:#404040;'> shown when the -o or -a options are used, and obfuscated on disk with
</span><span style='display:block; white-space:pre;color:#404040;'> rot13.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/33166
</span>---
games/fortune/Portfile | 7 ++--
games/fortune/files/patch-datfiles-Makefile | 53 +++++++++++++++++++++++++----
2 files changed, 52 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/fortune/Portfile b/games/fortune/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d8c0152..64e9289 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/fortune/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/fortune/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name fortune
version 6.2.0-RELEASE
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories games
platforms darwin freebsd
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +33,9 @@ post-patch {
</span> reinplace "s|/usr|${prefix}|" ${worksrcpath}/fortune/pathnames.h
reinplace "s|/usr/share|${prefix}/share|" ${worksrcpath}/fortune/fortune.6
reinplace "s|/usr/games/fortune|${prefix}/bin/fortune|" ${worksrcpath}/fortune/fortune.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|XXPREFIX|${prefix}|" ${worksrcpath}/fortune/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/datfiles/fortunes2-o ${worksrcpath}/datfiles/fortunes2-o.real
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/datfiles/limerick ${worksrcpath}/datfiles/limerick-o.real
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/datfiles/murphy-o ${worksrcpath}/datfiles/murphy-o.real
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +61,7 @@ destroot {
</span> xinstall -m 755 -d ${destroot}${prefix}/share/games/fortune
xinstall -m 644 -W ${worksrcpath}/datfiles \
fortunes fortunes.dat fortunes-o fortunes-o.dat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fortunes2-o fortunes2-o.dat limerick limerick.dat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fortunes2-o fortunes2-o.dat limerick-o limerick-o.dat \
</span> murphy murphy.dat murphy-o murphy-o.dat \
startrek startrek.dat zippy zippy.dat \
${destroot}${prefix}/share/games/fortune
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/fortune/files/patch-datfiles-Makefile b/games/fortune/files/patch-datfiles-Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>index eff284b..4ab68b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/fortune/files/patch-datfiles-Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/fortune/files/patch-datfiles-Makefile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,50 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- datfiles/Makefile.orig Tue Oct 8 18:03:42 2002
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ datfiles/Makefile Tue Oct 8 18:03:54 2002
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,4 +39,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fortunes-o: fortunes-o.${TYPE}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tr a-zA-Z n-za-mN-ZA-M < ${.ALLSRC} > ${.TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- datfiles/Makefile.orig 2005-02-03 11:20:36.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ datfiles/Makefile 2018-12-07 21:05:36.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # @(#)Makefile 8.2 (Berkeley) 4/19/94
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.33 2005/02/03 00:20:36 ru Exp $
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+all: $(BLDS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FILES= fortunes freebsd-tips murphy startrek zippy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FILES= fortunes murphy startrek zippy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BLDS= fortunes.dat murphy.dat startrek.dat zippy.dat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fortunes-o fortunes-o.dat freebsd-tips.dat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fortunes-o fortunes-o.dat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Pass all new entries by ${MAINTAINER} to preserve some semblance of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # humor in the fortune files. What's funny to you on 6 beers may not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,8 +14,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # THREE LINES AND UNCOMMENT THE FOURTH LINE.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # THE THREE LINES:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FILES+= fortunes2-o limerick murphy-o gerrold.limerick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BLDS+= fortunes2-o.dat limerick.dat murphy-o.dat gerrold.limerick.dat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FILES+= fortunes2-o limerick-o murphy-o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BLDS+= fortunes2-o.dat limerick-o.dat murphy-o.dat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TYPE= real
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # THE FOURTH LINE:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,17 +26,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILESDIR= ${SHAREDIR}/games/fortune
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.for f in fortunes fortunes2-o freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.for f in fortunes murphy startrek zippy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $f.dat: $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strfile -Cs ${.ALLSRC} ${.TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .endfor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fortunes-o.dat: fortunes-o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.for f in fortunes-o fortunes2-o limerick-o murphy-o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$f.dat: $f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strfile -Csx ${.ALLSRC} ${.TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fortunes-o: fortunes-o.${TYPE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$f: $f.${TYPE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LC_ALL=C tr a-zA-Z n-za-mN-ZA-M < ${.ALLSRC} > ${.TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.endfor
</span> +
<span style='display:block; white-space:pre;background:#e0ffe0;'>++all: $(BLDS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> .include <bsd.prog.mk>
</pre><pre style='margin:0'>
</pre>