Update to 05-07

4 files changed, 53 insertions, 16 deletions

diff --git a/lang/chameleon/Makefile b/lang/chameleon/Makefile
index bae653b94b3..c826c57d791 100644
--- a/lang/chameleon/Makefile
+++ b/lang/chameleon/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	chameleon
-PORTVERSION=	03.11
+DISTVERSION=	05-07
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.comp.nus.edu.sg/~sulzmann/chameleon/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A Haskell-style language
@@ -16,15 +15,20 @@ COMMENT=	A Haskell-style language
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		happy:${PORTSDIR}/devel/hs-happy
 
-ALL_TARGET=	just-boo
+USE_REINPLACE=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}/src
+MAKE_ARGS=	GHC=ghc INSTALL_PATH='\"${DATADIR}/\"'
+
+post-patch:
+	${REINPLACE_CMD} 's/gcc -O3/${CC} ${CFLAGS}/' ${WRKSRC}/Solvers/Makefile
+	@${RMDIR} ${WRKSRC}/../lib/Haskell98
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/chameleon ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/interface/Prelude.ch  ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
+	@${MKDIR} ${DATADIR}
+	${CP} -pr ${WRKSRC}/../lib ${DATADIR}
+	@${MKDIR} ${DATADIR}/src/Backends/Scheme/Prologue
+	${CP} -pr ${WRKSRC}/Backends/Scheme/Prologue/* ${DATADIR}/src/Backends/Scheme/Prologue
 
 .include <bsd.port.mk>
diff --git a/lang/chameleon/distinfo b/lang/chameleon/distinfo
index a412d61d311..7d83e8e2166 100644
--- a/lang/chameleon/distinfo
+++ b/lang/chameleon/distinfo
@@ -1,2 +1,2 @@
-MD5 (chameleon-03-11.tar.gz) = d2edfa2e4f9d46799685f4b9e697f114
-SIZE (chameleon-03-11.tar.gz) = 247582
+MD5 (chameleon-05-07.tar.gz) = 4f48cbce3f98d39d700204797a8c82a7
+SIZE (chameleon-05-07.tar.gz) = 269670
diff --git a/lang/chameleon/files/patch-Solvers_herbie.c b/lang/chameleon/files/patch-Solvers_herbie.c
new file mode 100644
index 00000000000..9ccabdcb479
--- /dev/null
+++ b/lang/chameleon/files/patch-Solvers_herbie.c
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- Solvers/herbie.c.orig
++++ Solvers/herbie.c
+@@ -25,12 +25,7 @@
+ // NOTE: memalign is not provided in MacOS X, but malloc is guaranteed to
+ //	 return 16-byte aligned blocks. (We assume 32 bit pointers
+ //	 everywhere -- what a crappy assumption.)
+-#ifdef SYS_MACOSX
+ #define memalign(a,s)	malloc(s)
+-#include <malloc/malloc.h>
+-#else
+-#include <malloc.h>
+-#endif
+ 
+ // #define HERBIE_DEBUG
+   
diff --git a/lang/chameleon/pkg-plist b/lang/chameleon/pkg-plist
index 6d9e672749f..c6402286325 100644
--- a/lang/chameleon/pkg-plist
+++ b/lang/chameleon/pkg-plist
@@ -1,6 +1,21 @@
 bin/chameleon
-%%EXAMPLESDIR%%/Prelude.ch
-%%PORTDOCS%%%%DOCSDIR%%/haskell.html
-%%PORTDOCS%%%%DOCSDIR%%/scoped.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%
+%%DATADIR%%/lib/Chameleon/Primitive.ch
+%%DATADIR%%/lib/Prelude.ch
+%%DATADIR%%/lib/XHaskell/RECast.ch
+%%DATADIR%%/lib/XHaskell/REInference.ch
+%%DATADIR%%/lib/XHaskell/RENorm.ch
+%%DATADIR%%/lib/XHaskell/REOpts.ch
+%%DATADIR%%/lib/XHaskell/REOpts.hs
+%%DATADIR%%/lib/XHaskell/RESubtype.ch
+%%DATADIR%%/lib/XHaskell/RETypes.ch
+%%DATADIR%%/lib/XHaskell/REtoHT.ch
+%%DATADIR%%/src/Backends/Scheme/Prologue/scheme-lazy.scm
+%%DATADIR%%/src/Backends/Scheme/Prologue/scheme.scm
+@dirrm %%DATADIR%%/lib/XHaskell
+@dirrm %%DATADIR%%/lib/Chameleon
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/src/Backends/Scheme/Prologue
+@dirrm %%DATADIR%%/src/Backends/Scheme
+@dirrm %%DATADIR%%/src/Backends
+@dirrm %%DATADIR%%/src
+@dirrm %%DATADIR%%