6 files changed, 64 insertions, 15 deletions

diff --git a/lang/ats/Makefile b/lang/ats/Makefile
index 705fd907b3c2..b917c20373f3 100644
--- a/lang/ats/Makefile
+++ b/lang/ats/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	ats
 PORTVERSION=	${ATS_VER}
-PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}-lang/${PORTNAME}-lang/${ATS_IMPL}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-lang-${ATS_IMPL}-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jyyou@cs.nctu.edu.tw
 COMMENT=	A language with a type system rooted in the Applied Type System
@@ -44,6 +44,16 @@ LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
 .endif
 
+post-patch:
+	${SED} -i '' -e 's/gcc/${CC}/' \
+	    ${WRKSRC}/ccomp/runtime/GCATS/Makefile \
+	    ${WRKSRC}/utils/scripts/Makefile
+	${SED} -i '' -e 's/ATSCCOMP_def "gcc"/ATSCCOMP_def "${CC}"/' \
+	    ${WRKSRC}/utils/scripts/basics.dats
+	${SED} -i '' -e 's/argv_p = "gcc"/argv_p = "${CC}"/' \
+	             -e 's/execvp("gcc", argv)/execvp("${CC}", argv)/' \
+	    ${WRKSRC}/utils/scripts/atslib.dats
+
 post-configure:
 .if defined(WITHOUT_GMP)
 	${SED} -i '' -e '/HAVE_GMP_H/d' ${WRKSRC}/config.h
diff --git a/lang/ats/bsd.ats.mk b/lang/ats/bsd.ats.mk
index 3bbf0e651972..bb052f338eac 100644
--- a/lang/ats/bsd.ats.mk
+++ b/lang/ats/bsd.ats.mk
@@ -1,5 +1,5 @@
 ATS_IMPL=	anairiats
-ATS_VER=	0.2.6
+ATS_VER=	0.2.7
 
 ATS_LIBDIR_REL=	lib/ats-${ATS_IMPL}-${ATS_VER}
 ATS_LIBDIR=	${LOCALBASE}/${ATS_LIBDIR_REL}
diff --git a/lang/ats/distinfo b/lang/ats/distinfo
index 9e462c41a302..0fbcc095dd9c 100644
--- a/lang/ats/distinfo
+++ b/lang/ats/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ats-lang-anairiats-0.2.6.tar.gz) = 403eda8834c76c24992f351c567862281b9f68ad1f1178d5e2252110b74bedf1
-SIZE (ats-lang-anairiats-0.2.6.tar.gz) = 2899016
+SHA256 (ats-lang-anairiats-0.2.7.tgz) = 9ed11ee4911ccad797a6b5cf1ceb7d8c3b85ddba923de9e199d86649907b4454
+SIZE (ats-lang-anairiats-0.2.7.tgz) = 2418573
diff --git a/lang/ats/files/patch-Makefile b/lang/ats/files/patch-Makefile
index 8aacc58df144..9dfb0ad61253 100644
--- a/lang/ats/files/patch-Makefile
+++ b/lang/ats/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-11-11 09:41:38.000000000 +0800
-+++ Makefile	2011-11-15 11:51:22.387400943 +0800
+--- Makefile.orig	2012-05-18 07:56:24.000000000 +0800
++++ Makefile	2012-05-23 14:47:29.661831756 +0800
 @@ -92,7 +92,7 @@
  	cd $(abs_top_srcdir)
  	[ -d $(DESTDIR)/$(bindir) ] || $(MKDIR_P) $(DESTDIR)/$(bindir)
@@ -18,15 +18,16 @@
  	  cd $(abs_top_srcdir) && \
  	  $(INSTALL) -d $(DESTDIR)$(ATSNEWHOME)/"$$d" && \
  	  find "$$d" -name .svn -prune -o -type f \
-@@ -140,6 +140,7 @@
+@@ -140,6 +140,8 @@
  	done
  
  install:: install_files
 +	find $(DESTDIR)$(ATSNEWHOME) -depth -type d -empty -delete
++	find $(DESTDIR)$(ATSNEWHOME) -type f -name '*.orig' -delete
  
  ######
  
-@@ -152,8 +153,7 @@
+@@ -152,8 +154,7 @@
    bin/atslex \
    ccomp/runtime/GCATS/gc.o \
    ccomp/runtime/GCATS/gc_mt.o \
@@ -36,33 +37,33 @@
  	@echo "ATS/Anairiats has been built up successfully!"
  	@echo "The value of ATSHOME for this build is \"$(ATSHOME)\"."
  	@echo "The value of ATSHOMERELOC for this build is \"$(ATSHOMERELOC)\"."
-@@ -212,25 +212,25 @@
+@@ -212,25 +213,25 @@
  
  ATSLIB=$(ATSHOMEQ)/bin/atslib
  
 -.libfiles_local: .libfiles ; $(CC) -E -P -x c -o $@ $<
 +.libfiles_local: .libfiles ; $(CC) -E -P -x c -o $@ $< ; sed -i '' -e '/linordset_randbst/d' $@
  libfiles: .libfiles_local
--	$(ATSLIB) $(ATS_PROOFCHECK) -D_XOPEN_SOURCE -O2 --libats
+-	$(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats
 -	$(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats_lex
 -	$(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats_smlbas
-+	$(ATSLIB) $(ATS_PROOFCHECK) -D_XOPEN_SOURCE -O2 $(CFLAGS) --libats
++	$(ATSLIB) $(ATS_PROOFCHECK) -O2 $(CFLAGS) --libats
 +	$(ATSLIB) $(ATS_PROOFCHECK) -O2 $(CFLAGS) --libats_lex
 +	$(ATSLIB) $(ATS_PROOFCHECK) -O2 $(CFLAGS) --libats_smlbas
  
  lib32files: .libfiles_local
--	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -D_XOPEN_SOURCE -O2 --libats
+-	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 --libats
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 --libats_lex
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 --libats_smlbas
-+	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -D_XOPEN_SOURCE -O2 $(CFLAGS) --libats
++	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 $(CFLAGS) --libats
 +	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 $(CFLAGS) --libats_lex
 +	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 $(CFLAGS) --libats_smlbas
  
  lib64files: .libfiles_local
--	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -D_XOPEN_SOURCE -O2 --libats
+-	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 --libats
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 --libats_lex
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 --libats_smlbas
-+	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -D_XOPEN_SOURCE -O2 $(CFLAGS) --libats
++	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 $(CFLAGS) --libats
 +	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 $(CFLAGS) --libats_lex
 +	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 $(CFLAGS) --libats_smlbas
  
diff --git a/lang/ats/files/patch-ccomp_runtime_GCATS_gcats1__misc.dats b/lang/ats/files/patch-ccomp_runtime_GCATS_gcats1__misc.dats
new file mode 100644
index 000000000000..19b0db5a1fa9
--- /dev/null
+++ b/lang/ats/files/patch-ccomp_runtime_GCATS_gcats1__misc.dats
@@ -0,0 +1,10 @@
+--- ccomp/runtime/GCATS/gcats1_misc.dats.orig	2012-05-23 14:32:51.606718510 +0800
++++ ccomp/runtime/GCATS/gcats1_misc.dats	2012-05-23 14:33:22.846718098 +0800
+@@ -55,6 +55,7 @@
+ //
+ // dir=1/-1 : upward/downward
+ //
++static int gc_stack_dir_get_inner (int *some_ptr) __attribute__((noinline));
+ static
+ int gc_stack_dir_get_inner (int *some_ptr) {
+   int some_int ;
diff --git a/lang/ats/pkg-plist b/lang/ats/pkg-plist
index 5eec3b57df6a..5310f022480b 100644
--- a/lang/ats/pkg-plist
+++ b/lang/ats/pkg-plist
@@ -53,18 +53,23 @@ bin/atspack
 %%ATS_LIBDIR%%/libats/CATS/linqueue_arr.cats
 %%ATS_LIBDIR%%/libats/CATS/linqueue_lst.cats
 %%ATS_LIBDIR%%/libats/CATS/linstack_arr.cats
+%%ATS_LIBDIR%%/libats/CATS/lockptr_spin.cats
+%%ATS_LIBDIR%%/libats/CATS/lockref_spin.cats
 %%ATS_LIBDIR%%/libats/CATS/parworkshop.cats
 %%ATS_LIBDIR%%/libats/CATS/regexp.cats
 %%ATS_LIBDIR%%/libats/CATS/slseg.cats
 %%ATS_LIBDIR%%/libats/CATS/vector.cats
 %%ATS_LIBDIR%%/libats/DATS/biarray.dats
+%%ATS_LIBDIR%%/libats/DATS/bimatrix.dats
 %%ATS_LIBDIR%%/libats/DATS/fmatrix.dats
 %%ATS_LIBDIR%%/libats/DATS/freelst.dats
 %%ATS_LIBDIR%%/libats/DATS/funarray_braun.dats
 %%ATS_LIBDIR%%/libats/DATS/fundeque_fingertree.dats
+%%ATS_LIBDIR%%/libats/DATS/funheap_binomial.dats
 %%ATS_LIBDIR%%/libats/DATS/funheap_braun.dats
 %%ATS_LIBDIR%%/libats/DATS/funmap_avltree.dats
 %%ATS_LIBDIR%%/libats/DATS/funmap_rbtree.dats
+%%ATS_LIBDIR%%/libats/DATS/funmset_listord.dats
 %%ATS_LIBDIR%%/libats/DATS/funralist_nested.dats
 %%ATS_LIBDIR%%/libats/DATS/funset_avltree.dats
 %%ATS_LIBDIR%%/libats/DATS/funset_listord.dats
@@ -78,25 +83,34 @@ bin/atspack
 %%ATS_LIBDIR%%/libats/DATS/intinf.dats
 %%ATS_LIBDIR%%/libats/DATS/iterint.dats
 %%ATS_LIBDIR%%/libats/DATS/linbitvec.dats
+%%ATS_LIBDIR%%/libats/DATS/linheap_binomial.dats
 %%ATS_LIBDIR%%/libats/DATS/linmap_avltree.dats
+%%ATS_LIBDIR%%/libats/DATS/linmap_avltree_ngc.dats
 %%ATS_LIBDIR%%/libats/DATS/linmap_rbtree.dats
 %%ATS_LIBDIR%%/libats/DATS/linordset_randbst.dats
 %%ATS_LIBDIR%%/libats/DATS/linqueue_arr.dats
 %%ATS_LIBDIR%%/libats/DATS/linqueue_lst.dats
 %%ATS_LIBDIR%%/libats/DATS/linset_avltree.dats
+%%ATS_LIBDIR%%/libats/DATS/linset_listord.dats
 %%ATS_LIBDIR%%/libats/DATS/linstack_arr.dats
+%%ATS_LIBDIR%%/libats/DATS/lockptr_spin.dats
+%%ATS_LIBDIR%%/libats/DATS/lockref_spin.dats
 %%ATS_LIBDIR%%/libats/DATS/parworkshop.dats
 %%ATS_LIBDIR%%/libats/DATS/rarray.dats
+%%ATS_LIBDIR%%/libats/DATS/refcount.dats
 %%ATS_LIBDIR%%/libats/DATS/regexp.dats
 %%ATS_LIBDIR%%/libats/DATS/vector.dats
 %%ATS_LIBDIR%%/libats/SATS/biarray.sats
+%%ATS_LIBDIR%%/libats/SATS/bimatrix.sats
 %%ATS_LIBDIR%%/libats/SATS/fmatrix.sats
 %%ATS_LIBDIR%%/libats/SATS/freelst.sats
 %%ATS_LIBDIR%%/libats/SATS/funarray_braun.sats
 %%ATS_LIBDIR%%/libats/SATS/fundeque_fingertree.sats
+%%ATS_LIBDIR%%/libats/SATS/funheap_binomial.sats
 %%ATS_LIBDIR%%/libats/SATS/funheap_braun.sats
 %%ATS_LIBDIR%%/libats/SATS/funmap_avltree.sats
 %%ATS_LIBDIR%%/libats/SATS/funmap_rbtree.sats
+%%ATS_LIBDIR%%/libats/SATS/funmset_listord.sats
 %%ATS_LIBDIR%%/libats/SATS/funralist_nested.sats
 %%ATS_LIBDIR%%/libats/SATS/funset_avltree.sats
 %%ATS_LIBDIR%%/libats/SATS/funset_listord.sats
@@ -113,17 +127,24 @@ bin/atspack
 %%ATS_LIBDIR%%/libats/SATS/iterint.sats
 %%ATS_LIBDIR%%/libats/SATS/itreep.sats
 %%ATS_LIBDIR%%/libats/SATS/linbitvec.sats
+%%ATS_LIBDIR%%/libats/SATS/linheap_binomial.sats
 %%ATS_LIBDIR%%/libats/SATS/linmap_avltree.sats
 %%ATS_LIBDIR%%/libats/SATS/linmap_rbtree.sats
 %%ATS_LIBDIR%%/libats/SATS/linordset_randbst.sats
 %%ATS_LIBDIR%%/libats/SATS/linqueue_arr.sats
 %%ATS_LIBDIR%%/libats/SATS/linqueue_lst.sats
 %%ATS_LIBDIR%%/libats/SATS/linset_avltree.sats
+%%ATS_LIBDIR%%/libats/SATS/linset_listord.sats
 %%ATS_LIBDIR%%/libats/SATS/linstack_arr.sats
+%%ATS_LIBDIR%%/libats/SATS/lockptr_spin.sats
+%%ATS_LIBDIR%%/libats/SATS/lockref_spin.sats
 %%ATS_LIBDIR%%/libats/SATS/optini.sats
 %%ATS_LIBDIR%%/libats/SATS/parworkshop.sats
 %%ATS_LIBDIR%%/libats/SATS/rarray.sats
+%%ATS_LIBDIR%%/libats/SATS/refcount.sats
+%%ATS_LIBDIR%%/libats/SATS/refcountr.sats
 %%ATS_LIBDIR%%/libats/SATS/regexp.sats
+%%ATS_LIBDIR%%/libats/SATS/sobjptr.sats
 %%ATS_LIBDIR%%/libats/SATS/vector.sats
 %%ATS_LIBDIR%%/libats/lex/lexing.dats
 %%ATS_LIBDIR%%/libats/lex/lexing.sats
@@ -131,9 +152,13 @@ bin/atspack
 %%ATS_LIBDIR%%/libats/ngc/CATS/deque_arr.cats
 %%ATS_LIBDIR%%/libats/ngc/DATS/deque_arr.dats
 %%ATS_LIBDIR%%/libats/ngc/DATS/dlist.dats
+%%ATS_LIBDIR%%/libats/ngc/DATS/linmap_avltree.dats
+%%ATS_LIBDIR%%/libats/ngc/DATS/linmap_pavltree.dats
 %%ATS_LIBDIR%%/libats/ngc/DATS/slist.dats
 %%ATS_LIBDIR%%/libats/ngc/SATS/deque_arr.sats
 %%ATS_LIBDIR%%/libats/ngc/SATS/dlist.sats
+%%ATS_LIBDIR%%/libats/ngc/SATS/linmap_avltree.sats
+%%ATS_LIBDIR%%/libats/ngc/SATS/linmap_pavltree.sats
 %%ATS_LIBDIR%%/libats/ngc/SATS/slist.sats
 %%ATS_LIBDIR%%/libats/smlbas/.libfiles
 %%ATS_LIBDIR%%/libats/smlbas/DATS/array.dats
@@ -312,6 +337,7 @@ bin/atspack
 %%ATS_LIBDIR%%/prelude/DATS/array_prf.dats
 %%ATS_LIBDIR%%/prelude/DATS/basics.dats
 %%ATS_LIBDIR%%/prelude/DATS/bool.dats
+%%ATS_LIBDIR%%/prelude/DATS/dlist_vt.dats
 %%ATS_LIBDIR%%/prelude/DATS/filebas.dats
 %%ATS_LIBDIR%%/prelude/DATS/float.dats
 %%ATS_LIBDIR%%/prelude/DATS/integer.dats
@@ -334,6 +360,7 @@ bin/atspack
 %%ATS_LIBDIR%%/prelude/DATS/string.dats
 %%ATS_LIBDIR%%/prelude/DATS/syndef.dats
 %%ATS_LIBDIR%%/prelude/DATS/unsafe.dats
+%%ATS_LIBDIR%%/prelude/DATS/vsubrw.dats
 %%ATS_LIBDIR%%/prelude/HATS/lmacrodef.hats
 %%ATS_LIBDIR%%/prelude/HATS/number.hats
 %%ATS_LIBDIR%%/prelude/HATS/syndef.hats
@@ -343,6 +370,7 @@ bin/atspack
 %%ATS_LIBDIR%%/prelude/SATS/bool.sats
 %%ATS_LIBDIR%%/prelude/SATS/byte.sats
 %%ATS_LIBDIR%%/prelude/SATS/char.sats
+%%ATS_LIBDIR%%/prelude/SATS/dlist_vt.sats
 %%ATS_LIBDIR%%/prelude/SATS/extern.sats
 %%ATS_LIBDIR%%/prelude/SATS/filebas.sats
 %%ATS_LIBDIR%%/prelude/SATS/float.sats