Skip to content

Commit

Permalink
moca: Fix configure failure
Browse files Browse the repository at this point in the history
  • Loading branch information
ryandesign committed Nov 28, 2019
1 parent de1bb70 commit f8eb4c8
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
7 changes: 5 additions & 2 deletions lang/moca/Portfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# -*- 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

PortSystem 1.0

name moca
Expand All @@ -16,13 +18,14 @@ master_sites http://moca.inria.fr/archive/
checksums rmd160 84384035883fe2f80f68024117ccf60c9697cb06 \
sha256 1d5fecd014890d5fcf1921a0145468a910ca7b87498fd12b9b670cb592ae74c2

patchfiles patch-config-Makefile.config.in.diff

extract.suffix .tgz

depends_build port:ocaml
depends_run port:ocaml

patchfiles patch-config-Makefile.config.in.diff \
patch-configure.diff

configure.pre_args "${destroot}${prefix}"

use_parallel_build no
Expand Down
22 changes: 22 additions & 0 deletions lang/moca/files/patch-configure.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Fix configure failure on recent macOS:
sed: RE error: illegal byte sequence
--- Mk/configure.orig 2011-02-21 13:14:35.000000000 -0600
+++ Mk/configure 2019-11-28 02:31:42.000000000 -0600
@@ -29,6 +29,7 @@
echo "# The editable source of this file is in $GENERATED.in" >> $GENERATED
echo "#" >> $GENERATED

+LC_CTYPE=ISO8859-1 \
sed -e "s|SRCROOTDIR=.*|SRCROOTDIR=$SRCROOTDIR|" \
$GENERATED.in >> $GENERATED

--- config/configure.orig 2012-06-04 08:01:22.000000000 -0500
+++ config/configure 2019-11-28 02:31:41.000000000 -0600
@@ -47,6 +47,7 @@
echo "# The editable source of this file is in $GENERATED.in" >> $GENERATED
echo "#" >> $GENERATED

+LC_CTYPE=ISO8859-1 \
sed -e "s|PREFIX=.*|PREFIX=$PREFIXDIR|" \
-e "s|SRCROOTDIR=.*|SRCROOTDIR=$SRCROOTDIR|" \
$GENERATED.in >> $GENERATED

0 comments on commit f8eb4c8

Please sign in to comment.