6 files changed, 76 insertions, 0 deletions

diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index 8d78c3c41565..6ea689938a19 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -26,6 +26,7 @@ USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	darcs darcs.1
 INSTALL_TARGET=	installbin
+USE_AUTOTOOLS=	autoconf:261:env
 
 .include <bsd.port.pre.mk>
 
@@ -56,6 +57,9 @@ post-patch:
 		${WRKSRC}/${MAKEFILE}
 .endif
 
+pre-configure:
+	@(cd ${WRKSRC} && ${AUTORECONF})
+
 post-configure:
 	@${REINPLACE_CMD} -e 's|$${prefix}|${PREFIX}|' ${WRKSRC}/cgi/darcs.cgi
 
diff --git a/devel/darcs/files/patch-aclocal.m4 b/devel/darcs/files/patch-aclocal.m4
new file mode 100644
index 000000000000..c088e6b82897
--- /dev/null
+++ b/devel/darcs/files/patch-aclocal.m4
@@ -0,0 +1,23 @@
+--- aclocal.m4.orig	2007-06-16 19:12:11.000000000 +0200
++++ aclocal.m4	2008-01-04 19:37:37.000000000 +0100
+@@ -447,6 +447,20 @@
+ openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+ openFd fd x y z a b = GHC.Handle.openFd fd x b y z a
+         ]]),
++AC_MSG_RESULT([okay])
++IMPORT_WORKAROUND([
++import qualified GHC.Handle ( fdToHandle' )
++import System.IO ( Handle, IOMode )
++import System.Posix.Internals ( FDType )
++import qualified GHC.IOBase ( FD )
++])
++CODE_WORKAROUND([[
++  {- 
++   Work around change in the GHC.Handle.fdToHandle' API.
++  -}
++openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
++openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
++]]),
+        AC_MSG_RESULT([failed])
+        AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
+     )
diff --git a/devel/darcs/files/patch-autoconf.mk.in b/devel/darcs/files/patch-autoconf.mk.in
new file mode 100644
index 000000000000..46c0366795d0
--- /dev/null
+++ b/devel/darcs/files/patch-autoconf.mk.in
@@ -0,0 +1,11 @@
+--- autoconf.mk.in.orig	2007-06-16 19:12:11.000000000 +0200
++++ autoconf.mk.in	2008-01-04 19:37:47.000000000 +0100
+@@ -19,7 +19,7 @@
+ OPTCCFLAGS      := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS))
+ LDFLAGS		:= @LDFLAGS@ @LIBS@
+ OPTLLDFLAGS     := $(addprefix -optl,$(LDFLAGS))
+-GHCFLAGS	:= -cpp @GHCFLAGS@
++GHCFLAGS	:= -package containers -cpp @GHCFLAGS@
+ HAVE_CURSES     := @HAVE_CURSES@
+ HAVE_LIBCURL    := @HAVE_LIBCURL@
+ HAVE_MAPI       := @HAVE_MAPI@
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 8d78c3c41565..6ea689938a19 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -26,6 +26,7 @@ USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	darcs darcs.1
 INSTALL_TARGET=	installbin
+USE_AUTOTOOLS=	autoconf:261:env
 
 .include <bsd.port.pre.mk>
 
@@ -56,6 +57,9 @@ post-patch:
 		${WRKSRC}/${MAKEFILE}
 .endif
 
+pre-configure:
+	@(cd ${WRKSRC} && ${AUTORECONF})
+
 post-configure:
 	@${REINPLACE_CMD} -e 's|$${prefix}|${PREFIX}|' ${WRKSRC}/cgi/darcs.cgi
 
diff --git a/devel/hs-darcs/files/patch-aclocal.m4 b/devel/hs-darcs/files/patch-aclocal.m4
new file mode 100644
index 000000000000..c088e6b82897
--- /dev/null
+++ b/devel/hs-darcs/files/patch-aclocal.m4
@@ -0,0 +1,23 @@
+--- aclocal.m4.orig	2007-06-16 19:12:11.000000000 +0200
++++ aclocal.m4	2008-01-04 19:37:37.000000000 +0100
+@@ -447,6 +447,20 @@
+ openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
+ openFd fd x y z a b = GHC.Handle.openFd fd x b y z a
+         ]]),
++AC_MSG_RESULT([okay])
++IMPORT_WORKAROUND([
++import qualified GHC.Handle ( fdToHandle' )
++import System.IO ( Handle, IOMode )
++import System.Posix.Internals ( FDType )
++import qualified GHC.IOBase ( FD )
++])
++CODE_WORKAROUND([[
++  {- 
++   Work around change in the GHC.Handle.fdToHandle' API.
++  -}
++openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
++openFd fd x y z a b = GHC.Handle.fdToHandle' fd x b y z a
++]]),
+        AC_MSG_RESULT([failed])
+        AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
+     )
diff --git a/devel/hs-darcs/files/patch-autoconf.mk.in b/devel/hs-darcs/files/patch-autoconf.mk.in
new file mode 100644
index 000000000000..46c0366795d0
--- /dev/null
+++ b/devel/hs-darcs/files/patch-autoconf.mk.in
@@ -0,0 +1,11 @@
+--- autoconf.mk.in.orig	2007-06-16 19:12:11.000000000 +0200
++++ autoconf.mk.in	2008-01-04 19:37:47.000000000 +0100
+@@ -19,7 +19,7 @@
+ OPTCCFLAGS      := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS))
+ LDFLAGS		:= @LDFLAGS@ @LIBS@
+ OPTLLDFLAGS     := $(addprefix -optl,$(LDFLAGS))
+-GHCFLAGS	:= -cpp @GHCFLAGS@
++GHCFLAGS	:= -package containers -cpp @GHCFLAGS@
+ HAVE_CURSES     := @HAVE_CURSES@
+ HAVE_LIBCURL    := @HAVE_LIBCURL@
+ HAVE_MAPI       := @HAVE_MAPI@