- Update to 2.5.

PR:		ports/104619
Submitted by:	Thomas Abthorpe <thomas@goodking.ca>

5 files changed, 41 insertions, 32 deletions

diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 1f618f73cf5f..1d2b3a774e54 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -6,31 +6,29 @@
 #
 
 PORTNAME=	chicken
-PORTVERSION=	2.3
+PORTVERSION=	2.5
 CATEGORIES=	lang scheme
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	alepulver
+MASTER_SITES=	http://www.call-with-current-continuation.org/
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	A Scheme-to-C compiler
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN1=		chicken-profile.1 chicken-setup.1 chicken.1 csc.1 csi.1
-INFO=		chicken
+
+OPTIONS=	PCRE "With PCRE support" off
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	ChangeLog INSTALL LICENSE NEWS README TASKS chicken.html chicken.pdf
+PORTDOCS=	ChangeLog INSTALL LICENSE NEWS README
 .endif
 
-OPTIONS=	PCRE "With PCRE support" off
-
 .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)
@@ -43,7 +41,6 @@ CONFIGURE_ENV+=	ac_cv_header_pcre_h=no
 post-patch:
 	@${REINPLACE_CMD} -e 's/\(install-data-am: \)install-data-local/\1/' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|"/usr/local/include" ||' ${WRKSRC}/csc.scm.in
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
@@ -51,7 +48,9 @@ post-install:
 	@${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 	@${MKDIR} ${EXAMPLESDIR}/benchmarks
-	${INSTALL_DATA} ${WRKSRC}/benchmarks/* ${EXAMPLESDIR}/benchmarks
+	@${MKDIR} ${EXAMPLESDIR}/benchmarks/options
+	@${MKDIR} ${EXAMPLESDIR}/benchmarks/others
+	${CP} -R ${WRKSRC}/benchmarks/* ${EXAMPLESDIR}/benchmarks/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/chicken/distinfo b/lang/chicken/distinfo
index 6decdd369099..8cd833f1f655 100644
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@@ -1,3 +1,3 @@
-MD5 (chicken-2.3.tar.gz) = 319a3ea1769747e69802062efb4fe22c
-SHA256 (chicken-2.3.tar.gz) = 530791fa60ecb5420fb038fa063fd752db49673e40cfff27352311eeb2ef4cfd
-SIZE (chicken-2.3.tar.gz) = 3906266
+MD5 (chicken-2.5.tar.gz) = 25b162542d9f1abb2828c384c38f48b5
+SHA256 (chicken-2.5.tar.gz) = 34d3b185e84e05b2b404637f99f0beddcee6382374000fba4171ae2ac3d487b7
+SIZE (chicken-2.5.tar.gz) = 3013368
diff --git a/lang/chicken/files/patch-Makefile.in b/lang/chicken/files/patch-Makefile.in
deleted file mode 100644
index f7e7194e11a7..000000000000
--- a/lang/chicken/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat May 28 11:37:56 2005
-+++ Makefile.in	Sat May 28 11:39:10 2005
-@@ -199,7 +199,7 @@
- # use -DC_NO_PIC_NO_DLL ... -DC_NO_PIC_NO_DLL is only for libtool
- # compiles
- BASE_CPPFLAGS = -DC_STACK_GROWS_DOWNWARD=$(STACK_GROWS_DOWNWARD) -DC_INSTALL_LIB_HOME='"$(pkglibdir)"' \
--  -DC_INSTALL_HOME='"$(pkgdatadir)"' -DC_USE_C_DEFAULTS
-+  -DC_INSTALL_HOME='"$(pkgdatadir)"' -DC_USE_C_DEFAULTS -I$(includedir)
- 
- INCLUDES = $(BASE_CPPFLAGS) -DC_NO_PIC_NO_DLL
- 
diff --git a/lang/chicken/pkg-descr b/lang/chicken/pkg-descr
index 02930048c574..5c27b43cca35 100644
--- a/lang/chicken/pkg-descr
+++ b/lang/chicken/pkg-descr
@@ -1,4 +1,4 @@
-CHICKEN is a compiler for the Scheme programming language.  CHICKEN
+CHICKEN is a compiler for the Scheme programming language. CHICKEN
 produces portable, efficient C, supports almost all of the current
 Scheme language standard (R5RS), and includes many enhancements and
 extensions.
diff --git a/lang/chicken/pkg-plist b/lang/chicken/pkg-plist
index 20927918bbff..bec3b6b495e6 100644
--- a/lang/chicken/pkg-plist
+++ b/lang/chicken/pkg-plist
@@ -1,3 +1,4 @@
+@exec mkdir -p %D/lib/chicken
 bin/chicken
 bin/chicken-profile
 bin/chicken-setup
@@ -18,13 +19,25 @@ lib/libuchicken.so
 lib/libuchicken.so.0
 %%DATADIR%%/banner.scm
 %%DATADIR%%/chicken-ffi-macros.scm
-%%DATADIR%%/chicken-match-macros.scm
 %%DATADIR%%/chicken-more-macros.scm
+%%DATADIR%%/eval.exports
+%%DATADIR%%/extras.exports
+%%DATADIR%%/library.exports
+%%DATADIR%%/lolevel.exports
+%%DATADIR%%/posix.exports
+%%DATADIR%%/regex.exports
+%%DATADIR%%/scheduler.exports
+%%DATADIR%%/srfi-1.exports
+%%DATADIR%%/srfi-13.exports
+%%DATADIR%%/srfi-14.exports
+%%DATADIR%%/srfi-18.exports
+%%DATADIR%%/srfi-4.exports
+%%DATADIR%%/tcp.exports
+%%DATADIR%%/utils.exports
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/boyer.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/browse.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/conform.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/cpstak.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/cscbench
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/ctak.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/dderiv.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/deriv.scm
@@ -42,17 +55,25 @@ lib/libuchicken.so.0
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/lattice.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/maze.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/nqueens.scm
-%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/plists
+%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/others/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/others/except.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/others/except2.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/others/exception.cpp
+%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/others/results.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/others/setlongjmp.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/plists.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/puzzle.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/scheme.scm
+%%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/stack-size.cmake
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/tak.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/takl.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/takr.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/traverse.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/travinit.scm
 %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/triangl.scm
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/benchmarks
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/others
+%%PORTDOCS%%@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks/options
+%%PORTDOCS%%@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%/benchmarks
+%%PORTDOCS%%@dirrm %%PORTDOCS%%%%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
-@exec mkdir -p %D/lib/chicken
 @dirrm lib/chicken