diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile index 4edbbcc407d7..e63ae4f556ad 100644 --- a/lang/chicken/Makefile +++ b/lang/chicken/Makefile @@ -1,59 +1,59 @@ PORTNAME= chicken DISTVERSION= 5.3.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= lang scheme MASTER_SITES= https://code.call-cc.org/releases/${DISTVERSION}/ MAINTAINER= gahr@FreeBSD.org COMMENT= Scheme-to-C compiler WWW= https://www.call-cc.org/ LICENSE= BSD3CLAUSE PD LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE USES= cpe gmake CPE_VENDOR= call-cc USE_LDCONFIG= yes MAKEFILE= GNUmakefile MAKE_ARGS= C_COMPILER="${CC}" \ C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \ CXX_COMPILER="${CXX}" \ CSC_PROGRAM=chicken-csc \ CSI_PROGRAM=chicken-csi \ DOCDIR="${DOCSDIR}" \ LIBDIR="${PREFIX}/lib" \ LIBRARIAN="${AR}" \ LINKER_OPTIONS="${LDFLAGS}" \ MANDIR=${PREFIX}/share/man \ PREFIX=${PREFIX} TEST_TARGET= check TEST_ARGS= ${MAKE_ARGS} PROGRAM_PREFIX=chicken- DATADIR= ${PREFIX}/share/chicken DOCSDIR= ${PREFIX}/share/doc/chicken PLIST_SUB= BINARYVERSION=${_CHICKEN_BINARYVERSION} OPTIONS_DEFINE= DOCS FEATHERS OPTIONS_SUB= yes # XXX: This should be a subpackage and on by default FEATHERS_DESC= Install the Feathers debugger (requires Tcl/Tk) FEATHERS_USES= tk:wrapper,run _CHICKEN_BINARYVERSION= 11 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/c* \ ${STAGEDIR}${PREFIX}/lib/chicken/${_CHICKEN_BINARYVERSION}/*.so \ ${STAGEDIR}${PREFIX}/lib/libchicken.so post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR} .include diff --git a/lang/chicken/files/patch-egg-compile.scm b/lang/chicken/files/patch-egg-compile.scm new file mode 100644 index 000000000000..d17adafbc42e --- /dev/null +++ b/lang/chicken/files/patch-egg-compile.scm @@ -0,0 +1,26 @@ +From 360e1c423b5475fa2c1caba1f19d652538a8f322 Mon Sep 17 00:00:00 2001 +From: Peter Bex +Date: Mon, 31 Oct 2022 13:06:26 +0100 +Subject: [PATCH 1/1] Do not double call normalize-destination on share dir + +In install-random-files, don't call normalize-destination on the +destination directory - this is already done in compile-egg-info + +Before, we'd see things like in the install script like: + mkdir -p /path/to/chicken/path/to/chicken/share +With this patch, it becomes: + mkdir -p /path/to/chicken/share +which is as it should be. + +Signed-off-by: felix +--- egg-compile.scm.orig 2021-11-18 06:32:06 UTC ++++ egg-compile.scm +@@ -1051,7 +1051,7 @@ + (root (string-append srcdir "/")) + (mkdir (mkdir-command platform)) + (sfiles (map (cut prefix srcdir <>) files)) +- (dfile (qs* (normalize-destination dest mode) platform #t)) ++ (dfile (qs* dest platform #t)) + (ddir (shell-variable "DESTDIR" platform))) + (print "\n" mkdir " " ddir dfile) + (let-values (((ds fs) (partition directory? sfiles)))