Update scheme48 to 1.9.

Also fix linking issue by setting LD="${CC}".

ok sthen@ landry@ Looks good to me Aaron Hsu (MAINTAINER)
This commit is contained in:
jturner 2013-02-06 20:37:34 +00:00
parent 13ae5ac032
commit ea2009b738
6 changed files with 94 additions and 76 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2012/04/20 10:48:40 jasper Exp $
# $OpenBSD: Makefile,v 1.9 2013/02/06 20:37:34 jturner Exp $
COMMENT= Scheme Underground's implementation of R5RS
V= 1.8
V= 1.9
DISTNAME= scheme48-$V
REVISION= 2
CATEGORIES= lang
HOMEPAGE= http://www.s48.org/
@ -23,11 +22,10 @@ EXTRACT_SUFX= .tgz
WANTLIB= c m pthread
USE_GMAKE= Yes
USE_GROFF= Yes
ALL_TARGET= enough
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= LDFLAGS="-Wl,--export-dynamic -pthread"
CONFIGURE_ENV= LD="${CC}" LDFLAGS="-Wl,--export-dynamic"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scheme48

View File

@ -1,5 +1,2 @@
MD5 (scheme48-1.8.tgz) = 8cClFQOdTfTgdyHyGUCtbQ==
RMD160 (scheme48-1.8.tgz) = JoXqLCzp5f8UCKH1iBguB/bTgis=
SHA1 (scheme48-1.8.tgz) = dSmf6d5L8jn8HVp9+i7Dd+DpjfE=
SHA256 (scheme48-1.8.tgz) = BKYeoo750fLw4oH9brUD8Qr8lLDT802/N2rtvpPrG7M=
SIZE (scheme48-1.8.tgz) = 3173151
SHA256 (scheme48-1.9.tgz) = 3LqR0VC3SQ5hcO9PvUWgZboNjW4iiUY3naDR18ungmc=
SIZE (scheme48-1.9.tgz) = 3945425

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.2 2008/08/19 22:20:40 jasper Exp $
$OpenBSD: patch-Makefile_in,v 1.3 2013/02/06 20:37:34 jturner Exp $
Fix fake-stage.
--- Makefile.in.orig Sat Jan 26 16:06:27 2008
+++ Makefile.in Fri Aug 15 15:16:45 2008
@@ -57,8 +57,8 @@ VERSION = 1.`cat $(srcdir)/build/minor-version-number`
--- Makefile.in.orig Thu Dec 27 11:46:24 2012
+++ Makefile.in Tue Feb 5 18:31:15 2013
@@ -71,8 +71,8 @@ VERSION = 1.`cat $(srcdir)/build/minor-version-number`
RUNNABLE = scheme48
CONFIG_SCRIPT = scheme48-config
MANPAGE = $(RUNNABLE).$(manext)
@ -15,23 +15,3 @@ Fix fake-stage.
distdir = /tmp
@@ -356,7 +356,7 @@ install: enough dirs \
inst-vm:
$(INSTALL_PROGRAM) $(VM) $(DESTDIR)$(LIB)
- if [-e $(VM).a]; then $(INSTALL_PROGRAM) $(VM).a $(DESTDIR)$(LIB); fi
+ if [ -e $(VM).a]; then $(INSTALL_PROGRAM) $(VM).a $(DESTDIR)$(LIB); fi
inst-image:
rm -f '/tmp/$(IMAGE)'
@@ -416,8 +416,8 @@ inst-config-script:
-e 's,@LD\@,$(LD),g' \
-e 's,@DYNAMIC_EXTERNALS_CFLAGS\@,$(DYNAMIC_EXTERNALS_CFLAGS),g' \
-e 's,@DYNAMIC_EXTERNALS_LDFLAGS\@,$(DYNAMIC_EXTERNALS_LDFLAGS),g' \
- < $(srcdir)/build/$(CONFIG_SCRIPT).in > $$config_script && \
- chmod +x $$config_script
+ < $(srcdir)/build/$(CONFIG_SCRIPT).in > $(DESTDIR)$$config_script && \
+ chmod +x $(DESTDIR)$$config_script
inst-externals:
$(INSTALL_PROGRAM) $(POSIX_EXTERNAL) $(SRFI_27_EXTERNAL) $(DESTDIR)$(LIB)/

View File

@ -1,32 +0,0 @@
$OpenBSD: patch-c_unix_socket_c,v 1.1 2008/08/19 22:20:40 jasper Exp $
Fix compilation with pthreads.
--- c/unix/socket.c.orig Fri Aug 15 14:51:34 2008
+++ c/unix/socket.c Fri Aug 15 14:55:51 2008
@@ -19,6 +19,7 @@
#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <pthread.h>
#include "c-mods.h"
#include "scheme48.h"
@@ -374,7 +375,7 @@ s48_get_host_by_name(s48_value machine)
handshake->host_name[machine_length] = '\0';
handshake->event_uid = s48_external_event_uid();
- if (pthread_create(&t, NULL, gethostbyname_thread, (void*) handshake))
+ if (pthread_create(&t, NULL, (void *)gethostbyname_thread, (void *) handshake))
{
static struct hostent *host;
s48_unregister_external_event_uid(handshake->event_uid);
@@ -473,7 +474,7 @@ s48_get_host_by_address(s48_value sch_addr)
(char *) s48_extract_byte_vector(sch_addr), sizeof(struct in_addr));
handshake->event_uid = s48_external_event_uid();
- if (pthread_create(&t, NULL, gethostbyaddr_thread, (void*) handshake))
+ if (pthread_create(&t, NULL, (void *)gethostbyaddr_thread, (void*) handshake))
{
s48_unregister_external_event_uid(handshake->event_uid);
free(handshake);

View File

@ -1,3 +1,5 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2008/08/19 22:20:40 jasper Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2013/02/06 20:37:34 jturner Exp $
lib/scheme48/ffi-test.so
lib/scheme48/posix.so
lib/scheme48/r6rs.so
lib/scheme48/srfi-27.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2012/04/20 10:48:40 jasper Exp $
@comment $OpenBSD: PLIST,v 1.4 2013/02/06 20:37:34 jturner Exp $
@conflict scsh-*
@conflict gambit-*
%%SHARED%%
@ -16,8 +16,23 @@ lib/scheme48/
lib/scheme48/scheme48.image
@bin lib/scheme48/scheme48vm
@man man/man1/scheme48.1
share/doc/manual-Z-G-D-1.gif
share/doc/manual-Z-H-1.html
share/doc/manual-Z-H-10.html
share/doc/manual-Z-H-11.html
share/doc/manual-Z-H-2.html
share/doc/manual-Z-H-3.html
share/doc/manual-Z-H-4.html
share/doc/manual-Z-H-5.html
share/doc/manual-Z-H-6.html
share/doc/manual-Z-H-7.html
share/doc/manual-Z-H-8.html
share/doc/manual-Z-H-9.html
share/doc/manual-Z-S.css
share/doc/manual.html
share/doc/scheme48/
share/doc/scheme48/COPYING
share/doc/scheme48/deriving.txt
share/doc/scheme48/hacking.txt
share/doc/scheme48/html/
share/doc/scheme48/html/manual-Z-G-D-1.gif
@ -38,11 +53,11 @@ share/doc/scheme48/html/unicode-Z-G-1.gif
share/doc/scheme48/install.txt
share/doc/scheme48/io.txt
share/doc/scheme48/manual.ps
share/doc/scheme48/meeting.ps
share/doc/scheme48/news.txt
share/doc/scheme48/no-leaf-env.txt
share/doc/scheme48/todo.txt
share/doc/scheme48/type.txt
share/doc/unicode-Z-G-1.gif
share/scheme48/
share/scheme48/big/
share/scheme48/big/array.scm
@ -51,6 +66,8 @@ share/scheme48/big/callback.scm
share/scheme48/big/check.scm
share/scheme48/big/compact-table.scm
share/scheme48/big/compose-cont.scm
share/scheme48/big/constant-table-check.scm
share/scheme48/big/constant-table.scm
share/scheme48/big/defrecord.scm
share/scheme48/big/destructure.scm
share/scheme48/big/dump.scm
@ -66,26 +83,35 @@ share/scheme48/big/import-def.scm
share/scheme48/big/inversion-list-check.scm
share/scheme48/big/inversion-list.scm
share/scheme48/big/iterate.scm
share/scheme48/big/libscheme48.scm
share/scheme48/big/linked-queue.scm
share/scheme48/big/lock.scm
share/scheme48/big/lu-decomp.scm
share/scheme48/big/mask.scm
share/scheme48/big/matcher-check.scm
share/scheme48/big/matcher.scm
share/scheme48/big/more-port.scm
share/scheme48/big/mvlet.scm
share/scheme48/big/os-time-check.scm
share/scheme48/big/os-time.scm
share/scheme48/big/pipe.scm
share/scheme48/big/placeholder.scm
share/scheme48/big/pp.scm
share/scheme48/big/queue-check.scm
share/scheme48/big/queue.scm
share/scheme48/big/random.scm
share/scheme48/big/receive.scm
share/scheme48/big/reinitializer.scm
share/scheme48/big/search-tree.scm
share/scheme48/big/shared-object.scm
share/scheme48/big/socket-check.scm
share/scheme48/big/socket.scm
share/scheme48/big/signal.scm
share/scheme48/big/strong.scm
share/scheme48/big/tconc-queue-check.scm
share/scheme48/big/tconc-queue.scm
share/scheme48/big/test-suite.scm
share/scheme48/big/text-codec-util.scm
share/scheme48/big/tlc-table-check.scm
share/scheme48/big/tlc-table.scm
share/scheme48/big/transport-link-cell-check.scm
share/scheme48/big/unicode-normalization-info.scm
share/scheme48/big/unicode-normalization.scm
share/scheme48/big/value-pipe.scm
@ -108,7 +134,6 @@ share/scheme48/env/basic-command.scm
share/scheme48/env/build.scm
share/scheme48/env/command-level.scm
share/scheme48/env/command.scm
share/scheme48/env/condition.scm
share/scheme48/env/debug.scm
share/scheme48/env/debuginfo.scm
share/scheme48/env/disasm.scm
@ -117,18 +142,20 @@ share/scheme48/env/dispcond.scm
share/scheme48/env/flatload.scm
share/scheme48/env/init-defpackage.scm
share/scheme48/env/inspect.scm
share/scheme48/env/io-condition.scm
share/scheme48/env/jar-assem.scm
share/scheme48/env/list-interface.scm
share/scheme48/env/load-package.scm
share/scheme48/env/menu.scm
share/scheme48/env/package-mutation-check.scm
share/scheme48/env/pacman.scm
share/scheme48/env/parse-bytecode.scm
share/scheme48/env/pedit.scm
share/scheme48/env/profile-check.scm
share/scheme48/env/profile-command.scm
share/scheme48/env/profile-instr.scm
share/scheme48/env/profile.scm
share/scheme48/env/read-command.scm
share/scheme48/env/shadow.scm
share/scheme48/env/signal.scm
share/scheme48/env/space.scm
share/scheme48/env/start.scm
share/scheme48/env/traverse.scm
@ -137,6 +164,7 @@ share/scheme48/env/unicode-charmap.scm
share/scheme48/env/unicode-info.scm
share/scheme48/env/user.scm
share/scheme48/env/version-info.scm
share/scheme48/env/vm-exception.scm
share/scheme48/link/
share/scheme48/link/data.scm
share/scheme48/link/generate-c-header.scm
@ -168,6 +196,13 @@ share/scheme48/misc/sicp.scm
share/scheme48/misc/static.scm
share/scheme48/misc/test-doodl.scm
share/scheme48/misc/test-packages.scm
share/scheme48/net/
share/scheme48/net/address.scm
share/scheme48/net/big-socket.scm
share/scheme48/net/external-enum-type.scm
share/scheme48/net/packages.scm
share/scheme48/net/socket-check.scm
share/scheme48/net/socket.scm
share/scheme48/opt/
share/scheme48/opt/analyze.scm
share/scheme48/opt/inline.scm
@ -177,6 +212,7 @@ share/scheme48/opt/usage.scm
share/scheme48/posix/
share/scheme48/posix/check.scm
share/scheme48/posix/dir.scm
share/scheme48/posix/errno.scm
share/scheme48/posix/file-options.scm
share/scheme48/posix/func-regexp.scm
share/scheme48/posix/io.scm
@ -186,7 +222,41 @@ share/scheme48/posix/proc.scm
share/scheme48/posix/regexp-check.scm
share/scheme48/posix/regexp.scm
share/scheme48/posix/signal.scm
share/scheme48/posix/syslog.scm
share/scheme48/posix/test-packages.scm
share/scheme48/posix/time.scm
share/scheme48/r6rs/
share/scheme48/r6rs/base-comparison.scm
share/scheme48/r6rs/bitwise-check.scm
share/scheme48/r6rs/bitwise.scm
share/scheme48/r6rs/bytevector-check.scm
share/scheme48/r6rs/bytevector-ieee-check.scm
share/scheme48/r6rs/bytevector-ieee.scm
share/scheme48/r6rs/bytevector-string-check.scm
share/scheme48/r6rs/bytevector-string.scm
share/scheme48/r6rs/bytevector.scm
share/scheme48/r6rs/comparison-check.scm
share/scheme48/r6rs/condition.scm
share/scheme48/r6rs/control.scm
share/scheme48/r6rs/enum-check.scm
share/scheme48/r6rs/enum.scm
share/scheme48/r6rs/equal.scm
share/scheme48/r6rs/hashtable-check.scm
share/scheme48/r6rs/hashtable.scm
share/scheme48/r6rs/list-check.scm
share/scheme48/r6rs/list.scm
share/scheme48/r6rs/n-ary-comparison.scm
share/scheme48/r6rs/packages.scm
share/scheme48/r6rs/reader-check.scm
share/scheme48/r6rs/reader-command.scm
share/scheme48/r6rs/reader.scm
share/scheme48/r6rs/record-command.scm
share/scheme48/r6rs/record-procedural-check.scm
share/scheme48/r6rs/record-procedural.scm
share/scheme48/r6rs/record-syntactic-check.scm
share/scheme48/r6rs/record-syntactic.scm
share/scheme48/r6rs/test-packages.scm
share/scheme48/r6rs/unicode-comparison.scm
share/scheme48/rts/
share/scheme48/rts/defenum.scm
share/scheme48/rts/floatnum.scm
@ -204,12 +274,13 @@ share/scheme48/sort/packages.scm
share/scheme48/sort/sort.scm
share/scheme48/sort/sortp.scm
share/scheme48/sort/test-packages.scm
share/scheme48/sort/test.scm
share/scheme48/sort/vbinsearch.scm
share/scheme48/sort/vector-util.scm
share/scheme48/sort/vhsort.scm
share/scheme48/sort/visort.scm
share/scheme48/sort/vmsort.scm
share/scheme48/sort/vqsort2.scm
share/scheme48/sort/vqsort3.scm
share/scheme48/srfi/
share/scheme48/srfi/packages.scm
share/scheme48/srfi/srfi-1.scm
@ -246,4 +317,6 @@ share/scheme48/srfi/srfi-7.scm
share/scheme48/srfi/srfi-71.scm
share/scheme48/srfi/srfi-74.scm
share/scheme48/srfi/srfi-78.scm
share/scheme48/srfi/srfi-95-check.scm
share/scheme48/srfi/srfi-95.scm
share/scheme48/srfi/test-packages.scm