[116442] trunk/dports/devel

[cal at macports.org]

Revision: 116442
          https://trac.macports.org/changeset/116442
Author:   cal at macports.org
Date:     2014-01-25 07:30:31 -0800 (Sat, 25 Jan 2014)
Log Message:
-----------
new port: hs-ipatch

Modified Paths:
--------------
    trunk/dports/devel/hs-ipatch/Portfile

Added Paths:
-----------
    trunk/dports/devel/hs-ipatch/
    trunk/dports/devel/hs-ipatch/files/
    trunk/dports/devel/hs-ipatch/files/patch-use-extensible-exceptions.diff

Modified: trunk/dports/devel/hs-ipatch/Portfile
===================================================================
--- 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)
@@ -4,29 +4,22 @@
 PortSystem          1.0
 PortGroup           haskell 1.0
 
-haskell.setup       hashed-storage 0.5.10
-revision            1
-checksums           rmd160  c1ec485b5a8aa08f749953a71afa0ac31a42b345 \
-                    sha256  05824a4cedd2be03444fd0bc664f5c94f6edc50005f1a8f99657150fa6cdedcc
+haskell.setup       ipatch 0.1.1 ghc no
+checksums           rmd160  e253f602aa2f4d5e880808edc79b807b646f9a8c \
+                    sha256  b8d1a4f99effe3ef05930935aa7aafbfa2a11da568b8588092f4ba28d002cea7
 
-maintainers         gwright
+maintainers         cal openmaintainer
 platforms           darwin
-license             BSD
+license             GPL-2
 
-description         Hashed file storage support code.
+description         interactive patch editor
 long_description	\
-	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). 
+    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.
 
-depends_lib-append  port:hs-binary \
-                    port:hs-dataenc \
-                    port:hs-extensible-exceptions \
-                    port:hs-mmap \
-                    port:hs-mtl \
-                    port:hs-zlib
+patchfiles          patch-use-extensible-exceptions.diff
+
+depends_lib-append  port:darcs \
+                    port:hs-hashed-storage

Added: trunk/dports/devel/hs-ipatch/files/patch-use-extensible-exceptions.diff
===================================================================
--- 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)
@@ -0,0 +1,57 @@
+--- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140125/00ef2144/attachment-0001.html>