diff options
Diffstat (limited to 'lang/chicken/patches')
-rw-r--r-- | lang/chicken/patches/patch-aa | 14 | ||||
-rw-r--r-- | lang/chicken/patches/patch-ab | 18 | ||||
-rw-r--r-- | lang/chicken/patches/patch-ac | 10 | ||||
-rw-r--r-- | lang/chicken/patches/patch-ad | 22 |
4 files changed, 28 insertions, 36 deletions
diff --git a/lang/chicken/patches/patch-aa b/lang/chicken/patches/patch-aa index 275d50318a8..ed1c533f8cf 100644 --- a/lang/chicken/patches/patch-aa +++ b/lang/chicken/patches/patch-aa @@ -1,23 +1,19 @@ -$NetBSD: patch-aa,v 1.7 2004/07/24 10:32:40 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2004/09/05 18:31:59 seb Exp $ ---- Makefile.am.orig 2004-05-20 23:20:58.000000000 +0200 +--- Makefile.am.orig 2004-07-07 19:34:07.000000000 +0200 +++ Makefile.am -@@ -294,9 +294,11 @@ pkgdata_DATA = chicken-match-macros.scm +@@ -269,8 +269,8 @@ pkgdata_DATA = chicken-match-macros.scm # Install docs and sources. install-data-local : chicken.html - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc - -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done -- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken + -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done -+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken -+ $(mkinstalldirs) $(DESTDIR)$(pkglibdir) -+ + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) chicken.html: chicken.texi - $(MAKEINFO) --no-split --html chicken.texi -@@ -514,7 +516,7 @@ paranoid : +@@ -489,7 +489,7 @@ paranoid : .PHONY : test test : diff --git a/lang/chicken/patches/patch-ab b/lang/chicken/patches/patch-ab index 50f4a394d73..f47a53c9367 100644 --- a/lang/chicken/patches/patch-ab +++ b/lang/chicken/patches/patch-ab @@ -1,32 +1,28 @@ -$NetBSD: patch-ab,v 1.5 2004/07/24 10:32:40 wiz Exp $ +$NetBSD: patch-ab,v 1.6 2004/09/05 18:31:59 seb Exp $ ---- Makefile.in.orig 2004-05-20 23:21:13.000000000 +0200 +--- Makefile.in.orig 2004-08-19 18:37:55.000000000 +0200 +++ Makefile.in -@@ -536,7 +536,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat +@@ -472,7 +472,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat configure.lineno $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign Makefile -+ $(AUTOMAKE) --foreign --ignore-deps Makefile ++ $(AUTOMAKE) --foreign --ignore-deps Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) -@@ -1440,9 +1440,11 @@ csc.scm: csc.scm.in +@@ -1343,8 +1343,8 @@ csc.scm: csc.scm.in # Install docs and sources. install-data-local : chicken.html - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc - -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done -- $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken + -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(prefix)/share/doc/chicken; done -+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/chicken -+ $(mkinstalldirs) $(DESTDIR)$(pkglibdir) -+ + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) chicken.html: chicken.texi - $(MAKEINFO) --no-split --html chicken.texi -@@ -1630,7 +1632,7 @@ paranoid : +@@ -1533,7 +1533,7 @@ paranoid : .PHONY : test test : diff --git a/lang/chicken/patches/patch-ac b/lang/chicken/patches/patch-ac index 66e6f4fc8f6..5a004f4e00a 100644 --- a/lang/chicken/patches/patch-ac +++ b/lang/chicken/patches/patch-ac @@ -1,15 +1,15 @@ -$NetBSD: patch-ac,v 1.2 2004/06/02 06:56:07 itojun Exp $ +$NetBSD: patch-ac,v 1.3 2004/09/05 18:31:59 seb Exp $ ---- chicken-config.in.orig 2004-05-21 06:21:00.000000000 +0900 -+++ chicken-config.in 2004-06-02 15:31:38.000000000 +0900 -@@ -49,7 +49,11 @@ +--- chicken-config.in.orig 2004-06-09 18:43:29.000000000 +0200 ++++ chicken-config.in +@@ -48,7 +48,11 @@ esac # standard library directory. case "%libdir%" in /usr/lib|"") LIBDIR=;; - *) LIBDIR=-L%libdir%;; + *) LIBDIR="-L%libdir%" + if [ `uname -s` = "NetBSD" ]; then -+ LIBDIR="$LIBDIR -Wl,-R%libdir%" ++ LIBDIR="$LIBDIR -Wl,-R%libdir%" + fi + ;; esac diff --git a/lang/chicken/patches/patch-ad b/lang/chicken/patches/patch-ad index e91e894c030..d8c700308c5 100644 --- a/lang/chicken/patches/patch-ad +++ b/lang/chicken/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.1 2003/05/21 19:43:04 seb Exp $ +$NetBSD: patch-ad,v 1.2 2004/09/05 18:31:59 seb Exp $ ---- testsuites/makefile.in.orig 2003-03-11 21:53:33.000000000 +0000 +--- testsuites/makefile.in.orig 2004-06-27 23:25:12.000000000 +0200 +++ testsuites/makefile.in @@ -1,5 +1,9 @@ # makefile for Chicken test-suite @@ -22,10 +22,10 @@ $NetBSD: patch-ad,v 1.1 2003/05/21 19:43:04 seb Exp $ CHICKENFLAGS = -hygienic -include-path .. -optimize-level 1 LIBDIR = .. CCOPTS = `../chicken-config -cflags | sed s%-I@prefix@/include%%g` - LIBS = `../chicken-config -extra-libs -libs | sed s%-L@prefix@/lib%%g | sed "s%@prefix@/lib/\(lib[-A-Za-z0-9_]*\.a\)%$(LIBDIR)/\1%g"` + LIBS = `../chicken-config -libs | sed s%-L@prefix@/lib%%g | sed "s%@prefix@/lib/\(lib[-A-Za-z0-9_]*\.a\)%$(LIBDIR)/\1%g"` -+CC= @CC@ -+LIBTOOL= @LIBTOOL@ ++CC = @CC@ ++LIBTOOL = @LIBTOOL@ + all : $(TESTCASES) @@ -34,24 +34,24 @@ $NetBSD: patch-ad,v 1.1 2003/05/21 19:43:04 seb Exp $ - $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ && \ - ./$@ + $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ -+ $(LIBTOOL) --mode=execute ./$@ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ ++ $(LIBTOOL) --mode=execute ./$@ test-r5rs : - $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c && \ - $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ && \ - ./$@ + $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ -+ $(LIBTOOL) --mode=execute ./$@ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ ++ $(LIBTOOL) --mode=execute ./$@ test-test-infrastructure : - $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c && \ - $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ && \ - ./$@ + $(CHICKEN) $@.scm $(CHICKENFLAGS) -output-file $@.c -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ -+ $(LIBTOOL) --mode=execute ./$@ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPTS) $@.c -L$(LIBDIR) -I$(INCDIR) $(LIBS) -o $@ ++ $(LIBTOOL) --mode=execute ./$@ clean: rm -f *.c $(TESTCASES) |