<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[136044] trunk/dports/textproc/yodl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/136044">136044</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-05-10 11:35:17 -0700 (Sun, 10 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>yodl: Update to 3.05.00
Also:
- Enable universal variant.
- Just use the system's bash and Perl. This simplifies the dependencies
and lets me get rid of an annoying patch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportstextprocyodlPortfile">trunk/dports/textproc/yodl/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportstextprocyodlfilesfixhashbangspatch">trunk/dports/textproc/yodl/files/fix-hashbangs.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportstextprocyodlPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/textproc/yodl/Portfile (136043 => 136044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/yodl/Portfile 2015-05-10 18:35:15 UTC (rev 136043)
+++ trunk/dports/textproc/yodl/Portfile 2015-05-10 18:35:17 UTC (rev 136044)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name yodl
</span><del>-version 3.04.00
-revision 1
</del><ins>+version 3.05.00
</ins><span class="cx"> categories textproc
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-3
</span><span class="lines">@@ -24,18 +23,15 @@
</span><span class="cx"> to be easy to use and extensible.
</span><span class="cx"> homepage http://yodl.sourceforge.net
</span><span class="cx">
</span><del>-depends_build port:icmake bin:perl:perl5
-depends_lib bin:bash:bash
-depends_skip_archcheck-append icmake bash
</del><ins>+depends_build port:icmake
</ins><span class="cx"> installs_libs no
</span><span class="cx">
</span><span class="cx"> master_sites sourceforge:project/yodl/yodl/${version}
</span><span class="cx"> distfiles yodl_${version}.orig${extract.suffix}
</span><del>-checksums rmd160 bd03e15418295eb112b4228d3e2fd68b95d225a7 \
- sha256 66b317877906e165506796f9342a1adf931376f7d8b6990b2d2ff12107685893
</del><ins>+checksums rmd160 22ba808220ea1d3e2e19d72df401101fb66d49e6 \
+ sha256 2f360062a85f9359207088b2586da863e2b111428f3e12486cd34c9de12b1b8a
</ins><span class="cx">
</span><span class="cx"> patchfiles avoid-c++11.patch \
</span><del>- fix-hashbangs.patch \
</del><span class="cx"> use-macports-compilers.patch \
</span><span class="cx"> use-macports-locations.patch
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -45,22 +41,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><del>-# TODO: Enable universal variant.
</del><ins>+variant universal {}
</ins><span class="cx">
</span><span class="cx"> # Install steps derived from INSTALL.txt in the distribution.
</span><span class="cx">
</span><span class="cx"> build {
</span><del>- set environ CFLAGS='${configure.cflags}'
- append environ " CXXFLAGS='${configure.cxxflags}'"
- append environ " LDFLAGS='${configure.ldflags}'"
</del><ins>+ set environ "CFLAGS='${configure.cflags} [get_canonical_archflags cc]'"
+ append environ \
+ " CXXFLAGS='${configure.cxxflags} [get_canonical_archflags cxx]'"
+ append environ \
+ " LDFLAGS='${configure.ldflags} [get_canonical_archflags ld]'"
</ins><span class="cx">
</span><span class="cx"> # Some sed(1) invocations fail without this.
</span><span class="cx"> append environ " LC_ALL=C"
</span><span class="cx">
</span><del>- # Don't bother building manual, since that requires LaTeX.
</del><ins>+ # Contrary to what the current INSTALL.txt says, 3.05.00 requires
+ # that "build macros" be run before "build man".
</ins><span class="cx"> system -W ${worksrcpath} "env $environ ./build programs"
</span><ins>+ system -W ${worksrcpath} "env $environ ./build macros"
</ins><span class="cx"> system -W ${worksrcpath} "env $environ ./build man"
</span><del>- system -W ${worksrcpath} "env $environ ./build macros"
</del><ins>+ # Don't bother building manual, since it requires LaTeX.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> destroot {
</span></span></pre></div>
<a id="trunkdportstextprocyodlfilesfixhashbangspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/textproc/yodl/files/fix-hashbangs.patch (136043 => 136044)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/textproc/yodl/files/fix-hashbangs.patch 2015-05-10 18:35:15 UTC (rev 136043)
+++ trunk/dports/textproc/yodl/files/fix-hashbangs.patch 2015-05-10 18:35:17 UTC (rev 136044)
</span><span class="lines">@@ -1,150 +0,0 @@
</span><del>-Index: macros/rawmacros/create
-===================================================================
---- macros/rawmacros/create.orig
-+++ macros/rawmacros/create
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- if [ "$#" == "0" ] ; then
- echo provide requested format as first arg.
-Index: macros/rawmacros/keepdiff
-===================================================================
---- macros/rawmacros/keepdiff.orig
-+++ macros/rawmacros/keepdiff
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- `diff $1 $1.rep > /dev/null`
-
-Index: macros/rawmacros/makeyoin
-===================================================================
---- macros/rawmacros/makeyoin.orig
-+++ macros/rawmacros/makeyoin
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- if [ "$*" == "0" ] ; then
- echo "Provide requested format as 1st argument (e.g., html, latex)"
-Index: macros/rawmacros/repairs
-===================================================================
---- macros/rawmacros/repairs.orig
-+++ macros/rawmacros/repairs
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- sed '
- s/htmlcommand/NOTRANS/g
- s/latexcommand/NOTRANS/g
-Index: macros/rawmacros/separator
-===================================================================
---- macros/rawmacros/separator.orig
-+++ macros/rawmacros/separator
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- target=$1
- file=$2
-Index: macros/rawmacros/startdoc
-===================================================================
---- macros/rawmacros/startdoc.orig
-+++ macros/rawmacros/startdoc
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- target=STARTDOC
-
-Index: scripts/configreplacements
-===================================================================
---- scripts/configreplacements.orig
-+++ scripts/configreplacements
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- CONFIG="tmp/wip/config.h"
-
-Index: scripts/createmacros
-===================================================================
---- scripts/createmacros.orig
-+++ scripts/createmacros
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- # This file creates the std.<format>.yo files, e.g. std.latex.yo
-
-Index: scripts/stdmacros
-===================================================================
---- scripts/stdmacros.orig
-+++ scripts/stdmacros
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- if [ "$#" == "0" ] ; then
- echo provide scratch filename, destination directory, requested format
-Index: scripts/yodl2whatever.in
-===================================================================
---- scripts/yodl2whatever.in.orig
-+++ scripts/yodl2whatever.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- # Don't hack the executable script by hand. Rather, reconfigure your
- # YODL package and do "make -C scripts clean; make -C scripts install".
-Index: src/yodl/replace
-===================================================================
---- src/yodl/replace.orig
-+++ src/yodl/replace
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- ls gram*.c | sed '
- s/gram//g
-Index: contrib/build.pl
-===================================================================
---- contrib/build.pl.orig
-+++ contrib/build.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
-
- # This script should be run from contrib's parent directory. I.e., you should
- # call it as `perl contrib/build.pl'.
-Index: macros/rawmacros/separator.pl
-===================================================================
---- macros/rawmacros/separator.pl.orig
-+++ macros/rawmacros/separator.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
-
- $target = $ARGV[0];
- $file = $ARGV[1];
-Index: macros/rawmacros/startdoc.pl
-===================================================================
---- macros/rawmacros/startdoc.pl.orig
-+++ macros/rawmacros/startdoc.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
-
- # The documentation of the macro in $file is extracted from $file and
- # written to stdout.
-Index: scripts/macroseparator.pl
-===================================================================
---- scripts/macroseparator.pl.orig
-+++ scripts/macroseparator.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
-
- $target = $ARGV[0];
- $file = $ARGV[1];
</del></span></pre>
</div>
</div>
</body>
</html>