Date: 31 Oct 2004 22:52:20 -0000 From: Erik Greenwald <erik@smluc.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: erik@math.smsu.edu Subject: ports/73362: [Maintainer Update] lang/qscheme Message-ID: <20041031225220.10279.qmail@phoenix.smluc.org> Resent-Message-ID: <200410312300.i9VN0ttR089170@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73362 >Category: ports >Synopsis: [Maintainer Update] lang/qscheme >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Oct 31 23:00:55 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Erik Greenwald >Release: FreeBSD 4.10-STABLE i386 >Organization: >Environment: System: FreeBSD fenris 4.10-STABLE FreeBSD 4.10-STABLE #1: Sat Sep 25 14:06:08 EDT 2004 root@:/usr/src/sys/compile/FENRIS i386 >Description: fixes configure error from bad tarball (tst dir missing) eliminates dependancy on gcc 2.95 (now works with gcc 3 series) fixed gmp lib dir flaw (the configure help reported the opetino to be --with-gmp-lib when the conifgure script actually used --with-gmp-dir. I believe this caused weird errors that ended up reporting as thread lib errors by the configure script...) have tested this on 4.10 (RELENG_4), 5.2.1p9 (a little, not sure on this one), and 6.0 (current). (due to weirdness with the new file vs cvs, must be patched in ${PORTSDIR}/lang/qscheme instead of ${PORTSDIR}, sorry) creates a new file, files/patch-vm2.c >How-To-Repeat: >Fix: --- lang_qscheme.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/lang/qscheme/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- Makefile 10 Jun 2004 18:30:09 -0000 1.14 +++ Makefile 31 Oct 2004 22:39:26 -0000 @@ -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 @@ GNU_CONFIGURE= yes USE_GMAKE= yes -#USE_AUTOCONF= yes -USE_GCC= 2.95 USE_REINPLACE= yes PLIST_SUB+= PORTVERSION="${PORTVERSION}" @@ -42,7 +40,7 @@ .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 Index: files/patch-Makefile.in =================================================================== RCS file: /home/ncvs/ports/lang/qscheme/files/patch-Makefile.in,v retrieving revision 1.2 diff -u -r1.2 patch-Makefile.in --- files/patch-Makefile.in 10 Jun 2004 18:30:09 -0000 1.2 +++ files/patch-Makefile.in 31 Oct 2004 22:39:26 -0000 @@ -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 Index: files/patch-configure =================================================================== RCS file: /home/ncvs/ports/lang/qscheme/files/patch-configure,v retrieving revision 1.3 diff -u -r1.3 patch-configure --- files/patch-configure 17 Feb 2004 10:17:36 -0000 1.3 +++ files/patch-configure 31 Oct 2004 22:39:26 -0000 @@ -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 <<EOF @@ -117,7 +117,7 @@ cat >> $CONFIG_STATUS <<EOF -CONFIG_FILES=\${CONFIG_FILES-"Makefile tst/Makefile doc/Makefile sgtk/Makefile"} -+CONFIG_FILES=\${CONFIG_FILES-"Makefile tst/Makefile doc/Makefile"} ++CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then Index: files/patch-vm2.c =================================================================== RCS file: files/patch-vm2.c diff -N files/patch-vm2.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-vm2.c 31 Oct 2004 22:39:26 -0000 @@ -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 */ + + + /**************************************************************** --- lang_qscheme.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041031225220.10279.qmail>