From bd738fd82285a6340ba485c16ec48ecaecc3b65a Mon Sep 17 00:00:00 2001 From: agc Date: Tue, 17 Aug 1999 11:18:40 +0000 Subject: Use USE_X11 in Makefile to show that this package links with X11 headers and libs. Make this package work on Solaris. Use the same "pkgsrc" configuration file for locations of objects on NetBSD (both ELF and a.out) and Solaris. Use a Makefile target, rather than a separate script. Avoid clash with ALIGN definition in --- lang/elk/Makefile | 19 +- lang/elk/files/patch-sum | 18 +- lang/elk/patches/patch-a | 77 ------- lang/elk/patches/patch-aa | 77 +++++++ lang/elk/patches/patch-ab | 375 +++++++++++++++++++++++++++++++ lang/elk/patches/patch-ac | 545 +++++++++++++++++++++++++++++++++++++++++++++ lang/elk/patches/patch-ad | 77 +++++++ lang/elk/patches/patch-ae | 17 ++ lang/elk/patches/patch-af | 132 +++++++++++ lang/elk/patches/patch-ag | 18 ++ lang/elk/patches/patch-ah | 29 +++ lang/elk/patches/patch-ai | 15 ++ lang/elk/patches/patch-aj | 15 ++ lang/elk/patches/patch-b | 375 ------------------------------- lang/elk/patches/patch-c | 545 --------------------------------------------- lang/elk/patches/patch-d | 77 ------- lang/elk/patches/patch-e | 17 -- lang/elk/patches/patch-f | 132 ----------- lang/elk/scripts/configure | 24 -- 19 files changed, 1329 insertions(+), 1255 deletions(-) delete mode 100644 lang/elk/patches/patch-a create mode 100644 lang/elk/patches/patch-aa create mode 100644 lang/elk/patches/patch-ab create mode 100644 lang/elk/patches/patch-ac create mode 100644 lang/elk/patches/patch-ad create mode 100644 lang/elk/patches/patch-ae create mode 100644 lang/elk/patches/patch-af create mode 100644 lang/elk/patches/patch-ag create mode 100644 lang/elk/patches/patch-ah create mode 100644 lang/elk/patches/patch-ai create mode 100644 lang/elk/patches/patch-aj delete mode 100644 lang/elk/patches/patch-b delete mode 100644 lang/elk/patches/patch-c delete mode 100644 lang/elk/patches/patch-d delete mode 100644 lang/elk/patches/patch-e delete mode 100644 lang/elk/patches/patch-f delete mode 100644 lang/elk/scripts/configure (limited to 'lang/elk') diff --git a/lang/elk/Makefile b/lang/elk/Makefile index 69e9fdc64d7..0e2add0f223 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1999/06/04 16:55:12 drochner Exp $ +# $NetBSD: Makefile,v 1.11 1999/08/17 11:18:40 agc Exp $ # FreeBSD Id: Makefile,v 1.15 1997/09/01 12:28:30 tg Exp # @@ -13,5 +13,22 @@ HOMEPAGE= http://www-rn.informatik.uni-bremen.de/software/elk/ NOT_FOR_PLATFORM= *-*-alpha *-*-mips #elf loading problems, LP64 ALL_TARGET= default +USE_X11= yes + +do-configure: + @case `${MAKE} show-shlib-type` in \ + a.out) exetype=aout ;; \ + ELF) exetype=elf ;; \ + 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 "../../mk/bsd.pkg.mk" diff --git a/lang/elk/files/patch-sum b/lang/elk/files/patch-sum index a1b5c26f7fb..4d968a4e34c 100644 --- a/lang/elk/files/patch-sum +++ b/lang/elk/files/patch-sum @@ -1,8 +1,12 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:54:07 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/08/17 11:18:40 agc Exp $ -MD5 (patch-a) = 2a64f01369ec305ca06ec20b2c7929db -MD5 (patch-b) = 606196dcb073174399e2ea016ce45da7 -MD5 (patch-c) = 843cd1ffe91e91925fcc2db09ba0003f -MD5 (patch-d) = bcfe220754da600d611a0989f48e534b -MD5 (patch-e) = 50a0bc3bad817e4cd9bb416d3428cc70 -MD5 (patch-f) = b371f8a4e43c5739e0bf97cdb9d88e87 +MD5 (patch-aa) = 2a64f01369ec305ca06ec20b2c7929db +MD5 (patch-ab) = 606196dcb073174399e2ea016ce45da7 +MD5 (patch-ac) = 7b17ca93610a97ea42931e80014a06a2 +MD5 (patch-ad) = bcfe220754da600d611a0989f48e534b +MD5 (patch-ae) = 50a0bc3bad817e4cd9bb416d3428cc70 +MD5 (patch-af) = b371f8a4e43c5739e0bf97cdb9d88e87 +MD5 (patch-ag) = 1b7ce3525985ea670f6d042dc0a6a283 +MD5 (patch-ah) = 6e370db1f6de0862aad57c7330867803 +MD5 (patch-ai) = 7515b0cba7a747baf7379f0778bfbf68 +MD5 (patch-aj) = d7ce903897077223da1addeb610c3219 diff --git a/lang/elk/patches/patch-a b/lang/elk/patches/patch-a deleted file mode 100644 index 42e89182c10..00000000000 --- a/lang/elk/patches/patch-a +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-a,v 1.3 1998/08/07 11:08:55 agc Exp $ - -*** doc/man/elk.1.orig Thu Apr 6 14:40:07 1995 ---- doc/man/elk.1 Thu Apr 6 14:41:02 1995 -*************** -*** 2,10 **** - .TH ELK 1 "15 January 1991" - .UC 4 - .SH NAME -! elk, scheme \- extensible Scheme interpreter - .SH SYNOPSIS -! .B scheme - [ - .B \-l \f2file\fP - ] [ ---- 2,10 ---- - .TH ELK 1 "15 January 1991" - .UC 4 - .SH NAME -! elk \- extensible Scheme interpreter - .SH SYNOPSIS -! .B elk - [ - .B \-l \f2file\fP - ] [ -*************** -*** 20,27 **** - ] [[ - .B \-\^\- - ] \f2args\fP] -- .LP -- .BR elk .\|.\|. - .SH DESCRIPTION - .I Elk - (Extension Language Kit) is a Scheme interpreter intended ---- 20,25 ---- -*************** -*** 32,38 **** - 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 ). - This interpreter, together with the standard Scheme toplevel, - .I Elk - can be used as an ordinary, stand-alone implementation of the ---- 30,36 ---- - 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 elk ). - This interpreter, together with the standard Scheme toplevel, - .I Elk - can be used as an ordinary, stand-alone implementation of the ---- Makefile.orig Mon Jul 31 13:56:26 1995 -+++ Makefile Tue Mar 31 11:44:51 1998 -@@ -16,9 +16,9 @@ - lib/unix\ - lib/xlib\ - lib/xt\ -- lib/xaw\ -- lib/xm\ -- lib/xm/xt -+ lib/xaw -+# lib/xm\ -+# lib/xm/xt - - # ---------------------------------------------------------------------- - -@@ -37,7 +37,7 @@ - done - - install: -- @for i in $(SUBDIRS) ;\ -+ @for i in $(SUBDIRS) doc/man;\ - do \ - echo Installing $$i...; \ - ( cd $$i ; $(MAKE) install ) || exit $$?; \ diff --git a/lang/elk/patches/patch-aa b/lang/elk/patches/patch-aa new file mode 100644 index 00000000000..d79ebd12aba --- /dev/null +++ b/lang/elk/patches/patch-aa @@ -0,0 +1,77 @@ +$NetBSD: patch-aa,v 1.1 1999/08/17 11:18:40 agc Exp $ + +*** doc/man/elk.1.orig Thu Apr 6 14:40:07 1995 +--- doc/man/elk.1 Thu Apr 6 14:41:02 1995 +*************** +*** 2,10 **** + .TH ELK 1 "15 January 1991" + .UC 4 + .SH NAME +! elk, scheme \- extensible Scheme interpreter + .SH SYNOPSIS +! .B scheme + [ + .B \-l \f2file\fP + ] [ +--- 2,10 ---- + .TH ELK 1 "15 January 1991" + .UC 4 + .SH NAME +! elk \- extensible Scheme interpreter + .SH SYNOPSIS +! .B elk + [ + .B \-l \f2file\fP + ] [ +*************** +*** 20,27 **** + ] [[ + .B \-\^\- + ] \f2args\fP] +- .LP +- .BR elk .\|.\|. + .SH DESCRIPTION + .I Elk + (Extension Language Kit) is a Scheme interpreter intended +--- 20,25 ---- +*************** +*** 32,38 **** + 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 ). + This interpreter, together with the standard Scheme toplevel, + .I Elk + can be used as an ordinary, stand-alone implementation of the +--- 30,36 ---- + 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 elk ). + This interpreter, together with the standard Scheme toplevel, + .I Elk + can be used as an ordinary, stand-alone implementation of the +--- Makefile.orig Mon Jul 31 13:56:26 1995 ++++ Makefile Tue Mar 31 11:44:51 1998 +@@ -16,9 +16,9 @@ + lib/unix\ + lib/xlib\ + lib/xt\ +- lib/xaw\ +- lib/xm\ +- lib/xm/xt ++ lib/xaw ++# lib/xm\ ++# lib/xm/xt + + # ---------------------------------------------------------------------- + +@@ -37,7 +37,7 @@ + done + + install: +- @for i in $(SUBDIRS) ;\ ++ @for i in $(SUBDIRS) doc/man;\ + do \ + echo Installing $$i...; \ + ( cd $$i ; $(MAKE) install ) || exit $$?; \ diff --git a/lang/elk/patches/patch-ab b/lang/elk/patches/patch-ab new file mode 100644 index 00000000000..b5c6748b296 --- /dev/null +++ b/lang/elk/patches/patch-ab @@ -0,0 +1,375 @@ +$NetBSD: patch-ab,v 1.1 1999/08/17 11:18:40 agc Exp $ + +--- /dev/null Fri Mar 27 13:45:57 1998 ++++ config/untested/aout-netbsd-cc Tue Mar 31 10:03:57 1998 +@@ -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 include file and uses "struct dirent")? ++# If not, the (obsolete) BSD-style interface with 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 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='' ++ ++ ++# What is the name of the a.out include file? ++ ++aout_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 ++# tcflsh use TCFLSH ioctl from ++# 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 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-ac b/lang/elk/patches/patch-ac new file mode 100644 index 00000000000..b17f8263d2e --- /dev/null +++ b/lang/elk/patches/patch-ac @@ -0,0 +1,545 @@ +$NetBSD: patch-ac,v 1.1 1999/08/17 11:18:41 agc Exp $ + +*** config/sites/386pc-freebsd2.1 Thu Jan 1 01:00:00 1970 +--- config/sites/386pc-freebsd2.1 Wed Mar 8 19:19:43 1995 +*************** +*** 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 +*** config/untested/386pc-freebsd2.1-cc Thu Jan 1 01:00:00 1970 +--- config/untested/386pc-freebsd2.1-cc Wed Mar 8 19:19:21 1995 +*************** +*** 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 include file and uses "struct dirent")? ++ # If not, the (obsolete) BSD-style interface with 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 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='' ++ ++ ++ # What is the name of the a.out include file? ++ ++ aout_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 ++ # tcflsh use TCFLSH ioctl from ++ # 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 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 +--- /dev/null Fri Mar 27 13:45:57 1998 ++++ config/sites/pkgsrc Tue Mar 31 10:24:13 1998 +@@ -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}/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="-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 ++ ++ ++# 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 new file mode 100644 index 00000000000..e83159460a6 --- /dev/null +++ b/lang/elk/patches/patch-ad @@ -0,0 +1,77 @@ +$NetBSD: patch-ad,v 1.1 1999/08/17 11:18:41 agc Exp $ + +*** src/dump-vanilla.c.orig Thu Jun 29 13:55:51 1995 +--- src/dump-vanilla.c Thu Sep 7 15:00:35 1995 +*************** +*** 12,17 **** +--- 12,21 ---- + + 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,125 **** + close (afd); + #if defined(__bsdi__) + data_start = N_DATADDR(hdr); + #else + data_start = hdr.a_text; + #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; +--- 117,131 ---- + 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); + data_end = (unsigned)sbrk (0); + #if !defined(__bsdi__) + data_end = (data_end + pagemask) & ~pagemask; +*** src/print.c.orig Mon Aug 7 09:28:42 1995 +--- src/print.c Thu Sep 7 14:58:28 1995 +*************** +*** 6,11 **** +--- 6,12 ---- + #include + #include + #include ++ #include + + #ifdef FLUSH_TIOCFLUSH + # include +*************** +*** 555,561 **** + register c; + char buf[256]; + extern sys_nerr; +! #ifndef __bsdi__ + extern char *sys_errlist[]; + #endif + GC_Node; +--- 556,562 ---- + register c; + char buf[256]; + extern sys_nerr; +! #if !(defined(BSD) && (BSD >= 199306)) + extern char *sys_errlist[]; + #endif + GC_Node; diff --git a/lang/elk/patches/patch-ae b/lang/elk/patches/patch-ae new file mode 100644 index 00000000000..42233818873 --- /dev/null +++ b/lang/elk/patches/patch-ae @@ -0,0 +1,17 @@ +$NetBSD: patch-ae,v 1.1 1999/08/17 11:18:41 agc Exp $ + +*** src/load-dl.c Sun Dec 17 15:45:40 1995 +--- src/load-dl.c Sun Dec 17 15:46:22 1995 +*************** +*** 4,9 **** +--- 4,13 ---- + 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-af b/lang/elk/patches/patch-af new file mode 100644 index 00000000000..f85d3f01c2d --- /dev/null +++ b/lang/elk/patches/patch-af @@ -0,0 +1,132 @@ +$NetBSD: patch-af,v 1.1 1999/08/17 11:18:41 agc Exp $ + +--- include/build 1998/03/31 09:49:53 1.1 ++++ include/build 1998/03/31 09:53:47 +@@ -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} \${PREFIX}/share/elk + @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 +--- src/build 1998/03/31 09:58:17 1.1 ++++ src/build 1998/03/31 10:00:03 +@@ -181,11 +181,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; \\ +--- lib/xlib/build 1998/03/31 10:24:34 1.1 ++++ lib/xlib/build 1998/03/31 10:26:57 +@@ -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) +--- lib/unix/build 1998/03/31 10:28:09 1.1 ++++ lib/unix/build 1998/03/31 10:28:42 +@@ -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) +--- lib/xt/build 1998/03/31 10:29:31 1.1 ++++ lib/xt/build 1998/03/31 10:30:02 +@@ -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) +--- doc/man/Makefile 1998/03/31 10:42:41 1.1 ++++ doc/man/Makefile 1998/03/31 10:43:33 +@@ -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 +--- scripts/build 1998/03/31 11:15:29 1.1 ++++ scripts/build 1998/03/31 11:16:06 +@@ -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-ag b/lang/elk/patches/patch-ag new file mode 100644 index 00000000000..82f28f9c6cc --- /dev/null +++ b/lang/elk/patches/patch-ag @@ -0,0 +1,18 @@ +$NetBSD: patch-ag,v 1.1 1999/08/17 11:18:41 agc Exp $ + +Avoid conflicts with the definition in + +--- include/misc.h 1999/08/17 08:00:50 1.1 ++++ include/misc.h 1999/08/17 08:01:01 +@@ -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-ah b/lang/elk/patches/patch-ah new file mode 100644 index 00000000000..4a6cf7df5c4 --- /dev/null +++ b/lang/elk/patches/patch-ah @@ -0,0 +1,29 @@ +$NetBSD: patch-ah,v 1.1 1999/08/17 11:18:41 agc Exp $ + +Avoid conflicts with the definition in + +--- src/heap-sc.c 1999/08/17 08:01:56 1.1 ++++ src/heap-sc.c 1999/08/17 08:02:34 +@@ -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-ai b/lang/elk/patches/patch-ai new file mode 100644 index 00000000000..9e806e3468a --- /dev/null +++ b/lang/elk/patches/patch-ai @@ -0,0 +1,15 @@ +$NetBSD: patch-ai,v 1.1 1999/08/17 11:18:41 agc Exp $ + +Avoid conflicts with the definition in + +--- src/list.c 1999/08/17 08:01:56 1.1 ++++ src/list.c 1999/08/17 08:02:37 +@@ -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-aj b/lang/elk/patches/patch-aj new file mode 100644 index 00000000000..c54e29d991b --- /dev/null +++ b/lang/elk/patches/patch-aj @@ -0,0 +1,15 @@ +$NetBSD: patch-aj,v 1.1 1999/08/17 11:18:41 agc Exp $ + +Avoid conflicts with the definition in + +--- src/main.c 1999/08/17 08:01:56 1.1 ++++ src/main.c 1999/08/17 08:02:42 +@@ -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-b b/lang/elk/patches/patch-b deleted file mode 100644 index ae1638f3024..00000000000 --- a/lang/elk/patches/patch-b +++ /dev/null @@ -1,375 +0,0 @@ -$NetBSD: patch-b,v 1.2 1998/08/07 11:08:55 agc Exp $ - ---- /dev/null Fri Mar 27 13:45:57 1998 -+++ config/untested/aout-netbsd-cc Tue Mar 31 10:03:57 1998 -@@ -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 include file and uses "struct dirent")? -+# If not, the (obsolete) BSD-style interface with 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 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='' -+ -+ -+# What is the name of the a.out include file? -+ -+aout_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 -+# tcflsh use TCFLSH ioctl from -+# 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 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-c b/lang/elk/patches/patch-c deleted file mode 100644 index 1a4a187fa14..00000000000 --- a/lang/elk/patches/patch-c +++ /dev/null @@ -1,545 +0,0 @@ -$NetBSD: patch-c,v 1.3 1998/08/07 11:08:55 agc Exp $ - -*** config/sites/386pc-freebsd2.1 Thu Jan 1 01:00:00 1970 ---- config/sites/386pc-freebsd2.1 Wed Mar 8 19:19:43 1995 -*************** -*** 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 -*** config/untested/386pc-freebsd2.1-cc Thu Jan 1 01:00:00 1970 ---- config/untested/386pc-freebsd2.1-cc Wed Mar 8 19:19:21 1995 -*************** -*** 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 include file and uses "struct dirent")? -+ # If not, the (obsolete) BSD-style interface with 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 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='' -+ -+ -+ # What is the name of the a.out include file? -+ -+ aout_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 -+ # tcflsh use TCFLSH ioctl from -+ # 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 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 ---- /dev/null Fri Mar 27 13:45:57 1998 -+++ config/sites/aout-netbsd Tue Mar 31 10:24:13 1998 -@@ -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}/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="-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 diff --git a/lang/elk/patches/patch-d b/lang/elk/patches/patch-d deleted file mode 100644 index 84ae97938fe..00000000000 --- a/lang/elk/patches/patch-d +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-d,v 1.3 1998/08/07 11:08:55 agc Exp $ - -*** src/dump-vanilla.c.orig Thu Jun 29 13:55:51 1995 ---- src/dump-vanilla.c Thu Sep 7 15:00:35 1995 -*************** -*** 12,17 **** ---- 12,21 ---- - - 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,125 **** - close (afd); - #if defined(__bsdi__) - data_start = N_DATADDR(hdr); - #else - data_start = hdr.a_text; - #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; ---- 117,131 ---- - 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); - data_end = (unsigned)sbrk (0); - #if !defined(__bsdi__) - data_end = (data_end + pagemask) & ~pagemask; -*** src/print.c.orig Mon Aug 7 09:28:42 1995 ---- src/print.c Thu Sep 7 14:58:28 1995 -*************** -*** 6,11 **** ---- 6,12 ---- - #include - #include - #include -+ #include - - #ifdef FLUSH_TIOCFLUSH - # include -*************** -*** 555,561 **** - register c; - char buf[256]; - extern sys_nerr; -! #ifndef __bsdi__ - extern char *sys_errlist[]; - #endif - GC_Node; ---- 556,562 ---- - register c; - char buf[256]; - extern sys_nerr; -! #if !(defined(BSD) && (BSD >= 199306)) - extern char *sys_errlist[]; - #endif - GC_Node; diff --git a/lang/elk/patches/patch-e b/lang/elk/patches/patch-e deleted file mode 100644 index 7be1585c2f8..00000000000 --- a/lang/elk/patches/patch-e +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-e,v 1.3 1998/08/07 11:08:56 agc Exp $ - -*** src/load-dl.c Sun Dec 17 15:45:40 1995 ---- src/load-dl.c Sun Dec 17 15:46:22 1995 -*************** -*** 4,9 **** ---- 4,13 ---- - 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-f b/lang/elk/patches/patch-f deleted file mode 100644 index d54c04ccc79..00000000000 --- a/lang/elk/patches/patch-f +++ /dev/null @@ -1,132 +0,0 @@ -$NetBSD: patch-f,v 1.2 1998/08/07 11:08:56 agc Exp $ - ---- include/build 1998/03/31 09:49:53 1.1 -+++ include/build 1998/03/31 09:53:47 -@@ -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} \${PREFIX}/share/elk - @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 ---- src/build 1998/03/31 09:58:17 1.1 -+++ src/build 1998/03/31 10:00:03 -@@ -181,11 +181,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; \\ ---- lib/xlib/build 1998/03/31 10:24:34 1.1 -+++ lib/xlib/build 1998/03/31 10:26:57 -@@ -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) ---- lib/unix/build 1998/03/31 10:28:09 1.1 -+++ lib/unix/build 1998/03/31 10:28:42 -@@ -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) ---- lib/xt/build 1998/03/31 10:29:31 1.1 -+++ lib/xt/build 1998/03/31 10:30:02 -@@ -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) ---- doc/man/Makefile 1998/03/31 10:42:41 1.1 -+++ doc/man/Makefile 1998/03/31 10:43:33 -@@ -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 ---- scripts/build 1998/03/31 11:15:29 1.1 -+++ scripts/build 1998/03/31 11:16:06 -@@ -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/scripts/configure b/lang/elk/scripts/configure deleted file mode 100644 index 02d88d971e6..00000000000 --- a/lang/elk/scripts/configure +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# $NetBSD: configure,v 1.4 1998/08/07 11:08:56 agc Exp $ -# - -mach=`uname -m` - -case $mach in -i386|sparc|amiga|atari|hp300|mac68k|mvme68k|sun3|sun3x|x68k) - exetype=aout - ;; -pmax|alpha) - exetype=elf - ;; -*) - echo "Unrecognised machine type: $mach" - exit 1 - ;; -esac - -ln -sf ${WRKSRC}/config/untested/$exetype-netbsd-cc ${WRKSRC}/config/system -ln -sf ${WRKSRC}/config/sites/$exetype-netbsd ${WRKSRC}/config/site - -exit 0 -- cgit v1.2.3