added support for IRIX 5

7 files changed, 133 insertions, 7 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 3a236696431..b282800fd94 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/05/05 03:11:53 minskim Exp $
+# $NetBSD: Makefile,v 1.44 2006/10/01 08:52:01 schwarz Exp $
 #
 
 DISTNAME=		aspell-0.60.4
@@ -52,6 +52,14 @@ LIBS.SunOS+=		-lm
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/aspell
 
+.include "../../mk/bsd.prefs.mk"
+.if !empty(LOWER_OPSYS:Mirix5*)
+# needs vsnprintf() and snprintf()
+. include "../../pkgtools/libnbcompat/buildlink3.mk"
+CPPFLAGS+=	-DDECLARE_VSNPRINTF -DDECLARE_SNPRINTF
+# IRIX 5 has an older implementation of signal()
+CPPFLAGS+=	-DHAVE_OLD_SIGNAL
+.endif
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index a5f75ae4866..664626757a8 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.20 2006/06/15 03:44:07 jlam Exp $
+$NetBSD: distinfo,v 1.21 2006/10/01 08:52:01 schwarz Exp $
 
 SHA1 (aspell-0.60.4.tar.gz) = 07353593eb89e64c49b1fd8dd405e3ee0ed86291
 RMD160 (aspell-0.60.4.tar.gz) = e0408acd4f3304c957aeea0b17a28d0c44e11064
 Size (aspell-0.60.4.tar.gz) = 1676825 bytes
 SHA1 (patch-aa) = f68dd79ef2d3290b019d7588cadb4fdf53b3b988
-SHA1 (patch-ac) = 4d20eebd29932f1ba970a9d85793fb8611d76ba8
+SHA1 (patch-ab) = 615a676128dab7d79e697f56330c8aaa6c901d3f
+SHA1 (patch-ac) = 8adbd2b330830ba0fb3fc063bee0fac69b0a1f64
+SHA1 (patch-ad) = ac4dd7b4df79b7755be1184f625460b64762a89c
+SHA1 (patch-ae) = d35f3544f44464a36685903ade3cdeb59c5fd836
+SHA1 (patch-af) = b34d98280c83f270f86ad3cf0f31e48688f53138
 SHA1 (patch-ag) = 04b34f2b780a632a5045120ae408ceea591a66de
 SHA1 (patch-ah) = b38fa850bb3ff3c62c020fb45ce388888f145286
 SHA1 (patch-ai) = f5192b728bb9de6b5b0beeeaa8cc771bc3321aae
diff --git a/textproc/aspell/patches/patch-ab b/textproc/aspell/patches/patch-ab
new file mode 100644
index 00000000000..91e9f8e484b
--- /dev/null
+++ b/textproc/aspell/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.7 2006/10/01 08:52:01 schwarz Exp $
+
+--- common/string.cpp.orig	2006-09-17 18:06:12.000000000 +0200
++++ common/string.cpp	2006-09-17 18:27:35.000000000 +0200
+@@ -18,6 +18,10 @@
+ #include "string.hpp"
+ #include "asc_ctype.hpp"
+ 
++#ifdef DECLARE_VSNPRINTF
++int vsnprintf(char *str, size_t size, const char *format, va_list ap);
++#endif
++
+ namespace acommon {
+   
+   // reserve space for at least s+1 characters
diff --git a/textproc/aspell/patches/patch-ac b/textproc/aspell/patches/patch-ac
index 2cb2e5e86bf..c92d59f8492 100644
--- a/textproc/aspell/patches/patch-ac
+++ b/textproc/aspell/patches/patch-ac
@@ -1,8 +1,50 @@
-$NetBSD: patch-ac,v 1.5 2005/06/28 14:17:50 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2006/10/01 08:52:01 schwarz Exp $
 
---- prog/check_funs.cpp.orig	2005-06-01 05:06:23.000000000 +0200
-+++ prog/check_funs.cpp
-@@ -216,7 +216,8 @@ static void layout_screen() {
+--- prog/check_funs.cpp.orig	2005-06-19 14:25:01.000000000 +0200
++++ prog/check_funs.cpp	2006-09-18 21:46:40.000000000 +0200
+@@ -28,6 +28,12 @@
+ 
+ #include <signal.h>
+ 
++#ifdef HAVE_OLD_SIGNAL
++#define SIGNALARG2 (void (*)(...))
++#else
++#define SIGNALARG2 /* empty, no change */
++#endif
++
+ #include "asc_ctype.hpp"
+ #include "check_funs.hpp"
+ #include "convert.hpp"
+@@ -174,8 +180,8 @@
+   
+ static void continue_handler(int) {
+   restore_state();
+-  signal(SIGTSTP, suspend_handler);
+-  signal(SIGCONT,  continue_handler),
++  signal(SIGTSTP, SIGNALARG2 suspend_handler);
++  signal(SIGCONT, SIGNALARG2 continue_handler),
+     last_signal = 0;
+ }
+ 
+@@ -191,7 +197,7 @@
+ 
+ static void suspend() {
+   save_state();
+-  signal(SIGTSTP, SIG_DFL);
++  signal(SIGTSTP, SIGNALARG2 SIG_DFL);
+   raise(SIGTSTP);
+   last_signal = 0;
+ }
+@@ -200,7 +206,7 @@
+   switch (last_signal) {
+   case SIGWINCH:
+     resize();
+-    signal(SIGWINCH, resize_handler);
++    signal(SIGWINCH, SIGNALARG2 resize_handler);
+     break;
+   case SIGTSTP:
+     suspend();
+@@ -216,7 +222,8 @@
    choice_w = 0;
    nonl();
    noecho();
@@ -12,3 +54,16 @@ $NetBSD: patch-ac,v 1.5 2005/06/28 14:17:50 wiz Exp $
    keypad(stdscr, true);
    clear();
    int height, width;
+@@ -272,9 +279,9 @@
+     }
+   }
+   if (use_curses) {
+-    signal(SIGWINCH, resize_handler);
+-    signal(SIGTSTP,  suspend_handler);
+-    signal(SIGCONT,  continue_handler);
++    signal(SIGWINCH, SIGNALARG2 resize_handler);
++    signal(SIGTSTP, SIGNALARG2 suspend_handler);
++    signal(SIGCONT, SIGNALARG2 continue_handler);
+   }
+ #endif
+   if (use_curses) {
diff --git a/textproc/aspell/patches/patch-ad b/textproc/aspell/patches/patch-ad
new file mode 100644
index 00000000000..f5c8d0341d8
--- /dev/null
+++ b/textproc/aspell/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.5 2006/10/01 08:52:01 schwarz Exp $
+
+--- common/convert.cpp.orig	2006-09-17 19:24:05.000000000 +0200
++++ common/convert.cpp	2006-09-17 19:24:46.000000000 +0200
+@@ -24,6 +24,10 @@
+ 
+ #include "gettext.h"
+ 
++#ifdef DECLARE_SNPRINTF
++int snprintf(char *str, size_t size, const char *format, ...);
++#endif
++
+ namespace acommon {
+ 
+   typedef unsigned char  byte;
diff --git a/textproc/aspell/patches/patch-ae b/textproc/aspell/patches/patch-ae
new file mode 100644
index 00000000000..45e95f86f8f
--- /dev/null
+++ b/textproc/aspell/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.5 2006/10/01 08:52:01 schwarz Exp $
+
+--- common/posib_err.cpp.orig	2006-09-17 19:21:18.000000000 +0200
++++ common/posib_err.cpp	2006-09-17 19:23:21.000000000 +0200
+@@ -14,6 +14,9 @@
+ 
+ #include "gettext.h"
+ 
++#ifdef DECLARE_SNPRINTF
++int snprintf(char *str, size_t size, const char *format, ...);
++#endif
+ 
+ namespace acommon {
+ 
diff --git a/textproc/aspell/patches/patch-af b/textproc/aspell/patches/patch-af
new file mode 100644
index 00000000000..89fb7c2e389
--- /dev/null
+++ b/textproc/aspell/patches/patch-af
@@ -0,0 +1,15 @@
+$NetBSD: patch-af,v 1.3 2006/10/01 08:52:01 schwarz Exp $
+
+--- modules/speller/default/language.cpp.orig	2006-09-17 23:54:51.000000000 +0200
++++ modules/speller/default/language.cpp	2006-09-17 23:55:57.000000000 +0200
+@@ -26,6 +26,10 @@
+ 
+ #include "gettext.h"
+ 
++#ifdef DECLARE_SNPRINTF
++int snprintf(char *str, size_t size, const char *format, ...);
++#endif
++
+ namespace aspeller {
+ 
+   static const char TO_CHAR_TYPE[256] = {