Make patches general so that the package builds on more platforms.

4 files changed, 41 insertions, 9 deletions

diff --git a/editors/vigor/distinfo b/editors/vigor/distinfo
index 85ac16212ac..136f85ae990 100644
--- a/editors/vigor/distinfo
+++ b/editors/vigor/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.7 2006/03/02 19:52:01 wiz Exp $
+$NetBSD: distinfo,v 1.8 2006/03/21 18:48:45 minskim Exp $
 
 SHA1 (vigor-0.016.tar.gz) = cbbd7db8226421b86c50799178033c4248753706
 RMD160 (vigor-0.016.tar.gz) = 52cf417f85560b46f140d6f1093133eccbd2fc43
 Size (vigor-0.016.tar.gz) = 1108486 bytes
 SHA1 (patch-aa) = 2ea52fe10dff6f2445ca0fd870065103b11b59cd
 SHA1 (patch-ab) = 2016eb247f7f747ca80041fac2ad15709f7e7a80
-SHA1 (patch-ac) = ab9924eaa775f17f9c51c1129a9cf2932035b9ab
-SHA1 (patch-ad) = 1052f71d407e054600e3971ceac2eb48018eee53
+SHA1 (patch-ac) = ae05085ef8f74a224b36a78f6e8220559b6a04b6
+SHA1 (patch-ad) = 4e9b24bc9fdb5582037ca0142038c1b8c09a8ab7
+SHA1 (patch-ae) = e3c7ce6c9afa9ab94c3d5ebe14b4b855a8658fae
diff --git a/editors/vigor/patches/patch-ac b/editors/vigor/patches/patch-ac
index b3a28ae9a1a..4f27d7d7ccc 100644
--- a/editors/vigor/patches/patch-ac
+++ b/editors/vigor/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2005/11/03 21:24:29 rillig Exp $
+$NetBSD: patch-ac,v 1.3 2006/03/21 18:48:45 minskim Exp $
 
---- build/configure.in.orig	2000-05-02 21:27:52.000000000 -0500
+--- build/configure.in.orig	2000-05-02 19:27:52.000000000 -0700
 +++ build/configure.in
 @@ -243,7 +243,8 @@ dnl Make sure we can find a Tcl/Tk inter
  LIBOBJS="tcl.o $LIBOBJS"
@@ -12,3 +12,20 @@ $NetBSD: patch-ac,v 1.2 2005/11/03 21:24:29 rillig Exp $
  AC_SEARCH_LIBS(Tcl_Init,tcl tcl82 tcl8.2 tcl80 tcl8.0,,dnl
    AC_MSG_ERROR([Tcl is required for Vigor but could not be located.]))
  AC_SEARCH_LIBS(Tk_Init,tk tk82 tk8.2 tk80 tk8.0,,dnl
+@@ -299,6 +300,16 @@ if test "$vi_cv_include_sys_select" = ye
+ fi
+ AC_MSG_RESULT($vi_cv_include_sys_select)
+ 
++dnl Checks for header files.
++AC_MSG_CHECKING(for sys/stropts.h)
++AC_CACHE_VAL(vi_cv_include_sys_stropts, [dnl
++AC_TRY_CPP([#include <sys/stropts.h>],
++	[vi_cv_include_sys_stropts=yes], [vi_cv_include_sys_stropts=no])])
++if test "$vi_cv_include_sys_stropts" = yes; then
++	AC_DEFINE(HAVE_SYS_STROPTS_H)
++fi
++AC_MSG_RESULT($vi_cv_include_sys_stropts)
++
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_CHECK_TYPE(ssize_t, int)
+ AC_C_BIGENDIAN
diff --git a/editors/vigor/patches/patch-ad b/editors/vigor/patches/patch-ad
index 9360765bc4d..ab474cfcc3c 100644
--- a/editors/vigor/patches/patch-ad
+++ b/editors/vigor/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2006/03/02 19:52:01 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2006/03/21 18:48:45 minskim Exp $
 
---- ex/ex_script.c.orig	2000-05-03 02:28:05.000000000 +0000
+--- ex/ex_script.c.orig	2000-05-02 19:28:05.000000000 -0700
 +++ ex/ex_script.c
 @@ -23,7 +23,7 @@ static const char sccsid[] = "@(#)ex_scr
  #include <sys/select.h>
  #endif
  #include <sys/stat.h>
 -#ifdef HAVE_SYS5_PTY
-+#if defined(HAVE_SYS5_PTY) && !defined(__NetBSD__)
++#if defined(HAVE_SYS5_PTY) && defined(HAVE_SYS_STROPTS_H)
  #include <sys/stropts.h>
  #endif
  #include <sys/time.h>
@@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.1 2006/03/02 19:52:01 wiz Exp $
  }
  
 -#ifdef HAVE_SYS5_PTY
-+#if defined(HAVE_SYS5_PTY) && !defined(__NetBSD__)
++#if defined(HAVE_SYS5_PTY) && defined(HAVE_SYS_STROPTS_H)
  static int ptys_open __P((int, char *));
  static int ptym_open __P((char *));
  
diff --git a/editors/vigor/patches/patch-ae b/editors/vigor/patches/patch-ae
new file mode 100644
index 00000000000..ff264d51747
--- /dev/null
+++ b/editors/vigor/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2006/03/21 18:48:45 minskim Exp $
+
+--- build/config.h.in.orig	2000-05-02 19:27:54.000000000 -0700
++++ build/config.h.in
+@@ -103,6 +103,9 @@
+ /* Define if you have <sys/select.h> */
+ #undef HAVE_SYS_SELECT_H
+ 
++/* Define if you have <sys/stropts.h> */
++#undef HAVE_SYS_STROPTS_H
++
+ /* Define if you have the System V style pty calls. */
+ #undef HAVE_SYS5_PTY
+