diff options
author | dmcmahill <dmcmahill> | 1999-12-15 23:51:04 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 1999-12-15 23:51:04 +0000 |
commit | 81271cdc06dde1d8c33193e7dbd8c54d27f7cd8a (patch) | |
tree | 60cdbf96db301badb6c149960b1d4115df4fce9e /x11/xview-lib/patches | |
parent | 6fec76d4e19662f4bd24f251a8ebbe561c019c09 (diff) | |
download | pkgsrc-81271cdc06dde1d8c33193e7dbd8c54d27f7cd8a.tar.gz |
- Break out patches to ./lib/libxview/misc/expandname.c and
./lib/libxview/textsw/txt_filter.c from patch-ad into patch-al and patch-ao.
- Fix several compilation bugs on the sparc. The code had #ifdef(sparc)
checks when it was really wanting to make an operating system choice, not
a processor choice. Thanks to Ethan Bakshy, ethan@mail.enteract.com
for pointing out the problem (on port-sparc).
Diffstat (limited to 'x11/xview-lib/patches')
-rw-r--r-- | x11/xview-lib/patches/patch-ad | 32 | ||||
-rw-r--r-- | x11/xview-lib/patches/patch-al | 26 | ||||
-rw-r--r-- | x11/xview-lib/patches/patch-am | 19 | ||||
-rw-r--r-- | x11/xview-lib/patches/patch-an | 22 | ||||
-rw-r--r-- | x11/xview-lib/patches/patch-ao | 11 |
5 files changed, 79 insertions, 31 deletions
diff --git a/x11/xview-lib/patches/patch-ad b/x11/xview-lib/patches/patch-ad index 8a96cadf970..73d92ba95db 100644 --- a/x11/xview-lib/patches/patch-ad +++ b/x11/xview-lib/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.4 1999/03/31 14:23:30 hubertf Exp $ +$NetBSD: patch-ad,v 1.5 1999/12/15 23:51:04 dmcmahill Exp $ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/attr/attr_copy.c ./lib/libxview/attr/attr_copy.c *** ../old/xview3.2p1-X11R6/lib/libxview/attr/attr_copy.c Tue Jun 29 01:14:35 1993 @@ -884,21 +884,6 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/misc/Imakefile ./lib/libxview/misc bitmask.c\ hashfn.c\ db_conv.c\ -diff -rc ../old/xview3.2p1-X11R6/lib/libxview/misc/expandname.c ./lib/libxview/misc/expandname.c -*** ../old/xview3.2p1-X11R6/lib/libxview/misc/expandname.c Tue Jun 29 01:16:30 1993 ---- ./lib/libxview/misc/expandname.c Sun Nov 20 13:39:03 1994 -*************** -*** 120,126 **** ---- 120,128 ---- - } - (void) close(pivec[0]); - #ifndef SVR4 -+ #if !(defined(BSD) && (BSD >= 199103)) - while (wait((union wait *) & status) != pid); -+ #endif - #else SVR4 - while (wait( & status) != pid); - #endif SVR4 diff -rc ../old/xview3.2p1-X11R6/lib/libxview/misc/getlogindr.c ./lib/libxview/misc/getlogindr.c *** ../old/xview3.2p1-X11R6/lib/libxview/misc/getlogindr.c Tue Jun 29 01:16:30 1993 --- ./lib/libxview/misc/getlogindr.c Sun Nov 20 13:39:03 1994 @@ -1934,21 +1919,6 @@ diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_file.c ./lib/libxview/t Pkg_private int textsw_change_directory(); Pkg_private void textsw_display(), textsw_display_view_margins(); -diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_filter.c ./lib/libxview/textsw/txt_filter.c -*** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_filter.c Tue Jun 29 01:17:39 1993 ---- ./lib/libxview/textsw/txt_filter.c Sun Nov 20 13:39:13 1994 -*************** -*** 55,60 **** ---- 55,63 ---- - #define REPLY_OKAY 0 - #define REPLY_SEND 1 - -+ static int talk_to_filter(); -+ static int start_filter(); -+ - /* performance: global cache of getdtablesize() */ - extern int dtablesize_cache; - diff -rc ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_input.c ./lib/libxview/textsw/txt_input.c *** ../old/xview3.2p1-X11R6/lib/libxview/textsw/txt_input.c Tue Jun 29 01:17:42 1993 --- ./lib/libxview/textsw/txt_input.c Sun Nov 20 13:39:13 1994 diff --git a/x11/xview-lib/patches/patch-al b/x11/xview-lib/patches/patch-al new file mode 100644 index 00000000000..a0574aa62bd --- /dev/null +++ b/x11/xview-lib/patches/patch-al @@ -0,0 +1,26 @@ +$NetBSD: patch-al,v 1.1 1999/12/15 23:51:04 dmcmahill Exp $ + +--- ./lib/libxview/misc/expandname.c.orig Tue Jun 29 01:16:30 1993 ++++ ./lib/libxview/misc/expandname.c Sun Dec 12 21:41:40 1999 +@@ -24,4 +24,7 @@ + #include <sgtty.h> + ++#if defined(BSD) && (BSD >= 199306) ++#include <unistd.h> ++#else + #ifdef sparc + #ifdef SVR4 +@@ -31,4 +34,5 @@ + #endif SVR4 + #endif ++#endif + + #ifdef SVR4 +@@ -121,5 +125,7 @@ + (void) close(pivec[0]); + #ifndef SVR4 ++#if !(defined(BSD) && (BSD >= 199103)) + while (wait((union wait *) & status) != pid); ++#endif + #else SVR4 + while (wait( & status) != pid); diff --git a/x11/xview-lib/patches/patch-am b/x11/xview-lib/patches/patch-am new file mode 100644 index 00000000000..4b33ba10029 --- /dev/null +++ b/x11/xview-lib/patches/patch-am @@ -0,0 +1,19 @@ +$NetBSD: patch-am,v 1.1 1999/12/15 23:51:04 dmcmahill Exp $ + +--- ./lib/libxview/wmgr/wmgr_menu.c.orig Tue Jun 29 01:17:24 1993 ++++ ./lib/libxview/wmgr/wmgr_menu.c Sun Dec 12 21:43:52 1999 +@@ -15,4 +15,8 @@ + #include <ctype.h> + #include <string.h> ++ ++#if defined(BSD) && (BSD >= 199306) ++#include <unistd.h> ++#else + #ifdef sparc + #ifdef SVR4 +@@ -21,4 +25,5 @@ + #include <vfork.h> + #endif SVR4 ++#endif sparc + #endif + diff --git a/x11/xview-lib/patches/patch-an b/x11/xview-lib/patches/patch-an new file mode 100644 index 00000000000..f76fafc5caf --- /dev/null +++ b/x11/xview-lib/patches/patch-an @@ -0,0 +1,22 @@ +--- ./lib/libxview/wmgr/wmgr_menu.c.orig Tue Jun 29 01:17:24 1993 ++++ ./lib/libxview/wmgr/wmgr_menu.c Sun Dec 12 22:12:12 1999 +@@ -11,8 +11,13 @@ + */ + ++#include <sys/param.h> + #include <sys/types.h> + #include <stdio.h> + #include <ctype.h> + #include <string.h> ++ ++#if defined(BSD) && (BSD >= 199306) ++#include <unistd.h> ++#else + #ifdef sparc + #ifdef SVR4 +@@ -21,4 +26,5 @@ + #include <vfork.h> + #endif SVR4 ++#endif sparc + #endif + diff --git a/x11/xview-lib/patches/patch-ao b/x11/xview-lib/patches/patch-ao new file mode 100644 index 00000000000..208d7aae40c --- /dev/null +++ b/x11/xview-lib/patches/patch-ao @@ -0,0 +1,11 @@ +$NetBSD: patch-ao,v 1.1 1999/12/15 23:51:04 dmcmahill Exp $ + +--- ./lib/libxview/textsw/txt_filter.c.orig Tue Jun 29 01:17:39 1993 ++++ ./lib/libxview/textsw/txt_filter.c Mon Dec 13 09:38:22 1999 +@@ -32,5 +32,5 @@ + #include <string.h> + +-#ifdef sparc ++#if defined(sparc) && !(defined(BSD) && (BSD >= 199306)) + #ifdef SVR4 + #include <unistd.h> |