[20726] trunk/dports/lang/ghc

[source_changes at macosforge.org]

Revision: 20726
          http://trac.macosforge.org/projects/macports/changeset/20726
Author:   gwright at macports.org
Date:     2006-11-22 11:45:16 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
Fix a bug when loading the X11 package into ghci; bump revision.

Modified Paths:
--------------
    trunk/dports/lang/ghc/Portfile
    trunk/dports/lang/ghc/files/patch-configure.ac

Added Paths:
-----------
    trunk/dports/lang/ghc/files/patch-Linker.c
    trunk/dports/lang/ghc/files/patch-package.conf.in

Modified: trunk/dports/lang/ghc/Portfile
===================================================================
--- trunk/dports/lang/ghc/Portfile	2006-11-22 14:56:59 UTC (rev 20725)
+++ trunk/dports/lang/ghc/Portfile	2006-11-22 19:45:16 UTC (rev 20726)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		ghc
 version		6.6
-revision	1
+revision	2
 categories	lang
 maintainers	gwright at macports.org
 platforms	darwin
@@ -33,7 +33,9 @@
 		${name}-${version}-src-extralibs.tar.bz2	md5 14b22fce36caffa509046361724bc119
 
 patchfiles	patch-configure.ac	\
-		patch-GHC.hs
+		patch-GHC.hs		\
+		patch-Linker.c		\
+		patch-package.conf.in
 
 depends_lib	port:readline \
 		port:gmp

Added: trunk/dports/lang/ghc/files/patch-Linker.c
===================================================================
--- trunk/dports/lang/ghc/files/patch-Linker.c	                        (rev 0)
+++ trunk/dports/lang/ghc/files/patch-Linker.c	2006-11-22 19:45:16 UTC (rev 20726)
@@ -0,0 +1,10 @@
+--- rts/Linker.c.sav	2006-11-21 12:58:37.000000000 -0500
++++ rts/Linker.c	2006-11-21 13:00:13.000000000 -0500
+@@ -797,6 +797,7 @@
+       RTS_POSIX_ONLY_SYMBOLS
+       RTS_MINGW_ONLY_SYMBOLS
+       RTS_CYGWIN_ONLY_SYMBOLS
++      RTS_DARWIN_ONLY_SYMBOLS
+       RTS_LIBGCC_SYMBOLS
+ #if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)
+       // dyld stub code contains references to this,

Modified: trunk/dports/lang/ghc/files/patch-configure.ac
===================================================================
--- trunk/dports/lang/ghc/files/patch-configure.ac	2006-11-22 14:56:59 UTC (rev 20725)
+++ trunk/dports/lang/ghc/files/patch-configure.ac	2006-11-22 19:45:16 UTC (rev 20726)
@@ -1,5 +1,5 @@
---- configure.ac.sav	2006-10-13 13:00:14.000000000 -0400
-+++ configure.ac	2006-10-13 13:01:02.000000000 -0400
+--- configure.ac.sav	2006-11-21 12:56:13.000000000 -0500
++++ configure.ac	2006-11-21 12:57:51.000000000 -0500
 @@ -1062,19 +1062,19 @@
  
  dnl ** (Mac OS X only: check for GMP.framework)
@@ -33,3 +33,14 @@
  AC_SUBST(HaveFrameworkGMP)
  
  dnl ** check for mingwex library
+@@ -1169,8 +1169,8 @@
+ AC_CHECK_FUNCS(clock_gettime)
+ 
+ dnl ** check for Apple's "interesting" long double compatibility scheme
+-AC_MSG_CHECKING(for printf$LDBLStub)
+-AC_TRY_LINK_FUNC(printf$LSBLStub,
++AC_MSG_CHECKING(for printf\$LDBLStub)
++AC_TRY_LINK_FUNC(printf\$LDBLStub,
+     [
+         AC_MSG_RESULT(yes)
+         AC_DEFINE([HAVE_PRINTF_LDBLSTUB],[1],

Added: trunk/dports/lang/ghc/files/patch-package.conf.in
===================================================================
--- trunk/dports/lang/ghc/files/patch-package.conf.in	                        (rev 0)
+++ trunk/dports/lang/ghc/files/patch-package.conf.in	2006-11-22 19:45:16 UTC (rev 20726)
@@ -0,0 +1,11 @@
+--- libraries/X11/package.conf.in.sav	2006-11-21 15:11:14.000000000 -0500
++++ libraries/X11/package.conf.in	2006-11-21 15:11:52.000000000 -0500
+@@ -25,7 +25,7 @@
+ hidden-modules:
+ 
+ import-dirs:	IMPORT_DIR
+-library-dirs:	LIB_DIR
++library-dirs:	LIB_DIR, /usr/X11R6/lib
+ hs-libraries:   "HSX11"
+ extra-libraries:	"HSX11_cbits", "X11"
+ include-dirs: 	INCLUDE_DIR

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061122/7a5c501d/attachment.html