[136044] trunk/dports/textproc/yodl
larryv at macports.org
larryv at macports.org
Sun May 10 11:35:17 PDT 2015
Revision: 136044
https://trac.macports.org/changeset/136044
Author: larryv at macports.org
Date: 2015-05-10 11:35:17 -0700 (Sun, 10 May 2015)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/dports/textproc/yodl/Portfile
Removed Paths:
-------------
trunk/dports/textproc/yodl/files/fix-hashbangs.patch
Modified: trunk/dports/textproc/yodl/Portfile
===================================================================
--- 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)
@@ -4,8 +4,7 @@
PortSystem 1.0
name yodl
-version 3.04.00
-revision 1
+version 3.05.00
categories textproc
platforms darwin
license GPL-3
@@ -24,18 +23,15 @@
to be easy to use and extensible.
homepage http://yodl.sourceforge.net
-depends_build port:icmake bin:perl:perl5
-depends_lib bin:bash:bash
-depends_skip_archcheck-append icmake bash
+depends_build port:icmake
installs_libs no
master_sites sourceforge:project/yodl/yodl/${version}
distfiles yodl_${version}.orig${extract.suffix}
-checksums rmd160 bd03e15418295eb112b4228d3e2fd68b95d225a7 \
- sha256 66b317877906e165506796f9342a1adf931376f7d8b6990b2d2ff12107685893
+checksums rmd160 22ba808220ea1d3e2e19d72df401101fb66d49e6 \
+ sha256 2f360062a85f9359207088b2586da863e2b111428f3e12486cd34c9de12b1b8a
patchfiles avoid-c++11.patch \
- fix-hashbangs.patch \
use-macports-compilers.patch \
use-macports-locations.patch
post-patch {
@@ -45,22 +41,26 @@
}
use_configure no
-# TODO: Enable universal variant.
+variant universal {}
# Install steps derived from INSTALL.txt in the distribution.
build {
- set environ CFLAGS='${configure.cflags}'
- append environ " CXXFLAGS='${configure.cxxflags}'"
- append environ " LDFLAGS='${configure.ldflags}'"
+ 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]'"
# Some sed(1) invocations fail without this.
append environ " LC_ALL=C"
- # Don't bother building manual, since that requires LaTeX.
+ # Contrary to what the current INSTALL.txt says, 3.05.00 requires
+ # that "build macros" be run before "build man".
system -W ${worksrcpath} "env $environ ./build programs"
+ system -W ${worksrcpath} "env $environ ./build macros"
system -W ${worksrcpath} "env $environ ./build man"
- system -W ${worksrcpath} "env $environ ./build macros"
+ # Don't bother building manual, since it requires LaTeX.
}
destroot {
Deleted: trunk/dports/textproc/yodl/files/fix-hashbangs.patch
===================================================================
--- 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)
@@ -1,150 +0,0 @@
-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];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150510/03a5b877/attachment.html>
More information about the macports-changes
mailing list