diff options
32 files changed, 224 insertions, 2081 deletions
diff --git a/lang/elk/Makefile b/lang/elk/Makefile index b5246e68f38..814beebc843 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -1,72 +1,18 @@ -# $NetBSD: Makefile,v 1.29 2005/06/01 18:02:58 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/10/15 23:07:21 tonio Exp $ -DISTNAME= elk-3.0 -PKGNAME= elk-3.0.3 -PKGREVISION= 1 +DISTNAME= elk-3.99.6 CATEGORIES= lang -MASTER_SITES= http://www-rn.informatik.uni-bremen.de/software/elk/dist/ +MASTER_SITES= http://sam.zoy.org/elk/ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://sam.zoy.org/elk/ COMMENT= Embeddable Scheme interpreter -# ELF loading problems, LP64 -NOT_FOR_PLATFORM= *-*-alpha *-*-mips* *-*-sparc64 +GNU_CONFIGURE=yes +USE_LIBTOOL= yes -BUILD_TARGET= default +CONFIGURE_ENV= WITH_XAW="${ELK_AWK}" -.include "../../mk/bsd.prefs.mk" - -ELK_GUI?= none -BUILD_DEFS+= ELK_GUI - -# We must strip the "-Wl," from the linker flags because they are saved -# by elk to be used to invoke the real "ld", which won't understand them. -# -.if ${ELK_GUI} != "none" -MAKE_ENV+= X11_LDFLAGS="${X11_LDFLAGS:S/-Wl,//}" -. if !empty(ELK_GUI:Mxaw) -. include "../../mk/xaw.buildlink3.mk" -LIBXAW:= ${LIBXAW:S/-Wl,//} -ELK_SUBDIRS+= lib/xlib lib/xt lib/xaw -PLIST_SRC+= ${PKGDIR}/PLIST.X11 -BUILD_DEFS+= XAW_TYPE -. endif -. if !empty(ELK_GUI:Mmotif) -. include "../../mk/motif.buildlink3.mk" -MOTIFLIB:= ${MOTIFLIB:S/-Wl,//} -ELK_SUBDIRS+= lib/xm lib/xm/xt -PLIST_SRC+= ${PKGDIR}/PLIST.Motif -. endif -.endif - -PLIST_SRC+= ${PKGDIR}/PLIST.base -MAKE_ENV+= ELK_SUBDIRS="${ELK_SUBDIRS}" - -.include "../../mk/x11.buildlink3.mk" - -do-configure: - ${MV} ${WRKSRC}/src/stab-elf.c ${WRKSRC}/src/stab-elf.c-dist - ${CP} ${FILESDIR}/stab-elf.c ${WRKSRC}/src - @case ${OBJECT_FMT} in \ - a.out) exetype=aout ;; \ - ELF) exetype=elf ;; \ - *) ${ECHO} "Unsupported object format: ${OBJECT_FMT}"; \ - exit 1 ;; \ - esac; \ - ${ECHO} "Setting up links for $$exetype on ${LOWER_OPSYS}"; \ - ${RM} -f ${WRKSRC}/config/untested/elf-solaris-cc; \ - ${LN} -s ${WRKSRC}/config/sun-sunos5-gcc \ - ${WRKSRC}/config/untested/elf-solaris-cc; \ - ${RM} -f ${WRKSRC}/config/system ${WRKSRC}/config/site; \ - ${LN} -s ${WRKSRC}/config/untested/$$exetype-${LOWER_OPSYS}-cc \ - ${WRKSRC}/config/system; \ - for f in aout-netbsd elf-netbsd elf-solaris; do \ - ${RM} -f ${WRKSRC}/config/sites/$$f; \ - ${LN} -s ${WRKSRC}/config/sites/pkgsrc \ - ${WRKSRC}/config/sites/$$f; \ - done; \ - ${LN} -s ${WRKSRC}/config/sites/$$exetype-${LOWER_OPSYS} \ - ${WRKSRC}/config/site +.include "options.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/elk/PLIST b/lang/elk/PLIST new file mode 100644 index 00000000000..6a2c3700fe2 --- /dev/null +++ b/lang/elk/PLIST @@ -0,0 +1,160 @@ +@comment $NetBSD: PLIST,v 1.3 2005/10/15 23:07:21 tonio Exp $ +bin/elk +bin/scheme-elk +include/elk/compat.h +include/elk/cstring.h +include/elk/exception.h +include/elk/extensions/unix.h +include/elk/extensions/xlib.h +include/elk/extensions/xt.h +include/elk/extern.h +include/elk/funcproto.h +include/elk/gc.h +include/elk/intern.h +include/elk/kernel.h +include/elk/misc.h +include/elk/object.h +include/elk/param.h +include/elk/scheme.h +include/elk/site.h +include/elk/stkmem.h +include/elk/type.h +lib/elk/bitstring.la +lib/elk/debug.la +lib/elk/elk-eval.la +lib/elk/hack.la +lib/elk/newhandler.la +lib/elk/record.la +lib/elk/regexp.la +lib/elk/struct.la +lib/elk/unix.la +${WITHMOTIF}lib/elk/motif.la +${WITHXAW}lib/elk/xaw.la +${WITHX11}lib/elk/xlib.la +lib/libelk.la +${WITHX11}lib/libelk-xlib.la +${WITHX11}lib/libelk-xt.la +man/man1/elk.1 +man/man1/scheme-elk.1 +share/doc/elk/examples/c++/class.cpp +share/doc/elk/examples/c++/constructor.cpp +share/doc/elk/examples/motif/drawing-area.scm +share/doc/elk/examples/motif/list.scm +share/doc/elk/examples/motif/main-window.scm +share/doc/elk/examples/motif/menu-stuff.scm +share/doc/elk/examples/motif/message-dialog.scm +share/doc/elk/examples/motif/option-menu.scm +share/doc/elk/examples/motif/popup-menu.scm +share/doc/elk/examples/motif/pulldown-menu.scm +share/doc/elk/examples/motif/radio-stuff.scm +share/doc/elk/examples/motif/radio.scm +share/doc/elk/examples/motif/scroll-bar.scm +share/doc/elk/examples/motif/selection-box.scm +share/doc/elk/examples/motif/vcr.scm +share/doc/elk/examples/regexp/match.scm +share/doc/elk/examples/scheme/Y.scm +share/doc/elk/examples/scheme/acker.scm +share/doc/elk/examples/scheme/billiard.scm +share/doc/elk/examples/scheme/cc.scm +share/doc/elk/examples/scheme/cell.scm +share/doc/elk/examples/scheme/co.scm +share/doc/elk/examples/scheme/compile.scm +share/doc/elk/examples/scheme/cps.scm +share/doc/elk/examples/scheme/dynamic.scm +share/doc/elk/examples/scheme/fib.scm +share/doc/elk/examples/scheme/fix.scm +share/doc/elk/examples/scheme/flame.scm +share/doc/elk/examples/scheme/hanoi.scm +share/doc/elk/examples/scheme/kons.scm +share/doc/elk/examples/scheme/meissel.scm +share/doc/elk/examples/scheme/mondo.scm +share/doc/elk/examples/scheme/perm.scm +share/doc/elk/examples/scheme/prim.scm +share/doc/elk/examples/scheme/ramanujan.scm +share/doc/elk/examples/scheme/rungekutta.scm +share/doc/elk/examples/scheme/sqrt.scm +share/doc/elk/examples/scheme/unify.scm +share/doc/elk/examples/scheme/work.scm +share/doc/elk/examples/tests/README +share/doc/elk/examples/tests/r4rstest.scm +share/doc/elk/examples/unix/calc.scm +share/doc/elk/examples/unix/copy.scm +share/doc/elk/examples/unix/lock.scm +share/doc/elk/examples/unix/ls.scm +share/doc/elk/examples/unix/pipsiz.scm +share/doc/elk/examples/unix/timeout.scm +share/doc/elk/examples/xaw/accel.scm +share/doc/elk/examples/xaw/clickcount.scm +share/doc/elk/examples/xaw/dialog.scm +share/doc/elk/examples/xaw/grip.scm +share/doc/elk/examples/xaw/list.scm +share/doc/elk/examples/xaw/paned.scm +share/doc/elk/examples/xaw/panner.scm +share/doc/elk/examples/xaw/popup.scm +share/doc/elk/examples/xaw/porthole.scm +share/doc/elk/examples/xaw/pulldown.scm +share/doc/elk/examples/xaw/scrollbar.scm +share/doc/elk/examples/xaw/scrollbox.scm +share/doc/elk/examples/xaw/stripchart.scm +share/doc/elk/examples/xaw/text.scm +share/doc/elk/examples/xaw/tree.scm +share/doc/elk/examples/xaw/viewport.scm +share/doc/elk/examples/xlib/hello.scm +share/doc/elk/examples/xlib/lines.scm +share/doc/elk/examples/xlib/map-all.scm +share/doc/elk/examples/xlib/picture.scm +share/doc/elk/examples/xlib/poly.scm +share/doc/elk/examples/xlib/properties.scm +share/doc/elk/examples/xlib/track.scm +share/doc/elk/examples/xlib/useful.scm +share/doc/elk/examples/xlib/wm-delete.scm +share/doc/elk/ps/bitstring.ps +share/doc/elk/ps/cprog.ps +share/doc/elk/ps/elk.ps +share/doc/elk/ps/kernel.ps +share/doc/elk/ps/oops.ps +share/doc/elk/ps/record.ps +share/doc/elk/ps/regexp.ps +share/doc/elk/ps/unix.ps +share/doc/elk/ps/usenix.ps +share/doc/elk/ps/xlib.ps +share/doc/elk/ps/xt.ps +share/elk/apropos.scm +share/elk/bitstring.scm +share/elk/cscheme.scm +share/elk/debug.scm +share/elk/describe.scm +share/elk/initscheme.scm +share/elk/oops.scm +share/elk/parse.scm +share/elk/pp.scm +share/elk/qsort.scm +share/elk/record.scm +share/elk/recordutil.scm +share/elk/regexp.scm +share/elk/safe-env.scm +share/elk/setf.scm +share/elk/slib.scm +share/elk/struct.scm +share/elk/toplevel.scm +share/elk/trace.scm +share/elk/unix.scm +${WITHXAW}share/elk/xaw.scm +${WITHX11}share/elk/xlib.scm +${WITHX11}share/elk/xwidgets.scm +${WITHMOTIF}share/elk/motif.scm +@dirrm share/elk +@dirrm share/doc/elk/ps +@dirrm share/doc/elk/examples/xlib +@dirrm share/doc/elk/examples/xaw +@dirrm share/doc/elk/examples/unix +@dirrm share/doc/elk/examples/tests +@dirrm share/doc/elk/examples/scheme +@dirrm share/doc/elk/examples/regexp +@dirrm share/doc/elk/examples/motif +@dirrm share/doc/elk/examples/c++ +@dirrm share/doc/elk/examples +@dirrm share/doc/elk +@dirrm lib/elk +@dirrm include/elk/extensions +@dirrm include/elk diff --git a/lang/elk/PLIST.Motif b/lang/elk/PLIST.Motif deleted file mode 100644 index 5a7ecabf017..00000000000 --- a/lang/elk/PLIST.Motif +++ /dev/null @@ -1,29 +0,0 @@ -@comment $NetBSD: PLIST.Motif,v 1.1 2002/01/09 23:04:53 seb Exp $ -lib/elk/runtime/obj/xm/ALIASES -lib/elk/runtime/obj/xm/arrow-button.o -lib/elk/runtime/obj/xm/bulletin-brd.o -lib/elk/runtime/obj/xm/cascade-btn.o -lib/elk/runtime/obj/xm/command.o -lib/elk/runtime/obj/xm/drawing-area.o -lib/elk/runtime/obj/xm/drawn-button.o -lib/elk/runtime/obj/xm/file-selectn.o -lib/elk/runtime/obj/xm/form.o -lib/elk/runtime/obj/xm/frame.o -lib/elk/runtime/obj/xm/label.o -lib/elk/runtime/obj/xm/list.o -lib/elk/runtime/obj/xm/main-window.o -lib/elk/runtime/obj/xm/message-box.o -lib/elk/runtime/obj/xm/paned-window.o -lib/elk/runtime/obj/xm/push-button.o -lib/elk/runtime/obj/xm/row-column.o -lib/elk/runtime/obj/xm/scale.o -lib/elk/runtime/obj/xm/scroll-bar.o -lib/elk/runtime/obj/xm/scrolled-win.o -lib/elk/runtime/obj/xm/selectn-box.o -lib/elk/runtime/obj/xm/separator.o -lib/elk/runtime/obj/xm/shell.o -lib/elk/runtime/obj/xm/support.o -lib/elk/runtime/obj/xm/text.o -lib/elk/runtime/obj/xm/toggle-btn.o -lib/elk/runtime/obj/xt-motif.o -@dirrm lib/elk/runtime/obj/xm diff --git a/lang/elk/PLIST.X11 b/lang/elk/PLIST.X11 deleted file mode 100644 index 34dbcc73c37..00000000000 --- a/lang/elk/PLIST.X11 +++ /dev/null @@ -1,30 +0,0 @@ -@comment $NetBSD: PLIST.X11,v 1.1 2002/01/09 23:04:54 seb Exp $ -include/elk/extensions/xlib.h -include/elk/extensions/xt.h -lib/elk/runtime/obj/xaw/ALIASES -lib/elk/runtime/obj/xaw/ascii.o -lib/elk/runtime/obj/xaw/box.o -lib/elk/runtime/obj/xaw/command.o -lib/elk/runtime/obj/xaw/dialog.o -lib/elk/runtime/obj/xaw/form.o -lib/elk/runtime/obj/xaw/grip.o -lib/elk/runtime/obj/xaw/label.o -lib/elk/runtime/obj/xaw/list.o -lib/elk/runtime/obj/xaw/menubutton.o -lib/elk/runtime/obj/xaw/paned.o -lib/elk/runtime/obj/xaw/panner.o -lib/elk/runtime/obj/xaw/porthole.o -lib/elk/runtime/obj/xaw/repeater.o -lib/elk/runtime/obj/xaw/scrollbar.o -lib/elk/runtime/obj/xaw/shell.o -lib/elk/runtime/obj/xaw/simplemenu.o -lib/elk/runtime/obj/xaw/sme.o -lib/elk/runtime/obj/xaw/smebsb.o -lib/elk/runtime/obj/xaw/smeline.o -lib/elk/runtime/obj/xaw/stripchart.o -lib/elk/runtime/obj/xaw/toggle.o -lib/elk/runtime/obj/xaw/tree.o -lib/elk/runtime/obj/xaw/viewport.o -lib/elk/runtime/obj/xlib.o -lib/elk/runtime/obj/xt.o -@dirrm lib/elk/runtime/obj/xaw diff --git a/lang/elk/PLIST.base b/lang/elk/PLIST.base deleted file mode 100644 index 37eefb9f299..00000000000 --- a/lang/elk/PLIST.base +++ /dev/null @@ -1,75 +0,0 @@ -@comment $NetBSD: PLIST.base,v 1.1 2002/01/09 23:04:54 seb Exp $ -bin/elk -include/elk/compat.h -include/elk/config.h -include/elk/cstring.h -include/elk/exception.h -include/elk/extensions/unix.h -include/elk/extern.h -include/elk/funcproto.h -include/elk/gc.h -include/elk/misc.h -include/elk/object.h -include/elk/param.h -include/elk/scheme.h -include/elk/stkmem.h -include/elk/type.h -lib/elk/lib/ldflags -lib/elk/lib/linkscheme -lib/elk/lib/makedl -lib/elk/lib/module.o -lib/elk/lib/standalone.o -lib/elk/runtime/obj/bitstring.o -lib/elk/runtime/obj/debug.o -lib/elk/runtime/obj/elk-eval.o -lib/elk/runtime/obj/hack.o -lib/elk/runtime/obj/monitor.o -lib/elk/runtime/obj/newhandler.o -lib/elk/runtime/obj/record.o -lib/elk/runtime/obj/regexp.o -lib/elk/runtime/obj/struct.o -lib/elk/runtime/obj/unix.o -lib/elk/runtime/scm/apropos.scm -lib/elk/runtime/scm/bitstring.scm -lib/elk/runtime/scm/cscheme.scm -lib/elk/runtime/scm/debug.scm -lib/elk/runtime/scm/describe.scm -lib/elk/runtime/scm/gdbmtest.scm -lib/elk/runtime/scm/initscheme.scm -lib/elk/runtime/scm/motif.scm -lib/elk/runtime/scm/oops.scm -lib/elk/runtime/scm/parse.scm -lib/elk/runtime/scm/pp.scm -lib/elk/runtime/scm/qsort.scm -lib/elk/runtime/scm/record.scm -lib/elk/runtime/scm/recordutil.scm -lib/elk/runtime/scm/regexp.scm -lib/elk/runtime/scm/safe-env.scm -lib/elk/runtime/scm/setf.scm -lib/elk/runtime/scm/siteinfo.scm -lib/elk/runtime/scm/struct.scm -lib/elk/runtime/scm/toplevel.scm -lib/elk/runtime/scm/trace.scm -lib/elk/runtime/scm/unix.scm -lib/elk/runtime/scm/xlib.scm -lib/elk/runtime/scm/xt.scm -lib/elk/runtime/scm/xwidgets.scm -man/man1/elk.1 -share/doc/elk/bitstring.ps -share/doc/elk/cprog.ps -share/doc/elk/kernel.ps -share/doc/elk/oops.ps -share/doc/elk/record.ps -share/doc/elk/regexp.ps -share/doc/elk/unix.ps -share/doc/elk/usenix.ps -share/doc/elk/xlib.ps -share/doc/elk/xt.ps -@dirrm share/doc/elk -@dirrm lib/elk/runtime/scm -@dirrm lib/elk/runtime/obj -@dirrm lib/elk/runtime -@dirrm lib/elk/lib -@dirrm lib/elk -@dirrm include/elk/extensions -@dirrm include/elk diff --git a/lang/elk/buildlink3.mk b/lang/elk/buildlink3.mk index e7cce9c8d2d..c8a525eba21 100644 --- a/lang/elk/buildlink3.mk +++ b/lang/elk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2005/03/30 19:44:44 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2005/10/15 23:07:21 tonio Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ELK_BUILDLINK3_MK:= ${ELK_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nelk} BUILDLINK_PACKAGES+= elk .if !empty(ELK_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.elk+= elk>=3.0.3nb1 +BUILDLINK_DEPENDS.elk+= elk>=3.99.6 BUILDLINK_PKGSRCDIR.elk?= ../../lang/elk .endif # ELK_BUILDLINK3_MK diff --git a/lang/elk/distinfo b/lang/elk/distinfo index 280d0088bf0..116b38bc8fa 100644 --- a/lang/elk/distinfo +++ b/lang/elk/distinfo @@ -1,29 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 09:03:06 agc Exp $ +$NetBSD: distinfo,v 1.6 2005/10/15 23:07:21 tonio Exp $ -SHA1 (elk-3.0.tar.gz) = d62ae8a88e3206a578195611ace50168e6078661 -RMD160 (elk-3.0.tar.gz) = 9c4b46c51109242bf591302da46b17c2bca2046e -Size (elk-3.0.tar.gz) = 762484 bytes -SHA1 (patch-aa) = 109e70fb6ba64b116c3b472b8586bf9c89c29348 -SHA1 (patch-ab) = 62cac0487bf259aa481fbc23fd34b168475062fe -SHA1 (patch-ac) = 34c00b8d706834bc5ffd4dca21049b56d2ae35bd -SHA1 (patch-ad) = 421d3a738fa78db6c139331ca0d57987f94266bd -SHA1 (patch-ae) = d1514bc0391f59adbd2591b361348a2baee118f4 -SHA1 (patch-af) = e3b2da075f099e7f3abff82afc255018c21639dd -SHA1 (patch-ag) = 3aebf5f386e67c2a87cb549a6c6a7d4f332db1fe -SHA1 (patch-ah) = 901fbd12b2d103cf1efe965d82c03b6790aa0282 -SHA1 (patch-ai) = 0a3569151de7d78706b5c5112bc260e880c25056 -SHA1 (patch-aj) = fc3294f5198caa7a91aafffaed9ec1b2e55c7696 -SHA1 (patch-ak) = 59fec6f3b2d00c75d3954ccb20237dd179ac0f81 -SHA1 (patch-al) = c17f9c1760bca6928f517bc9d2c64d1eba5b5756 -SHA1 (patch-am) = 1950af890ce6fc3acf2340630199dd8c375f9b0e -SHA1 (patch-an) = a8eef0e5a1315cd5a0e3a4ce2b7ea80fd4e62db5 -SHA1 (patch-ao) = af0d66514fb2673388658d74246d9e83c174118e -SHA1 (patch-ap) = 4c76aa4b44b2a3d2e2bcbed3c6d4d639c99e51a4 -SHA1 (patch-aq) = 0d10cc53d0284ce56bb6929579962c7b29afcbe6 -SHA1 (patch-ar) = a145d0b1aba3d201bda60b9c82eff8c642c5919f -SHA1 (patch-as) = 69b51d90a4e34cd7b1c3a2a290343420ffee51eb -SHA1 (patch-at) = 133495a41196a4017c232cf7d1de2c8283f36968 -SHA1 (patch-au) = 6bba0055e67418cdb3a0da1c9754cad8de4bb03d -SHA1 (patch-av) = f764b4ca96f8c837ad1a392137e96b90d8102cd1 -SHA1 (patch-aw) = 3fa21da8be16407ece0cfae3f6510b7ee8052e6c -SHA1 (patch-ax) = 3e7e0c0a4cff6b33acd818579f743bf8f6665dec +SHA1 (elk-3.99.6.tar.gz) = 10fb17ab7e06a34ad3067be323482091fa79d398 +RMD160 (elk-3.99.6.tar.gz) = f7e7861bae4e996b4eac2f6d3c004f5631b73e38 +Size (elk-3.99.6.tar.gz) = 847811 bytes +SHA1 (patch-aa) = 8eafcd683ad0a87003d3727a6a37e321ef92b0a4 +SHA1 (patch-ab) = e28bb6c96d315dfb3010036e3bc40b0e50b3b2b2 diff --git a/lang/elk/files/stab-elf.c b/lang/elk/files/stab-elf.c deleted file mode 100644 index ba6ededf2c9..00000000000 --- a/lang/elk/files/stab-elf.c +++ /dev/null @@ -1,97 +0,0 @@ -/* $NetBSD: stab-elf.c,v 1.4 2002/01/09 23:04:55 seb Exp $ */ - -/* - * Copyright (c) 2000 Alistair G. Crooks. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Alistair G. Crooks. - * 4. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS - * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -#include <sys/cdefs.h> - -#ifndef lint -__COPYRIGHT( - "@(#) Copyright (c) 2000 \ - The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: stab-elf.c,v 1.4 2002/01/09 23:04:55 seb Exp $"); -#endif - -#include <sys/types.h> -#include <sys/param.h> - -#include <elf.h> -#include <err.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#ifndef AWK -#define AWK "/usr/bin/awk" -#endif - -#ifndef NM -#define NM "/usr/bin/nm" -#endif - -#ifdef __ELF__ -#define NAME_OFFSET 0 -#else -#define NAME_OFFSET 1 -#endif - -SYMTAB * -Open_File_And_Snarf_Symbols (name) - char *name; -{ - SYMTAB *tab = NULL; - FILE *pp; - char cmd[MAXPATHLEN + 200]; - char buf[BUFSIZ]; - SYM **nextp; - SYM *sp; - - (void) snprintf(cmd, sizeof(cmd), "%s -g %s | %s '$2 == \"T\" { printf(\"%%s %%s\\n\", $1, $3) }'", NM, name, AWK); - if ((pp = popen(cmd, "r")) == NULL) { - Primitive_Error("can't open a.out file"); - } - tab = (SYMTAB *)Safe_Malloc (sizeof (SYMTAB)); - tab->first = 0; - tab->strings = 0; - nextp = &tab->first; - while (fgets(buf, sizeof(buf), pp) != NULL) { - sp = (SYM *)Safe_Malloc(sizeof (SYM)); - sp->name = Safe_Malloc(strlen(buf) + 1 - 8 - 1); - buf[strlen(buf) - 1] = '\0'; - (void) strcpy(sp->name, &buf[8 + 1 + NAME_OFFSET]); - (void) sscanf(buf, "%08x", &sp->value); - *nextp = sp; - nextp = &sp->next; - *nextp = 0; - } - (void) pclose(pp); - return tab; -} diff --git a/lang/elk/options.mk b/lang/elk/options.mk new file mode 100644 index 00000000000..997cdaad02a --- /dev/null +++ b/lang/elk/options.mk @@ -0,0 +1,36 @@ +# $NetBSD: options.mk,v 1.1 2005/10/15 23:07:21 tonio Exp $ + +# Global and legacy options + +PKG_OPTIONS_VAR= PKG_OPTIONS.elk +PKG_SUPPORTED_OPTIONS= xaw motif +PKG_SUGGESTED_OPTIONS= + +.include "../../mk/bsd.options.mk" + +### +### x11 support +### +.if !empty(PKG_OPTIONS:Mxaw) || !empty(PKG_OPTIONS:Mmotif) +. include "../../mk/x11.buildlink3.mk" +PLIST_SUBST+= WITHX11="" +. if !empty(PKG_OPTIONS:Mxaw) +PLIST_SUBST+= WITHXAW="" +ELK_AWK="yes" +. include "../../mk/xaw.buildlink3.mk" +. else +PLIST_SUBST+= WITHXAW="@comment " +ELK_AWK="no" +. endif +. if !empty(PKG_OPTIONS:Mmotif) +. include "../../mk/motif.buildlink3.mk" +PLIST_SUBST+= WITHMOTIF="" +. else +PLIST_SUBST+= WITHMOTIF="@comment " +. endif +.else +CONFIGURE_ARGS+= --without-x +PLIST_SUBST+= WITHMOTIF="@comment " +PLIST_SUBST+= WITHX11="@comment " +PLIST_SUBST+= WITHXAW="@comment " +.endif diff --git a/lang/elk/patches/patch-ab b/lang/elk/patches/patch-ab index 0c6510a8d2b..fbb4789b752 100644 --- a/lang/elk/patches/patch-ab +++ b/lang/elk/patches/patch-ab @@ -1,85 +1,14 @@ -$NetBSD: patch-ab,v 1.3 2002/01/09 23:04:55 seb Exp $ +$NetBSD: patch-ab,v 1.4 2005/10/15 23:07:21 tonio Exp $ ---- config/sites/386pc-freebsd2.1.orig Sat Jan 5 18:03:07 2002 -+++ config/sites/386pc-freebsd2.1 -@@ -0,0 +1,80 @@ -+# This is a shell script. It is sourced by the build scripts in the -+# various subdirectories to gather site- and installation-specific -+# information required for building the Makefiles. -+# -+# This script is read after the "system" file, therefore you can place -+# variable settings here to override those from "system". -+# -+# Some variables in this script are interpreted as boolean variables and -+# indicate presence or absence of one specific feature. The value "yes" -+# is regarded as "true", all other values (including no value or even -+# non-existence of the variable) are interpreted as "false". -+# -+# Do not forget to quote values that contain shell meta syntax. -+# -+# ----------------------------------------------------------------------- -+ -+ -+# The directory where all files are installed by running "make install". -+# The subdirectories bin, lib, include, and runtime (with various -+# subdirectories) are created automatically, but $install_dir isn't. -+# Make sure $install_dir doesn't point to the top of the source tree -+# (i.e. choose a subdirectory or a directory outside the source tree). -+ -+install_dir=${PREFIX}/share/elk -+ -+ -+# Libraries against which to link the X11 extension (typically -lX11). -+# -+# Any of the following library lists may be prefixed by something like -+# -L/usr/X11/lib if the X-libraries do not reside in a standard directory; -+# an additional -R/usr/X11/lib and -lsocket may be required in case of -+# SunOS 5.x/SysVR4). -+ -+libxlib="-L${X11BASE}/lib -lX11" -+ -+# Libraries against which to link the Xt extension (typically -+# -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11). -lXaw is needed to get the correct -+# definition of the vendor shell widget class -+ -+libxt="-L${X11BASE}/lib -lX11 -lXext -lICE -lSM -lXt -lXmu -lXaw" -+ -+ -+# Libraries against which to link the Athena widgets extension (typically -+# identical to libxt above) -+ -+libxaw="-L${X11BASE}/lib -lX11 -lXext -lICE -lSM -lXt -lXmu -lXaw" -+ -+ -+# Libraries against which to link the Motif extension (typically like -+# libaw above with Xaw replaced by Xm) -+ -+libxmotif="-L${X11BASE}/lib -lX11 -lXext -lICE -lSM -lXt -lXmu -lXm" -+ -+ -+# Additional flags (typically -Isomething) to be supplied to the C -+# compiler when compiling an X11 application, or a Motif application, -+# respectively. -+ -+x11_incl=-I${X11BASE}/include -+motif_incl=-I${X11BASE}/include -+ -+ -+# Set "gdbm" to "yes" if you have the GNU gdbm library installed and -+# want the gdbm extension to be compiled. "gdbm_inc" gives additional -+# C compiler flags required to compile a program using gdbm. -+ -+gdbm= -+gdbm_incl=-I${PREFIX}/include/gdbm -+ -+ -+# Do you want to use the generational garbage collector? If not, the -+# stop-and-copy garbage collector will be used. -+ -+generational_gc=yes -+ -+ -+# The default heap size of the Scheme interpreter in KBytes (if the -+# stop-and-copy garbage collector is used). -+ -+default_heap_size=1024 +--- configure.orig 2003-12-05 13:51:16.000000000 +0100 ++++ configure +@@ -26177,6 +26177,9 @@ else + ac_cv_my_have_xaw="no (cross-compiling)" + fi + ++if test "${WITH_XAW}" = "no"; then ++ ac_cv_my_have_xaw=no ++fi + + if test "${ac_cv_my_have_xaw}" = "yes"; then + HAVE_XAW_TRUE= diff --git a/lang/elk/patches/patch-ac b/lang/elk/patches/patch-ac deleted file mode 100644 index 50dc0f24c2f..00000000000 --- a/lang/elk/patches/patch-ac +++ /dev/null @@ -1,84 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2002/09/23 08:45:43 jlam Exp $ - ---- config/sites/pkgsrc.orig Sun Jan 6 13:39:38 2002 -+++ config/sites/pkgsrc -@@ -0,0 +1,79 @@ -+# This is a shell script. It is sourced by the build scripts in the -+# various subdirectories to gather site- and installation-specific -+# information required for building the Makefiles. -+# -+# This script is read after the "system" file, therefore you can place -+# variable settings here to override those from "system". -+# -+# Some variables in this script are interpreted as boolean variables and -+# indicate presence or absence of one specific feature. The value "yes" -+# is regarded as "true", all other values (including no value or even -+# non-existence of the variable) are interpreted as "false". -+# -+# Do not forget to quote values that contain shell meta syntax. -+# -+# ----------------------------------------------------------------------- -+ -+ -+# The directory where all files are installed by running "make install". -+# The subdirectories bin, lib, include, and runtime (with various -+# subdirectories) are created automatically, but $install_dir isn't. -+# Make sure $install_dir doesn't point to the top of the source tree -+# (i.e. choose a subdirectory or a directory outside the source tree). -+ -+install_dir=${PREFIX}/lib/elk -+ -+ -+# Libraries against which to link the X11 extension (typically -lX11). -+# -+# Any of the following library lists may be prefixed by something like -+# -L/usr/X11/lib if the X-libraries do not reside in a standard directory; -+# an additional -R/usr/X11/lib and -lsocket may be required in case of -+# SunOS 5.x/SysVR4). -+ -+libxlib="${X11_LDFLAGS} -lX11" -+ -+# Libraries against which to link the Xt extension (typically -+# -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11). -lXaw is needed to get the correct -+# definition of the vendor shell widget class -+ -+libxt="${X11_LDFLAGS} -lX11 -lXext -lICE -lSM -lXt -lXmu ${LIBXAW}" -+ -+# Libraries against which to link the Athena widgets extension (typically -+# identical to libxt above) -+ -+libxaw="${X11_LDFLAGS} -lX11 -lXext -lICE -lSM -lXt -lXmu ${LIBXAW}" -+ -+ -+# Libraries against which to link the Motif extension (typically like -+# libaw above with Xaw replaced by Xm) -+ -+libxmotif="${X11_LDFLAGS} -lX11 -lXext -lICE -lSM -lXt -lXmu ${MOTIFLIB}" -+ -+ -+# Additional flags (typically -Isomething) to be supplied to the C -+# compiler when compiling an X11 application, or a Motif application, -+# respectively. -+ -+x11_incl=${CPPFLAGS} -+motif_incl=${CPPFLAGS} -+ -+ -+# Set "gdbm" to "yes" if you have the GNU gdbm library installed and -+# want the gdbm extension to be compiled. "gdbm_inc" gives additional -+# C compiler flags required to compile a program using gdbm. -+ -+gdbm= -+gdbm_incl=${CPPFLAGS} -+ -+ -+# Do you want to use the generational garbage collector? If not, the -+# stop-and-copy garbage collector will be used. -+ -+generational_gc=yes -+ -+ -+# The default heap size of the Scheme interpreter in KBytes (if the -+# stop-and-copy garbage collector is used). -+ -+default_heap_size=1024 diff --git a/lang/elk/patches/patch-ad b/lang/elk/patches/patch-ad deleted file mode 100644 index eaa308bcb73..00000000000 --- a/lang/elk/patches/patch-ad +++ /dev/null @@ -1,375 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2002/01/09 23:04:55 seb Exp $ - ---- config/untested/386pc-freebsd2.1-cc.orig Sat Jan 5 18:03:08 2002 -+++ config/untested/386pc-freebsd2.1-cc -@@ -0,0 +1,370 @@ -+# This is a shell script. It is sourced by the build scripts in the -+# various subdirectories to gather system-, compiler-, and OS-specific -+# information required for building the Makefiles. -+# -+# Most variables in this script are interpreted as boolean variables and -+# indicate presence or absence of one specific feature. The value "yes" -+# is regarded as "true", all other values (including no value or even -+# non-existence of the variable) are interpreted as "false". -+# -+# Do not forget to quote values that contain shell meta syntax. -+# -+# ----------------------------------------------------------------------- -+ -+ -+# $system should contain the name of this file. It may be used by some -+# of the build scripts to do things that are specific to one single -+# type of system. -+ -+system=386pc-freebsd2.1-cc -+ -+ -+# Does the system support the vprintf library function? If not, -+# availability of the (non-portable) _doprnt function is assumed. -+ -+vprintf=yes -+ -+ -+# Does the directory(3) library follow the POSIX conventions (i.e. -+# requires the <dirent.h> include file and uses "struct dirent")? -+# If not, the (obsolete) BSD-style interface with <sys/dir.h> and -+# "struct direct" is assumed. -+ -+dirent=yes -+ -+ -+# Does the system have the random/srandom library functions? If not, -+# rand/srand will be used instead. -+ -+random=yes -+ -+ -+# Does the system have the index library function? If not, strchr -+# will be used. -+ -+index=yes -+ -+ -+# Does the system have the bcopy, bzero, and bcmp library functions? -+# If not, memcpy/memset/memcmp will be used. -+ -+bstring=yes -+ -+ -+# Does using the access system call require <unistd.h> to be included? -+# (Look into the manual page for access if in doubt.) -+ -+include_unistd_h=yes -+ -+ -+# If the FIONREAD ioctl command is defined, which file must be included? -+ -+fionread_include='<sys/ioctl.h>' -+ -+ -+# What is the name of the a.out include file? -+ -+aout_h='<a.out.h>' -+ -+ -+# The following variables control how certain system limits are obtained -+# during runtime. -+# -+# If getdtablesize() is available to determine the maximum number of open -+# files per process, set getdtablesize=yes. -+# Alternatively, if POSIX-style sysconf() can be called with _SC_OPEN_MAX, -+# set sysconf_open_max=yes. -+# If neither is set to "yes", an educated guess will be made. -+ -+getdtablesize=yes -+sysconf_open_max=yes -+ -+# If POSIX-style pathconf() can be invoked with _PC_PATH_MAX to determine -+# the maximum pathname length, set pathconf_path_max=yes. -+ -+pathconf_path_max=yes -+ -+# If the system page size can be determined by calling getpagesize() -+# set getpagesize=yes. -+# Alternatively, if sysconf() can be invoked with _SC_PAGESIZE, set -+# sysconf_pagesize=yes. -+# These two variables are only required if the generational garbage -+# collector is used. -+ -+getpagesize=yes -+sysconf_pagesize=no -+ -+ -+# Set reliable_signals=bsd if your system supports BSD-style reliable -+# signals (has sigblock and related functions); set reliable_signals=posix -+# for POSIX-style signals (sigprocmask, sigsets); otherwise old V7/SysV -+# signal semantics are assumed. -+ -+reliable_signals=bsd -+ -+ -+# To support dynamic loading of object files and "dump", the system's -+# a.out format has to be known. Choose one of the following: -+# -+# coff ecoff xcoff elf macho hp9k convex -+# -+# Other values of "aout_format" are interpreted as BSD-style a.out format. -+ -+aout_format= -+ -+ -+# Which mechanism should be used to dynamically load object files? -+# Possible values currently are: -+# -+# ld BSD-style incremental loading based on ld -A -+# rld NeXT-style rld_load() -+# shl HP-UX shl_load() -+# dl SysVR4/SunOS5 dlopen() -+# -+# Leave load_obj empty if dynamic loading is not supported. -+ -+load_obj=dl -+ -+ -+ # The following variables are only relevant if load_obj is set. -+ -+ # Linker options to produce a shared object from a .o file. -+ # Only used if load_obj=dl. -+ -+ ldflags_shared='-Bshareable' -+ -+ # The libraries against which dynamically loaded files are resolved -+ # at the time they are loaded. -+ -+ load_libraries= -+ -+ # Does the ld-option -x really do what the manual says it does (i.e. -+ # omit local symbols), or does it somehow render the resulting object -+ # file unsuitable for dynamic loading? If in doubt, leave it out -+ # (which may result in somewhat larger object files). -+ -+ incremental_ldflags=-x -+ -+ # Systems with "aout_format=ecoff" may require a call to the cacheflush -+ # system call after an object file has been loaded. Which include file -+ # has to be included in this case? -+ -+ cachectl_h=unused -+ -+ # Is the ANSI-C atexit function supported to register an exit handler? -+ # If not, the exit library function will be redefined and will end in -+ # a call to _exit. -+ -+ atexit=yes -+ -+ -+# Do the names of external functions in the symbol table always begin -+# with a special character (such as underline)? If so, syms_begin_with -+# should hold this character, otherwise leave it empty. -+ -+syms_begin_with=_ -+ -+ -+# The symbol prefixes of extension initialization and finalization -+# functions (without the initial $syms_begin_with). Do not change -+# these unless the compiler or linker restricts the length of symbols! -+ -+init_prefix=elk_init_ -+finit_prefix=elk_finit_ -+ -+ -+# Is the "dump" function supported? -+ -+can_dump=no -+ -+ -+# The following variables are only relevant if "can_dump=yes". -+ -+ # Is the fchmod system call broken or unavailable? -+ -+ fchmod_broken=no -+ -+ # These four variables are only relevant if the system has the BSD-style -+ # a.out format. -+ # segment_size is the segment size of the system's memory management -+ # unit, i.e. the number to a multiple of which the size of an a.out -+ # segment (e.g. .text) is rounded up. -+ # file_text_start is the file offset at which the text segment starts -+ # in an a.out file. -+ # mem_text_start is the starting address of the text segment in memory. -+ # text_length_adj must be set to "sizeof (struct exec)" if the length of -+ # the text segment stored in the a.out header includes the a.out header -+ # itself. -+ -+ segment_size=__LDPGSZ -+ file_text_start='(N_TXTOFF(hdr) + sizeof(struct exec))' -+ mem_text_start='(sizeof(struct exec) + getpagesize())' -+ text_length_adj='(sizeof(struct exec))' -+ -+ # Only relevant if "aout_format=coff": the system's pagesize. -+ -+ coff_pagesize= -+ -+ # Only relevant if "aout_format=hp9k" and "load_obj=shl" -+ -+ hp_shared_libraries=yes -+ -+ # Print debug messages when dumping -+ -+ debug_dump=yes -+ -+ -+# Is the "termio" terminal interface supported by the system? If not, -+# BSD-style tty handling will be used. -+ -+termio=yes -+ -+ -+# flush_stdio and flush_tty indicate how clear-input/output-port can -+# flush (purge) a FILE pointer and a TTY file descriptor. -+# Possible values of flush_stdio: -+# bsd assume old BSD-style FILE* (with _cnt, _ptr, _base) -+# fpurge use 4.4BSD-style fpurge stdio library function -+# linux use Linux-specific method -+# Possible values of flush_tty: -+# tiocflush use TIOCFLUSH ioctl from <sys/ioctl.h> -+# tcflsh use TCFLSH ioctl from <termio.h> -+# Leave the variable(s) empty if flushing is not supported. -+ -+flush_stdio=fpurge -+flush_tty=tiocflush -+ -+ -+# The interpreter uses the getrlimit function to determine the maximum -+# stack size of the running program. If this function is not supported, -+# set max_stack_size to a (fixed) maximum stack size (in bytes). -+ -+max_stack_size= -+ -+ -+# Is the mprotect system call supported? The generational garbage collector -+# requires mprotect to implement incremental GC. $mprotect is ignored if -+# generational_gc is set to "no" in the site file. Set mprotect=mmap if -+# mprotect is supported, but only for mmap()ed memory. -+ -+mprotect=yes -+ -+ -+# How can a SIGSEGV or SIGBUS signal handler find out the address of -+# the faulting memory reference? This variable is only used if -+# $mprotect is "yes" or "mmap". Possible values are: -+# -+# siginfo handler is called with siginfo_t structure (enabled -+# by a call to sigaction) -+# sigcontext address is in the sigcontext structure (3rd arg, sc_badvaddr) -+# arg4 address is delivered to handler as argument #4 -+# aix use an AIX-specific hack to get hold of the bad address -+# hpux use a HP-UX-specific hack -+ -+sigsegv_addr=arg4 -+ -+ -+# Does the system support the alloca library function, and does this -+# function actually extend the stack? If in doubt, extract alloca.o -+# from the C library and check if it contains the symbols malloc and free. -+# If this is the case, forget it. -+ -+use_alloca=yes -+ -+ -+# Must <alloca.h> be included to use alloca? Is "#pragma alloca" required? -+ -+include_alloca_h=no -+pragma_alloca=no -+ -+ -+# Does the system (or compiler) require certain objects (e.g. doubles) -+# to be aligned at 8-byte boundaries? If not, 4-byte alignment will -+# be assumed. -+ -+align_8byte=yes -+ -+ -+# The C compiler used to compile the source code. -+ -+cc=cc -+ -+ -+# The name of the linker. This is usually just "ld", or /usr/ccs/bin/ld -+# in SVR4-based systems. -+ -+ld=ld -+ -+ -+# The C compiler flags used for all files. -+ -+cflags='-O2 -pipe -m486' -+ -+ -+# Are extra C compiler flags (such as -D_NO_PROTO) required to compile -+# Motif applications? -+ -+motif_cflags= -+ -+ -+# Are extra C compiler flags (such as -G 0) required to compile -+# dynamically loadable files? -+ -+obj_cflags='-fpic -DPIC' -+ -+ -+# Are extra linker flags (such as -G 0) required to link several object -+# files together to one dynamically loadable file? -+ -+obj_ldflags= -+ -+ -+# The linker flags used to link the interpreter. -+ -+ldflags='-lm' -+ -+ -+# The lint flags. -+ -+lintflags='-abxh' -+ -+ -+# Are function prototypes in the header files required? If prototypes=yes, -+# prototypes are used unconditionally; if prototypes=no, prototypes are -+# not used; otherwise prototypes are only used if the source code is -+# compiled with an ANSI-C- or C++-compiler. -+ -+prototypes=yes -+ -+ -+# Does your C preprocessor support the ANSI-C ## operator, although -+# __STDC__ is not defined? -+ -+ansi_cpp=no -+ -+ -+# The UNIX extension likes to know which of the following system calls, -+# library functions, and include files are supported by the system. -+ -+gettimeofday=yes -+ftime= -+vfork=yes -+gethostname=yes -+uname=yes -+mktemp=yes -+tmpnam=yes -+tempnam=yes -+getcwd=yes -+getwd=yes -+rename=yes -+waitpid=yes -+wait3=yes -+wait4=yes -+utime_h=yes -+regcomp=yes -+ -+ -+# Element type of the gidset argument of getgroups(); typically int -+# or gid_t. Only needed by the UNIX extension. -+ -+getgroups_type=gid_t diff --git a/lang/elk/patches/patch-ae b/lang/elk/patches/patch-ae deleted file mode 100644 index 67a902c46a6..00000000000 --- a/lang/elk/patches/patch-ae +++ /dev/null @@ -1,375 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2002/01/09 23:04:55 seb Exp $ - ---- config/untested/aout-netbsd-cc.orig Sat Jan 5 18:03:08 2002 -+++ config/untested/aout-netbsd-cc -@@ -0,0 +1,370 @@ -+# This is a shell script. It is sourced by the build scripts in the -+# various subdirectories to gather system-, compiler-, and OS-specific -+# information required for building the Makefiles. -+# -+# Most variables in this script are interpreted as boolean variables and -+# indicate presence or absence of one specific feature. The value "yes" -+# is regarded as "true", all other values (including no value or even -+# non-existence of the variable) are interpreted as "false". -+# -+# Do not forget to quote values that contain shell meta syntax. -+# -+# ----------------------------------------------------------------------- -+ -+ -+# $system should contain the name of this file. It may be used by some -+# of the build scripts to do things that are specific to one single -+# type of system. -+ -+system=aout-netbsd-cc -+ -+ -+# Does the system support the vprintf library function? If not, -+# availability of the (non-portable) _doprnt function is assumed. -+ -+vprintf=yes -+ -+ -+# Does the directory(3) library follow the POSIX conventions (i.e. -+# requires the <dirent.h> include file and uses "struct dirent")? -+# If not, the (obsolete) BSD-style interface with <sys/dir.h> and -+# "struct direct" is assumed. -+ -+dirent=yes -+ -+ -+# Does the system have the random/srandom library functions? If not, -+# rand/srand will be used instead. -+ -+random=yes -+ -+ -+# Does the system have the index library function? If not, strchr -+# will be used. -+ -+index=yes -+ -+ -+# Does the system have the bcopy, bzero, and bcmp library functions? -+# If not, memcpy/memset/memcmp will be used. -+ -+bstring=no -+ -+ -+# Does using the access system call require <unistd.h> to be included? -+# (Look into the manual page for access if in doubt.) -+ -+include_unistd_h=yes -+ -+ -+# If the FIONREAD ioctl command is defined, which file must be included? -+ -+fionread_include='<sys/ioctl.h>' -+ -+ -+# What is the name of the a.out include file? -+ -+aout_h='<a.out.h>' -+ -+ -+# The following variables control how certain system limits are obtained -+# during runtime. -+# -+# If getdtablesize() is available to determine the maximum number of open -+# files per process, set getdtablesize=yes. -+# Alternatively, if POSIX-style sysconf() can be called with _SC_OPEN_MAX, -+# set sysconf_open_max=yes. -+# If neither is set to "yes", an educated guess will be made. -+ -+getdtablesize=yes -+sysconf_open_max=yes -+ -+# If POSIX-style pathconf() can be invoked with _PC_PATH_MAX to determine -+# the maximum pathname length, set pathconf_path_max=yes. -+ -+pathconf_path_max=yes -+ -+# If the system page size can be determined by calling getpagesize() -+# set getpagesize=yes. -+# Alternatively, if sysconf() can be invoked with _SC_PAGESIZE, set -+# sysconf_pagesize=yes. -+# These two variables are only required if the generational garbage -+# collector is used. -+ -+getpagesize=yes -+sysconf_pagesize=no -+ -+ -+# Set reliable_signals=bsd if your system supports BSD-style reliable -+# signals (has sigblock and related functions); set reliable_signals=posix -+# for POSIX-style signals (sigprocmask, sigsets); otherwise old V7/SysV -+# signal semantics are assumed. -+ -+reliable_signals=bsd -+ -+ -+# To support dynamic loading of object files and "dump", the system's -+# a.out format has to be known. Choose one of the following: -+# -+# coff ecoff xcoff elf macho hp9k convex -+# -+# Other values of "aout_format" are interpreted as BSD-style a.out format. -+ -+aout_format= -+ -+ -+# Which mechanism should be used to dynamically load object files? -+# Possible values currently are: -+# -+# ld BSD-style incremental loading based on ld -A -+# rld NeXT-style rld_load() -+# shl HP-UX shl_load() -+# dl SysVR4/SunOS5 dlopen() -+# -+# Leave load_obj empty if dynamic loading is not supported. -+ -+load_obj=dl -+ -+ -+ # The following variables are only relevant if load_obj is set. -+ -+ # Linker options to produce a shared object from a .o file. -+ # Only used if load_obj=dl. -+ -+ ldflags_shared='-Bshareable' -+ -+ # The libraries against which dynamically loaded files are resolved -+ # at the time they are loaded. -+ -+ load_libraries= -+ -+ # Does the ld-option -x really do what the manual says it does (i.e. -+ # omit local symbols), or does it somehow render the resulting object -+ # file unsuitable for dynamic loading? If in doubt, leave it out -+ # (which may result in somewhat larger object files). -+ -+ incremental_ldflags=-x -+ -+ # Systems with "aout_format=ecoff" may require a call to the cacheflush -+ # system call after an object file has been loaded. Which include file -+ # has to be included in this case? -+ -+ cachectl_h=unused -+ -+ # Is the ANSI-C atexit function supported to register an exit handler? -+ # If not, the exit library function will be redefined and will end in -+ # a call to _exit. -+ -+ atexit=yes -+ -+ -+# Do the names of external functions in the symbol table always begin -+# with a special character (such as underline)? If so, syms_begin_with -+# should hold this character, otherwise leave it empty. -+ -+syms_begin_with=_ -+ -+ -+# The symbol prefixes of extension initialization and finalization -+# functions (without the initial $syms_begin_with). Do not change -+# these unless the compiler or linker restricts the length of symbols! -+ -+init_prefix=elk_init_ -+finit_prefix=elk_finit_ -+ -+ -+# Is the "dump" function supported? -+ -+can_dump=no -+ -+ -+# The following variables are only relevant if "can_dump=yes". -+ -+ # Is the fchmod system call broken or unavailable? -+ -+ fchmod_broken=no -+ -+ # These four variables are only relevant if the system has the BSD-style -+ # a.out format. -+ # segment_size is the segment size of the system's memory management -+ # unit, i.e. the number to a multiple of which the size of an a.out -+ # segment (e.g. .text) is rounded up. -+ # file_text_start is the file offset at which the text segment starts -+ # in an a.out file. -+ # mem_text_start is the starting address of the text segment in memory. -+ # text_length_adj must be set to "sizeof (struct exec)" if the length of -+ # the text segment stored in the a.out header includes the a.out header -+ # itself. -+ -+ segment_size=__LDPGSZ -+ file_text_start='(N_TXTOFF(hdr) + sizeof(struct exec))' -+ mem_text_start='(sizeof(struct exec) + getpagesize())' -+ text_length_adj='(sizeof(struct exec))' -+ -+ # Only relevant if "aout_format=coff": the system's pagesize. -+ -+ coff_pagesize= -+ -+ # Only relevant if "aout_format=hp9k" and "load_obj=shl" -+ -+ hp_shared_libraries=yes -+ -+ # Print debug messages when dumping -+ -+ debug_dump=yes -+ -+ -+# Is the "termio" terminal interface supported by the system? If not, -+# BSD-style tty handling will be used. -+ -+termio=yes -+ -+ -+# flush_stdio and flush_tty indicate how clear-input/output-port can -+# flush (purge) a FILE pointer and a TTY file descriptor. -+# Possible values of flush_stdio: -+# bsd assume old BSD-style FILE* (with _cnt, _ptr, _base) -+# fpurge use 4.4BSD-style fpurge stdio library function -+# linux use Linux-specific method -+# Possible values of flush_tty: -+# tiocflush use TIOCFLUSH ioctl from <sys/ioctl.h> -+# tcflsh use TCFLSH ioctl from <termio.h> -+# Leave the variable(s) empty if flushing is not supported. -+ -+flush_stdio=fpurge -+flush_tty=tiocflush -+ -+ -+# The interpreter uses the getrlimit function to determine the maximum -+# stack size of the running program. If this function is not supported, -+# set max_stack_size to a (fixed) maximum stack size (in bytes). -+ -+max_stack_size= -+ -+ -+# Is the mprotect system call supported? The generational garbage collector -+# requires mprotect to implement incremental GC. $mprotect is ignored if -+# generational_gc is set to "no" in the site file. Set mprotect=mmap if -+# mprotect is supported, but only for mmap()ed memory. -+ -+mprotect=yes -+ -+ -+# How can a SIGSEGV or SIGBUS signal handler find out the address of -+# the faulting memory reference? This variable is only used if -+# $mprotect is "yes" or "mmap". Possible values are: -+# -+# siginfo handler is called with siginfo_t structure (enabled -+# by a call to sigaction) -+# sigcontext address is in the sigcontext structure (3rd arg, sc_badvaddr) -+# arg4 address is delivered to handler as argument #4 -+# aix use an AIX-specific hack to get hold of the bad address -+# hpux use a HP-UX-specific hack -+ -+sigsegv_addr=arg4 -+ -+ -+# Does the system support the alloca library function, and does this -+# function actually extend the stack? If in doubt, extract alloca.o -+# from the C library and check if it contains the symbols malloc and free. -+# If this is the case, forget it. -+ -+use_alloca=yes -+ -+ -+# Must <alloca.h> be included to use alloca? Is "#pragma alloca" required? -+ -+include_alloca_h=no -+pragma_alloca=no -+ -+ -+# Does the system (or compiler) require certain objects (e.g. doubles) -+# to be aligned at 8-byte boundaries? If not, 4-byte alignment will -+# be assumed. -+ -+align_8byte=yes -+ -+ -+# The C compiler used to compile the source code. -+ -+cc=cc -+ -+ -+# The name of the linker. This is usually just "ld", or /usr/ccs/bin/ld -+# in SVR4-based systems. -+ -+ld=ld -+ -+ -+# The C compiler flags used for all files. -+ -+cflags='-O2 -pipe' -+ -+ -+# Are extra C compiler flags (such as -D_NO_PROTO) required to compile -+# Motif applications? -+ -+motif_cflags= -+ -+ -+# Are extra C compiler flags (such as -G 0) required to compile -+# dynamically loadable files? -+ -+obj_cflags='-fPIC -DPIC' -+ -+ -+# Are extra linker flags (such as -G 0) required to link several object -+# files together to one dynamically loadable file? -+ -+obj_ldflags= -+ -+ -+# The linker flags used to link the interpreter. -+ -+ldflags='-lm' -+ -+ -+# The lint flags. -+ -+lintflags='-abxh' -+ -+ -+# Are function prototypes in the header files required? If prototypes=yes, -+# prototypes are used unconditionally; if prototypes=no, prototypes are -+# not used; otherwise prototypes are only used if the source code is -+# compiled with an ANSI-C- or C++-compiler. -+ -+prototypes=yes -+ -+ -+# Does your C preprocessor support the ANSI-C ## operator, although -+# __STDC__ is not defined? -+ -+ansi_cpp=no -+ -+ -+# The UNIX extension likes to know which of the following system calls, -+# library functions, and include files are supported by the system. -+ -+gettimeofday=yes -+ftime= -+vfork=yes -+gethostname=yes -+uname=yes -+mktemp=yes -+tmpnam=yes -+tempnam=yes -+getcwd=yes -+getwd=yes -+rename=yes -+waitpid=yes -+wait3=yes -+wait4=yes -+utime_h=yes -+regcomp=yes -+ -+ -+# Element type of the gidset argument of getgroups(); typically int -+# or gid_t. Only needed by the UNIX extension. -+ -+getgroups_type=gid_t diff --git a/lang/elk/patches/patch-af b/lang/elk/patches/patch-af deleted file mode 100644 index fd91e5c8b2f..00000000000 --- a/lang/elk/patches/patch-af +++ /dev/null @@ -1,379 +0,0 @@ -$NetBSD: patch-af,v 1.3 2002/01/09 23:04:56 seb Exp $ - ---- config/untested/elf-netbsd-cc.orig Sat Jan 5 18:03:08 2002 -+++ config/untested/elf-netbsd-cc -@@ -0,0 +1,374 @@ -+# This is a shell script. It is sourced by the build scripts in the -+# various subdirectories to gather system-, compiler-, and OS-specific -+# information required for building the Makefiles. -+# -+# Most variables in this script are interpreted as boolean variables and -+# indicate presence or absence of one specific feature. The value "yes" -+# is regarded as "true", all other values (including no value or even -+# non-existence of the variable) are interpreted as "false". -+# -+# Do not forget to quote values that contain shell meta syntax. -+# -+# ----------------------------------------------------------------------- -+ -+ -+# $system should contain the name of this file. It may be used by some -+# of the build scripts to do things that are specific to one single -+# type of system. -+ -+system=elf-netbsd-cc -+ -+ -+# Does the system support the vprintf library function? If not, -+# availability of the (non-portable) _doprnt function is assumed. -+ -+vprintf=yes -+ -+ -+# Does the directory(3) library follow the POSIX conventions (i.e. -+# requires the <dirent.h> include file and uses "struct dirent")? -+# If not, the (obsolete) BSD-style interface with <sys/dir.h> and -+# "struct direct" is assumed. -+ -+dirent=yes -+ -+ -+# Does the system have the random/srandom library functions? If not, -+# rand/srand will be used instead. -+ -+random=yes -+ -+ -+# Does the system have the index library function? If not, strchr -+# will be used. -+ -+index=yes -+ -+ -+# Does the system have the bcopy, bzero, and bcmp library functions? -+# If not, memcpy/memset/memcmp will be used. -+ -+bstring=no -+ -+ -+# Does using the access system call require <unistd.h> to be included? -+# (Look into the manual page for access if in doubt.) -+ -+include_unistd_h=yes -+ -+ -+# If the FIONREAD ioctl command is defined, which file must be included? -+ -+fionread_include='<sys/ioctl.h>' -+ -+ -+# What is the name of the a.out include file? -+ -+aout_h='<a.out.h>' -+ -+ -+# The following variables control how certain system limits are obtained -+# during runtime. -+# -+# If getdtablesize() is available to determine the maximum number of open -+# files per process, set getdtablesize=yes. -+# Alternatively, if POSIX-style sysconf() can be called with _SC_OPEN_MAX, -+# set sysconf_open_max=yes. -+# If neither is set to "yes", an educated guess will be made. -+ -+getdtablesize=yes -+sysconf_open_max=yes -+ -+# If POSIX-style pathconf() can be invoked with _PC_PATH_MAX to determine -+# the maximum pathname length, set pathconf_path_max=yes. -+ -+pathconf_path_max=yes -+ -+# If the system page size can be determined by calling getpagesize() -+# set getpagesize=yes. -+# Alternatively, if sysconf() can be invoked with _SC_PAGESIZE, set -+# sysconf_pagesize=yes. -+# These two variables are only required if the generational garbage -+# collector is used. -+ -+getpagesize=yes -+sysconf_pagesize=no -+ -+ -+# Set reliable_signals=bsd if your system supports BSD-style reliable -+# signals (has sigblock and related functions); set reliable_signals=posix -+# for POSIX-style signals (sigprocmask, sigsets); otherwise old V7/SysV -+# signal semantics are assumed. -+ -+reliable_signals=bsd -+ -+ -+# To support dynamic loading of object files and "dump", the system's -+# a.out format has to be known. Choose one of the following: -+# -+# coff ecoff xcoff elf macho hp9k convex -+# -+# Other values of "aout_format" are interpreted as BSD-style a.out format. -+ -+aout_format=elf -+ -+ -+# Which mechanism should be used to dynamically load object files? -+# Possible values currently are: -+# -+# ld BSD-style incremental loading based on ld -A -+# rld NeXT-style rld_load() -+# shl HP-UX shl_load() -+# dl SysVR4/SunOS5 dlopen() -+# -+# Leave load_obj empty if dynamic loading is not supported. -+ -+load_obj=dl -+ -+ -+ # The following variables are only relevant if load_obj is set. -+ -+ # Linker options to produce a shared object from a .o file. -+ # Only used if load_obj=dl. -+ -+ ldflags_shared='-Bshareable' -+ -+ # The libraries against which dynamically loaded files are resolved -+ # at the time they are loaded. -+ -+ load_libraries= -+ -+ # Does the ld-option -x really do what the manual says it does (i.e. -+ # omit local symbols), or does it somehow render the resulting object -+ # file unsuitable for dynamic loading? If in doubt, leave it out -+ # (which may result in somewhat larger object files). -+ -+ incremental_ldflags=-x -+ -+ # Systems with "aout_format=ecoff" may require a call to the cacheflush -+ # system call after an object file has been loaded. Which include file -+ # has to be included in this case? -+ -+ cachectl_h=unused -+ -+ # Is the ANSI-C atexit function supported to register an exit handler? -+ # If not, the exit library function will be redefined and will end in -+ # a call to _exit. -+ -+ atexit=yes -+ -+ -+# Do the names of external functions in the symbol table always begin -+# with a special character (such as underline)? If so, syms_begin_with -+# should hold this character, otherwise leave it empty. -+ -+syms_begin_with= -+ -+ -+# The symbol prefixes of extension initialization and finalization -+# functions (without the initial $syms_begin_with). Do not change -+# these unless the compiler or linker restricts the length of symbols! -+ -+init_prefix=elk_init_ -+finit_prefix=elk_finit_ -+ -+ -+# Is the "dump" function supported? -+ -+can_dump=no -+ -+ -+# The following variables are only relevant if "can_dump=yes". -+ -+ # Is the fchmod system call broken or unavailable? -+ -+ fchmod_broken=no -+ -+ # These four variables are only relevant if the system has the BSD-style -+ # a.out format. -+ # segment_size is the segment size of the system's memory management -+ # unit, i.e. the number to a multiple of which the size of an a.out -+ # segment (e.g. .text) is rounded up. -+ # file_text_start is the file offset at which the text segment starts -+ # in an a.out file. -+ # mem_text_start is the starting address of the text segment in memory. -+ # text_length_adj must be set to "sizeof (struct exec)" if the length of -+ # the text segment stored in the a.out header includes the a.out header -+ # itself. -+ -+ segment_size=__LDPGSZ -+ file_text_start='(N_TXTOFF(hdr) + sizeof(struct exec))' -+ mem_text_start='(sizeof(struct exec) + getpagesize())' -+ text_length_adj='(sizeof(struct exec))' -+ -+ # Only relevant if "aout_format=coff": the system's pagesize. -+ -+ coff_pagesize= -+ -+ # Only relevant if "aout_format=hp9k" and "load_obj=shl" -+ -+ hp_shared_libraries=yes -+ -+ # Print debug messages when dumping -+ -+ debug_dump=yes -+ -+ -+# Is the "termio" terminal interface supported by the system? If not, -+# BSD-style tty handling will be used. -+ -+termio=yes -+ -+ -+# flush_stdio and flush_tty indicate how clear-input/output-port can -+# flush (purge) a FILE pointer and a TTY file descriptor. -+# Possible values of flush_stdio: -+# bsd assume old BSD-style FILE* (with _cnt, _ptr, _base) -+# fpurge use 4.4BSD-style fpurge stdio library function -+# linux use Linux-specific method -+# Possible values of flush_tty: -+# tiocflush use TIOCFLUSH ioctl from <sys/ioctl.h> -+# tcflsh use TCFLSH ioctl from <termio.h> -+# Leave the variable(s) empty if flushing is not supported. -+ -+flush_stdio=fpurge -+flush_tty=tiocflush -+ -+ -+# The interpreter uses the getrlimit function to determine the maximum -+# stack size of the running program. If this function is not supported, -+# set max_stack_size to a (fixed) maximum stack size (in bytes). -+ -+max_stack_size= -+ -+ -+# Is the mprotect system call supported? The generational garbage collector -+# requires mprotect to implement incremental GC. $mprotect is ignored if -+# generational_gc is set to "no" in the site file. Set mprotect=mmap if -+# mprotect is supported, but only for mmap()ed memory. -+ -+mprotect=yes -+ -+ -+# How can a SIGSEGV or SIGBUS signal handler find out the address of -+# the faulting memory reference? This variable is only used if -+# $mprotect is "yes" or "mmap". Possible values are: -+# -+# siginfo handler is called with siginfo_t structure (enabled -+# by a call to sigaction) -+# sigcontext address is in the sigcontext structure (3rd arg, sc_badvaddr) -+# arg4 address is delivered to handler as argument #4 -+# aix use an AIX-specific hack to get hold of the bad address -+# hpux use a HP-UX-specific hack -+ -+sigsegv_addr=arg4 -+ -+ -+# Does the system support the alloca library function, and does this -+# function actually extend the stack? If in doubt, extract alloca.o -+# from the C library and check if it contains the symbols malloc and free. -+# If this is the case, forget it. -+ -+use_alloca=yes -+ -+ -+# Must <alloca.h> be included to use alloca? Is "#pragma alloca" required? -+ -+include_alloca_h=no -+pragma_alloca=no -+ -+ -+# Does the system (or compiler) require certain objects (e.g. doubles) -+# to be aligned at 8-byte boundaries? If not, 4-byte alignment will -+# be assumed. -+ -+align_8byte=yes -+ -+ -+# The C compiler used to compile the source code. -+ -+cc=cc -+ -+ -+# The name of the linker. This is usually just "ld", or /usr/ccs/bin/ld -+# in SVR4-based systems. -+ -+ld=ld -+ -+ -+# The C compiler flags used for all files. -+ -+cflags='-O2 -pipe' -+ -+ -+# Are extra C compiler flags (such as -D_NO_PROTO) required to compile -+# Motif applications? -+ -+motif_cflags= -+ -+ -+# Are extra C compiler flags (such as -G 0) required to compile -+# dynamically loadable files? -+ -+obj_cflags='-fPIC -DPIC' -+ -+ -+# Are extra linker flags (such as -G 0) required to link several object -+# files together to one dynamically loadable file? -+ -+obj_ldflags= -+ -+ -+# The linker flags used to link the interpreter. -+ -+ldflags='-lm' -+ -+ -+# The lint flags. -+ -+lintflags='-abxh' -+ -+ -+# Are function prototypes in the header files required? If prototypes=yes, -+# prototypes are used unconditionally; if prototypes=no, prototypes are -+# not used; otherwise prototypes are only used if the source code is -+# compiled with an ANSI-C- or C++-compiler. -+ -+prototypes=yes -+ -+ -+# Does your C preprocessor support the ANSI-C ## operator, although -+# __STDC__ is not defined? -+ -+ansi_cpp=no -+ -+ -+# The UNIX extension likes to know which of the following system calls, -+# library functions, and include files are supported by the system. -+ -+gettimeofday=yes -+ftime= -+vfork=yes -+gethostname=yes -+uname=yes -+mktemp=yes -+tmpnam=yes -+tempnam=yes -+getcwd=yes -+getwd=yes -+rename=yes -+waitpid=yes -+wait3=yes -+wait4=yes -+utime_h=yes -+regcomp=yes -+ -+ -+# Element type of the gidset argument of getgroups(); typically int -+# or gid_t. Only needed by the UNIX extension. -+ -+getgroups_type=gid_t -+ -+# which flags - if any - need to be passed to cc so a binary have all its -+# symbols added top the dynamic symbol table -+exportflags=-Wl,--export-dynamic diff --git a/lang/elk/patches/patch-ag b/lang/elk/patches/patch-ag deleted file mode 100644 index 02b605658ac..00000000000 --- a/lang/elk/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2002/01/09 23:04:56 seb Exp $ - ---- doc/man/Makefile.orig Tue Jul 25 16:20:17 1995 -+++ doc/man/Makefile -@@ -7,5 +7,10 @@ - elk.1.html: elk.1 - $(UNROFF) $? - -+default: elk.1 -+ - clean: - rm -f elk.ps elk.1.html -+ -+install: elk.1 -+ ${BSD_INSTALL_MAN} elk.1 ${PREFIX}/man/man1 diff --git a/lang/elk/patches/patch-ah b/lang/elk/patches/patch-ah deleted file mode 100644 index a588a73dc48..00000000000 --- a/lang/elk/patches/patch-ah +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2002/01/09 23:04:56 seb Exp $ - ---- doc/man/elk.1.orig Fri Aug 11 16:27:03 1995 -+++ doc/man/elk.1 -@@ -2,9 +2,9 @@ - .TH ELK 1 "15 January 1991" - .UC 4 - .SH NAME --elk, scheme \- extensible Scheme interpreter -+elk \- extensible Scheme interpreter - .SH SYNOPSIS --.B scheme -+.B elk - [ - .B \-l \f2file\fP - ] [ -@@ -20,8 +20,6 @@ - ] [[ - .B \-\^\- - ] \f2args\fP] --.LP --.BR elk .\|.\|. - .SH DESCRIPTION - .I Elk - (Extension Language Kit) is a Scheme implementation designed -@@ -32,7 +30,7 @@ - is linked with the application it serves, but a stand-alone version - of the Scheme interpreter is installed as well (usually under - the name --.BR scheme ). -+.BR elk ). - This interpreter, together with the standard Scheme toplevel, - .I Elk - can be used as an ordinary, stand-alone implementation of the diff --git a/lang/elk/patches/patch-ai b/lang/elk/patches/patch-ai deleted file mode 100644 index a378d4a76eb..00000000000 --- a/lang/elk/patches/patch-ai +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2002/01/09 23:04:56 seb Exp $ - ---- include/build.orig Thu Jun 22 19:18:14 1995 -+++ include/build -@@ -21,18 +21,17 @@ - stkmem.h\\ - type.h - -+INCDIR= \${PREFIX}/include/elk -+ - config.h: ../config/system ../config/site - \$(SHELL) ./build-config - - install: \$(FILES) -- -@if [ ! -d $install_dir/include ]; then \\ -- echo mkdir $install_dir/include; \\ -- mkdir $install_dir/include; \\ -- fi -+ -@mkdir -p \${INCDIR} - @for i in \$(FILES) ;\\ - do \\ -- echo cp \$\$i $install_dir/include; \\ -- cp \$\$i $install_dir/include; \\ -+ echo \${BSD_INSTALL_DATA} \$\$i \${INCDIR}; \\ -+ \${BSD_INSTALL_DATA} \$\$i \${INCDIR}; \\ - done - - localize: config.h diff --git a/lang/elk/patches/patch-aj b/lang/elk/patches/patch-aj deleted file mode 100644 index b368b860519..00000000000 --- a/lang/elk/patches/patch-aj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2002/01/09 23:04:56 seb Exp $ - ---- include/misc.h.orig Wed Aug 2 18:16:09 1995 -+++ include/misc.h -@@ -38,9 +38,9 @@ - - /* Align heap addresses */ - #ifdef ALIGN_8BYTE --# define ALIGN(ptr) ((ptr) = (char *)(((long)(ptr) + 7) & ~7)) -+# define ELK_ALIGN(ptr) ((ptr) = (char *)(((long)(ptr) + 7) & ~7)) - #else --# define ALIGN(ptr) ((ptr) = (char *)(((long)(ptr) + 3) & ~3)) -+# define ELK_ALIGN(ptr) ((ptr) = (char *)(((long)(ptr) + 3) & ~3)) - #endif - - /* Normalize stack addresses */ diff --git a/lang/elk/patches/patch-ak b/lang/elk/patches/patch-ak deleted file mode 100644 index edf0d5f245a..00000000000 --- a/lang/elk/patches/patch-ak +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2002/01/09 23:04:56 seb Exp $ - ---- lib/unix/build.orig Tue Jul 18 13:07:06 1995 -+++ lib/unix/build -@@ -87,15 +87,9 @@ - mkdir $install_dir/runtime/obj; \\ - fi - cp unix.pre $install_dir/runtime/obj/unix.o -- -@if [ ! -d $install_dir/include ]; then \\ -- echo mkdir $install_dir/include; \\ -- mkdir $install_dir/include; \\ -- fi -- -@if [ ! -d $install_dir/include/extensions ]; then \\ -- echo mkdir $install_dir/include/extensions; \\ -- mkdir $install_dir/include/extensions; \\ -- fi -- cp unix.h $install_dir/include/extensions -+ -@mkdir -p \${PREFIX}/include/elk/extensions -+ \${BSD_INSTALL_DATA} unix.h \${PREFIX}/include/elk/extensions -+ - - lint: - lint \$(LINTFLAGS) -I\$(INC) \$(C) diff --git a/lang/elk/patches/patch-al b/lang/elk/patches/patch-al deleted file mode 100644 index c31118397cf..00000000000 --- a/lang/elk/patches/patch-al +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-al,v 1.3 2002/01/09 23:04:56 seb Exp $ - ---- lib/xlib/build.orig Tue Jul 18 13:19:11 1995 -+++ lib/xlib/build -@@ -117,15 +117,8 @@ - mkdir $install_dir/runtime/obj; \\ - fi - cp xlib.pre $install_dir/runtime/obj/xlib.o -- -@if [ ! -d $install_dir/include ]; then \\ -- echo mkdir $install_dir/include; \\ -- mkdir $install_dir/include; \\ -- fi -- -@if [ ! -d $install_dir/include/extensions ]; then \\ -- echo mkdir $install_dir/include/extensions; \\ -- mkdir $install_dir/include/extensions; \\ -- fi -- cp xlib.h $install_dir/include/extensions -+ -@mkdir -p \${PREFIX}/include/elk/extensions -+ \${BSD_INSTALL_DATA} xlib.h \${PREFIX}/include/elk/extensions - - lint: - lint \$(LINTFLAGS) -I\$(INC) $x11_incl \$(C) diff --git a/lang/elk/patches/patch-am b/lang/elk/patches/patch-am deleted file mode 100644 index fb8e87688e6..00000000000 --- a/lang/elk/patches/patch-am +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-am,v 1.1 2002/01/09 23:04:57 seb Exp $ - ---- lib/xt/build.orig Tue Jul 18 13:21:52 1995 -+++ lib/xt/build -@@ -97,15 +97,9 @@ - mkdir $install_dir/runtime/obj; \\ - fi - cp xt.pre $install_dir/runtime/obj/xt.o -- -@if [ ! -d $install_dir/include ]; then \\ -- echo mkdir $install_dir/include; \\ -- mkdir $install_dir/include; \\ -- fi -- -@if [ ! -d $install_dir/include/extensions ]; then \\ -- echo mkdir $install_dir/include/extensions; \\ -- mkdir $install_dir/include/extensions; \\ -- fi -- cp xt.h $install_dir/include/extensions -+ -@mkdir -p \${PREFIX}/include/elk/extensions -+ \${BSD_INSTALL_DATA} xt.h \${PREFIX}/include/elk/extensions -+ - - lint: - lint \$(LINTFLAGS) -I\$(INC) -I../xlib $x11_incl \$(C) diff --git a/lang/elk/patches/patch-an b/lang/elk/patches/patch-an deleted file mode 100644 index 99640e5056d..00000000000 --- a/lang/elk/patches/patch-an +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-an,v 1.1 2002/01/09 23:04:57 seb Exp $ - ---- scripts/build.orig Mon Jun 26 16:04:26 1995 -+++ scripts/build -@@ -30,10 +30,7 @@ - chmod +x \$@ - - install: \$(FILES) -- -@if [ ! -d $install_dir/lib ]; then \\ -- echo mkdir $install_dir/lib; \\ -- mkdir $install_dir/lib; \\ -- fi -+ -@mkdir -p $install_dir/lib - cp linkscheme $install_dir/lib - cp makedl $install_dir/lib - cp ldflags $install_dir/lib diff --git a/lang/elk/patches/patch-ao b/lang/elk/patches/patch-ao deleted file mode 100644 index 6d3991027fc..00000000000 --- a/lang/elk/patches/patch-ao +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2002/01/09 23:04:57 seb Exp $ - ---- src/build.orig Mon Jan 24 17:12:31 1994 -+++ src/build -@@ -115,10 +115,12 @@ - O2= \$(OCOMMON) main2.o stab2.o - O3= \$(OCOMMON) main3.o stab2.o - -+EXPORTFLAGS= $exportflags -+ - all: scheme standalone.o module.o - - scheme: \$(O1) -- \$(CC) -o \$@ \$(CFLAGS) \$(O1) \$(LDFLAGS) -+ \$(CC) \${EXPORTFLAGS} -o \$@ \$(CFLAGS) \$(O1) \$(LDFLAGS) - - standalone.o: \$(O2) - ld -r -o \$@ \$(O2) -@@ -181,11 +183,7 @@ - rm main3.c - - install: scheme standalone.o module.o -- -@if [ ! -d $install_dir/bin ]; then \\ -- echo mkdir $install_dir/bin; \\ -- mkdir $install_dir/bin; \\ -- fi -- cp scheme $install_dir/bin -+ \${BSD_INSTALL_PROGRAM} scheme \${PREFIX}/bin/elk - -@if [ ! -d $install_dir/lib ]; then \\ - echo mkdir $install_dir/lib; \\ - mkdir $install_dir/lib; \\ diff --git a/lang/elk/patches/patch-ap b/lang/elk/patches/patch-ap deleted file mode 100644 index 777d9e19d32..00000000000 --- a/lang/elk/patches/patch-ap +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2002/01/09 23:04:57 seb Exp $ - ---- src/dump-vanilla.c.orig Thu Jun 29 13:55:51 1995 -+++ src/dump-vanilla.c -@@ -12,6 +12,10 @@ - - extern void *sbrk(); - -+#if defined(__FreeBSD__) || defined(__NetBSD__) -+extern etext; -+#endif -+ - #if defined(hp9000s300) || defined(__hp9000s300) || defined(__hp9000s300__) - static int getpagesize () { - return EXEC_PAGESIZE; -@@ -113,13 +117,15 @@ - close (afd); - #if defined(__bsdi__) - data_start = N_DATADDR(hdr); -+#elif defined (__FreeBSD__) || defined(__NetBSD__) -+ data_start = (int) &etext; - #else - data_start = hdr.a_text; -+#endif - #if defined(sun) || defined(__sun__) - data_start += pagemask+1; - #endif - data_start = (data_start + SEG_SIZ-1) & ~(SEG_SIZ-1); --#endif - data_end = (unsigned)sbrk (0); - #if !defined(__bsdi__) - data_end = (data_end + pagemask) & ~pagemask; diff --git a/lang/elk/patches/patch-aq b/lang/elk/patches/patch-aq deleted file mode 100644 index 1740863632f..00000000000 --- a/lang/elk/patches/patch-aq +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2002/01/09 23:04:58 seb Exp $ - ---- src/heap-sc.c.orig Thu Apr 4 14:55:43 1996 -+++ src/heap-sc.c -@@ -37,11 +37,11 @@ - (void)P_Collect (); - p = Hp; - } -- ALIGN(p); -+ ELK_ALIGN(p); - if (p + size > Heap_End) { - (void)P_Collect (); - p = Hp; -- ALIGN(p); -+ ELK_ALIGN(p); - if (p + size > Heap_End - HEAP_MARGIN) - Uncatchable_Error ("Out of heap space"); - } -@@ -108,7 +108,7 @@ - SETPOINTER(*p, POINTER(*tag)); - return; - } -- ALIGN(To); -+ ELK_ALIGN(To); - switch (t) { - case T_Bignum: - size = sizeof (struct S_Bignum) - sizeof (gran_t) diff --git a/lang/elk/patches/patch-ar b/lang/elk/patches/patch-ar deleted file mode 100644 index 5ec5c1e3c41..00000000000 --- a/lang/elk/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2002/01/09 23:04:58 seb Exp $ - ---- src/list.c.orig Sun Aug 6 16:34:10 1995 -+++ src/list.c -@@ -23,7 +23,7 @@ - register char *p; - - p = Hp; -- ALIGN(p); -+ ELK_ALIGN(p); - if (p + sizeof (struct S_Pair) <= Heap_End && !GC_Debug) { - Hp = p + sizeof (struct S_Pair); - SET(cell, T_Pair, (struct S_Pair *)p); diff --git a/lang/elk/patches/patch-as b/lang/elk/patches/patch-as deleted file mode 100644 index 10ef4efcab8..00000000000 --- a/lang/elk/patches/patch-as +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-as,v 1.1 2002/01/09 23:04:58 seb Exp $ - ---- src/load-dl.c.orig Fri Dec 22 15:46:24 1995 -+++ src/load-dl.c -@@ -4,6 +4,10 @@ - extern char *strrchr(); - extern char *getenv(); - -+#ifndef RTLD_NOW -+#define RTLD_NOW 1 -+#endif -+ - Dlopen_File (fn) char *fn; { - void *handle; - SYM *sp; diff --git a/lang/elk/patches/patch-at b/lang/elk/patches/patch-at deleted file mode 100644 index 62c21b1a975..00000000000 --- a/lang/elk/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.1 2002/01/09 23:04:58 seb Exp $ - ---- src/main.c.orig Thu Mar 28 10:31:30 1996 -+++ src/main.c -@@ -196,7 +196,7 @@ - - stkbase = &foo; - Stack_Grows_Down = Check_Stack_Grows_Down (); -- ALIGN(stkbase); -+ ELK_ALIGN(stkbase); - Make_Heap (heap); - Init_Everything (); - #ifdef ATEXIT diff --git a/lang/elk/patches/patch-au b/lang/elk/patches/patch-au deleted file mode 100644 index fdf3643f376..00000000000 --- a/lang/elk/patches/patch-au +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-au,v 1.2 2004/03/28 15:51:25 uebayasi Exp $ - ---- src/print.c.orig Thu Apr 4 22:25:04 1996 -+++ src/print.c -@@ -5,7 +5,8 @@ - - #include <errno.h> - #include <ctype.h> --#include <varargs.h> -+#include <stdarg.h> -+#include <sys/param.h> - - #ifdef FLUSH_TIOCFLUSH - # include <sys/ioctl.h> -@@ -95,15 +96,11 @@ vsprintf (s, fmt, ap) register char *s, - #endif - - /*VARARGS0*/ --Printf (va_alist) va_dcl { -+Printf (Object port, char *fmt, ...) { - va_list args; -- Object port; -- char *fmt; - char buf[1024]; - -- va_start (args); -- port = va_arg (args, Object); -- fmt = va_arg (args, char *); -+ va_start (args, fmt); - if (PORT(port)->flags & P_STRING) { - vsprintf (buf, fmt, args); - Print_String (port, buf, strlen (buf)); -@@ -555,8 +552,7 @@ Format (port, fmt, len, argc, argv) Obje - char *p; - register c; - char buf[256]; -- extern sys_nerr; --#ifndef __bsdi__ -+#if !(defined(BSD) && (BSD >= 199306)) - extern char *sys_errlist[]; - #endif - GC_Node; diff --git a/lang/elk/patches/patch-av b/lang/elk/patches/patch-av deleted file mode 100644 index c9bb6344efb..00000000000 --- a/lang/elk/patches/patch-av +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-av,v 1.1 2004/03/28 15:51:25 uebayasi Exp $ - ---- src/error.c.orig Sat Aug 5 19:33:48 1995 -+++ src/error.c -@@ -1,5 +1,5 @@ - #include <ctype.h> --#include <varargs.h> -+#include <stdarg.h> - - #include "kernel.h" - -@@ -40,13 +40,11 @@ void Set_App_Name (name) char *name; { - /*VARARGS1*/ - Fatal_Error (foo) char *foo; { foo = foo; } - #else --Fatal_Error (va_alist) va_dcl { -+Fatal_Error (char *fmt, ...) { - va_list args; -- char *fmt; - - Disable_Interrupts; -- va_start (args); -- fmt = va_arg (args, char *); -+ va_start (args, fmt); - (void)fflush (stdout); - if (appname) - fprintf (stderr, "\n%s: fatal error: ", appname); -@@ -89,15 +87,14 @@ Uncatchable_Error (errmsg) char *errmsg; - /*VARARGS1*/ - Primitive_Error (foo) char *foo; { foo = foo; } - #else --Primitive_Error (va_alist) va_dcl { -+Primitive_Error (char *fmt, ...) { - va_list args; -- register char *p, *fmt; -+ register char *p; - register i, n; - Object msg, sym, argv[10]; - GC_Node; GCNODE gcv; - -- va_start (args); -- fmt = va_arg (args, char *); -+ va_start (args, fmt); - for (n = 0, p = fmt; *p; p++) - if (*p == '~' && p[1] != '~' && p[1] != '%' - && p[1] != 'E' && p[1] != 'e') diff --git a/lang/elk/patches/patch-aw b/lang/elk/patches/patch-aw deleted file mode 100644 index 359290e3a49..00000000000 --- a/lang/elk/patches/patch-aw +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2004/03/28 15:51:25 uebayasi Exp $ - ---- src/terminate.c.orig Mon Aug 7 16:30:12 1995 -+++ src/terminate.c -@@ -1,7 +1,7 @@ - /* Termination functions, weak pointers. - */ - --#include <varargs.h> -+#include <stdarg.h> - - #include "kernel.h" - -@@ -50,17 +50,11 @@ void Deregister_Object (obj) Object obj; - * Null is returned when the object has not been found. - */ - /*VARARGS*/ --Object Find_Object (va_alist) va_dcl { -+Object Find_Object (int type, GENERIC group, MATCHFUN match, ...) { - WEAK_NODE *p; -- int type; -- GENERIC group; -- MATCHFUN match; - va_list args; - -- va_start (args); -- type = va_arg (args, int); -- group = va_arg (args, GENERIC); -- match = va_arg (args, MATCHFUN); -+ va_start (args, match); - for (p = first; p; p = p->next) { - if (TYPE(p->obj) != type || p->group != group) - continue; diff --git a/lang/elk/patches/patch-ax b/lang/elk/patches/patch-ax deleted file mode 100644 index 9e11879e66a..00000000000 --- a/lang/elk/patches/patch-ax +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2004/03/28 15:51:25 uebayasi Exp $ - ---- include/extern.h.orig Mon Aug 7 16:32:17 1995 -+++ include/extern.h -@@ -82,8 +82,8 @@ extern Object The_Environment, Global_En - - /* Error handling - */ --extern Primitive_Error P_((ELLIPSIS)); --extern Fatal_Error P_((ELLIPSIS)); -+extern Primitive_Error P_((char *, ...)); -+extern Fatal_Error P_((char *, ...)); - extern Range_Error P_((Object)); - extern Panic P_((const char*)); - extern Object P_Error P_((int, Object*)); -@@ -313,7 +313,7 @@ extern Object P_Print P_((int, Object*)) - extern Object P_Get_Output_String P_((Object)); - extern Check_Output_Port P_((Object)); - extern Discard_Output P_((Object)); --extern Printf P_((ELLIPSIS)); -+extern Printf P_((Object, char *, ...)); - extern Print_Object P_((Object, Object, int, int, int)); - extern General_Print_Object P_((Object, Object, int)); - extern Format P_((Object, const char*, int, int, Object*)); -@@ -433,7 +433,7 @@ extern Object Bits_To_Symbols P_((unsign - */ - extern void Register_Object P_((Object, GENERIC, PFO, int)); - extern void Deregister_Object P_((Object)); --extern Object Find_Object P_((ELLIPSIS)); -+extern Object Find_Object P_((int, GENERIC, MATCHFUN, ...)); - extern void Terminate_Group P_((GENERIC)); - extern void Terminate_Type P_((int)); - |