Attachment 196088 Details for Bug 230535 – chicken.diff

[patch] chicken.diff

chicken.diff (text/plain), 13.69 KB, created by Tobias Kortkamp on 2018-08-11 15:39:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2018-08-11 15:39:39 UTC

Size: 13.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 476812)
>+++ Makefile	(working copy)
>@@ -2,40 +2,43 @@
> # $FreeBSD$
> 
> PORTNAME=	chicken
>-PORTVERSION=	4.12.0
>+DISTVERSION=	5.0.0rc1
> PORTEPOCH=	1
> CATEGORIES=	lang scheme
>-MASTER_SITES=	http://code.call-cc.org/releases/${PORTVERSION}/
>+MASTER_SITES=	http://code.call-cc.org/releases/${PORTVERSION}/ \
>+		https://code.call-cc.org/dev-snapshots/2018/08/11/
> 
>-MAINTAINER=	vmagerya@gmail.com
>+MAINTAINER=	tobik@FreeBSD.org
> COMMENT=	Scheme-to-C compiler
> 
>+LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
> USES=		cpe gmake
> CPE_VENDOR=	call-cc
> MAKEFILE=	GNUmakefile
> USE_LDCONFIG=	yes
>-MAKE_ARGS+=	PLATFORM=bsd \
>+MAKE_ARGS=	PLATFORM=bsd \
> 		PREFIX=${PREFIX} \
> 		MANDIR=${PREFIX}/man \
> 		LIBDIR="${PREFIX}/lib" \
> 		DOCDIR="${DOCSDIR}" \
>-		ARCH=${NEW_ARCH} \
> 		C_COMPILER="${CC}" \
> 		CXX_COMPILER="${CXX}" \
> 		LIBRARIAN="${AR}" \
>-		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}"
>+		C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
>+		LINKER_OPTIONS="${LDFLAGS}"
>+MAKE_JOBS_UNSAFE=	yes
> TEST_TARGET=	check
> 
>-NEW_ARCH=	${ARCH:S/i386/x86/:S/amd64/x86-64/}
>+OPTIONS_DEFINE=	DOCS FEATHERS
>+OPTIONS_SUB=	yes
> 
>-OPTIONS_DEFINE=	DOCS FEATHERS
>+# XXX: This should be a subpackage and on by default
> FEATHERS_DESC=	Install the Feathers debugger (requires Tcl/Tk)
> 
>-FEATHERS_RUN_DEPENDS=\
>-		wish:x11-toolkits/tk-wrapper
>+FEATHERS_USES=	tk:wrapper,run
> 
>-OPTIONS_SUB=	yes
>-
> post-patch-FEATHERS-off:
> 	@${REINPLACE_CMD} \
> 		-e 's/feathers.1//g' \
>@@ -44,16 +47,9 @@
> 		${WRKSRC}/rules.make
> 
> post-install:
>-	${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
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/c* \
>+		${STAGEDIR}${PREFIX}/lib/chicken/?/*.so \
>+		${STAGEDIR}${PREFIX}/lib/libchicken.so
> 
> post-install-DOCS-on:
> 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 476812)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1488700400
>-SHA256 (chicken-4.12.0.tar.gz) = 605ace459bc66e8c5f82abb03d9b1c9ca36f1c2295931d244d03629a947a6989
>-SIZE (chicken-4.12.0.tar.gz) = 4240266
>+TIMESTAMP = 1533992402
>+SHA256 (chicken-5.0.0rc1.tar.gz) = fb8af147e7965761dd212b53162b181d4c9473906fd889e719c71624bca65957
>+SIZE (chicken-5.0.0rc1.tar.gz) = 3998098
>Index: files/patch-rules.make
>===================================================================
>--- files/patch-rules.make	(revision 476812)
>+++ files/patch-rules.make	(nonexistent)
>@@ -1,13 +0,0 @@
>---- rules.make.orig	2014-06-07 12:24:41 UTC
>-+++ rules.make
>-@@ -243,8 +243,8 @@ lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUF
>- 
>- # import libraries and extensions
>- 
>--%.so: %.o
>--	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $^ $(LINKER_OUTPUT_OPTION) $@ \
>-+%.so: %.o $(PRIMARY_LIBCHICKEN)
>-+	$(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $< $(LINKER_OUTPUT_OPTION) $@ \
>- 	  $(LINKER_LIBRARY_PREFIX)$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(LINKER_LIBRARY_SUFFIX) \
>- 	  $(LIBRARIES)
>- 
>
>Property changes on: files/patch-rules.make
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 476812)
>+++ pkg-message	(working copy)
>@@ -1,8 +1,2 @@
>-===============================================================================
>-Note that some chicken "eggs" require the environment variable TZ to be set in
>-order to function properly.
>-
>-To set the timezone to Greenwich Mean Time in [t]csh, the command would be:
>-
>-> setenv TZ GMT
>-===============================================================================
>+Some chicken eggs require the environment variable TZ to be set in
>+order to function properly.  See environ(7) for more information.
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 476812)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,5 @@
> bin/chicken
>-bin/chicken-bug
>+bin/chicken-do
> bin/chicken-install
> bin/chicken-profile
> bin/chicken-status
>@@ -9,33 +9,53 @@
> %%FEATHERS%%bin/feathers
> include/chicken/chicken-config.h
> include/chicken/chicken.h
>-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/chicken/9/chicken.base.import.so
>+lib/chicken/9/chicken.bitwise.import.so
>+lib/chicken/9/chicken.blob.import.so
>+lib/chicken/9/chicken.compiler.user-pass.import.so
>+lib/chicken/9/chicken.condition.import.so
>+lib/chicken/9/chicken.continuation.import.so
>+lib/chicken/9/chicken.csi.import.so
>+lib/chicken/9/chicken.errno.import.so
>+lib/chicken/9/chicken.eval.import.so
>+lib/chicken/9/chicken.file.import.so
>+lib/chicken/9/chicken.file.posix.import.so
>+lib/chicken/9/chicken.fixnum.import.so
>+lib/chicken/9/chicken.flonum.import.so
>+lib/chicken/9/chicken.foreign.import.so
>+lib/chicken/9/chicken.format.import.so
>+lib/chicken/9/chicken.gc.import.so
>+lib/chicken/9/chicken.internal.import.so
>+lib/chicken/9/chicken.io.import.so
>+lib/chicken/9/chicken.irregex.import.so
>+lib/chicken/9/chicken.keyword.import.so
>+lib/chicken/9/chicken.load.import.so
>+lib/chicken/9/chicken.locative.import.so
>+lib/chicken/9/chicken.memory.import.so
>+lib/chicken/9/chicken.memory.representation.import.so
>+lib/chicken/9/chicken.pathname.import.so
>+lib/chicken/9/chicken.platform.import.so
>+lib/chicken/9/chicken.plist.import.so
>+lib/chicken/9/chicken.port.import.so
>+lib/chicken/9/chicken.pretty-print.import.so
>+lib/chicken/9/chicken.process-context.import.so
>+lib/chicken/9/chicken.process-context.posix.import.so
>+lib/chicken/9/chicken.process.import.so
>+lib/chicken/9/chicken.process.signal.import.so
>+lib/chicken/9/chicken.random.import.so
>+lib/chicken/9/chicken.read-syntax.import.so
>+lib/chicken/9/chicken.repl.import.so
>+lib/chicken/9/chicken.sort.import.so
>+lib/chicken/9/chicken.string.import.so
>+lib/chicken/9/chicken.syntax.import.so
>+lib/chicken/9/chicken.tcp.import.so
>+lib/chicken/9/chicken.time.import.so
>+lib/chicken/9/chicken.time.posix.import.so
>+lib/chicken/9/srfi-4.import.so
>+lib/chicken/9/types.db
> lib/libchicken.a
> lib/libchicken.so
>-lib/libchicken.so.8
>-man/man1/chicken-bug.1.gz
>+lib/libchicken.so.9
> man/man1/chicken-install.1.gz
> man/man1/chicken-profile.1.gz
> man/man1/chicken-status.1.gz
>@@ -44,18 +64,16 @@
> man/man1/csc.1.gz
> man/man1/csi.1.gz
> %%FEATHERS%%man/man1/feathers.1.gz
>+%%FEATHERS%%%%DATADIR%%/feathers.tcl
> %%DATADIR%%/setup.defaults
>-%%FEATHERS%%%%DATADIR%%/feathers.tcl
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/manual/Accessing external objects.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Acknowledgements.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Basic mode of operation.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Bibliography.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Bugs and limitations.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/C interface.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Callbacks.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Cross development.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Data representation.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Debugging.html
>@@ -62,47 +80,66 @@
> %%PORTDOCS%%%%DOCSDIR%%/manual/Declarations.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Deployment.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Deviations from the standard.html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Egg specification format.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Embedding.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Exceptions.html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Extension tools.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Extensions to the standard.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Extensions.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Foreign type specifiers.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Getting started.html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Included modules.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Interface to external functions and variables.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Locations.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Macros.html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken base).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken bitwise).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken blob).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken condition).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken continuation).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken csi).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken errno).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken eval).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken file posix).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken file).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken fixnum).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken flonum).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken foreign).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken format).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken gc).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken io).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken irregex).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken keyword).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken load).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken locative).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken memory representation).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken memory).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken module).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken pathname).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken platform).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken plist).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken port).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken pretty-print).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken process signal).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken process).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken process-context posix).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken process-context).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken random).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken read-syntax).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken repl).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken sort).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken string).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken syntax).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken tcp).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken time posix).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module (chicken time).html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module r4rs.html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module r5rs.html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module scheme.html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Module srfi-4.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Modules.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Non-standard macros and special forms.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Non-standard read syntax.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Other support procedures.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Parameters.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Supported language.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/The R5RS standard.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/The User's Manual.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Types.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit data-structures.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit eval.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit expand.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit extras.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit files.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit irregex.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit library.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit lolevel.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit ports.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit posix.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit srfi-1.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit srfi-13.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit srfi-14.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit srfi-18.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit srfi-4.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit srfi-69.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit tcp.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/Unit utils.html
>+%%PORTDOCS%%%%DOCSDIR%%/manual/Units and linking model.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Using the compiler.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/Using the interpreter.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/chicken.png
>-%%PORTDOCS%%%%DOCSDIR%%/manual/faq.html
>-%%PORTDOCS%%%%DOCSDIR%%/manual/index.html
> %%PORTDOCS%%%%DOCSDIR%%/manual/manual.css
> @postexec %D/bin/chicken-install -update-db
>-@postunexec rm -f %D/lib/chicken/8/modules.db
>+@postunexec rm -f %D/lib/chicken/9/modules.db

Flags:

tobik: maintainer-approval? (vmagerya)

Actions: View | Diff

Attachments on bug 230535: 196088