3 files changed, 27 insertions, 16 deletions
diff --git a/lang/ghc/patches/patch-ac b/lang/ghc/patches/patch-ac
index 65549f390e8..23a7b03e6fb 100644
--- a/lang/ghc/patches/patch-ac
+++ b/lang/ghc/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2007/03/24 17:57:20 kristerw Exp $
+$NetBSD: patch-ac,v 1.7 2008/03/17 15:33:10 kristerw Exp $
 
---- rts/package.conf.in.orig	2007-02-25 00:05:44.000000000 +0100
-+++ rts/package.conf.in	2007-02-25 00:06:23.000000000 +0100
-@@ -68,7 +68,7 @@
+--- rts/package.conf.in.orig	2007-12-10 16:11:32.000000000 -0200
++++ rts/package.conf.in
+@@ -73,7 +73,7 @@ depends:	 	
  hugs-options:
  cc-options:
  
diff --git a/lang/ghc/patches/patch-ad b/lang/ghc/patches/patch-ad
index b0bb4420484..519a26b5268 100644
--- a/lang/ghc/patches/patch-ad
+++ b/lang/ghc/patches/patch-ad
@@ -1,13 +1,9 @@
-$NetBSD: patch-ad,v 1.8 2007/03/24 17:57:20 kristerw Exp $
+$NetBSD: patch-ad,v 1.9 2008/03/17 15:33:10 kristerw Exp $
 
---- libraries/readline/package.conf.in.orig	2007-02-25 00:07:25.000000000 +0100
-+++ libraries/readline/package.conf.in	2007-02-25 00:07:47.000000000 +0100
-@@ -27,7 +27,7 @@
- depends:	base
- hugs-options:
- cc-options:
--ld-options:
-+ld-options:	"-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib"
- framework-dirs:
- frameworks:
- haddock-interfaces:	HADDOCK_IFACE
+--- libraries/readline/readline.cabal.orig	2007-12-10 16:20:29.000000000 -0200
++++ libraries/readline/readline.cabal
+@@ -32,3 +32,4 @@ library
+   includes:	HsReadline.h
+   install-includes:	HsReadline.h HsReadlineConfig.h
+   c-sources:	HsReadline_cbits.c
++  ld-options:    "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib"
diff --git a/lang/ghc/patches/patch-aj b/lang/ghc/patches/patch-aj
new file mode 100644
index 00000000000..0978c1d78aa
--- /dev/null
+++ b/lang/ghc/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.3 2008/03/17 15:33:10 kristerw Exp $
+
+--- libraries/readline/configure.orig	2008-02-21 09:32:21.000000000 -0300
++++ libraries/readline/configure
+@@ -1300,6 +1300,10 @@ else
+   readline_libraries=NONE
+ fi;
+ 
++# Force readline paths.
++readline_includes="@PREFIX@/include"
++readline_libraries="@PREFIX@/lib"
++
+ 
+ if test "$enable_readline" = no; then
+   BUILD_PACKAGE_BOOL=False