<!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>[116442] trunk/dports/devel</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/116442">116442</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-01-25 07:30:31 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>new port: hs-ipatch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelhsipatchPortfile">trunk/dports/devel/hs-ipatch/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/hs-ipatch/</li>
<li>trunk/dports/devel/hs-ipatch/files/</li>
<li><a href="#trunkdportsdevelhsipatchfilespatchuseextensibleexceptionsdiff">trunk/dports/devel/hs-ipatch/files/patch-use-extensible-exceptions.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelhsipatchPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/hs-ipatch/Portfile (116441 => 116442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/hs-hashed-storage/Portfile 2014-01-25 10:06:23 UTC (rev 116441)
+++ trunk/dports/devel/hs-ipatch/Portfile 2014-01-25 15:30:31 UTC (rev 116442)
</span><span class="lines">@@ -4,29 +4,22 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup haskell 1.0
</span><span class="cx">
</span><del>-haskell.setup hashed-storage 0.5.10
-revision 1
-checksums rmd160 c1ec485b5a8aa08f749953a71afa0ac31a42b345 \
- sha256 05824a4cedd2be03444fd0bc664f5c94f6edc50005f1a8f99657150fa6cdedcc
</del><ins>+haskell.setup ipatch 0.1.1 ghc no
+checksums rmd160 e253f602aa2f4d5e880808edc79b807b646f9a8c \
+ sha256 b8d1a4f99effe3ef05930935aa7aafbfa2a11da568b8588092f4ba28d002cea7
</ins><span class="cx">
</span><del>-maintainers gwright
</del><ins>+maintainers cal openmaintainer
</ins><span class="cx"> platforms darwin
</span><del>-license BSD
</del><ins>+license GPL-2
</ins><span class="cx">
</span><del>-description Hashed file storage support code.
</del><ins>+description interactive patch editor
</ins><span class="cx"> long_description \
</span><del>- Support code for reading and manipulating hashed file storage \
- (where each file and directory is associated with a \
- cryptographic hash, for corruption-resistant storage and fast \
- comparisons). \
- \
- The supported storage formats include darcs hashed pristine, \
- a plain filesystem tree and an indexed plain tree (where the \
- index maintains hashes of the plain files and directories).
</del><ins>+ ipatch brings the power and convenience of selecting and editing patches in \
+ Darcs to those who are not using the Darcs version control system. \
+ \nIt allows the user to interactively split a patch file into several patch \
+ file, as well as applying a patch interactively and possibly partially.
</ins><span class="cx">
</span><del>-depends_lib-append port:hs-binary \
- port:hs-dataenc \
- port:hs-extensible-exceptions \
- port:hs-mmap \
- port:hs-mtl \
- port:hs-zlib
</del><ins>+patchfiles patch-use-extensible-exceptions.diff
+
+depends_lib-append port:darcs \
+ port:hs-hashed-storage
</ins></span></pre></div>
<a id="trunkdportsdevelhsipatchfilespatchuseextensibleexceptionsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/hs-ipatch/files/patch-use-extensible-exceptions.diff (0 => 116442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/hs-ipatch/files/patch-use-extensible-exceptions.diff (rev 0)
+++ trunk/dports/devel/hs-ipatch/files/patch-use-extensible-exceptions.diff 2014-01-25 15:30:31 UTC (rev 116442)
</span><span class="lines">@@ -0,0 +1,57 @@
</span><ins>+--- src/IPatch/Common.hs.orig 2014-01-25 15:50:41.000000000 +0100
++++ src/IPatch/Common.hs 2014-01-25 16:17:01.000000000 +0100
+@@ -16,11 +16,12 @@
+ - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ - Boston, MA 02110-1301, USA.
+ -}
+-{-# LANGUAGE Rank2Types, ScopedTypeVariables, TypeFamilies, GADTs #-}
++{-# LANGUAGE Rank2Types, ScopedTypeVariables, TypeFamilies, GADTs, ScopedTypeVariables #-}
+ module IPatch.Common where
+
+ import Control.Applicative ( (<$>) )
+ import Control.Monad ( when, unless )
++import Control.Exception ( catch, IOException )
+ import System.Posix.Files ( getSymbolicLinkStatus, isRegularFile, isDirectory )
+ import System.Directory ( createDirectoryIfMissing, doesFileExist, removeFile )
+ import System.FilePath.Posix ( (</>), takeDirectory, normalise )
+@@ -75,7 +76,7 @@
+ else do
+ exT <- doesFileExist dest'
+ when exT $ removeFile dest'
+- `catch` fail ("clonePathWithDeletion: Bad file " ++ source </> path)
++ `catch` (\(_ :: IOException) -> fail ("clonePathWithDeletion: Bad file " ++ source </> path))
+
+ clonePathsWithDeletion source dest = mapM_ (clonePathWithDeletion source dest)
+
+@@ -144,8 +145,8 @@
+ exitWith $ ExitFailure 1
+
+ -- Now we obliterate the patch, undoing its effects
+- applyToWorking repo [] (invert patch_ps) `catch` \e ->
+- fail ("Couldn't undo diff effect in working dir.\n" ++ show e)
++ applyToWorking repo [] (invert patch_ps) `catch` (\(e :: IOException) ->
++ fail ("Couldn't undo diff effect in working dir.\n" ++ show e))
+
+ return (Sealed patch_ps)
+
+--- src/IPatch/Apply.hs.orig 2014-01-25 16:16:07.000000000 +0100
++++ src/IPatch/Apply.hs 2014-01-25 16:16:40.000000000 +0100
+@@ -20,6 +20,7 @@
+ module IPatch.Apply where
+
+ import Control.Monad ( when )
++import Control.Exception ( catch, IOException )
+ import System.Exit ( exitWith, ExitCode(ExitSuccess) )
+ import Data.Functor
+
+@@ -100,8 +101,8 @@
+ exitWith ExitSuccess
+ debugMessage $ "Applying selected patches"
+
+- applyToWorking repo opts wanted_ps `catch` \e ->
+- fail ("Error applying patch to working dir:\n" ++ show e)
++ applyToWorking repo opts wanted_ps `catch` (\(e :: IOException) ->
++ fail ("Error applying patch to working dir:\n" ++ show e))
+
+ yorn <- promptYorn "Really apply the selected changes?"
+ when yorn $ do
</ins></span></pre>
</div>
</div>
</body>
</html>