- Update to version 3.3.0.

PR:		ports/125568
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp>

7 files changed, 66 insertions, 16 deletions

diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 96705505b641..ff8e6c80ed1c 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	chicken
-PORTVERSION=	3.2.0
+PORTVERSION=	3.3.0
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://www.call-with-current-continuation.org/ \
-				http://chicken.wiki.br/releases/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+		http://chicken.wiki.br/releases/${PORTVERSION}/
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	A Scheme-to-C compiler
 
 USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 MAKE_ARGS+=	PLATFORM=bsd PREFIX=${PREFIX} TOPMANDIR="${PREFIX}/man"
 PLATFORM=	bsd
 
@@ -27,16 +27,9 @@ INFODIR=	${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64"
-#BROKEN=		coredump during build on ia64
-.endif
-
 .if defined(WITH_PCRE)
 LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-USE_HOST_PCRE=${PREFIX}/lib/libpcre.so
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-.else
-CONFIGURE_ENV+=	ac_cv_header_pcre_h=no
+MAKE_ARGS+=	USE_HOST_PCRE=yes
 .endif
 
 MAKE_FLAGS+=	HOST=${HOST} PREFIX=${PREFIX} PLATFORM=${PLATFORM} INFODIR=${PREFIX}/info
@@ -44,8 +37,6 @@ MAKE_FLAGS+=	HOST=${HOST} PREFIX=${PREFIX} PLATFORM=${PLATFORM} INFODIR=${PREFIX
 post-patch:
 	${MV} ${WRKSRC}/apply-hack.x86.s ${WRKSRC}/apply-hack.i386.s
 	${MV} ${WRKSRC}/apply-hack.x86-64.s ${WRKSRC}/apply-hack.amd64.s
-#	@${REINPLACE_CMD} -e 's/\(install-data-am: \)install-data-local/\1/' \
-#		${WRKSRC}/Makefile.in
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
diff --git a/lang/chicken/distinfo b/lang/chicken/distinfo
index 8f21729f60c1..09ee170be128 100644
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@@ -1,3 +1,3 @@
-MD5 (chicken-3.2.0.tar.gz) = 94e518fe97f75c111cc700711de009d1
-SHA256 (chicken-3.2.0.tar.gz) = ab8c5b9c11c169e03762af11c1938edc05bd437b6197c674e3cdbcff82d1a22a
-SIZE (chicken-3.2.0.tar.gz) = 3165645
+MD5 (chicken-3.3.0.tar.gz) = 835401781fb606741ba3606fa3e89b78
+SHA256 (chicken-3.3.0.tar.gz) = 5ce2519bac9956de5700a5777b2bbc2cd89202ef2d2252a40a0d1e8c9854bec6
+SIZE (chicken-3.3.0.tar.gz) = 4228441
diff --git a/lang/chicken/files/patch-Makefile.bsd b/lang/chicken/files/patch-Makefile.bsd
new file mode 100644
index 000000000000..5ad58d953806
--- /dev/null
+++ b/lang/chicken/files/patch-Makefile.bsd
@@ -0,0 +1,12 @@
+--- ./Makefile.bsd.orig	2008-06-28 23:24:06.000000000 +0900
++++ ./Makefile.bsd	2008-07-17 01:19:10.000000000 +0900
+@@ -87,6 +87,9 @@
+ ifneq ($(HACKED_APPLY),)
+ 	echo "#define C_HACKED_APPLY" >>$@
+ endif
++ifneq ($(USE_HOST_PCRE),)
++	echo "#define C_USE_HOST_PCRE" >>$@
++endif
+ 	cat chicken-defaults.h >>$@
+ 
+ include rules.make
diff --git a/lang/chicken/files/patch-chicken.texi b/lang/chicken/files/patch-chicken.texi
new file mode 100644
index 000000000000..698dc8cecb32
--- /dev/null
+++ b/lang/chicken/files/patch-chicken.texi
@@ -0,0 +1,13 @@
+--- ./chicken.texi.orig	2008-06-28 23:34:20.000000000 +0900
++++ ./chicken.texi	2008-07-17 01:22:17.000000000 +0900
+@@ -4,6 +4,10 @@
+ @copying
+ Copyright 2007-2008 Felix Winkelmann and the Chicken Team
+ @end copying
++@dircategory The Algorithmic Language Scheme
++@direntry
++* Chicken: (chicken).     A compiler that translates Scheme source files into C.
++@end direntry
+ @titlepage
+ @sp 10
+ @title{Chicken Scheme Reference Manual}
diff --git a/lang/chicken/files/patch-defaults.make b/lang/chicken/files/patch-defaults.make
new file mode 100644
index 000000000000..2dca9219e86e
--- /dev/null
+++ b/lang/chicken/files/patch-defaults.make
@@ -0,0 +1,21 @@
+--- ./defaults.make.orig	2008-06-28 23:24:06.000000000 +0900
++++ ./defaults.make	2008-07-17 01:19:10.000000000 +0900
+@@ -47,6 +47,7 @@
+ PREFIX ?= c:/devtools
+ else
+ PREFIX ?= /usr/local
++LOCALBASE ?= /usr/local
+ endif
+ endif
+ 
+@@ -146,8 +147,8 @@
+ # options
+ 
+ ifneq ($(USE_HOST_PCRE),)
+-LIBRARIES += -lpcre
+-PCRE_INCLUDES =
++LIBRARIES += -L$(LOCALBASE)/lib -lpcre
++PCRE_INCLUDES = -I$(LOCALBASE)/include
+ C_COMPILER_PCRE_OPTIONS =
+ PCRE_OBJECTS_1 =
+ else
diff --git a/lang/chicken/files/patch-rules.make b/lang/chicken/files/patch-rules.make
new file mode 100644
index 000000000000..c8ad9279bff0
--- /dev/null
+++ b/lang/chicken/files/patch-rules.make
@@ -0,0 +1,10 @@
+--- ./rules.make.orig	2008-06-28 23:24:06.000000000 +0900
++++ ./rules.make	2008-07-17 01:20:53.000000000 +0900
+@@ -845,6 +845,7 @@
+ 	$(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) $(DESTDIR)$(IMANDIR) 
+ 	$(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) $(DESTDIR)$(IINFODIR)
+ 	$(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) $(DESTDIR)$(IDOCDIR)
++	$(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) $(DESTDIR)$(IDATADIR)
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CSI_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)
+ 	$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_PROFILE_PROGRAM)$(EXE) $(DESTDIR)$(IBINDIR)
diff --git a/lang/chicken/pkg-plist b/lang/chicken/pkg-plist
index ac9074275eff..e73054735f0b 100644
--- a/lang/chicken/pkg-plist
+++ b/lang/chicken/pkg-plist
@@ -19,6 +19,7 @@ lib/libuchicken.so
 %%DATADIR%%/extras.exports
 %%DATADIR%%/library.exports
 %%DATADIR%%/lolevel.exports
+%%DATADIR%%/ports.exports
 %%DATADIR%%/posix.exports
 %%DATADIR%%/regex.exports
 %%DATADIR%%/scheduler.exports
@@ -32,6 +33,7 @@ lib/libuchicken.so
 %%DATADIR%%/utils.exports
 %%DATADIR%%/doc/LICENSE
 %%DATADIR%%/doc/README
+%%DATADIR%%/doc/chicken.pdf
 %%DATADIR%%/doc/html/accessing-external-objects.html
 %%DATADIR%%/doc/html/acknowledgements.html
 %%DATADIR%%/doc/html/basic-mode-of-operation.html
@@ -63,6 +65,7 @@ lib/libuchicken.so
 %%DATADIR%%/doc/html/unit-library.html
 %%DATADIR%%/doc/html/unit-lolevel.html
 %%DATADIR%%/doc/html/unit-match.html
+%%DATADIR%%/doc/html/unit-ports.html
 %%DATADIR%%/doc/html/unit-posix.html
 %%DATADIR%%/doc/html/unit-regex.html
 %%DATADIR%%/doc/html/unit-srfi-1.html