[128860] trunk/dports/textproc/yodl
larryv at macports.org
larryv at macports.org
Fri Nov 28 13:31:59 PST 2014
Revision: 128860
https://trac.macports.org/changeset/128860
Author: larryv at macports.org
Date: 2014-11-28 13:31:59 -0800 (Fri, 28 Nov 2014)
Log Message:
-----------
yodl: Rename patches
Modified Paths:
--------------
trunk/dports/textproc/yodl/Portfile
Added Paths:
-----------
trunk/dports/textproc/yodl/files/fix-hashbangs.patch
trunk/dports/textproc/yodl/files/use-macports-compilers.patch
trunk/dports/textproc/yodl/files/use-macports-locations.patch
Removed Paths:
-------------
trunk/dports/textproc/yodl/files/bash-hashbang.patch
trunk/dports/textproc/yodl/files/macports-compilers.patch
trunk/dports/textproc/yodl/files/macports-locations.patch
Modified: trunk/dports/textproc/yodl/Portfile
===================================================================
--- trunk/dports/textproc/yodl/Portfile 2014-11-28 19:50:56 UTC (rev 128859)
+++ trunk/dports/textproc/yodl/Portfile 2014-11-28 21:31:59 UTC (rev 128860)
@@ -32,9 +32,9 @@
checksums rmd160 bd03e15418295eb112b4228d3e2fd68b95d225a7 \
sha256 66b317877906e165506796f9342a1adf931376f7d8b6990b2d2ff12107685893
-patchfiles bash-hashbang.patch \
- macports-compilers.patch \
- macports-locations.patch
+patchfiles fix-hashbangs.patch \
+ use-macports-compilers.patch \
+ use-macports-locations.patch
post-patch {
reinplace -W ${worksrcpath} s|__MP_CC__|${configure.cc}| INSTALL.im
reinplace -W ${worksrcpath} s|__MP_CXX__|${configure.cxx}| INSTALL.im
Deleted: trunk/dports/textproc/yodl/files/bash-hashbang.patch
===================================================================
--- trunk/dports/textproc/yodl/files/bash-hashbang.patch 2014-11-28 19:50:56 UTC (rev 128859)
+++ trunk/dports/textproc/yodl/files/bash-hashbang.patch 2014-11-28 21:31:59 UTC (rev 128860)
@@ -1,110 +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
Copied: trunk/dports/textproc/yodl/files/fix-hashbangs.patch (from rev 128846, trunk/dports/textproc/yodl/files/bash-hashbang.patch)
===================================================================
--- trunk/dports/textproc/yodl/files/fix-hashbangs.patch (rev 0)
+++ trunk/dports/textproc/yodl/files/fix-hashbangs.patch 2014-11-28 21:31:59 UTC (rev 128860)
@@ -0,0 +1,110 @@
+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
Deleted: trunk/dports/textproc/yodl/files/macports-compilers.patch
===================================================================
--- trunk/dports/textproc/yodl/files/macports-compilers.patch 2014-11-28 19:50:56 UTC (rev 128859)
+++ trunk/dports/textproc/yodl/files/macports-compilers.patch 2014-11-28 21:31:59 UTC (rev 128860)
@@ -1,51 +0,0 @@
-Index: INSTALL.im
-===================================================================
---- INSTALL.im.orig
-+++ INSTALL.im
-@@ -76,8 +76,8 @@ void setLocations()
- MAN = BASE + "/share/man";
- STD_INCLUDE = BASE + "/share/yodl";
-
-- COMPILER = "gcc";
-- CXX = "g++";
-+ COMPILER = "__MP_CC__";
-+ CXX = "__MP_CXX__";
- }
-
-
-Index: build
-===================================================================
---- build.orig
-+++ build
-@@ -13,6 +13,7 @@
- string CLASSES;
- string g_lopt;
- string g_copt;
-+string g_cxxopt;
- string g_cwd;
- string g_wip = "tmp/wip"; // no slash here
- string g_install = "tmp/install"; // no slash here
-@@ -61,6 +62,8 @@ void main(int argc, list argv)
-
- g_copt = setOpt(COPT + " -g", "CFLAGS");
-
-+ g_cxxopt = setOpt(g_cxxopt, "CXXFLAGS");
-+
- #ifdef PROFILING
- g_copt = COPT + " -pg";
- g_lopt = "-pg";
-Index: icmake/program
-===================================================================
---- icmake/program.orig
-+++ icmake/program
-@@ -26,8 +26,8 @@ void _programYodlverbinsert()
- {
- if ("src/verbinsert/verbinsert.cc" younger
- g_install + BIN + "/yodlverbinsert")
-- run(CXX + " --std=c++11 -o " + g_install + BIN + "/yodlverbinsert " +
-- g_copt + " src/verbinsert/verbinsert.cc " + g_lopt);
-+ run(CXX + " -o " + g_install + BIN + "/yodlverbinsert " +
-+ g_cxxopt + " src/verbinsert/verbinsert.cc " + g_lopt);
- }
-
- void program(string target)
Deleted: trunk/dports/textproc/yodl/files/macports-locations.patch
===================================================================
--- trunk/dports/textproc/yodl/files/macports-locations.patch 2014-11-28 19:50:56 UTC (rev 128859)
+++ trunk/dports/textproc/yodl/files/macports-locations.patch 2014-11-28 21:31:59 UTC (rev 128860)
@@ -1,31 +0,0 @@
-Index: INSTALL.im
-===================================================================
---- INSTALL.im.orig
-+++ INSTALL.im
-@@ -65,14 +65,14 @@ string CXX;
-
- void setLocations()
- {
-- BASE = "/usr";
-+ BASE = "__MP_PREFIX__";
-
- // make sure that BIN, STD_INCLUDE, MAN, DOC and DOCDOC all are
- // absolute paths
-
- BIN = BASE + "/bin";
- DOC = BASE + "/share/doc/yodl";
-- DOCDOC = BASE + "/share/doc/yodl-doc";
-+ DOCDOC = DOC;
- MAN = BASE + "/share/man";
- STD_INCLUDE = BASE + "/share/yodl";
-
-Index: build
-===================================================================
---- build.orig
-+++ build
-@@ -1,4 +1,4 @@
--#!/usr/bin/icmake -qt/tmp/yodl
-+#!__MP_PREFIX__/bin/icmake -qt/tmp/yodl
-
- #include "VERSION"
- #include "INSTALL.im"
Copied: trunk/dports/textproc/yodl/files/use-macports-compilers.patch (from rev 128846, trunk/dports/textproc/yodl/files/macports-compilers.patch)
===================================================================
--- trunk/dports/textproc/yodl/files/use-macports-compilers.patch (rev 0)
+++ trunk/dports/textproc/yodl/files/use-macports-compilers.patch 2014-11-28 21:31:59 UTC (rev 128860)
@@ -0,0 +1,51 @@
+Index: INSTALL.im
+===================================================================
+--- INSTALL.im.orig
++++ INSTALL.im
+@@ -76,8 +76,8 @@ void setLocations()
+ MAN = BASE + "/share/man";
+ STD_INCLUDE = BASE + "/share/yodl";
+
+- COMPILER = "gcc";
+- CXX = "g++";
++ COMPILER = "__MP_CC__";
++ CXX = "__MP_CXX__";
+ }
+
+
+Index: build
+===================================================================
+--- build.orig
++++ build
+@@ -13,6 +13,7 @@
+ string CLASSES;
+ string g_lopt;
+ string g_copt;
++string g_cxxopt;
+ string g_cwd;
+ string g_wip = "tmp/wip"; // no slash here
+ string g_install = "tmp/install"; // no slash here
+@@ -61,6 +62,8 @@ void main(int argc, list argv)
+
+ g_copt = setOpt(COPT + " -g", "CFLAGS");
+
++ g_cxxopt = setOpt(g_cxxopt, "CXXFLAGS");
++
+ #ifdef PROFILING
+ g_copt = COPT + " -pg";
+ g_lopt = "-pg";
+Index: icmake/program
+===================================================================
+--- icmake/program.orig
++++ icmake/program
+@@ -26,8 +26,8 @@ void _programYodlverbinsert()
+ {
+ if ("src/verbinsert/verbinsert.cc" younger
+ g_install + BIN + "/yodlverbinsert")
+- run(CXX + " --std=c++11 -o " + g_install + BIN + "/yodlverbinsert " +
+- g_copt + " src/verbinsert/verbinsert.cc " + g_lopt);
++ run(CXX + " -o " + g_install + BIN + "/yodlverbinsert " +
++ g_cxxopt + " src/verbinsert/verbinsert.cc " + g_lopt);
+ }
+
+ void program(string target)
Copied: trunk/dports/textproc/yodl/files/use-macports-locations.patch (from rev 128846, trunk/dports/textproc/yodl/files/macports-locations.patch)
===================================================================
--- trunk/dports/textproc/yodl/files/use-macports-locations.patch (rev 0)
+++ trunk/dports/textproc/yodl/files/use-macports-locations.patch 2014-11-28 21:31:59 UTC (rev 128860)
@@ -0,0 +1,31 @@
+Index: INSTALL.im
+===================================================================
+--- INSTALL.im.orig
++++ INSTALL.im
+@@ -65,14 +65,14 @@ string CXX;
+
+ void setLocations()
+ {
+- BASE = "/usr";
++ BASE = "__MP_PREFIX__";
+
+ // make sure that BIN, STD_INCLUDE, MAN, DOC and DOCDOC all are
+ // absolute paths
+
+ BIN = BASE + "/bin";
+ DOC = BASE + "/share/doc/yodl";
+- DOCDOC = BASE + "/share/doc/yodl-doc";
++ DOCDOC = DOC;
+ MAN = BASE + "/share/man";
+ STD_INCLUDE = BASE + "/share/yodl";
+
+Index: build
+===================================================================
+--- build.orig
++++ build
+@@ -1,4 +1,4 @@
+-#!/usr/bin/icmake -qt/tmp/yodl
++#!__MP_PREFIX__/bin/icmake -qt/tmp/yodl
+
+ #include "VERSION"
+ #include "INSTALL.im"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141128/5dd27bdb/attachment.html>
More information about the macports-changes
mailing list