3 files changed, 58 insertions, 35 deletions

diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index d824844fcc66..1b410a66f662 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chicken
-PORTVERSION=	4.10.0
+PORTVERSION=	4.11.0
 PORTEPOCH=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://code.call-cc.org/releases/${PORTVERSION}/
@@ -27,19 +27,37 @@ MAKE_ARGS+=	PLATFORM=bsd \
 
 NEW_ARCH=	${ARCH:S/i386/x86/:S/amd64/x86-64/}
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS FEATHERS
+FEATHERS_DESC=	Install the Feathers debugger (requires Tcl/Tk)
+
+FEATHERS_RUN_DEPENDS=\
+		wish:x11-toolkits/tk-wrapper
+
+OPTIONS_SUB=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "amd64" && ${ARCH} != "i386" && ${ARCH} != "sparc64"
-MAKE_ARGS+=	HACKED_APPLY=
+.if !${PORT_OPTIONS:MFEATHERS}
+post-patch:
+	${REINPLACE_CMD} \
+		-e 's/feathers.1//g' \
+		-e '/INSTALL_PROGRAM.*_DEBUGGER_/{N;d;}' \
+		-e '/INSTALL_PROGRAM.*feathers/d' \
+		${WRKSRC}/rules.make
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/chicken/7/*.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libchicken*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chicken
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chicken-bug
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chicken-install
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chicken-profile
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chicken-status
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chicken-uninstall
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/csc
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/csi
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/chicken/8/*.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libchicken.so.8
 
 # This only works *after* chicken is installed.
 regression-test: build
diff --git a/lang/chicken/distinfo b/lang/chicken/distinfo
index b92824e1f2e2..f3a40700f128 100644
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@@ -1,2 +1,3 @@
-SHA256 (chicken-4.10.0.tar.gz) = 0e07f5abcd11961986950dbeaa5a40db415f8a1b65daff9c300e9b05b334899b
-SIZE (chicken-4.10.0.tar.gz) = 4020442
+TIMESTAMP = 1464444057
+SHA256 (chicken-4.11.0.tar.gz) = e3dc2b8f95b6a3cd59c85b5bb6bdb2bd9cefc45b5d536a20cad74e3c63f4ad89
+SIZE (chicken-4.11.0.tar.gz) = 4201815
diff --git a/lang/chicken/pkg-plist b/lang/chicken/pkg-plist
index cd00b37afc70..ada245836069 100644
--- a/lang/chicken/pkg-plist
+++ b/lang/chicken/pkg-plist
@@ -6,34 +6,35 @@ bin/chicken-status
 bin/chicken-uninstall
 bin/csc
 bin/csi
+%%FEATHERS%%bin/feathers
 include/chicken/chicken-config.h
 include/chicken/chicken.h
-lib/chicken/7/chicken.import.so
-lib/chicken/7/csi.import.so
-lib/chicken/7/data-structures.import.so
-lib/chicken/7/extras.import.so
-lib/chicken/7/files.import.so
-lib/chicken/7/foreign.import.so
-lib/chicken/7/irregex.import.so
-lib/chicken/7/lolevel.import.so
-lib/chicken/7/ports.import.so
-lib/chicken/7/posix.import.so
-lib/chicken/7/setup-api.import.so
-lib/chicken/7/setup-api.so
-lib/chicken/7/setup-download.import.so
-lib/chicken/7/setup-download.so
-lib/chicken/7/srfi-1.import.so
-lib/chicken/7/srfi-13.import.so
-lib/chicken/7/srfi-14.import.so
-lib/chicken/7/srfi-18.import.so
-lib/chicken/7/srfi-4.import.so
-lib/chicken/7/srfi-69.import.so
-lib/chicken/7/tcp.import.so
-lib/chicken/7/types.db
-lib/chicken/7/utils.import.so
+lib/chicken/8/chicken.import.so
+lib/chicken/8/csi.import.so
+lib/chicken/8/data-structures.import.so
+lib/chicken/8/extras.import.so
+lib/chicken/8/files.import.so
+lib/chicken/8/foreign.import.so
+lib/chicken/8/irregex.import.so
+lib/chicken/8/lolevel.import.so
+lib/chicken/8/ports.import.so
+lib/chicken/8/posix.import.so
+lib/chicken/8/setup-api.import.so
+lib/chicken/8/setup-api.so
+lib/chicken/8/setup-download.import.so
+lib/chicken/8/setup-download.so
+lib/chicken/8/srfi-1.import.so
+lib/chicken/8/srfi-13.import.so
+lib/chicken/8/srfi-14.import.so
+lib/chicken/8/srfi-18.import.so
+lib/chicken/8/srfi-4.import.so
+lib/chicken/8/srfi-69.import.so
+lib/chicken/8/tcp.import.so
+lib/chicken/8/types.db
+lib/chicken/8/utils.import.so
 lib/libchicken.a
 lib/libchicken.so
-lib/libchicken.so.7
+lib/libchicken.so.8
 man/man1/chicken-bug.1.gz
 man/man1/chicken-install.1.gz
 man/man1/chicken-profile.1.gz
@@ -42,7 +43,9 @@ man/man1/chicken-uninstall.1.gz
 man/man1/chicken.1.gz
 man/man1/csc.1.gz
 man/man1/csi.1.gz
+%%FEATHERS%%man/man1/feathers.1.gz
 %%DATADIR%%/setup.defaults
+%%FEATHERS%%%%DATADIR%%/feathers.tcl
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
@@ -55,6 +58,7 @@ man/man1/csi.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/manual/Callbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/Cross development.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/Data representation.html
+%%PORTDOCS%%%%DOCSDIR%%/manual/Debugging.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/Declarations.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/Deployment.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/Deviations from the standard.html
@@ -100,5 +104,5 @@ man/man1/csi.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/manual/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual/manual.css
-@exec %D/bin/chicken-install -update-db
-@unexec rm -f %D/lib/chicken/7/modules.db
+@postexec %D/bin/chicken-install -update-db
+@postunexec rm -f %D/lib/chicken/8/modules.db