5 files changed, 13 insertions, 122 deletions

diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 6a64e0a08ac7..956504ca32bd 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	darcs
-PORTVERSION=	1.0.8
-PORTREVISION=	2
+PORTVERSION=	1.0.9
 CATEGORIES=	devel
 MASTER_SITES=	http://darcs.net/
 
@@ -20,8 +19,8 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		readline.5:${PORTSDIR}/devel/readline
 
 OPTIONS=	SERVER "install server" off
-USE_AUTOTOOLS=	autoconf:259
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib/ ${PTHREAD_LIBS}" \
 		CFLAGS=""
@@ -51,22 +50,16 @@ INSTALL_TARGET+=	installdocs
 
 MAN1=	darcs.1
 
-post-patch:
-	@${RM} ${WRKSRC}/configure
 .if defined(WITH_SERVER)
+post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libexecdir)/cgi-bin|${PREFIX}/${CGIDIR}| ; \
-		s|darcs/cgi.conf|cgi.conf.sample| ; /ln/d' \
+		s|darcs/cgi.conf|darcs/cgi.conf.sample|' \
 		${WRKSRC}/${MAKEFILE}
-	@${REINPLACE_CMD} -e '/$$(sysconfdir)\/darcs/d' ${WRKSRC}/${MAKEFILE}
-.endif
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '/$$(datadir)/d' ${WRKSRC}/${MAKEFILE}
-.else
-	@${REINPLACE_CMD} -e 's/^\(installdocs:.\)darcs.ps/\1/ ; \
-			s/^\(installbin:\).*/\1/ ; /darcs\.ps/d ' \
-		 ${WRKSRC}/${MAKEFILE}
 .endif
 
+post-configure:
+	@${REINPLACE_CMD} -e 's|$${prefix}|${PREFIX}|' ${WRKSRC}/cgi/darcs.cgi
+
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/darcs
 
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 24cfc54ac99e..1bb8b0d7b613 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,3 +1,3 @@
-MD5 (darcs-1.0.8.tar.gz) = a7a26d1a98c5675dcab4c2cc30eba59d
-SHA256 (darcs-1.0.8.tar.gz) = 36cf64b10a9e09e4bb2d4bc78371a8b511e7e5bbf13deb1a754e867b0efcfcac
-SIZE (darcs-1.0.8.tar.gz) = 1010010
+MD5 (darcs-1.0.9.tar.gz) = 07222cd3c500aa31e3332847573a4ab2
+SHA256 (darcs-1.0.9.tar.gz) = a5fe4d5a743d8052d6cbfcea480a44593f821afd8a42e6d6d4ae37d40ed23cd8
+SIZE (darcs-1.0.9.tar.gz) = 1080280
diff --git a/devel/hs-darcs/files/patch-Lcs.lhs b/devel/hs-darcs/files/patch-Lcs.lhs
deleted file mode 100644
index aa7279e36b2f..000000000000
--- a/devel/hs-darcs/files/patch-Lcs.lhs
+++ /dev/null
@@ -1,56 +0,0 @@
-Tue Aug 15 19:41:27 EDT 2006  Esa Ilari Vuokko <ei@vuokko.info>
-  * Workaround for HasBounds that was removed in base-2.0 (GHC 6.6)
-diff -rN -u old-hsdarcs/Lcs.lhs new-hsdarcs-1/Lcs.lhs
---- Lcs.lhs	2007-01-22 01:20:24.000000000 -0500
-+++ Lcs.lhs	2007-01-22 01:20:25.000000000 -0500
-@@ -358,7 +358,8 @@
- -- | goto next unchanged line, return the given line if unchanged
- nextUnchanged :: BSTArray s -> Int -> ST s Int
- nextUnchanged c i = do
--  if i == (aLen c) + 1 then return i
-+  len <- aLenM c
-+  if i == len + 1 then return i
-      else do b <- readArray c i
-              if b then nextUnchanged c (i+1)
-                 else return i
-@@ -367,7 +368,8 @@
- --   behind the last line
- skipOneUnChanged :: BSTArray s -> Int -> ST s Int
- skipOneUnChanged c i = do
--  if i == (aLen c) + 1 then return i
-+  len <- aLenM c
-+  if i == len + 1 then return i
-      else do b <- readArray c i
-              if not b then return (i+1)
-                 else skipOneUnChanged c (i+1)
-@@ -381,8 +383,9 @@
- 
- -- | goto next changed line, return the given line if changed
- nextChanged :: BSTArray s -> Int -> ST s (Maybe Int)
--nextChanged c i =
--  if i <= aLen c
-+nextChanged c i = do
-+  len <- aLenM c
-+  if i <= len
-     then do b <- readArray c i
-             if not b then nextChanged c (i+1)
-                else return $ Just i
-@@ -430,8 +433,17 @@
- initP :: [PackedString] -> PArray
- initP a = listArray (0, length a) (nilPS:a)
- 
-+#if __GLASGOW_HASKELL__ > 604
-+aLen :: (IArray a e) => a Int e -> Int
-+aLen a = snd $ bounds a
-+aLenM :: (MArray a e m) => a Int e -> m Int
-+aLenM a = getBounds a >>= return . snd
-+#else
- aLen :: HasBounds a => a Int e -> Int
- aLen a = snd $ bounds a
-+aLenM :: (HasBounds a, Monad m) => a Int e -> m Int
-+aLenM = return . snd . bounds
-+#endif
- \end{code}
- 
- \begin{code}
-
diff --git a/devel/hs-darcs/files/patch-configure.ac.diff b/devel/hs-darcs/files/patch-configure.ac.diff
deleted file mode 100644
index 290b26459a46..000000000000
--- a/devel/hs-darcs/files/patch-configure.ac.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Wed Oct  4 08:31:58 EDT 2006  Josef Svenningsson <josef.svenningsson@gmail.com>
-  * Look for Text.Regex in package regex-compat. Needed for GHC 6.6
-diff -rN -u old-hsdarcs/configure.ac new-hsdarcs-1/configure.ac
---- configure.ac	2007-01-22 02:16:07.000000000 -0500
-+++ configure.ac	2007-01-22 02:16:08.000000000 -0500
-@@ -110,6 +110,7 @@
- dnl Look for Text.Regex
- 
- GHC_CHECK_MODULE(Text.Regex( mkRegex, matchRegex, Regex ), text, mkRegex undefined)
-+GHC_CHECK_MODULE(Text.Regex( mkRegex, matchRegex, Regex ), regex-compat, mkRegex undefined)
- 
- dnl See if we need a package for QuickCheck
- 
-
-Tue Aug 15 19:57:14 EDT 2006  Esa Ilari Vuokko <ei@vuokko.info>
-  * Link to relevant symbol when checking for Control.Monad.Error
-diff -rN -u old-hsdarcs/configure.ac new-hsdarcs-1/configure.ac
---- configure.ac	2007-01-22 02:26:47.000000000 -0500
-+++ configure.ac	2007-01-22 02:26:49.000000000 -0500
-@@ -117,8 +117,8 @@
- 
- dnl See if we need the util or mtl packages for Control.Monad
- 
--GHC_CHECK_MODULE(Control.Monad.Error, util, putStr undefined)
--GHC_CHECK_MODULE(Control.Monad.Error, mtl, putStr undefined)
-+GHC_CHECK_MODULE(Control.Monad.Error, util, strMsg "foo" :: String)
-+GHC_CHECK_MODULE(Control.Monad.Error, mtl, strMsg "foo" :: String)
- 
- dnl See if we need a package for parsec...
- 
-
-Tue Aug 15 19:57:39 EDT 2006  Esa Ilari Vuokko <ei@vuokko.info>
-  * Check for module Text.Html in package html
-diff -rN -u old-hsdarcs/configure.ac new-hsdarcs-1/configure.ac
---- configure.ac	2007-01-22 02:25:55.000000000 -0500
-+++ configure.ac	2007-01-22 02:25:57.000000000 -0500
-@@ -124,6 +124,10 @@
- 
- GHC_CHECK_MODULE(Text.ParserCombinators.Parsec, parsec, errorPos undefined)
- 
-+dnl Check if we need package html
-+
-+GHC_CHECK_MODULE(Text.Html, html, text "foo")
-+
- dnl Deal with systems on which getCurrentDirectory uses '\\' rather than '/':
- 
- WORKAROUND_getCurrentDirectory
-
diff --git a/devel/hs-darcs/pkg-plist b/devel/hs-darcs/pkg-plist
index 38e4afd4384c..0a97a4f0b811 100644
--- a/devel/hs-darcs/pkg-plist
+++ b/devel/hs-darcs/pkg-plist
@@ -1,7 +1,7 @@
 bin/darcs
 etc/bash_completion.d/darcs
 %%SERVER%%%%CGIDIR%%/darcs.cgi
-%%SERVER%%etc/cgi.conf.sample
+%%SERVER%%etc/darcs/cgi.conf.sample
 %%SERVER%%share/darcs/xslt/annotate.xslt
 %%SERVER%%share/darcs/xslt/browse.xslt
 %%SERVER%%share/darcs/xslt/common.xslt
@@ -15,6 +15,7 @@ etc/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/contents.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.css
 %%PORTDOCS%%%%DOCSDIR%%/manual/darcs.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/darcs.ps
 %%PORTDOCS%%%%DOCSDIR%%/manual/footnode.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/images.aux
 %%PORTDOCS%%%%DOCSDIR%%/manual/images.log
@@ -67,6 +68,7 @@ etc/bash_completion.d/darcs
 %%PORTDOCS%%%%DOCSDIR%%/manual/up_g.png
 %%PORTDOCS%%%%DOCSDIR%%/manual/WARNINGS
 @dirrm etc/bash_completion.d
+%%SERVER%%@dirrmtry etc/darcs
 %%SERVER%%@dirrm share/darcs/xslt
 %%SERVER%%@dirrm share/darcs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples