Attachment 127529 Details for Bug 171374 – ats-0.2.8.patch

[patch] ats-0.2.8.patch

ats-0.2.8.patch (text/plain), 9.72 KB, created by Jyun-Yan You on 2012-09-06 12:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jyun-Yan You

Created: 2012-09-06 12:50:01 UTC

Size: 9.72 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/lang/ats/Makefile /amd/gcs/98/9855518/src/ports/lang/ats/Makefile
>--- /usr/ports/lang/ats/Makefile	2012-06-28 02:07:16.000000000 +0800
>+++ /amd/gcs/98/9855518/src/ports/lang/ats/Makefile	2012-09-06 19:27:12.366323000 +0800
>@@ -22,7 +22,7 @@
> CFLAGS+=	-I${LOCALBASE}/include \
> 		-L${LOCALBASE}/lib
> 
>-PORTDOCS=	FAQ.txt BOOK
>+PORTDOCS=	FAQ.txt
> PORTEXAMPLES=	AUP INTRO KernighanRitchie MISC MULTICORE TEST
> 
> OPTIONS_DEFINE=		GMP PCRE
>diff -ruN --exclude=CVS /usr/ports/lang/ats/bsd.ats.mk /amd/gcs/98/9855518/src/ports/lang/ats/bsd.ats.mk
>--- /usr/ports/lang/ats/bsd.ats.mk	2012-06-14 00:19:08.000000000 +0800
>+++ /amd/gcs/98/9855518/src/ports/lang/ats/bsd.ats.mk	2012-09-06 19:27:12.364323000 +0800
>@@ -1,5 +1,5 @@
> ATS_IMPL=	anairiats
>-ATS_VER=	0.2.7
>+ATS_VER=	0.2.8
> 
> ATS_LIBDIR_REL=	lib/ats-${ATS_IMPL}-${ATS_VER}
> ATS_LIBDIR=	${LOCALBASE}/${ATS_LIBDIR_REL}
>@@ -16,7 +16,7 @@
> BUILD_DEPENDS+=	${LOCALBASE}/bin/atscc:${PORTSDIR}/lang/ats
> 
> USE_GMAKE=	yes
>-MAKE_ENV+=	ATSHOME=${LOCALBASE}
>+MAKE_ENV+=	ATSHOME=${ATS_LIBDIR} ATSHOMERELOC=ATS-${ATS_VER}
> MAKE_ARGS+=	-C contrib/${ATS_CTRB}
> 
> ATS_WRKSRC=	cd ${PORTSDIR}/lang/ats; ${MAKE} -V WRKSRC
>@@ -27,7 +27,7 @@
> 
> pre-build:
> 	${SED} -i '' \
>-	    -e 's/^ATSCC=$.*$/ATSCC=\1 $$(CFLAGS)/' \
>+	    -e 's/^ATSCC=$.*$/ATSCC=\1 $$(CFLAGS) -IATS./' \
> 	    ${BUILD_WRKSRC}/contrib/${ATS_CTRB}/Makefile
> 	${LN} -sf ${BUILD_WRKSRC}/contrib ${BUILD_WRKSRC}/contrib/${ATS_CTRB}/
> 
>@@ -42,7 +42,7 @@
> 	${COPYTREE_SHARE} . ${ATS_CTRBEXAMPLEDIR}
> 	${FIND} ${ATS_CTRBEXAMPLEDIR} -name Makefile \
> 	    -exec ${SED} -i '' \
>-	                 -e 's|^ATSUSRQ=.*|ATSUSRQ="${LOCALBASE}"|' \
>+	                 -e 's|^ATSUSRQ=.*|ATSUSRQ="${ATS_LIBDIR}"|' \
> 	                 -e 's|^ATSLIBQ=.*|ATSLIBQ="${ATS_LIBDIR}"|' {} \;
> .endif
> 
>diff -ruN --exclude=CVS /usr/ports/lang/ats/distinfo /amd/gcs/98/9855518/src/ports/lang/ats/distinfo
>--- /usr/ports/lang/ats/distinfo	2012-05-29 01:40:27.000000000 +0800
>+++ /amd/gcs/98/9855518/src/ports/lang/ats/distinfo	2012-09-06 19:27:12.361326000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (ats-lang-anairiats-0.2.7.tgz) = 9ed11ee4911ccad797a6b5cf1ceb7d8c3b85ddba923de9e199d86649907b4454
>-SIZE (ats-lang-anairiats-0.2.7.tgz) = 2418573
>+SHA256 (ats-lang-anairiats-0.2.8.tgz) = caa9a17ea3ddd7938bc50f25b323379453fba9f27fd1a66d202404bbac734d32
>+SIZE (ats-lang-anairiats-0.2.8.tgz) = 2318886
>diff -ruN --exclude=CVS /usr/ports/lang/ats/files/patch-Makefile /amd/gcs/98/9855518/src/ports/lang/ats/files/patch-Makefile
>--- /usr/ports/lang/ats/files/patch-Makefile	2012-05-29 01:40:27.000000000 +0800
>+++ /amd/gcs/98/9855518/src/ports/lang/ats/files/patch-Makefile	2012-09-06 19:27:12.378311000 +0800
>@@ -1,24 +1,37 @@
>---- Makefile.orig	2012-05-18 07:56:24.000000000 +0800
>-+++ Makefile	2012-05-23 14:47:29.661831756 +0800
>-@@ -92,7 +92,7 @@
>+--- Makefile.orig	2012-09-04 11:37:57.000000000 +0800
>++++ Makefile	2012-09-06 19:21:24.886921581 +0800
>+@@ -59,12 +59,6 @@
>+ 	autoheader $<
>+ 	touch $@
>+ 
>+-configure: configure.ac $(SRC_CONFIG_FILES)
>+-	aclocal
>+-	automake --add-missing --foreign || true
>+-	autoconf
>+-	touch $(BUILT_CONFIG_FILES)
>+-
>+ -include config.mk
>+ 
>+ ######
>+@@ -92,7 +86,7 @@
>  	cd $(abs_top_srcdir)
>  	[ -d $(DESTDIR)/$(bindir) ] || $(MKDIR_P) $(DESTDIR)/$(bindir)
>  	$(MKDIR_P) $(DESTDIR)$(ATSNEWHOME)/bin
> -	find ccomp contrib doc libats libc prelude -type d \
>-+	find ccomp libats libc prelude -type d \
>++	find ccomp libats libatsdoc libc prelude -type d \
>  	  -exec $(MKDIR_P) $(DESTDIR)$(ATSNEWHOME)/\{} \; \
>  	  -print
>  
>-@@ -100,7 +100,7 @@
>+@@ -100,7 +94,7 @@
>  #
>  # recursively install all files in the list except .svn control files.
>  #
> -	for d in ccomp/runtime contrib doc libats libc prelude; do \
>-+	for d in ccomp/runtime libats libc prelude; do \
>++	for d in ccomp/runtime libats libatsdoc libc prelude; do \
>  	  cd $(abs_top_srcdir) && \
>  	  $(INSTALL) -d $(DESTDIR)$(ATSNEWHOME)/"$$d" && \
>  	  find "$$d" -name .svn -prune -o -type f \
>-@@ -140,6 +140,8 @@
>+@@ -140,6 +134,8 @@
>  	done
>  
>  install:: install_files
>@@ -27,17 +40,22 @@
>  
>  ######
>  
>-@@ -152,8 +154,7 @@
>+@@ -151,12 +147,11 @@
>+   libfiles_mt \
>+   bin/atspack \
>    bin/atslex \
>+-  libatsdoca \
>+-  bin/atsdoc \
>    ccomp/runtime/GCATS/gc.o \
>    ccomp/runtime/GCATS/gc_mt.o \
>--  atsopt1_gc \
>+   atsopt1_gc \
> -  contrib
>-+  atsopt1_gc
>++  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)\"."
>-@@ -212,25 +213,25 @@
>+@@ -215,25 +210,25 @@
>  
>  ATSLIB=$(ATSHOMEQ)/bin/atslib
>  
>@@ -72,5 +90,5 @@
> -	$(ATSLIB) $(ATS_PROOFCHECK) -D_ATS_MULTITHREAD -O2 --libats_mt
> +	$(ATSLIB) $(ATS_PROOFCHECK) -D_ATS_MULTITHREAD -O2 $(CFLAGS) --libats_mt
>  
>- ###### a lexer for ATS ######
>+ libatsdoca: ; $(MAKE) -C libatsdoc
>  
>diff -ruN --exclude=CVS /usr/ports/lang/ats/files/patch-config.mk.in /amd/gcs/98/9855518/src/ports/lang/ats/files/patch-config.mk.in
>--- /usr/ports/lang/ats/files/patch-config.mk.in	1970-01-01 08:00:00.000000000 +0800
>+++ /amd/gcs/98/9855518/src/ports/lang/ats/files/patch-config.mk.in	2012-09-06 19:27:12.381307000 +0800
>@@ -0,0 +1,11 @@
>+--- config.mk.in.orig	2012-09-06 15:37:58.253921955 +0800
>++++ config.mk.in	2012-09-06 15:38:09.939751074 +0800
>+@@ -2,7 +2,7 @@
>+ PACKAGE_TARNAME := @PACKAGE_TARNAME@
>+ PACKAGE_VERSION := @PACKAGE_VERSION@
>+ 
>+-abs_top_srcdir := @abs_top_srcdir@
>++abs_top_srcdir := $(realpath @abs_top_srcdir@)
>+ prefix := @prefix@
>+ exec_prefix := @exec_prefix@
>+ bindir := @bindir@
>diff -ruN --exclude=CVS /usr/ports/lang/ats/files/patch-libatsdoc_Makefile /amd/gcs/98/9855518/src/ports/lang/ats/files/patch-libatsdoc_Makefile
>--- /usr/ports/lang/ats/files/patch-libatsdoc_Makefile	1970-01-01 08:00:00.000000000 +0800
>+++ /amd/gcs/98/9855518/src/ports/lang/ats/files/patch-libatsdoc_Makefile	2012-09-06 19:27:12.375314000 +0800
>@@ -0,0 +1,11 @@
>+--- libatsdoc/Makefile.orig	2012-09-06 15:39:38.797921223 +0800
>++++ libatsdoc/Makefile	2012-09-06 15:40:12.166571629 +0800
>+@@ -43,7 +43,7 @@
>+ ######
>+ 
>+ all:: Makefile_out
>+-all:: ; make -f Makefile_out
>++all:: ; $(MAKE) -f Makefile_out
>+ all:: cleanall
>+ 
>+ ######
>diff -ruN --exclude=CVS /usr/ports/lang/ats/pkg-plist /amd/gcs/98/9855518/src/ports/lang/ats/pkg-plist
>--- /usr/ports/lang/ats/pkg-plist	2012-05-29 01:40:27.000000000 +0800
>+++ /amd/gcs/98/9855518/src/ports/lang/ats/pkg-plist	2012-09-06 19:27:12.386303000 +0800
>@@ -1,4 +1,5 @@
> bin/atscc
>+bin/atsdoc
> bin/atslex
> bin/atslib
> bin/atsopt
>@@ -6,6 +7,7 @@
> %%ATS_LIBDIR%%/INSTALL
> %%ATS_LIBDIR%%/VERSION.txt
> %%ATS_LIBDIR%%/bin/atscc
>+%%ATS_LIBDIR%%/bin/atsdoc
> %%ATS_LIBDIR%%/bin/atslex
> %%ATS_LIBDIR%%/bin/atslib
> %%ATS_LIBDIR%%/bin/atsopt
>@@ -14,6 +16,7 @@
> %%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libats_lex.a
> %%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libats_mt.a
> %%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libats_smlbas.a
>+%%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libatsdoc.a
> %%ATS_LIBDIR%%/ccomp/runtime/GCATS/Makefile
> %%ATS_LIBDIR%%/ccomp/runtime/GCATS/README
> %%ATS_LIBDIR%%/ccomp/runtime/GCATS/gc.o
>@@ -85,7 +88,6 @@
> %%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
>@@ -142,9 +144,7 @@
> %%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
>@@ -184,6 +184,28 @@
> %%ATS_LIBDIR%%/libats/smlbas/SATS/real.sats
> %%ATS_LIBDIR%%/libats/smlbas/SATS/string.sats
> %%ATS_LIBDIR%%/libats/smlbas/SATS/time.sats
>+%%ATS_LIBDIR%%/libatsdoc/CATS/libatsdoc_lexbuf.cats
>+%%ATS_LIBDIR%%/libatsdoc/CATS/libatsdoc_location.cats
>+%%ATS_LIBDIR%%/libatsdoc/CATS/libatsdoc_reader.cats
>+%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_atext.dats
>+%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_error.dats
>+%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_filename.dats
>+%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_lexbuf.dats
>+%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_location.dats
>+%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_reader.dats
>+%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_symbol.dats
>+%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_symmap.dats
>+%%ATS_LIBDIR%%/libatsdoc/Makefile
>+%%ATS_LIBDIR%%/libatsdoc/Makefile_inp
>+%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_atext.sats
>+%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_error.sats
>+%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_filename.sats
>+%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_lexbuf.sats
>+%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_location.sats
>+%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_reader.sats
>+%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_symbol.sats
>+%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_symmap.sats
>+%%ATS_LIBDIR%%/libatsdoc/dynloadall.dats
> %%ATS_LIBDIR%%/libc/CATS/SIMD_v2df.cats
> %%ATS_LIBDIR%%/libc/CATS/complex.cats
> %%ATS_LIBDIR%%/libc/CATS/ctype.cats
>@@ -360,7 +382,6 @@
> %%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
>@@ -425,6 +446,10 @@
> @dirrm %%ATS_LIBDIR%%/libats/smlbas/SATS
> @dirrm %%ATS_LIBDIR%%/libats/smlbas
> @dirrm %%ATS_LIBDIR%%/libats
>+@dirrm %%ATS_LIBDIR%%/libatsdoc/CATS
>+@dirrm %%ATS_LIBDIR%%/libatsdoc/DATS
>+@dirrm %%ATS_LIBDIR%%/libatsdoc/SATS
>+@dirrm %%ATS_LIBDIR%%/libatsdoc
> @dirrm %%ATS_LIBDIR%%/libc/CATS
> @dirrm %%ATS_LIBDIR%%/libc/DATS
> @dirrm %%ATS_LIBDIR%%/libc/HATS

Actions: View | Diff

Attachments on bug 171374: 127529