summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/elk/Makefile19
-rw-r--r--lang/elk/files/patch-sum18
-rw-r--r--lang/elk/patches/patch-aa (renamed from lang/elk/patches/patch-a)2
-rw-r--r--lang/elk/patches/patch-ab (renamed from lang/elk/patches/patch-b)2
-rw-r--r--lang/elk/patches/patch-ac (renamed from lang/elk/patches/patch-c)6
-rw-r--r--lang/elk/patches/patch-ad (renamed from lang/elk/patches/patch-d)2
-rw-r--r--lang/elk/patches/patch-ae (renamed from lang/elk/patches/patch-e)2
-rw-r--r--lang/elk/patches/patch-af (renamed from lang/elk/patches/patch-f)2
-rw-r--r--lang/elk/patches/patch-ag18
-rw-r--r--lang/elk/patches/patch-ah29
-rw-r--r--lang/elk/patches/patch-ai15
-rw-r--r--lang/elk/patches/patch-aj15
-rw-r--r--lang/elk/scripts/configure24
13 files changed, 114 insertions, 40 deletions
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-aa
index 42e89182c10..d79ebd12aba 100644
--- a/lang/elk/patches/patch-a
+++ b/lang/elk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-a,v 1.3 1998/08/07 11:08:55 agc Exp $
+$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
diff --git a/lang/elk/patches/patch-b b/lang/elk/patches/patch-ab
index ae1638f3024..b5c6748b296 100644
--- a/lang/elk/patches/patch-b
+++ b/lang/elk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-b,v 1.2 1998/08/07 11:08:55 agc Exp $
+$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
diff --git a/lang/elk/patches/patch-c b/lang/elk/patches/patch-ac
index 1a4a187fa14..b17f8263d2e 100644
--- a/lang/elk/patches/patch-c
+++ b/lang/elk/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-c,v 1.3 1998/08/07 11:08:55 agc Exp $
+$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
@@ -461,7 +461,7 @@ $NetBSD: patch-c,v 1.3 1998/08/07 11:08:55 agc Exp $
+
+ getgroups_type=gid_t
--- /dev/null Fri Mar 27 13:45:57 1998
-+++ config/sites/aout-netbsd Tue Mar 31 10:24:13 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
@@ -530,7 +530,7 @@ $NetBSD: patch-c,v 1.3 1998/08/07 11:08:55 agc Exp $
+# C compiler flags required to compile a program using gdbm.
+
+gdbm=
-+gdbm_incl=-I${PREFIX}/include/gdbm
++gdbm_incl=-I${PREFIX}/include
+
+
+# Do you want to use the generational garbage collector? If not, the
diff --git a/lang/elk/patches/patch-d b/lang/elk/patches/patch-ad
index 84ae97938fe..e83159460a6 100644
--- a/lang/elk/patches/patch-d
+++ b/lang/elk/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-d,v 1.3 1998/08/07 11:08:55 agc Exp $
+$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
diff --git a/lang/elk/patches/patch-e b/lang/elk/patches/patch-ae
index 7be1585c2f8..42233818873 100644
--- a/lang/elk/patches/patch-e
+++ b/lang/elk/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-e,v 1.3 1998/08/07 11:08:56 agc Exp $
+$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
diff --git a/lang/elk/patches/patch-f b/lang/elk/patches/patch-af
index d54c04ccc79..f85d3f01c2d 100644
--- a/lang/elk/patches/patch-f
+++ b/lang/elk/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-f,v 1.2 1998/08/07 11:08:56 agc Exp $
+$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
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 <sys/param.h>
+
+--- 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 <sys/param.h>
+
+--- 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 <sys/param.h>
+
+--- 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 <sys/param.h>
+
+--- 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/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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-02 23:15:48 +0000