Fix build on SunOS.

4 files changed, 48 insertions, 8 deletions

diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 4052b1cc1dd..31d4c5f2302 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2010/01/17 12:02:08 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2011/05/14 19:27:53 hans Exp $
 
 DISTNAME=	cku211
 PKGNAME=	kermit-8.0.211
@@ -52,6 +52,8 @@ BUILD_TARGET=	macosx10
 .  endif
 .elif ${OPSYS} == "Linux"
 BUILD_TARGET=	linux
+.elif ${OPSYS} == "SunOS"
+BUILD_TARGET=	solaris10g+openssl+shadow+pam+zlib
 .else
 BUILD_TARGET=	netbsd+openssl
 .include "../../security/openssl/buildlink3.mk"
diff --git a/comms/kermit/distinfo b/comms/kermit/distinfo
index 90f7f7d02f2..2b246facaea 100644
--- a/comms/kermit/distinfo
+++ b/comms/kermit/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2007/08/08 22:14:49 joerg Exp $
+$NetBSD: distinfo,v 1.17 2011/05/14 19:27:53 hans Exp $
 
 SHA1 (kermit-8.0.211/cku211.tar.gz) = cd5e0524d27fea0275a0938da2a5fc115e0978b8
 RMD160 (kermit-8.0.211/cku211.tar.gz) = c80de6eeec3b4d87a09946a4d440da3b4faaa3b2
 Size (kermit-8.0.211/cku211.tar.gz) = 2878523 bytes
-SHA1 (patch-aa) = 376dc03cc9f75322f2fda308b268c70a13ebba8a
+SHA1 (patch-aa) = 222e5c3879271f876c9b61d5a51a6825f443b048
 SHA1 (patch-ab) = 7e874c4d7d6febe4c6694134879fe0008f6e9c8f
 SHA1 (patch-ac) = 01e7ab07fcebd971672488221efa4d987c4ebf3e
 SHA1 (patch-ad) = 8f6073b0e68cf3191ffba6d818a87ab3f3095ea4
@@ -15,3 +15,4 @@ SHA1 (patch-ai) = 975a18c41b7fc031515bda5c4a9c284e80c9d1a4
 SHA1 (patch-aj) = 6468e2139639f601de4609db8dff07b8b3a82d82
 SHA1 (patch-ak) = 9ded2d7cc3a83158edfbbe87851f892ccb09df0b
 SHA1 (patch-al) = f28a0449e763069f64719693de0848bf50e61099
+SHA1 (patch-am) = 8c5acbfefe7b7d11825cc32c4449582b51f6cad9
diff --git a/comms/kermit/patches/patch-aa b/comms/kermit/patches/patch-aa
index dc7d9b54beb..46e29666ec2 100644
--- a/comms/kermit/patches/patch-aa
+++ b/comms/kermit/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2004/04/15 18:14:52 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2011/05/14 19:27:53 hans Exp $
 
---- makefile.orig	2004-04-11 19:21:42.000000000 +0200
-+++ makefile	2004-04-14 15:42:12.000000000 +0200
-@@ -745,8 +745,8 @@
+--- makefile.orig	2004-04-17 20:52:00.000000000 +0200
++++ makefile	2009-12-26 23:49:53.284197908 +0100
+@@ -745,8 +745,8 @@ K5LIB=-L/usr/kerberos/lib
  K5INC=-I/usr/kerberos/include
  SRPLIB=-L$(srproot)/lib
  SRPINC=-I$(srproot)/include
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.7 2004/04/15 18:14:52 drochner Exp $
  #
  # aix41+krb5+krb4:                    IBM AIX 4.1 with Kerberos IV and V
  # aix43gcc+krb5+krb4:                 IBM AIX 4.3 built with gcc, ditto
-@@ -1821,6 +1821,16 @@
+@@ -1821,6 +1821,16 @@ netbsd:
  	-DCK_DTRCD -DCK_DTRCTS -DTPUTSARGTYPE=int -DFNFLOAT $(KFLAGS) -O" \
  	"LIBS= -lcurses -lcrypt -lm $(LIBS)"
  
@@ -30,3 +30,26 @@ $NetBSD: patch-aa,v 1.7 2004/04/15 18:14:52 drochner Exp $
  #NetBSD 1.5.x in which the return type of the function pointer that is the
  #third argument of tputs() was changed from void to int...  The regular NetBSD
  #target builds OK here but this one eliminates the (harmless) warning.
+@@ -3263,7 +3273,7 @@ solaris2xg+openssl+zlib+pam+shadow:
+ 	-DCK_AUTHENTICATION -DCK_SSL -DCK_PAM -DCK_SHADOW  -DZLIB \
+ 	-DBIGBUFOK $(SSLINC) $(KFLAGS)" \
+ 	"LIBS= $(SSLLIB) -ltermlib \
+-	-lsocket -lnsl -lm -lresolv -lssl -lcrypto -lpam -lz"
++	-lsocket -lnsl -lm -lresolv -lssl -lcrypto -lpam -lz $(LIBS)"
+ 
+ #Ditto but with GCC 3.1 in which you have to specify 32-bit with -m32.
+ #In Solaris 9 (and maybe 8) you'll also need specifiy the Library path.
+@@ -3401,6 +3411,13 @@ solaris9g+openssl+shadow+pam+zlib:
+ 	"KFLAGS=-DSOLARIS9 -DHDBUUCP -DDIRENT -DZLIB -DCK_PAM -DCK_SHADOW \
+ 	-DLIBDES $(KFLAGS)" "LIBS= -lpam -ldes425 -lz $(LIBS)"
+ 
++#Solaris 10 with gcc + OpenSSL + Shadow (32-bit)
++solaris10g+openssl+shadow+pam+zlib:
++	$(MAKE) "MAKE=$(MAKE)" solaris2xg+openssl+zlib+pam+shadow \
++	KTARGET=$${KTARGET:-$(@)} \
++	"KFLAGS=-DSOLARIS9 -DHDBUUCP -DDIRENT -DZLIB -DCK_PAM -DCK_SHADOW \
++	-DLIBDES $(KFLAGS)" "LIBS= -lpam -lz $(LIBS)"
++
+ #Solaris 9 with gcc + OpenSSL + Kerberos 5 + Krb4 + Shadow (32-bit)
+ solaris9g+krb5+krb4+openssl+shadow+pam+zlib:
+ 	$(MAKE) "MAKE=$(MAKE)" solaris2xg+krb5+krb4+openssl+shadow \
diff --git a/comms/kermit/patches/patch-am b/comms/kermit/patches/patch-am
new file mode 100644
index 00000000000..244ff9dee21
--- /dev/null
+++ b/comms/kermit/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.1 2011/05/14 19:27:53 hans Exp $
+
+--- ckuusx.c.orig	2004-03-14 18:13:23.000000000 +0100
++++ ckuusx.c	2009-12-26 23:23:19.652637206 +0100
+@@ -70,6 +70,9 @@ _PROTOTYP(char * os2_gethostname, (void)
+ #ifdef BSD44
+ #include <errno.h>
+ #endif /* BSD44 */
++#ifdef SOLARIS
++#include <errno.h>
++#endif
+ 
+ extern xx_strp xxstring;
+