diff options
| author | obraun <obraun@FreeBSD.org> | 2008-01-05 02:44:16 +0800 |
|---|---|---|
| committer | obraun <obraun@FreeBSD.org> | 2008-01-05 02:44:16 +0800 |
| commit | e151b20d23c39d487b93e4afda5461c93c682a99 (patch) | |
| tree | dd050b00f06ca86676040d99f75831398893e7d5 /devel/darcs | |
| parent | 5aaa480c8f5105de2d39241db2a35d0082243374 (diff) | |
| download | freebsd-ports-gnome-e151b20d23c39d487b93e4afda5461c93c682a99.tar.gz freebsd-ports-gnome-e151b20d23c39d487b93e4afda5461c93c682a99.tar.zst freebsd-ports-gnome-e151b20d23c39d487b93e4afda5461c93c682a99.zip | |
Fix build with ghc 6.8.2.
Diffstat (limited to 'devel/darcs')
| -rw-r--r-- | devel/darcs/Makefile | 4 | ||||
| -rw-r--r-- | devel/darcs/files/patch-aclocal.m4 | 23 | ||||
| -rw-r--r-- | devel/darcs/files/patch-autoconf.mk.in | 11 |
3 files changed, 38 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@ |