Make this package work on Solaris.

4 files changed, 70 insertions, 10 deletions

diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index b44bcc4c5ce..2718a3e61eb 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/04/09 00:55:22 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 1999/04/09 08:33:50 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1997/01/06 12:13:36 jkh Exp
 #
 
@@ -10,12 +10,11 @@ MAINTAINER=	packages@netbsd.org
 
 NO_WRKSUBDIR=   yes
 
-OPSYS!=		uname -s
-
 pre-configure:
+	${CHMOD} -R u+w ${WRKDIR}
 	for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
 		echo patching $$f ; \
-		${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f > $$f.pdone && ${MV} $$f.pdone $$f; \
+		${SED} -e 's:/usr/local:${PREFIX}:g' $$f > $$f.pdone && ${MV} $$f.pdone $$f; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rtty/patches/patch-aa b/sysutils/rtty/patches/patch-aa
index 748425f31f6..e9afe6fe77e 100644
--- a/sysutils/rtty/patches/patch-aa
+++ b/sysutils/rtty/patches/patch-aa
@@ -1,15 +1,43 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:14:08 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/04/09 08:33:51 agc Exp $
 
---- Makefile.orig	Fri Aug 23 16:46:42 1996
-+++ Makefile	Sat Aug 24 02:14:12 1996
-@@ -38,8 +38,8 @@
- CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_STRDUP -UNEED_INET_ATON \
+Make this work on NetBSD and Solaris.
+
+--- Makefile.orig	Fri Apr  9 09:25:00 1999
++++ Makefile	Fri Apr  9 09:27:50 1999
+@@ -23,7 +23,7 @@
+ DESTPATH = $(DESTROOT)/usr/local/rtty
+ DESTBIN = $(DESTPATH)/bin
+ 
+-CC = cc
++CC = gcc
+ CDEBUG = -O -g
+ #
+ # use -U to undefine, -D to define
+@@ -35,15 +35,24 @@
+ #	NO_SOCKADDR_LEN	if your "struct sockaddr_in" lacks a sin_len field
+ #	NO_HSTRERROR	if your C library has no hstrerror() function
+ #
+-CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_STRDUP -UNEED_INET_ATON \
++CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_STRDUP \
  	-UNO_SOCKADDR_LEN -UNO_HSTRERROR
  #
 -CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/local/include
 -LIBS = 
-+CFLAGS = $(CDEBUG) $(CDEFS)
++CFLAGS+= $(CDEBUG) $(CDEFS)
 +LIBS = -lcrypt
  #(if WANT_TCPIP defined and this isn't in your libc)
  # -lresolv
  #(if the resolver needs it, which BIND>=4.9's will on BSD>=4.4 systems)
+ # -l44bsd
++
++OPSYS!= uname -s
++
++.if ${OPSYS} == "NetBSD"
++CDEFS+= -UNEED_INET_ATON
++.elif ${OPSYS} == "SunOS"
++LIBS+= -lsocket -lnsl
++CDEFS+= -DNEED_INET_ATON
++.endif
+ 
+ BINARY = ttysrv rtty locbrok
+ SCRIPT = Startup console startsrv agelogs agelog
diff --git a/sysutils/rtty/patches/patch-ab b/sysutils/rtty/patches/patch-ab
new file mode 100644
index 00000000000..958a5c82916
--- /dev/null
+++ b/sysutils/rtty/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 1999/04/09 08:33:51 agc Exp $
+
+Make this compile on Solaris.
+
+--- ttysrv.c	1999/04/09 08:23:23	1.1
++++ ttysrv.c	1999/04/09 08:24:08
+@@ -40,6 +40,9 @@
+ #include <string.h>
+ #include <netdb.h>
+ #include <pwd.h>
++#if (defined(__sun__) && defined(__svr4__))
++#include <fcntl.h>
++#endif
+ 
+ #include "rtty.h"
+ #ifdef NEED_BITYPES_H
diff --git a/sysutils/rtty/patches/patch-ac b/sysutils/rtty/patches/patch-ac
new file mode 100644
index 00000000000..9612bae72e7
--- /dev/null
+++ b/sysutils/rtty/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 1999/04/09 08:33:51 agc Exp $
+
+Make this compile on Solaris.
+
+--- rtty.c	1999/04/09 08:29:25	1.1
++++ rtty.c	1999/04/09 08:30:06
+@@ -35,6 +35,10 @@
+ #include <pwd.h>
+ #include <termios.h>
+ 
++#if (defined(__sun__) && defined(__svr4__))
++#include <fcntl.h>
++#endif
++
+ #include "rtty.h"
+ #ifdef NEED_BITYPES_H
+ # include "bitypes.h"