- Update to version 2.6.

- Remove PORTDOCS and list the files in pkg-plist.
- Remove BROKEN on ia64 to see if the problem has been fixed and to allow
  further investigation.
- Remove patch which was integrated.

4 files changed, 19 insertions, 60 deletions

diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 4aae17848436..cfd179f819ec 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	chicken
-PORTVERSION=	2.5
+PORTVERSION=	2.6
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://www.call-with-current-continuation.org/
 
@@ -15,21 +15,17 @@ COMMENT=	A Scheme-to-C compiler
 
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 
-MAN1=		chicken-profile.1 chicken-setup.1 chicken.1 csc.1 csi.1
-
-OPTIONS=	PCRE "With PCRE support" off
+OPTIONS=	PCRE "Enable PCRE support" off
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	ChangeLog INSTALL LICENSE NEWS README
-.endif
+MAN1=		chicken-profile.1 chicken-setup.1 chicken.1 csc.1 csi.1
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "ia64"
-BROKEN=		coredump during build on ia64
+#BROKEN=		coredump during build on ia64
 .endif
 
 .if defined(WITH_PCRE)
@@ -47,10 +43,9 @@ post-install:
 	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
+	cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog INSTALL LICENSE NEWS README \
+		${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}/benchmarks
-	@${MKDIR} ${EXAMPLESDIR}/benchmarks/options
-	@${MKDIR} ${EXAMPLESDIR}/benchmarks/others
 	${CP} -R ${WRKSRC}/benchmarks/* ${EXAMPLESDIR}/benchmarks/
 .endif
 
diff --git a/lang/chicken/distinfo b/lang/chicken/distinfo
index 8cd833f1f655..e7ad12f74a9f 100644
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@@ -1,3 +1,3 @@
-MD5 (chicken-2.5.tar.gz) = 25b162542d9f1abb2828c384c38f48b5
-SHA256 (chicken-2.5.tar.gz) = 34d3b185e84e05b2b404637f99f0beddcee6382374000fba4171ae2ac3d487b7
-SIZE (chicken-2.5.tar.gz) = 3013368
+MD5 (chicken-2.6.tar.gz) = 332edae079bb34d815369f4ba5181983
+SHA256 (chicken-2.6.tar.gz) = 32385c5393c7376035f911f3e887351b1ce8fb6e56498cc4258815bc6db06326
+SIZE (chicken-2.6.tar.gz) = 3517981
diff --git a/lang/chicken/files/patch-boot__cfiles__csc.c b/lang/chicken/files/patch-boot__cfiles__csc.c
deleted file mode 100644
index 94137c843bb8..000000000000
--- a/lang/chicken/files/patch-boot__cfiles__csc.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- boot/cfiles/csc.c   Wed Sep 27 19:43:04 2006
-+++ csc.c       Wed Dec  6 11:44:51 2006
-@@ -1,7 +1,7 @@
- /* Generated from csc.scm by the Chicken compiler
--   2006-09-27 11:43
--   Version 2.434 - linux-unix-gnu-x86 - [ libffi dload ptables applyhook ]
--   command line: csc.scm -output-file csc.c -quiet -no-trace -optimize-level 2 -include-path .
-+   2006-12-06 11:44
-+   Version 2.5 - freebsd-unix-gnu-x86 - [ dload ptables applyhook ]
-+   command line: csc.scm -quiet -no-trace -optimize-level 2 -include-path . -output-file csc.c
-    used units: library eval extras extras srfi_1 srfi_13 regex utils
-    default heap size: 0
-    default nursery (stack) size: 131072
-@@ -976,9 +976,9 @@
- C_save(t1);
- C_reclaim((void*)toplevel_trampoline,NULL);}
- toplevel_initialized=1;
--if(!C_demand_2(2418)){
-+if(!C_demand_2(2415)){
- C_save(t1);
--C_rereclaim2(2418*sizeof(C_word), 1);
-+C_rereclaim2(2415*sizeof(C_word), 1);
- t1=C_restore;}
- a=C_alloc(3);
- C_initialize_lf(lf,411);
-@@ -1006,12 +1006,10 @@
- lf[48]=C_h_pair(C_restore,tmp);
- tmp=C_static_string(C_heaptop,12,"/usr/include");
- C_save(tmp);
--tmp=C_static_string(C_heaptop,18,"/usr/local/include");
--C_save(tmp);
- tmp=C_static_string(C_heaptop,0,"");
- C_save(tmp);
--lf[49]=C_h_list(3,C_pick(2),C_pick(1),C_pick(0));
--C_drop(3);
-+lf[49]=C_h_list(2,C_pick(1),C_pick(0));
-+C_drop(2);
- lf[52]=C_static_string(C_heaptop,2,"/c");
- lf[53]=C_static_string(C_heaptop,2,"-c");
- lf[71]=C_h_intern(&lf[71],18,"string-intersperse");
diff --git a/lang/chicken/pkg-plist b/lang/chicken/pkg-plist
index bec3b6b495e6..e4688752b257 100644
--- a/lang/chicken/pkg-plist
+++ b/lang/chicken/pkg-plist
@@ -17,7 +17,6 @@ lib/libuchicken.a
 lib/libuchicken.la
 lib/libuchicken.so
 lib/libuchicken.so.0
-%%DATADIR%%/banner.scm
 %%DATADIR%%/chicken-ffi-macros.scm
 %%DATADIR%%/chicken-more-macros.scm
 %%DATADIR%%/eval.exports
@@ -34,6 +33,11 @@ lib/libuchicken.so.0
 %%DATADIR%%/srfi-4.exports
 %%DATADIR%%/tcp.exports
 %%DATADIR%%/utils.exports
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/boyer.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/browse.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/conform.scm
@@ -71,9 +75,9 @@ lib/libuchicken.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/traverse.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/travinit.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/triangl.scm
-%%PORTDOCS%%@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/others
-%%PORTDOCS%%@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/options
-%%PORTDOCS%%@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks
-%%PORTDOCS%%@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/benchmarks/others
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/benchmarks
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
 @dirrm lib/chicken