diff options
| author | Misty De Meo | 2013-09-10 22:38:36 -0700 |
|---|---|---|
| committer | Misty De Meo | 2013-09-10 22:38:48 -0700 |
| commit | b932ec27d59b06504ee1b8a5fe25a69a8a43e4eb (patch) | |
| tree | 0804d58d733f1804d43555b7cb31e3dd83a9ae0a /Library | |
| parent | c7790d9fb7a3d692f5afb485b7260abf2913225d (diff) | |
| download | homebrew-b932ec27d59b06504ee1b8a5fe25a69a8a43e4eb.tar.bz2 | |
alpine: fix build with Tcl 8.6
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/alpine.rb | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/Library/Formula/alpine.rb b/Library/Formula/alpine.rb index 8971dac5b..5376a888e 100644 --- a/Library/Formula/alpine.rb +++ b/Library/Formula/alpine.rb @@ -5,12 +5,16 @@ class Alpine < Formula url 'ftp://ftp.cac.washington.edu/alpine/alpine-2.00.tar.gz' sha1 '363b3aa5d3eb1319e168639fbbc42b033b16f15b' - # Upstream builds are broken on Snow Leopard due to a hack put in - # for prior versions of OS X. See: - # http://trac.macports.org/ticket/20971 def patches - "https://trac.macports.org/export/89747/trunk/dports/mail/alpine/files/alpine-osx-10.6.patch" - end if MacOS.version >= :snow_leopard + p = [] + # Upstream builds are broken on Snow Leopard due to a hack put in + # for prior versions of OS X. See: + # http://trac.macports.org/ticket/20971 + p << "https://trac.macports.org/export/89747/trunk/dports/mail/alpine/files/alpine-osx-10.6.patch" if MacOS.version >= :snow_leopard + # Fails to build against Tcl 8.6; reported upstream: + # http://mailman2.u.washington.edu/pipermail/alpine-info/2013-September/005291.html + p << DATA + end def install ENV.j1 @@ -20,3 +24,25 @@ class Alpine < Formula system "make install" end end + +__END__ +diff --git a/web/src/alpined.d/alpined.c b/web/src/alpined.d/alpined.c +index 98c5a63..d2c63b5 100644 +--- a/web/src/alpined.d/alpined.c ++++ b/web/src/alpined.d/alpined.c +@@ -751,10 +751,10 @@ main(int argc, char *argv[]) + } + + switch(Tcl_Eval(interp, &buf[co])){ +- case TCL_OK : peReturn(cs, "OK", interp->result); break; +- case TCL_ERROR : peReturn(cs, "ERROR", interp->result); break; +- case TCL_BREAK : peReturn(cs, "BREAK", interp->result); break; +- case TCL_RETURN : peReturn(cs, "RETURN", interp->result); break; ++ case TCL_OK : peReturn(cs, "OK", Tcl_GetStringResult(interp)); break; ++ case TCL_ERROR : peReturn(cs, "ERROR", Tcl_GetStringResult(interp)); break; ++ case TCL_BREAK : peReturn(cs, "BREAK", Tcl_GetStringResult(interp)); break; ++ case TCL_RETURN : peReturn(cs, "RETURN", Tcl_GetStringResult(interp)); break; + default : peReturn(cs, "BOGUS", "eval returned unexpected value"); break; + } + } + |