cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

and patches. most removed as integrated.

Browse Source
This commit is contained in:
espie 2004-09-15 19:13:34 +00:00
parent 3703b1b9d8
commit 6523d17a3d
16 changed files with 56 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lang/scm/patches/patch-build_scm Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-build_scm,v 1.1 2004/09/15 19:13:34 espie Exp $
--- build.scm.orig Sun Nov 30 23:29:36 2003
+++ build.scm Sun Sep 5 11:45:36 2004
@@ -633,9 +633,11 @@
(curses netbsd "-I/usr/pkg/include" "-lncurses" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
(editline netbsd "-I/usr/pkg/include" "-lreadline" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ())
(graphics netbsd "-I/usr/X11R6/include -DX11" "-lX11" "-Wl,-rpath -Wl,/usr/X11R6/lib -L/usr/X11R6/lib" () ())
+ (dlll openbsd "-DSUN_DL" "" "" () ())
(m netbsd "" "-lm" #f () ())
(m openbsd "" "-lm" #f () ())
(curses openbsd "" "-lcurses" "/usr/lib/libcurses.a" () ())
+ (regex openbsd "" "" #f () ())
))
'(compile-commands

18
lang/scm/patches/patch-scm_dynl_c → lang/scm/patches/patch-dynl_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-scm_dynl_c,v 1.3 2001/02/03 20:42:46 espie Exp $
--- dynl.c.orig Tue Sep 7 15:14:00 1999
+++ dynl.c Thu Feb 1 00:50:38 2001
@@ -419,7 +419,23 @@ SCM l_dyn_call(symb, shl)
ASSERT(NIMP(symb) && STRINGP(symb), symb, ARG1, s_call);
ASSERT(NIMP(shl) && CAR(shl)==tc16_shl, shl, ARG2, s_call);
$OpenBSD: patch-dynl_c,v 1.1 2004/09/15 19:13:34 espie Exp $
--- dynl.c.orig Sat Jan 25 16:41:11 2003
+++ dynl.c Sun Sep 5 11:41:31 2004
@@ -424,7 +424,23 @@ SCM l_dyn_call(symb, shl)
ASRTER(NIMP(symb) && STRINGP(symb), symb, ARG1, s_call);
ASRTER(NIMP(shl) && CAR(shl)==tc16_shl, shl, ARG2, s_call);
DEFER_INTS;
- func = dlsym(SHL(shl), CHARS(symb));
+#ifdef __OpenBSD__
@ -26,9 +26,9 @@ $OpenBSD: patch-scm_dynl_c,v 1.3 2001/02/03 20:42:46 espie Exp $
if (!func) {
char *dlr = dlerror();
ALLOW_INTS;
@@ -448,7 +464,23 @@ SCM l_dyn_main_call(symb, shl, args)
ASSERT(NIMP(symb) && STRINGP(symb), symb, ARG1, s_main_call);
ASSERT(NIMP(shl) && CAR(shl)==tc16_shl, shl, ARG2, s_main_call);
@@ -453,7 +469,23 @@ SCM l_dyn_main_call(symb, shl, args)
ASRTER(NIMP(symb) && STRINGP(symb), symb, ARG1, s_main_call);
ASRTER(NIMP(shl) && CAR(shl)==tc16_shl, shl, ARG2, s_main_call);
DEFER_INTS;
- func = dlsym(SHL(shl), CHARS(symb));
+#ifdef __OpenBSD__

84
lang/scm/patches/patch-scm_build_scm
View File

@ -1,84 +0,0 @@
$OpenBSD: patch-scm_build_scm,v 1.4 2001/02/03 20:42:46 espie Exp $
--- build.scm.orig Sat Feb 5 03:37:17 2000
+++ build.scm Wed Jan 31 15:33:57 2001
@@ -451,6 +451,7 @@
(microsoft-c-nt i386 ms-dos cl ) ;link
(microsoft-quick-c 8086 ms-dos qcl ) ;qlink
(ms-dos 8086 ms-dos cc ) ;link
+ (openbsd *unknown* unix gcc ) ;gcc
(os/2-cset i386 os/2 icc ) ;link386
(os/2-emx i386 os/2 gcc ) ;gcc
(svr4-gcc-sun-ld sparc sunos gcc ) ;ld
@@ -582,6 +583,10 @@
(dlll freebsd "-DSUN_DL" "" "" () ())
(nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ())
(dump freebsd "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ())
+ (dlll openbsd "-DSUN_DL" "" "" () ())
+ (m openbsd "" "-lm" #f () ())
+ (curses openbsd "" "-lcurses" "/usr/lib/libcurses.a" () ())
+ (regex openbsd "" "" #f () ())
))
'(compile-commands
@@ -1389,6 +1394,61 @@
(and (batch:try-command
parms
"ld" "-Bshareable" "-o"
+ (string-append
+ (car (parameter-list-ref parms 'implvic))
+ oname ".so")
+ objects)
+ (batch:rebuild-catalog parms)
+ (string-append
+ (car (parameter-list-ref parms 'implvic))
+ oname ".so"))))
+
+(defcommand compile-c-files openbsd
+ (lambda (files parms)
+ (and (batch:try-chopped-command
+ parms
+ "cc" "-O2" "-Wall" "-c"
+ (c-includes parms)
+ (c-flags parms)
+ files)
+ (map c->o files))))
+(defcommand link-c-program openbsd
+ (lambda (oname objects libs parms)
+ (batch:rename-file parms
+ oname (string-append oname "~"))
+ (and (batch:try-command parms
+ "cc" "-o" oname
+ (must-be-first
+ '("-nostartfiles"
+ "pre-crt0.o" "crt0.o"
+ "/usr/lib/crt0.o")
+ (append libs objects)))
+ oname)))
+(defcommand compile-dll-c-files openbsd
+ (lambda (files parms)
+ (and (batch:try-chopped-command
+ parms
+ "cc" "-O2" "-Wall" "-fPIC" "-c"
+ (string-append
+ "-I" (parameter-list-ref parms 'scm-srcdir))
+ (c-includes parms)
+ (c-flags parms)
+ files)
+ (let ((objs (map c->o files)))
+ (every
+ (lambda (f)
+ (and (batch:try-command
+ parms "gcc" "-shared" "-fPIC" f)
+ (batch:try-command
+ parms "mv" "a.out" f)))
+ objs)
+ objs))))
+
+(defcommand make-dll-archive openbsd
+ (lambda (oname objects libs parms)
+ (and (batch:try-command
+ parms
+ "gcc" "-shared" "-fPIC" "-o"
(string-append
(car (parameter-list-ref parms 'implvic))
oname ".so")

17
lang/scm/patches/patch-scm_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-scm_c,v 1.1 2004/09/15 19:13:34 espie Exp $
--- scm.c.orig Thu Oct 16 19:54:32 2003
+++ scm.c Sun Sep 5 11:41:32 2004
@@ -743,6 +743,13 @@ void final_scm(freeall)
# ifndef MSDOS /* DJGPP defines both */
# define SYSTNAME "unix"
# endif
+#else
+# ifdef __unix__
+# define DIRSEP "/"
+# ifndef MSDOS /* DJGPP defines both */
+# define SYSTNAME "unix"
+# endif
+# endif
#endif
#ifdef MWC
# define SYSTNAME "coherent"

17
lang/scm/patches/patch-scm_findexec_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-scm_findexec_c,v 1.2 2001/02/03 20:42:46 espie Exp $
--- findexec.c.orig Tue May 2 04:21:39 2000
+++ findexec.c Tue Jan 30 14:39:37 2001
@@ -72,6 +72,13 @@ Wed Feb 21 23:06:35 1996 Aubrey Jaffer
# include <sys/types.h>
# include <sys/stat.h>
#endif
+#ifdef __OpenBSD__
+/* This might be same for 44bsd derived system. */
+# include <stdlib.h>
+# include <unistd.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif
#ifdef __alpha
# include <string.h>
# include <stdlib.h>

13
lang/scm/patches/patch-scm_ioext_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-scm_ioext_c,v 1.2 2001/02/03 20:42:46 espie Exp $
--- ioext.c.orig Tue Jan 30 12:57:54 2001
+++ ioext.c Tue Jan 30 12:58:30 2001
@@ -70,6 +70,9 @@ SCM stat2scm P((struct stat *stat_temp))
#ifdef __FreeBSD__
# include <unistd.h>
#endif
+#ifdef __OpenBSD__
+# include <unistd.h>
+#endif
/* added by Denys Duchier */
#ifdef __SVR4
# include <sys/types.h>

14
lang/scm/patches/patch-scm_posix_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-scm_posix_c,v 1.2 2001/02/03 20:42:47 espie Exp $
--- posix.c.orig Thu Oct 14 05:46:15 1999
+++ posix.c Tue Jan 30 14:14:04 2001
@@ -60,6 +60,10 @@
# else
# ifdef linux
# include <unistd.h>
+# else
+# ifdef __OpenBSD__
+# include <unistd.h>
+# endif
# endif
# endif
#endif

24
lang/scm/patches/patch-scm_repl_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-scm_repl_c,v 1.2 2001/02/03 20:42:47 espie Exp $
--- repl.c.orig Thu Mar 30 21:06:07 2000
+++ repl.c Tue Jan 30 14:44:45 2001
@@ -53,6 +53,11 @@ void scm_fill_freelist P((void));
# include <sys/types.h>
#endif
+#ifdef __OpenBSD__
+# include <ctype.h>
+# include <unistd.h>
+#endif
+
#ifdef ARM_ULIB
# include <termio.h>
int set_erase()
@@ -1452,7 +1457,7 @@ void init_sbrk()
}
void scm_brk_report()
{
- unsigned long scm_curbrk = sbrk(0),
+ unsigned long scm_curbrk = (unsigned long)sbrk(0),
dif1 = ((dumped ? scm_dumped_brk : scm_curbrk) - scm_init_brk)/1024,
dif2 = (scm_curbrk - scm_dumped_brk)/1024;

27
lang/scm/patches/patch-scm_scm_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-scm_scm_c,v 1.2 2001/02/03 20:42:47 espie Exp $
--- scm.c.orig Tue Sep 21 05:14:03 1999
+++ scm.c Tue Jan 30 14:28:01 2001
@@ -62,6 +62,9 @@
# ifdef SVR4
# include <unistd.h>
# endif
+# ifdef __OpenBSD__
+# include <unistd.h>
+# endif
# ifdef __amigados__
# include <unistd.h>
# endif
@@ -601,6 +604,13 @@ void final_scm(freeall)
# define DIRSEP "/"
# ifndef MSDOS /* DJGPP defines both */
# define SYSTNAME "unix"
+# endif
+#else
+# ifdef __unix__
+# define DIRSEP "/"
+# ifndef MSDOS /* DJGPP defines both */
+# define SYSTNAME "unix"
+# endif
# endif
#endif
#ifdef MWC

11
lang/scm/patches/patch-scm_scm_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-scm_scm_h,v 1.2 2001/02/03 20:42:47 espie Exp $
--- scm.h.orig Tue Jan 30 14:46:01 2001
+++ scm.h Tue Jan 30 14:46:52 2001
@@ -649,6 +649,7 @@ SCM my_time P((void));
SCM your_time P((void));
void init_iprocs P((iproc *subra, int type));
+void final_scm P((int));
void init_sbrk P((void));
int init_buf0 P((FILE *inport));
void scm_init_from_argv P((int argc, char **argv, char *script_arg,

13
lang/scm/patches/patch-scm_scmmain_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-scm_scmmain_c,v 1.2 2001/02/03 20:42:47 espie Exp $
--- scmmain.c.orig Tue Jan 30 14:28:32 2001
+++ scmmain.c Tue Jan 30 14:29:35 2001
@@ -45,6 +45,9 @@
#include "scm.h"
#include "patchlvl.h"
+#ifdef __OpenBSD__
+# include <unistd.h>
+#endif
#ifndef GENERIC_NAME
# define GENERIC_NAME "scm"
#endif

13
lang/scm/patches/patch-scm_socket_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-scm_socket_c,v 1.2 2001/02/03 20:42:47 espie Exp $
--- socket.c.orig Tue Jan 30 14:16:50 2001
+++ socket.c Tue Jan 30 14:17:26 2001
@@ -69,6 +69,9 @@
# ifdef SVR4
# include <unistd.h>
# endif
+# ifdef __OpenBSD__
+# include <unistd.h>
+# endif
#endif /* STDC_HEADERS */
static char s_inetaddr[] = "inet:string->address";

13
lang/scm/patches/patch-scm_sys_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-scm_sys_c,v 1.2 2001/02/03 20:42:47 espie Exp $
--- sys.c.orig Tue Jan 30 10:09:47 2001
+++ sys.c Tue Jan 30 10:10:32 2001
@@ -72,6 +72,9 @@ SCM *loc_open_file; /* for open-file ca
# ifdef linux
# include <unistd.h>
# endif
+# ifdef __OpenBSD__
+# include <unistd.h>
+# endif
#endif
static void gc_sweep P((int contin_bad));

28
lang/scm/patches/patch-scm_time_c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-scm_time_c,v 1.2 2001/02/03 20:42:47 espie Exp $
--- time.c.orig Tue May 2 04:21:39 2000
+++ time.c Tue Jan 30 10:00:34 2001
@@ -44,6 +44,11 @@
#include "scm.h"
+#ifdef __unix__
+# ifndef unix
+# define unix 1
+# endif
+#endif
#ifdef STDC_HEADERS
# include <time.h>
# ifdef M_SYSV
@@ -104,6 +109,12 @@
# define USE_GETTIMEOFDAY
#endif
#ifdef __FreeBSD__
+# include <sys/types.h>
+# include <sys/time.h>
+# include <sys/timeb.h>
+# define USE_GETTIMEOFDAY
+#endif
+#ifdef __OpenBSD__
# include <sys/types.h>
# include <sys/time.h>
# include <sys/timeb.h>

13
lang/scm/patches/patch-scm_unix_c
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-scm_unix_c,v 1.2 2001/02/03 20:42:48 espie Exp $
--- unix.c.orig Tue Jan 30 14:17:52 2001
+++ unix.c Tue Jan 30 14:18:20 2001
@@ -62,6 +62,9 @@ SCM stat2scm P((struct stat *stat_temp))
# ifdef SVR4
# include <unistd.h>
# endif
+# ifdef __OpenBSD__
+# include <unistd.h>
+# endif
#endif /* STDC_HEADERS */
/* Only the superuser can successfully execute mknod and acct */

15
lang/scm/patches/patch-time_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-time_c,v 1.1 2004/09/15 19:13:35 espie Exp $
--- time.c.orig Wed Dec 11 22:55:48 2002
+++ time.c Sun Sep 5 11:41:32 2004
@@ -44,6 +44,11 @@
#include "scm.h"
+#ifdef __unix__
+# ifndef unix
+# define unix 1
+# endif
+#endif
#ifdef STDC_HEADERS
# include <time.h>
# ifdef M_SYSV