Attachment #88739 for bug #125568




#

PORTNAME=	chicken
PORTVERSION=	3.3.0
CATEGORIES=	lang scheme
MASTER_SITES=	http://www.call-with-current-continuation.org/ \
				http://chicken.wiki.br/releases/${PORTVERSION}/


.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"
MAKE_ARGS+=	USE_HOST_PCRE=yes
.else
CONFIGURE_ENV+=	ac_cv_header_pcre_h=no
.endif

Lines 1-3 Link Here

(-)ports/lang/chicken/distinfo (-3 / +3 lines)
1	MD5 (chicken-3.2.0.tar.gz) = 94e518fe97f75c111cc700711de009d1	1	MD5 (chicken-3.3.0.tar.gz) = 835401781fb606741ba3606fa3e89b78
2	SHA256 (chicken-3.2.0.tar.gz) = ab8c5b9c11c169e03762af11c1938edc05bd437b6197c674e3cdbcff82d1a22a	2	SHA256 (chicken-3.3.0.tar.gz) = 5ce2519bac9956de5700a5777b2bbc2cd89202ef2d2252a40a0d1e8c9854bec6
3	SIZE (chicken-3.2.0.tar.gz) = 3165645	3	SIZE (chicken-3.3.0.tar.gz) = 4228441




--- ./Makefile.bsd.orig	2008-06-28 23:24:06.000000000 +0900
+++ ./Makefile.bsd	2008-07-16 22:09:42.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




--- ./defaults.make.orig	2008-06-28 23:24:06.000000000 +0900
+++ ./defaults.make	2008-07-16 22:14:17.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




%%DATADIR%%/extras.exports
%%DATADIR%%/library.exports
%%DATADIR%%/lolevel.exports
%%DATADIR%%/ports.exports
%%DATADIR%%/posix.exports
%%DATADIR%%/regex.exports
%%DATADIR%%/scheduler.exports

%%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

%%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

Return to bug 125568

Lines 6-12 Link Here

(-)ports/lang/chicken/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= chicken	8	PORTNAME= chicken
9	PORTVERSION= 3.2.0	9	PORTVERSION= 3.3.0
10	CATEGORIES= lang scheme	10	CATEGORIES= lang scheme
11	MASTER_SITES= http://www.call-with-current-continuation.org/ \	11	MASTER_SITES= http://www.call-with-current-continuation.org/ \
12	http://chicken.wiki.br/releases/${PORTVERSION}/	12	http://chicken.wiki.br/releases/${PORTVERSION}/
Lines 33-40 INFODIR= ${PREFIX}/${INFO_PATH} Link Here
33		33
34	.if defined(WITH_PCRE)	34	.if defined(WITH_PCRE)
35	LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre	35	LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
36	USE_HOST_PCRE=${PREFIX}/lib/libpcre.so
37	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"	36	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
		37	MAKE_ARGS+= USE_HOST_PCRE=yes
38	.else	38	.else
39	CONFIGURE_ENV+= ac_cv_header_pcre_h=no	39	CONFIGURE_ENV+= ac_cv_header_pcre_h=no
40	.endif	40	.endif

Line 0 Link Here

(-)ports/lang/chicken/files/patch-Makefile.bsd (+12 lines)
	1	--- ./Makefile.bsd.orig 2008-06-28 23:24:06.000000000 +0900
	2	+++ ./Makefile.bsd 2008-07-16 22:09:42.000000000 +0900
	3	@@ -87,6 +87,9 @@
	4	ifneq ($(HACKED_APPLY),)
	5	echo "#define C_HACKED_APPLY" >>$@
	6	endif
	7	+ifneq ($(USE_HOST_PCRE),)
	8	+ echo "#define C_USE_HOST_PCRE" >>$@
	9	+endif
	10	cat chicken-defaults.h >>$@
	11
	12	include rules.make

Line 0 Link Here

(-)ports/lang/chicken/files/patch-defaults.make (+21 lines)
	1	--- ./defaults.make.orig 2008-06-28 23:24:06.000000000 +0900
	2	+++ ./defaults.make 2008-07-16 22:14:17.000000000 +0900
	3	@@ -47,6 +47,7 @@
	4	PREFIX ?= c:/devtools
	5	else
	6	PREFIX ?= /usr/local
	7	+LOCALBASE ?= /usr/local
	8	endif
	9	endif
	10
	11	@@ -146,8 +147,8 @@
	12	# options
	13
	14	ifneq ($(USE_HOST_PCRE),)
	15	-LIBRARIES += -lpcre
	16	-PCRE_INCLUDES =
	17	+LIBRARIES += -L$(LOCALBASE)/lib -lpcre
	18	+PCRE_INCLUDES = -I$(LOCALBASE)/include
	19	C_COMPILER_PCRE_OPTIONS =
	20	PCRE_OBJECTS_1 =
	21	else

Lines 19-24 lib/libuchicken.so Link Here

(-)ports/lang/chicken/pkg-plist (+3 lines)
19	%%DATADIR%%/extras.exports	19	%%DATADIR%%/extras.exports
20	%%DATADIR%%/library.exports	20	%%DATADIR%%/library.exports
21	%%DATADIR%%/lolevel.exports	21	%%DATADIR%%/lolevel.exports
		22	%%DATADIR%%/ports.exports
22	%%DATADIR%%/posix.exports	23	%%DATADIR%%/posix.exports
23	%%DATADIR%%/regex.exports	24	%%DATADIR%%/regex.exports
24	%%DATADIR%%/scheduler.exports	25	%%DATADIR%%/scheduler.exports
Lines 32-37 lib/libuchicken.so Link Here
32	%%DATADIR%%/utils.exports	33	%%DATADIR%%/utils.exports
33	%%DATADIR%%/doc/LICENSE	34	%%DATADIR%%/doc/LICENSE
34	%%DATADIR%%/doc/README	35	%%DATADIR%%/doc/README
		36	%%DATADIR%%/doc/chicken.pdf
35	%%DATADIR%%/doc/html/accessing-external-objects.html	37	%%DATADIR%%/doc/html/accessing-external-objects.html
36	%%DATADIR%%/doc/html/acknowledgements.html	38	%%DATADIR%%/doc/html/acknowledgements.html
37	%%DATADIR%%/doc/html/basic-mode-of-operation.html	39	%%DATADIR%%/doc/html/basic-mode-of-operation.html
Lines 63-68 lib/libuchicken.so Link Here
63	%%DATADIR%%/doc/html/unit-library.html	65	%%DATADIR%%/doc/html/unit-library.html
64	%%DATADIR%%/doc/html/unit-lolevel.html	66	%%DATADIR%%/doc/html/unit-lolevel.html
65	%%DATADIR%%/doc/html/unit-match.html	67	%%DATADIR%%/doc/html/unit-match.html
		68	%%DATADIR%%/doc/html/unit-ports.html
66	%%DATADIR%%/doc/html/unit-posix.html	69	%%DATADIR%%/doc/html/unit-posix.html
67	%%DATADIR%%/doc/html/unit-regex.html	70	%%DATADIR%%/doc/html/unit-regex.html
68	%%DATADIR%%/doc/html/unit-srfi-1.html	71	%%DATADIR%%/doc/html/unit-srfi-1.html