Support large files in sam.

From trebol via pkgsrc-users.
While here, regenerate patches (one per file, unified diffs).
Bump PKGREVISION.

(This commit message was written in sam.)


(bsiegert)

$NetBSD: patch-include_libg.h,v 1.1 2017/09/21 14:37:40 bsiegert Exp $

--- include/libg.h.orig	2017-09-21 13:54:43.000000000 +0000
+++ include/libg.h
@@ -94,12 +94,12 @@ struct	Fontchar
 
 struct	Subfont
 {
-	short		minrow;	/* first character row in font (for X subfonts) */
-	short		mincol;	/* first character col in font (for X subfonts) */
-	short		minchar; /* first char code in subfont */
-	short		maxchar; /* last char code in subfont */
-	short		width;	/* number of chars in row */
-	short		n;	/* number of chars in font */
+	int		minrow;	/* first character row in font (for X subfonts) */
+	int		mincol;	/* first character col in font (for X subfonts) */
+	int		minchar; /* first char code in subfont */
+	int		maxchar; /* last char code in subfont */
+	int		width;	/* number of chars in row */
+	int		n;	/* number of chars in font */
 	unsigned char	height;	/* height of bitmap */
 	char		ascent;	/* top of bitmap to baseline */
 	Fontchar	*info;	/* n+1 character descriptors */

$NetBSD: patch-sam_B.rc,v 1.1 2017/09/21 14:37:40 bsiegert Exp $

--- sam/B.rc.orig	2017-09-21 13:54:41.000000000 +0000
+++ sam/B.rc
@@ -1,4 +1,4 @@
-#!/bin/rc
+#!/usr/local/bin/rc
 
 files=()
 line=''

$NetBSD: patch-sam_Makefile,v 1.1 2017/09/21 14:37:40 bsiegert Exp $

--- sam/Makefile.orig	2017-09-21 13:54:42.000000000 +0000
+++ sam/Makefile
@@ -1,18 +1,17 @@
 #	Copyright (c) 1992 AT&T - All rights reserved.
 #
-#	Prototype Makefile for sam
+#	Prototype BSDi Makefile for sam
+#	Courtesy of Boyd Roberts
+#
+#	Define operating system type: -DBSDi
 #
-#	define operating system.  ONE of:
-#		-DIRIX -DSUNOS -DUMIPS -DSYSVR3 -DAIX -DOSF1
-#		-DHPUX -DAPOLLO -DCONVEX -DDYNIX
-#	
 #	Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
 #	if your compiler supports posix-compatible compilation
-OS=-DIRIX -ansiposix
+OS=-DBSDi -O2
 
 #	add -Iincludedir for any include directories that need to be searched
 #	for posix header files (for UMIPS, add -I/usr/include/posix)
-INCS=-I../include
+INCS=-I../include -I/usr/include/posix
 
 #	Set the name of the environment variable containing the user's home directory
 HOMEDIR=HOME
@@ -22,12 +21,12 @@ HOMEDIR=HOME
 #	where sam is to be installed.  SAMSAVEDIR is the name of the directory
 #	where the samsave file restoration script is stored.
 RSAMNAME=sam
-TERMNAME=/v/bin/samterm
-SAMDIR=/usr/bin
-SAMSAVEDIR=/v/bin
+TERMNAME=$(PREFIX)/bin/samterm
+SAMDIR=$(PREFIX)/bin
+SAMSAVEDIR=$(PREFIX)/bin
 
 #	Set TMP to a good place for tmp files (with lots of room)
-TMP=/usr/tmp
+TMP=/var/tmp
 
 #	Set SHELLNAME and SHELLPATH to the name of a shell and the pathname
 #	of its executable
@@ -37,7 +36,7 @@ SHELLPATH=/bin/sh
 #	Set RXNAME and RXPATHNAME to the name of the remote execution command
 #	and the pathname of its executable
 RXNAME=rsh
-RXPATHNAME=/usr/bsd/rsh
+RXPATHNAME=/usr/bin/rsh
 
 SAMSAVE=/bin/sh\\n$(SAMSAVEDIR)/samsave
 
@@ -68,9 +67,10 @@ nuke:	clean
 	rm -f sam
 
 install:	sam
-	cp sam $(SAMDIR)/$(RSAMNAME)
-	cp samsave $(SAMSAVEDIR)/samsave
-	chmod +x samsave
+	$(INSTALL) -c sam $(SAMDIR)/$(RSAMNAME)
+	$(INSTALL) -c samsave $(SAMSAVEDIR)/samsave
+	$(INSTALL) -c B.sh $(SAMDIR)/B
+	chmod +x $(SAMSAVEDIR)/samsave
 
 $(OBJ):	sam.h ../include/u.h ../include/libc.h errors.h mesg.h
 

$NetBSD: patch-sam_io.c,v 1.1 2017/09/21 14:37:40 bsiegert Exp $

--- sam/io.c.orig	2017-09-21 13:54:43.000000000 +0000
+++ sam/io.c
@@ -2,7 +2,9 @@
 #include "sam.h"
 
 #define	NSYSFILE	3
+#ifndef NOFILE
 #define	NOFILE		128
+#endif
 
 void
 checkqid(File *f)

$NetBSD: patch-samterm_Makefile,v 1.1 2017/09/21 14:37:40 bsiegert Exp $

--- samterm/Makefile.orig	2017-09-21 13:54:42.000000000 +0000
+++ samterm/Makefile
@@ -1,31 +1,35 @@
 #	Copyright (c) 1992 AT&T - All rights reserved.
 #
-#	Prototype Makefile for samterm
+#	Prototype BSDi Makefile for samterm
+#	Courtesy of Boyd Roberts
+#
+#	Define operating system type: -DBSDi
 #
-#	define operating system.  ONE of:
-#		-DIRIX -DSUNOS -DUMIPS -DSYSVR3 -DAIX -DOSF1
-#		-DHPUX -DAPOLLO -DCONVEX -DDYNIX
-#	
 #	Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
 #	if your compiler supports posix-compatible compilation
-OS=-DIRIX -ansiposix
+OS=-DBSDi -O2
 
 #	add -Iincludedir for any include directories that need to be searched
 #	for posix header files (for UMIPS, add -I/usr/include/posix)
-INCS=-I../include
+INCS=-I../include -I/usr/include/posix
 
 #	SAMTERM contains the name of the file containing the samterm
 #	executable.  SAMTERMDIR is the directory where it is installed.
 SAMTERM=samterm
-SAMTERMDIR=/v/bin
+SAMTERMDIR=$(PREFIX)/bin
 
 #	set this if your X libraries are in different locations
 #	or if you need extra libraries to load with X11 applications
-XLIBS=/usr/local/X11R5/lib/libXt.a /usr/local/X11R5/lib/libX11.a
+#XLIBS= /usr/X11R6/lib/libXt.a \
+#      /usr/X11R6/lib/libSM.a \
+#      /usr/X11R6/lib/libICE.a \
+#      /usr/X11R6/lib/libX11.a
+
+XLIBS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lSM -lICE -lX11
 
 CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION
 
-LIBS=../libframe/libframe.a ../libXg/libXg.a
+LIBS=../libframe/libframe.a ../libXg/libXg.a 
 CC=cc
 
 OBJ=main.o flayer.o icons.o io.o menu.o mesg.o rasp.o scroll.o unix.o