--- netkit-combo-0.17/netkit-base/inetd/servtab.c.orig	2000-07-23 05:20:50.000000000 +0900
+++ netkit-combo-0.17/netkit-base/inetd/servtab.c	2010-01-05 15:43:37.000000000 +0900
@@ -771,7 +771,7 @@
 			return;
 		}
 		
-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
+#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
 
 		/*
 		 * sep->se_wait may be holding the pid of a daemon
--- netkit-combo-0.17/netkit-rsh/rcp/rcp.c.orig	2010-01-08 08:23:24.000000000 +0900
+++ netkit-combo-0.17/netkit-rsh/rcp/rcp.c	2010-01-08 08:30:41.000000000 +0900
@@ -44,6 +44,7 @@
 /*
  * rcp
  */
+#define _GNU_SOURCE
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
--- netkit-combo-0.17/netkit-rsh/rsh/pathnames.h.orig	2010-08-28 20:25:37.000000000 +0900
+++ netkit-combo-0.17/netkit-rsh/rsh/pathnames.h	2010-08-28 20:27:27.000000000 +0900
@@ -34,4 +34,4 @@
  *	$Id: pathnames.h,v 1.1 1996/07/15 19:58:37 dholland Exp $
  */
 
-#define	_PATH_RLOGIN	"/usr/bin/netkit-rlogin"
+#define	_PATH_RLOGIN	"/usr/bin/rlogin"
--- netkit-combo-0.17/netkit-telnet/telnetd/utility.c.orig	2008-07-23 01:02:01.000000000 +0900
+++ netkit-combo-0.17/netkit-telnet/telnetd/utility.c	2010-01-07 14:05:44.000000000 +0900
@@ -39,6 +39,8 @@
 
 #define PRINTOPTIONS
 
+#define _GNU_SOURCE
+#include <stdio.h>
 #include <stdarg.h>
 #include <sys/utsname.h>
 #include <sys/time.h>
--- netkit-combo-0.17/netkit-timed/timed/timed/globals.h.orig	1997-04-06 07:26:22.000000000 +0900
+++ netkit-combo-0.17/netkit-timed/timed/timed/globals.h	2010-01-06 08:55:16.000000000 +0900
@@ -66,6 +66,7 @@
 #define	SECHR	(60*60)
 #define	SECDAY	(24*SECHR)
 #endif /* sgi */
+#define CLK_TCK HZ
 
 extern int sock;
 
--- netkit-combo-0.17/Makefile.orig	1999-12-13 03:34:35.000000000 +0900
+++ netkit-combo-0.17/Makefile	2010-01-06 10:55:03.000000000 +0900
@@ -1,6 +1,12 @@
 # You can do "make SUB=blah" to make only a few, or edit here, or both
 # You can also run make directly in the subdirs you want.
 
+include configure.defs
+ROOTBINDIR=/bin
+SBINDIR=/usr/sbin
+BINDIR=/usr/bin
+MANDIR=/usr/share/man
+
 SUB = netkit-base netkit-rpc \
       netkit-ntalk bsd-finger linux-ftpd netkit-ftp netwrite \
       netkit-bootparamd netkit-tftp \
@@ -15,6 +21,12 @@
 	(cd $(patsubst %.depend, %, $@) && $(MAKE) depend)
 
 %.install:
+	mkdir -p $(INSTALLROOT)$(ROOTBINDIR)
+	mkdir -p $(INSTALLROOT)$(SBINDIR)
+	mkdir -p $(INSTALLROOT)$(BINDIR)
+	mkdir -p $(INSTALLROOT)$(MANDIR)/man1
+	mkdir -p $(INSTALLROOT)$(MANDIR)/man5
+	mkdir -p $(INSTALLROOT)$(MANDIR)/man8
 	(cd $(patsubst %.install, %, $@) && $(MAKE) install)
 
 %.clean:
--- netkit-combo-0.17/biff+comsat/comsat/Makefile.orig	1999-08-01 06:09:46.000000000 +0900
+++ netkit-combo-0.17/biff+comsat/comsat/Makefile	2010-01-06 11:02:59.000000000 +0900
@@ -13,7 +13,7 @@
 install: comsat
 	install -s -m$(DAEMONMODE) comsat $(INSTALLROOT)$(SBINDIR)/in.comsat
 	install -m$(MANMODE) comsat.8 $(INSTALLROOT)$(MANDIR)/man8/in.comsat.8
-	ln -sf in.comsat.8 $(MANDIR)/man8/comsat.8
+	ln -sf in.comsat.8 $(INSTALLROOT)$(MANDIR)/man8/comsat.8
 
 clean:
 	rm -f *.o comsat