Fix build on SunOS.

13 files changed, 140 insertions, 16 deletions

diff --git a/comms/estic/Makefile b/comms/estic/Makefile
index 35d3ebf705f..7fb334f5165 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2011/03/31 17:55:25 is Exp $
+# $NetBSD: Makefile,v 1.32 2012/02/16 16:47:57 hans Exp $
 
 DISTNAME=	estic-1.61
 PKGREVISION=	2
@@ -25,6 +25,13 @@ BUILD_TARGET=	depend all
 ESTICPATCH=	${DISTNAME}-patch-from-1.60${EXTRACT_SUFX}
 MAKE_FILE=	make/freebsd-x.mak
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "SunOS"
+CPPFLAGS+=	-DSOLARIS
+.else
+CPPFLAGS+=	-DFREEBSD
+.endif
+
 INSTALLATION_DIRS=	bin
 
 post-extract:
diff --git a/comms/estic/distinfo b/comms/estic/distinfo
index 9bf1f8ce59f..be085242a0e 100644
--- a/comms/estic/distinfo
+++ b/comms/estic/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/11/27 19:36:09 joerg Exp $
+$NetBSD: distinfo,v 1.12 2012/02/16 16:47:57 hans Exp $
 
 SHA1 (estic-1.60-sources.zip) = ce66a6d52faaf6adba492bb3f74e49eab608d0c3
 RMD160 (estic-1.60-sources.zip) = be071c72ab881c815dc9a0847f2b09914bdeb2ed
@@ -7,14 +7,18 @@ SHA1 (estic-1.61-patch-from-1.60.zip) = b58cf388e2eb60685402a84cc260d88dc7c1820f
 RMD160 (estic-1.61-patch-from-1.60.zip) = d450161014f353892d72b5ddb87f9d6560ee8c1d
 Size (estic-1.61-patch-from-1.60.zip) = 1017 bytes
 SHA1 (patch-.._spunk_coll.cc) = 5500da1f5332475b5e07a2da53d6b7936a8b4f2d
-SHA1 (patch-.._spunk_machine.h) = fefb7b832d11347dea8011094ee22214b102b7e7
-SHA1 (patch-aa) = d94d170ac16a95f96730d64ca77be18446515fd7
+SHA1 (patch-.._spunk_machine.h) = e6e14ff2f1ae0c053cdc007cace23e80cda693c1
+SHA1 (patch-.._spunk_menuedit.h) = 1768a768c5782ba85a600cc79480ec88c52c4a18
+SHA1 (patch-.._spunk_menuitem.h) = da14216e8e51eec825c7cedffbee9d60359dedf3
+SHA1 (patch-.._spunk_str.cc) = 01ff453a244f9ac7f14273073635b2a7cfdcaa36
+SHA1 (patch-.._spunk_xsrc_screen.cc) = 0ec1b7362fea28694cef83a118b3ec9e0ad52389
+SHA1 (patch-aa) = ca4da0f9f231f4f48d9a001b03d3bcbf35efbc12
 SHA1 (patch-ab) = 1ee3659e221e07796f4581bd191145c8cc6673a1
 SHA1 (patch-ac) = 2dd445fc1b14bc58d361fed4d6e2366a060b5203
 SHA1 (patch-ad) = b7287df75abc237859ee25ce04c5b3df4d338c37
 SHA1 (patch-ae) = 29ce3dafba535a26aef00e53da05d51eb09617be
-SHA1 (patch-af) = 39a39789e8875d901bce07581b544ef8590af4fa
-SHA1 (patch-ag) = 8d73c2923b1a083683c30fbb066b4fe2872ce927
+SHA1 (patch-af) = 7e24769f8ab5ca49e1a784b3aa964e3b994622ac
+SHA1 (patch-ag) = 0bcc50298d0950cf5909eb770c5d1a29959991dd
 SHA1 (patch-ah) = 4a5ce78d5d7173132c91ec5dbcf20b0484afe882
 SHA1 (patch-ai) = d7fdcc29f357a9a8b0790e2491f577160d05db34
 SHA1 (patch-aj) = afaa7e22e01fc698418fb6543fe8e7f81feab106
@@ -25,7 +29,7 @@ SHA1 (patch-an) = 087a21d344336e2190c3e76b16670551686cd7c0
 SHA1 (patch-ao) = a6385f7d356d1422695a382b33db4fb150e14d7a
 SHA1 (patch-ap) = 1aee1dead27df8b62ba560dad19fe083fe8d6204
 SHA1 (patch-aq) = 7f5a947ae8ed36e3d41d92f639b3419273732335
-SHA1 (patch-ar) = 0e4a869f71ebb5e19ad6ae4d38314f68993e31d8
+SHA1 (patch-ar) = d9fbecdc0cd5aa04e8f3b4a89c1e3482566ec0a9
 SHA1 (patch-as) = cbbd38095f9e14e6a8290e73a8f8aee083387b8f
 SHA1 (patch-at) = 87ea33bc400397c5ee9f7aeedf7c8b409dc9dbe7
 SHA1 (patch-au) = 0de3e83ee0fe9881dd68ed2b9ffb7511376da911
@@ -35,3 +39,5 @@ SHA1 (patch-ax) = 18f16c755f05d5899d13be239544366a1393d7d3
 SHA1 (patch-ay) = 25ec057efcb071f83ab53ca7d7d2af22e9a2c93f
 SHA1 (patch-az) = 661710c038aa502216c7cf5c7374515a43518a7f
 SHA1 (patch-ba) = cced4632684abfe71b115ec0cc65bbd77a7d2770
+SHA1 (patch-devstate.cc) = 653d7f34add30a554f31dc94aee532a2aae4db5d
+SHA1 (patch-iclog.cc) = 670599dfb2abe3c17d67ddbf1be9850fa30e00db
diff --git a/comms/estic/patches/patch-.._spunk_machine.h b/comms/estic/patches/patch-.._spunk_machine.h
index 821f450e453..694622a55b8 100644
--- a/comms/estic/patches/patch-.._spunk_machine.h
+++ b/comms/estic/patches/patch-.._spunk_machine.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-.._spunk_machine.h,v 1.1 2011/11/27 19:36:09 joerg Exp $
+$NetBSD: patch-.._spunk_machine.h,v 1.2 2012/02/16 16:47:58 hans Exp $
 
 --- ../spunk/machine.h.orig	2011-11-27 02:08:02.000000000 +0000
 +++ ../spunk/machine.h
@@ -11,3 +11,12 @@ $NetBSD: patch-.._spunk_machine.h,v 1.1 2011/11/27 19:36:09 joerg Exp $
  #    error Byte order not defined!
  #endif
  
+@@ -312,7 +312,7 @@ typedef unsigned        u32;            
+ 
+ #ifdef SOLARIS
+ 
+-#include <sys/endian.h>
++#include <sys/byteorder.h>
+ #ifdef _BIG_ENDIAN
+ #    define CPU_BIG_ENDIAN
+ #else
diff --git a/comms/estic/patches/patch-.._spunk_menuedit.h b/comms/estic/patches/patch-.._spunk_menuedit.h
new file mode 100644
index 00000000000..1763c5f683f
--- /dev/null
+++ b/comms/estic/patches/patch-.._spunk_menuedit.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-.._spunk_menuedit.h,v 1.1 2012/02/16 16:47:58 hans Exp $
+
+--- ../spunk/menuedit.h.orig	1996-11-07 18:06:48.000000000 +0100
++++ ../spunk/menuedit.h	2012-01-25 18:38:05.997403890 +0100
+@@ -28,6 +28,7 @@
+ #include "datetime.h"
+ #include "charset.h"
+ 
++#undef CS
+ 
+ 
+ /*****************************************************************************/
diff --git a/comms/estic/patches/patch-.._spunk_menuitem.h b/comms/estic/patches/patch-.._spunk_menuitem.h
new file mode 100644
index 00000000000..f018f8292e1
--- /dev/null
+++ b/comms/estic/patches/patch-.._spunk_menuitem.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-.._spunk_menuitem.h,v 1.1 2012/02/16 16:47:58 hans Exp $
+
+--- ../spunk/menuitem.h.orig	1996-12-10 14:41:04.000000000 +0100
++++ ../spunk/menuitem.h	2012-01-25 18:39:54.872853784 +0100
+@@ -27,7 +27,7 @@
+ #include "datetime.h"
+ #include "charset.h"
+ 
+-
++#undef CS
+ 
+ /*****************************************************************************/
+ /*                              class MenueLine                              */
diff --git a/comms/estic/patches/patch-.._spunk_str.cc b/comms/estic/patches/patch-.._spunk_str.cc
new file mode 100644
index 00000000000..6f966b22ddb
--- /dev/null
+++ b/comms/estic/patches/patch-.._spunk_str.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-.._spunk_str.cc,v 1.1 2012/02/16 16:47:58 hans Exp $
+
+--- ../spunk/str.cc.orig	1996-12-01 11:23:50.000000000 +0100
++++ ../spunk/str.cc	2012-01-25 18:54:36.312130772 +0100
+@@ -31,6 +31,7 @@
+ #include "stream.h"
+ #include "streamid.h"
+ 
++#undef CS
+ 
+ 
+ // Register class String
diff --git a/comms/estic/patches/patch-.._spunk_xsrc_screen.cc b/comms/estic/patches/patch-.._spunk_xsrc_screen.cc
new file mode 100644
index 00000000000..7b90923ce0a
--- /dev/null
+++ b/comms/estic/patches/patch-.._spunk_xsrc_screen.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-.._spunk_xsrc_screen.cc,v 1.1 2012/02/16 16:47:58 hans Exp $
+
+--- ../spunk/xsrc/screen.cc.orig	1996-11-07 18:06:58.000000000 +0100
++++ ../spunk/xsrc/screen.cc	2012-01-25 18:43:41.244123272 +0100
+@@ -21,6 +21,10 @@
+ 
+ #include <string.h>
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ #include "../cont.h"
+ #include "../winattr.h"
+ #include "../environ.h"
diff --git a/comms/estic/patches/patch-aa b/comms/estic/patches/patch-aa
index 6d858883163..8b48251c821 100644
--- a/comms/estic/patches/patch-aa
+++ b/comms/estic/patches/patch-aa
@@ -1,7 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
+$NetBSD: patch-aa,v 1.2 2012/02/16 16:47:58 hans Exp $
 
 --- estic.cc.orig	Wed Mar  5 21:20:42 1997
 +++ estic.cc	Sat Feb 10 18:38:34 2001
+@@ -1,5 +1,4 @@
+-/*****************************************************************************/
+-/*                                                                           */
++/*****************************************************************************/ /*                                                                           */
+ /*                                   ESTIC.CC                                */
+ /*                                                                           */
+ /* (C) 1995-97  Ullrich von Bassewitz                                        */
+@@ -71,6 +70,7 @@
+ #endif
+ #include "estic.h"
+ 
++#undef FS
+ 
+ 
+ /*****************************************************************************/
 @@ -80,9 +80,9 @@
  
  
@@ -15,7 +30,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
  
  static const char VersionStr [] = "1.50";
  static const char VersionID []  = "ESTIC-Version";
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ const u16 msCLIWinWarning               
  IstecApp::IstecApp (int argc, char* argv []):
      Program (argc, argv, CreateMenueBar, CreateStatusLine, "estic"),
      StatusFlags (0),
diff --git a/comms/estic/patches/patch-af b/comms/estic/patches/patch-af
index 5444132c865..bb3f1b80825 100644
--- a/comms/estic/patches/patch-af
+++ b/comms/estic/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
+$NetBSD: patch-af,v 1.2 2012/02/16 16:47:58 hans Exp $
 
 --- make/freebsd-x.mak.orig	Fri Jan 31 03:57:24 1997
 +++ make/freebsd-x.mak	Sat Feb 10 18:38:34 2001
@@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
  
 -CFLAGS	= -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
 -
-+CFLAGS	+= -DFREEBSD -Wall -I$(INCDIR) -fno-implicit-templates -DEXPLICIT_TEMPLATES
++CFLAGS	+= $(CPPFLAGS) -Wall -I$(INCDIR) -fno-implicit-templates -DEXPLICIT_TEMPLATES
  
  # ------------------------------------------------------------------------------
  # Implicit rules
diff --git a/comms/estic/patches/patch-ag b/comms/estic/patches/patch-ag
index 53ae0eb3e40..461ab12e59e 100644
--- a/comms/estic/patches/patch-ag
+++ b/comms/estic/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2006/09/08 07:35:50 joerg Exp $
+$NetBSD: patch-ag,v 1.5 2012/02/16 16:47:58 hans Exp $
 
 --- ../spunk/make/freebsd-x.mak.orig	1996-11-24 22:33:26.000000000 +0100
 +++ ../spunk/make/freebsd-x.mak
@@ -10,7 +10,7 @@ $NetBSD: patch-ag,v 1.4 2006/09/08 07:35:50 joerg Exp $
  
  # Flags for the gnu compiler
 -CFLAGS	= -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-+CFLAGS	+= -DFREEBSD -Wall -I$(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
++CFLAGS	+= $(CPPFLAGS) -Wall -I$(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
  
  LIB	= spunk.a
  ZIPFILE = spunk.zip
diff --git a/comms/estic/patches/patch-ar b/comms/estic/patches/patch-ar
index 41b345e4103..93783549660 100644
--- a/comms/estic/patches/patch-ar
+++ b/comms/estic/patches/patch-ar
@@ -1,8 +1,19 @@
-$NetBSD: patch-ar,v 1.1.1.1 2001/02/10 18:34:23 tron Exp $
+$NetBSD: patch-ar,v 1.2 2012/02/16 16:47:58 hans Exp $
 
 --- ../spunk/menue.cc.orig	Sun Jan 26 18:17:32 1997
 +++ ../spunk/menue.cc	Sat Feb 10 18:38:35 2001
-@@ -495,8 +495,8 @@
+@@ -26,6 +26,10 @@
+ #include <stdlib.h>
+ #endif
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
++
+ #include "keydef.h"
+ #include "screen.h"
+ #include "winattr.h"
+@@ -495,8 +499,8 @@ void GenericMenue::DynamicRight ()
  
  i16 GenericMenue::GetChoice ()
  {
diff --git a/comms/estic/patches/patch-devstate.cc b/comms/estic/patches/patch-devstate.cc
new file mode 100644
index 00000000000..b3201341545
--- /dev/null
+++ b/comms/estic/patches/patch-devstate.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-devstate.cc,v 1.1 2012/02/16 16:47:58 hans Exp $
+
+--- devstate.cc.orig	1997-01-31 03:57:14.000000000 +0100
++++ devstate.cc	2012-01-25 18:49:00.031935640 +0100
+@@ -38,6 +38,7 @@
+ #include "iccom.h"
+ #include "iclog.h"
+ 
++#undef DS
+ 
+ 
+ /*****************************************************************************/
diff --git a/comms/estic/patches/patch-iclog.cc b/comms/estic/patches/patch-iclog.cc
new file mode 100644
index 00000000000..70c474fa4ba
--- /dev/null
+++ b/comms/estic/patches/patch-iclog.cc
@@ -0,0 +1,12 @@
+$NetBSD: patch-iclog.cc,v 1.1 2012/02/16 16:47:58 hans Exp $
+
+--- iclog.cc.orig	2012-01-25 18:32:44.447476635 +0100
++++ iclog.cc	2012-01-25 18:50:27.905634296 +0100
+@@ -31,6 +31,7 @@
+ #include "iccli.h"
+ #include "iclog.h"
+ 
++#undef DS
+ 
+ 
+ /*****************************************************************************/