From 8e768c8949edc5e53a3d305a3d7442bd8517fef3 Mon Sep 17 00:00:00 2001 From: Sergey Matveychuk Date: Mon, 1 Nov 2004 21:59:34 +0000 Subject: - Fix configure error from bad tarball - Eliminate dependancy on gcc 2.95 - Fix gmp lib dir flaw PR: ports/73362 Submitted by: maintainer --- lang/qscheme/Makefile | 6 ++---- lang/qscheme/files/patch-Makefile.in | 20 ++++++++++++++++++-- lang/qscheme/files/patch-configure | 4 ++-- lang/qscheme/files/patch-vm2.c | 13 +++++++++++++ 4 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 lang/qscheme/files/patch-vm2.c (limited to 'lang/qscheme') diff --git a/lang/qscheme/Makefile b/lang/qscheme/Makefile index 96299f9dfbb5..df1352f986a2 100644 --- a/lang/qscheme/Makefile +++ b/lang/qscheme/Makefile @@ -7,7 +7,7 @@ PORTNAME= qscheme PORTVERSION= 0.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang scheme MASTER_SITES= http://www.sof.ch/dan/qscheme/files/ @@ -20,8 +20,6 @@ LIB_DEPENDS= getline:${PORTSDIR}/devel/libgetline GNU_CONFIGURE= yes USE_GMAKE= yes -#USE_AUTOCONF= yes -USE_GCC= 2.95 USE_REINPLACE= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" @@ -42,7 +40,7 @@ post-patch: .if ${OSVERSION} >= 500000 BUILD_DEPENDS+= ${LOCALBASE}/include/gmp.h:${PORTSDIR}/math/libgmp4 -CONFIGURE_ARGS+= --with-gmp-lib=${LOCALBASE}/lib \ +CONFIGURE_ARGS+= --with-gmp-dir=${LOCALBASE}/lib \ --with-gmp-inc=${LOCALBASE}/include .endif diff --git a/lang/qscheme/files/patch-Makefile.in b/lang/qscheme/files/patch-Makefile.in index 02f354a37d63..045f49c73e79 100644 --- a/lang/qscheme/files/patch-Makefile.in +++ b/lang/qscheme/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- Makefile.in.orig Sun Feb 10 12:52:32 2002 -+++ Makefile.in Sun Feb 10 12:52:37 2002 +--- Makefile.in.orig Thu Jun 22 19:10:21 2000 ++++ Makefile.in Fri Oct 29 10:07:48 2004 @@ -111,7 +111,7 @@ EXTRA_DIST = mkoptable mkwhatis $(modsrc) $(scmsrc) CHANGES LICENCE_EXCEPTION @@ -8,3 +8,19 @@ +SUBDIRS = . doc noinst_LIBRARIES = libqs.a + +@@ -580,10 +580,10 @@ + %.x:%.i + mkoptable $< > $@ + +-sproto.h: $(libqs_src) +- @cfunctions $(libqs_src) \ +- | sed 's/^#include "c-extensions.h".*$$/#define PROTO(x) x/' > $@.new +- @if diff $@ $@.new >/dev/null ; then rm $@.new; else mv $@.new $@ ; fi ++#sproto.h: $(libqs_src) ++# @cfunctions $(libqs_src) \ ++# | sed 's/^#include "c-extensions.h".*$$/#define PROTO(x) x/' > $@.new ++# @if diff $@ $@.new >/dev/null ; then rm $@.new; else mv $@.new $@ ; fi + + # force sproto.h to be up to date. Otherwise compilation of + # distribution may fail, because sproto.h can trigger the cfunction diff --git a/lang/qscheme/files/patch-configure b/lang/qscheme/files/patch-configure index 5209603fddc8..496031dff2bc 100644 --- a/lang/qscheme/files/patch-configure +++ b/lang/qscheme/files/patch-configure @@ -108,7 +108,7 @@ ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "Makefile tst/Makefile doc/Makefile sgtk/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -+trap 'rm -fr `echo "Makefile tst/Makefile doc/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 ++trap 'rm -fr `echo "Makefile doc/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/lang/qscheme/files/patch-vm2.c b/lang/qscheme/files/patch-vm2.c new file mode 100644 index 000000000000..d4340b993641 --- /dev/null +++ b/lang/qscheme/files/patch-vm2.c @@ -0,0 +1,13 @@ +--- vm2.c.orig Wed Oct 27 19:33:03 2004 ++++ vm2.c Wed Oct 27 19:33:16 2004 +@@ -185,8 +185,8 @@ + + #define RETURN(value) { TOS=(value); NEXT; } + +-#define Prim(name,str,nargs) l_##name##: /* str */ +-#define PrimVarargs(name,str) l_##name##: /* str */ ++#define Prim(name,str,nargs) l_##name: /* str */ ++#define PrimVarargs(name,str) l_##name: /* str */ + + + /**************************************************************** -- cgit v1.2.3