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.)

11 files changed, 182 insertions, 224 deletions

diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 299ebd25b9b..019669aed69 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2015/07/04 16:18:29 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2017/09/21 14:37:39 bsiegert Exp $
 
 DISTNAME=		sam
 PKGNAME=		sam-4.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		editors plan9
 MASTER_SITES=		ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 EXTRACT_SUFX=		.msg.gz
diff --git a/editors/sam/distinfo b/editors/sam/distinfo
index f5a6c622116..a498730faf4 100644
--- a/editors/sam/distinfo
+++ b/editors/sam/distinfo
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 03:32:21 agc Exp $
+$NetBSD: distinfo,v 1.8 2017/09/21 14:37:39 bsiegert Exp $
 
 SHA1 (sam.msg.gz) = c6d2baa07a3b7410658e31e6ebfb997809c8323e
 RMD160 (sam.msg.gz) = f3a6f354bd11b45966818188392c4655267f0571
 SHA512 (sam.msg.gz) = 279e9854a2177330fcb80a5ad2751b01629b35d33c759e9f2d707450753c4b5c6c3ec07cbbe4e01f1b9c43e167570e88de4f9f403f9c0fe58f360db99f40e666
 Size (sam.msg.gz) = 246311 bytes
-SHA1 (patch-aa) = baba874e5d18b0c19f8255ed97f5f98f57d52cac
+SHA1 (patch-aa) = cbc293b98847bc36d87a780cda487e88096a2dc4
 SHA1 (patch-ab) = 76fa25ab4737f925eefe2e3876d862e7814d3d31
-SHA1 (patch-ac) = fa5ccdc02a82d4bd4a713f53a180126b85df0880
-SHA1 (patch-ad) = 3a456316d0806b6b6bc6f6143bb3dd3701f8c1e1
 SHA1 (patch-ae) = b95056d090d73ffa8920669027b43d16d6cf81f5
 SHA1 (patch-af) = 9afde00ab2b86519dcf558c0e1e2232b3839b579
-SHA1 (patch-ag) = 348b5400cccdd8cdcc6e63244a6e28551bbfb354
 SHA1 (patch-ah) = 0126f1eee5bbcf59e3e08063d2cddffba83dc94b
 SHA1 (patch-ai) = ca76a0c22c4e962ec590e9aeff719c71bd6fdafc
 SHA1 (patch-aj) = 1f6270f7893fce0d1b213fcaa4b91c6c3e82c833
 SHA1 (patch-ak) = 80f9399d23fb615da4d98488e93a58a101e57e4c
+SHA1 (patch-include_libg.h) = eaa8b3831d44b5d96d2b1154d201576878ee8d81
+SHA1 (patch-sam_B.rc) = e6d774d230656bb6ae9800e35fe20c2760e8380e
+SHA1 (patch-sam_Makefile) = 378874943b4719cb434de56d4f5aa665c66121d1
+SHA1 (patch-sam_io.c) = e7ca3a59b5a493db55397655aa1db5c3ac65c508
+SHA1 (patch-samterm_Makefile) = 6772ee78eb2e5512c2002b86a851a6e71bdbdaef
diff --git a/editors/sam/patches/patch-aa b/editors/sam/patches/patch-aa
index 0a93ea70d57..e59a5d82cd8 100644
--- a/editors/sam/patches/patch-aa
+++ b/editors/sam/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2001/05/01 09:16:25 agc Exp $
+$NetBSD: patch-aa,v 1.5 2017/09/21 14:37:40 bsiegert Exp $
 
---- libXg/Makefile.orig	Tue May  1 09:42:03 2001
-+++ libXg/Makefile	Tue May  1 09:48:09 2001
+--- libXg/Makefile.orig	2017-09-21 13:54:42.000000000 +0000
++++ libXg/Makefile
 @@ -1,24 +1,23 @@
  #	Copyright (c) 1992 AT&T - All rights reserved.
  #
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.4 2001/05/01 09:16:25 agc Exp $
  
  #	add name of librarian
  AR=ar
-@@ -36,7 +35,7 @@
+@@ -36,7 +35,7 @@ OBJS=	arc.o arith.o balloc.o bitblt.o bi
  	rdfontfile.o rectclip.o rune.o segment.o string.o strwidth.o texture.o\
  	wrbitmap.o wrbitmapfile.o xtbinit.o
  
@@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.4 2001/05/01 09:16:25 agc Exp $
  compile:	$(LIB)
  test:	test.o
  	$(CC) -o $@ $? $(LIB) $(XLIBS) -lm
-@@ -47,10 +46,12 @@
+@@ -47,10 +46,12 @@ clean:
  nuke:	clean
  	rm -f $(LIB)
  
@@ -55,7 +55,7 @@ $NetBSD: patch-aa,v 1.4 2001/05/01 09:16:25 agc Exp $
  $(LIB):	$(OBJS)
  	$(AR) rv $(LIB) $(OBJS)
  	$(RANLIB) $(LIB)
--
--$(LIB)(%.o): %.o
  
+-$(LIB)(%.o): %.o
+-
  $(OBJS):	../include/libg.h libgint.h ../include/libc.h
diff --git a/editors/sam/patches/patch-ac b/editors/sam/patches/patch-ac
deleted file mode 100644
index 810c10dfccd..00000000000
--- a/editors/sam/patches/patch-ac
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2000/09/13 10:42:00 tron Exp $
-
-*** samterm/Makefile.orig	Fri Jul 28 14:09:32 1995
---- samterm/Makefile	Fri Jul 21 15:30:09 1995
-***************
-*** 1,31 ****
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype Makefile for samterm
-  #
-- #	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
-  
-  #	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
-  
-  #	SAMTERM contains the name of the file containing the samterm
-  #	executable.  SAMTERMDIR is the directory where it is installed.
-  SAMTERM=samterm
-! SAMTERMDIR=/v/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
-  
-  CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION
-  
-! 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
---- 1,35 ----
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype BSDi Makefile for samterm
-! #	Courtesy of Boyd Roberts
-! #
-! #	Define operating system type: -DBSDi
-  #
-  #	Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
-  #	if your compiler supports posix-compatible compilation
-! 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 -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=$(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/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 
-  CC=cc
-  
-  OBJ=main.o flayer.o icons.o io.o menu.o mesg.o rasp.o scroll.o unix.o
diff --git a/editors/sam/patches/patch-ad b/editors/sam/patches/patch-ad
deleted file mode 100644
index b172e8a3ea3..00000000000
--- a/editors/sam/patches/patch-ad
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD: patch-ad,v 1.3 1998/08/07 11:11:18 agc Exp $
-
-*** sam/Makefile.orig	Mon Jul 31 15:45:40 1995
---- sam/Makefile	Mon Jul 31 15:46:24 1995
-***************
-*** 1,18 ****
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype Makefile for sam
-  #
-- #	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
-  
-  #	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
-  
-  #	Set the name of the environment variable containing the user's home directory
-  HOMEDIR=HOME
---- 1,17 ----
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype BSDi Makefile for sam
-! #	Courtesy of Boyd Roberts
-! #
-! #	Define operating system type: -DBSDi
-  #
-  #	Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
-  #	if your compiler supports posix-compatible compilation
-! 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 -I/usr/include/posix
-  
-  #	Set the name of the environment variable containing the user's home directory
-  HOMEDIR=HOME
-***************
-*** 22,33 ****
-  #	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
-  
-  #	Set TMP to a good place for tmp files (with lots of room)
-! TMP=/usr/tmp
-  
-  #	Set SHELLNAME and SHELLPATH to the name of a shell and the pathname
-  #	of its executable
---- 21,32 ----
-  #	where sam is to be installed.  SAMSAVEDIR is the name of the directory
-  #	where the samsave file restoration script is stored.
-  RSAMNAME=sam
-! TERMNAME=$(PREFIX)/bin/samterm
-! SAMDIR=$(PREFIX)/bin
-! SAMSAVEDIR=$(PREFIX)/bin
-  
-  #	Set TMP to a good place for tmp files (with lots of room)
-! TMP=/var/tmp
-  
-  #	Set SHELLNAME and SHELLPATH to the name of a shell and the pathname
-  #	of its executable
-***************
-*** 37,43 ****
-  #	Set RXNAME and RXPATHNAME to the name of the remote execution command
-  #	and the pathname of its executable
-  RXNAME=rsh
-! RXPATHNAME=/usr/bsd/rsh
-  
-  SAMSAVE=/bin/sh\\n$(SAMSAVEDIR)/samsave
-  
---- 36,42 ----
-  #	Set RXNAME and RXPATHNAME to the name of the remote execution command
-  #	and the pathname of its executable
-  RXNAME=rsh
-! RXPATHNAME=/usr/bin/rsh
-  
-  SAMSAVE=/bin/sh\\n$(SAMSAVEDIR)/samsave
-  
-***************
-*** 68,76 ****
-  	rm -f sam
-  
-  install:	sam
-! 	cp sam $(SAMDIR)/$(RSAMNAME)
-! 	cp samsave $(SAMSAVEDIR)/samsave
-! 	chmod +x samsave
-  
-  $(OBJ):	sam.h ../include/u.h ../include/libc.h errors.h mesg.h
-  
---- 67,76 ----
-  	rm -f sam
-  
-  install:	sam
-! 	$(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
-  
-*** sam/B.rc.orig	Mon Jul 31 15:45:31 1995
---- sam/B.rc	Mon Jul 31 15:47:10 1995
-***************
-*** 1,4 ****
-! #!/bin/rc
-  
-  files=()
-  line=''
---- 1,4 ----
-! #!/usr/local/bin/rc
-  
-  files=()
-  line=''
diff --git a/editors/sam/patches/patch-ag b/editors/sam/patches/patch-ag
deleted file mode 100644
index 383a9d90c4e..00000000000
--- a/editors/sam/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:11:19 agc Exp $
-
-*** sam/io.c	1997/10/01 08:25:28	1.1
---- sam/io.c	1997/10/01 08:25:59
-***************
-*** 2,8 ****
---- 2,10 ----
-  #include "sam.h"
-  
-  #define	NSYSFILE	3
-+ #ifndef NOFILE
-  #define	NOFILE		128
-+ #endif
-  
-  void
-  checkqid(File *f)
diff --git a/editors/sam/patches/patch-include_libg.h b/editors/sam/patches/patch-include_libg.h
new file mode 100644
index 00000000000..813f97cedb6
--- /dev/null
+++ b/editors/sam/patches/patch-include_libg.h
@@ -0,0 +1,23 @@
+$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 */
diff --git a/editors/sam/patches/patch-sam_B.rc b/editors/sam/patches/patch-sam_B.rc
new file mode 100644
index 00000000000..9ad826792ac
--- /dev/null
+++ b/editors/sam/patches/patch-sam_B.rc
@@ -0,0 +1,10 @@
+$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=''
diff --git a/editors/sam/patches/patch-sam_Makefile b/editors/sam/patches/patch-sam_Makefile
new file mode 100644
index 00000000000..cdcc1e02028
--- /dev/null
+++ b/editors/sam/patches/patch-sam_Makefile
@@ -0,0 +1,69 @@
+$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
+ 
diff --git a/editors/sam/patches/patch-sam_io.c b/editors/sam/patches/patch-sam_io.c
new file mode 100644
index 00000000000..d16a04122c0
--- /dev/null
+++ b/editors/sam/patches/patch-sam_io.c
@@ -0,0 +1,14 @@
+$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)
diff --git a/editors/sam/patches/patch-samterm_Makefile b/editors/sam/patches/patch-samterm_Makefile
new file mode 100644
index 00000000000..5f257c89a32
--- /dev/null
+++ b/editors/sam/patches/patch-samterm_Makefile
@@ -0,0 +1,50 @@
+$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