diff options
| author | agc <agc@pkgsrc.org> | 1997-10-06 15:19:30 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1997-10-06 15:19:30 +0000 |
| commit | 58b4b2b1583510fae4a4828eb5d6b721fb2d7b50 (patch) | |
| tree | b56d71624abb47c739ba516839a008e54c7179bd /lang/icon/patches | |
| parent | 55702c4eaff95890627c5344a758d8db45f50c12 (diff) | |
| download | pkgsrc-58b4b2b1583510fae4a4828eb5d6b721fb2d7b50.tar.gz | |
Add NetBSD RCS Id.
Modify FreeBSD's ecvt patch, so that it's commented out in FreeBSD,
but still short-circuits in other 4.4-lite derived systems.
Add NetBSD/i386-specific files.
Only tested on NetBSD/i386 (1.2G) so far.
Diffstat (limited to 'lang/icon/patches')
| -rw-r--r-- | lang/icon/patches/patch-ab | 24 | ||||
| -rw-r--r-- | lang/icon/patches/patch-cc | 7 |
2 files changed, 17 insertions, 14 deletions
diff --git a/lang/icon/patches/patch-ab b/lang/icon/patches/patch-ab index d20f29f9044..d6b587124f1 100644 --- a/lang/icon/patches/patch-ab +++ b/lang/icon/patches/patch-ab @@ -1,18 +1,20 @@ ---- src/runtime/rmisc.r.orig Sat Nov 4 00:26:32 1995 -+++ src/runtime/rmisc.r Sat Nov 2 16:48:35 1996 -@@ -125,15 +125,6 @@ +--- src/runtime/rmisc.r 1997/10/02 09:28:35 1.1 ++++ src/runtime/rmisc.r 1997/10/02 09:30:08 +@@ -123,14 +123,15 @@ return buf; #endif /* OS2EMX */ -#if FreeBSD --#define ecvt(w,x,y,z) 0 -- -- sprintf(buf, "%f", number); -- for(i=strlen(buf); i>1 && buf[i-1]=='0' && buf[i-2]!='.'; i--) -- buf[i-1] = '\0'; -- return buf; ++#if (defined(GenericBSD) && !defined(FreeBSD)) ++/* This is commented out in the FreeBSD ports collection */ + #define ecvt(w,x,y,z) 0 + + sprintf(buf, "%f", number); + for(i=strlen(buf); i>1 && buf[i-1]=='0' && buf[i-2]!='.'; i--) + buf[i-1] = '\0'; + return buf; -#endif /* FreeBSD */ -- ++#endif /* GenericBSD && !FreeBSD */ + p1 = ecvt(number, ndigit, &decpt, &sign); p2 = buf; - if (sign) diff --git a/lang/icon/patches/patch-cc b/lang/icon/patches/patch-cc index 86ff84ffe76..c8e3860b4da 100644 --- a/lang/icon/patches/patch-cc +++ b/lang/icon/patches/patch-cc @@ -2,11 +2,12 @@ --- src/h/sys.h Wed Mar 1 15:43:55 1995 *************** *** 181,192 **** ---- 181,195 ---- +--- 181,196 ---- #include <sys/ioctl.h> #include <errno.h> #include <sys/signal.h> -+ #ifdef __FreeBSD__ ++ #include <sys/param.h> ++ #if (defined(BSD) && BSD >= 199306) + #include <sgtty.h> + #endif #endif /* HaveTioc */ @@ -24,7 +25,7 @@ *** 24,29 **** --- 24,33 ---- - #ifdef FreeBSD + #ifdef GenericBSD + /* Look at the DL_GETERRNO constant, if it exists this is FreeBSD 1.1.5 + or 2.0. If it doesn't exist this must be post 2.0 with an dlerror */ |