5 files changed, 20 insertions, 27 deletions

diff --git a/lang/ats/Makefile b/lang/ats/Makefile
index 6612afaef61d..6eacb62ec3d8 100644
--- a/lang/ats/Makefile
+++ b/lang/ats/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: ats
-# Date created: September 29 2011
-# Whom: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
-#
+# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
 # $FreeBSD$
-#
 
 PORTNAME=	ats
 PORTVERSION=	${ATS_VER}
-PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}-lang/${PORTNAME}-lang/${ATS_IMPL}-${PORTVERSION}
@@ -15,7 +10,7 @@ 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
+COMMENT=	Language with a type system rooted in the Applied Type System
 
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
@@ -48,7 +43,8 @@ LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 post-patch:
 	${SED} -i '' -e 's/gcc/${CC}/' \
 	    ${WRKSRC}/ccomp/runtime/GCATS/Makefile \
-	    ${WRKSRC}/utils/scripts/Makefile
+	    ${WRKSRC}/utils/scripts/Makefile \
+	    ${WRKSRC}/libatsdoc/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}"/' \
@@ -64,7 +60,7 @@ post-configure:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && \
 	${COPYTREE_SHARE} "${PORTDOCS}" ${DOCSDIR}
diff --git a/lang/ats/bsd.ats.mk b/lang/ats/bsd.ats.mk
index 37b6ecfff4be..942035943bbf 100644
--- a/lang/ats/bsd.ats.mk
+++ b/lang/ats/bsd.ats.mk
@@ -1,5 +1,5 @@
 ATS_IMPL=	anairiats
-ATS_VER=	0.2.8
+ATS_VER=	0.2.9
 
 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 9a467a277b62..f81abea4dc70 100644
--- a/lang/ats/distinfo
+++ b/lang/ats/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ats-lang-anairiats-0.2.8.tgz) = caa9a17ea3ddd7938bc50f25b323379453fba9f27fd1a66d202404bbac734d32
-SIZE (ats-lang-anairiats-0.2.8.tgz) = 2318886
+SHA256 (ats-lang-anairiats-0.2.9.tgz) = 44bbf49f7bea0e411c5a24ae0ea3ecf1d771886b6bd19ea6798badb01f1512fd
+SIZE (ats-lang-anairiats-0.2.9.tgz) = 2466767
diff --git a/lang/ats/files/patch-Makefile b/lang/ats/files/patch-Makefile
index 15a8dd957f19..190dbc2177a9 100644
--- a/lang/ats/files/patch-Makefile
+++ b/lang/ats/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2012-09-04 11:37:57.000000000 +0800
-+++ Makefile	2012-09-06 19:21:24.886921581 +0800
+--- Makefile.orig	2013-01-24 10:49:41.547037509 +0800
++++ Makefile	2013-01-24 10:55:14.781718163 +0800
 @@ -59,12 +59,6 @@
  	autoheader $<
  	touch $@
@@ -40,27 +40,19 @@
  
  ######
  
-@@ -151,12 +147,11 @@
-   libfiles_mt \
-   bin/atspack \
-   bin/atslex \
--  libatsdoca \
--  bin/atsdoc \
-   ccomp/runtime/GCATS/gc.o \
+@@ -155,8 +151,7 @@
    ccomp/runtime/GCATS/gc_mt.o \
    atsopt1_gc \
+   bin/atslex \
+-  bin/atsdoc \
 -  contrib
-+  libatsdoca \
 +  bin/atsdoc
  	@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)\"."
-@@ -215,25 +210,25 @@
- 
- ATSLIB=$(ATSHOMEQ)/bin/atslib
+@@ -217,23 +212,23 @@
  
--.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_local: .libfiles ; $(CC) -E -P -x c -o $@ $<
  libfiles: .libfiles_local
 -	$(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats
 -	$(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats_lex
diff --git a/lang/ats/pkg-plist b/lang/ats/pkg-plist
index d3d42a4d7851..60d3b5eac078 100644
--- a/lang/ats/pkg-plist
+++ b/lang/ats/pkg-plist
@@ -89,6 +89,7 @@ bin/atspack
 %%ATS_LIBDIR%%/libats/DATS/linheap_binomial.dats
 %%ATS_LIBDIR%%/libats/DATS/linmap_avltree.dats
 %%ATS_LIBDIR%%/libats/DATS/linmap_rbtree.dats
+%%ATS_LIBDIR%%/libats/DATS/linmap_skiplist.dats
 %%ATS_LIBDIR%%/libats/DATS/linordset_randbst.dats
 %%ATS_LIBDIR%%/libats/DATS/linqueue_arr.dats
 %%ATS_LIBDIR%%/libats/DATS/linqueue_lst.dats
@@ -132,6 +133,7 @@ bin/atspack
 %%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/linmap_skiplist.sats
 %%ATS_LIBDIR%%/libats/SATS/linordset_randbst.sats
 %%ATS_LIBDIR%%/libats/SATS/linqueue_arr.sats
 %%ATS_LIBDIR%%/libats/SATS/linqueue_lst.sats
@@ -144,7 +146,9 @@ bin/atspack
 %%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
@@ -382,6 +386,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