Install header files, as they are needed by x11/9term

Install some libraries, as they are needed by x11/9term
Move DEPENDS line in Makefile to shut up pkglint
Bump version number to 4.3nb1

6 files changed, 156 insertions, 161 deletions

diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index c3e86460c3b..895eaf5c6f8 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2001/04/30 20:13:55 jtb Exp $
+# $NetBSD: Makefile,v 1.17 2001/05/01 09:16:24 agc Exp $
 # FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
 #
 
 DISTNAME=		sam
-PKGNAME=		sam-4.3
+PKGNAME=		sam-4.3nb1
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 EXTRACT_SUFX=		.msg.gz
@@ -11,6 +11,8 @@ EXTRACT_SUFX=		.msg.gz
 MAINTAINER=		packages@netbsd.org
 COMMENT=		Unix version of Rob Pike's editor for plan9
 
+DEPENDS+=		libXgFonts-1.0:../../fonts/Xg
+
 NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${GZCAT} ${DOWNLOADED_DISTFILE} | ${SH}
 
@@ -18,8 +20,6 @@ MANCOMPRESSED=		yes
 USE_X11BASE=		yes
 MAKE_ENV+=		X11PREFIX=${X11PREFIX}
 
-DEPENDS+=		libXgFonts-1.0:../../fonts/Xg
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/editors/sam/distinfo b/editors/sam/distinfo
index 103b8d0e695..395d5f2836e 100644
--- a/editors/sam/distinfo
+++ b/editors/sam/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/01 09:16:25 agc Exp $
 
 SHA1 (sam.msg.gz) = c6d2baa07a3b7410658e31e6ebfb997809c8323e
 Size (sam.msg.gz) = 246311 bytes
-SHA1 (patch-aa) = abcbe3ec6c4c736c2786327d189c3e47d0a10bb6
-SHA1 (patch-ab) = 530d0224a1ec44eb42444d8cf39b75052fde44a0
+SHA1 (patch-aa) = baba874e5d18b0c19f8255ed97f5f98f57d52cac
+SHA1 (patch-ab) = 76fa25ab4737f925eefe2e3876d862e7814d3d31
 SHA1 (patch-ac) = fa5ccdc02a82d4bd4a713f53a180126b85df0880
 SHA1 (patch-ad) = 3a456316d0806b6b6bc6f6143bb3dd3701f8c1e1
 SHA1 (patch-ae) = b95056d090d73ffa8920669027b43d16d6cf81f5
-SHA1 (patch-af) = 9d2eba4ceb17d311c1c743d7d0c1dbd9eebdc44a
+SHA1 (patch-af) = b7f32619782b542773a85ea2d24c55f05782af94
 SHA1 (patch-ag) = 348b5400cccdd8cdcc6e63244a6e28551bbfb354
 SHA1 (patch-ah) = 0126f1eee5bbcf59e3e08063d2cddffba83dc94b
 SHA1 (patch-ai) = ca76a0c22c4e962ec590e9aeff719c71bd6fdafc
diff --git a/editors/sam/patches/patch-aa b/editors/sam/patches/patch-aa
index 6d66315dcb4..0a93ea70d57 100644
--- a/editors/sam/patches/patch-aa
+++ b/editors/sam/patches/patch-aa
@@ -1,64 +1,61 @@
-$NetBSD: patch-aa,v 1.3 2000/09/13 10:42:00 tron Exp $
+$NetBSD: patch-aa,v 1.4 2001/05/01 09:16:25 agc Exp $
 
-*** libXg/Makefile.orig	Fri Jul 28 14:02:17 1995
---- libXg/Makefile	Fri Jul 21 15:03:43 1995
-***************
-*** 1,24 ****
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype Makefile for libXg
-  #
-- #	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
-! INCS=-I../include
-  
-  #	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
-  
-  #	add name of library orderer - use ":" if none
-! RANLIB=:
-  
-  #	add name of librarian
-  AR=ar
---- 1,23 ----
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype BSDi Makefile for libXg
-! #	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=-O2 -DBSDi
-  
-  #	add -Iincludedir for any include directories that need to be searched
-! INCS=-I../include -I${X11BASE}/include
-  
-  #	set this if your X libraries are in different locations
-  #	or if you need extra libraries to load with X11 applications
-! XLIBS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lX11
-  
-  #	add name of library orderer - use ":" if none
-! RANLIB=ranlib
-  
-  #	add name of librarian
-  AR=ar
-***************
-*** 50,56 ****
-  $(LIB):	$(OBJS)
-  	$(AR) rv $(LIB) $(OBJS)
-  	$(RANLIB) $(LIB)
-- 
-- $(LIB)(%.o): %.o
-  
-  $(OBJS):	../include/libg.h libgint.h ../include/libc.h
---- 49,53 ----
+--- libXg/Makefile.orig	Tue May  1 09:42:03 2001
++++ libXg/Makefile	Tue May  1 09:48:09 2001
+@@ -1,24 +1,23 @@
+ #	Copyright (c) 1992 AT&T - All rights reserved.
+ #
+-#	Prototype Makefile for libXg
++#	Prototype BSDi Makefile for libXg
++#	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=-O2 -DBSDi
+ 
+ #	add -Iincludedir for any include directories that need to be searched
+-INCS=-I../include
++INCS=-I../include -I${X11BASE}/include
+ 
+ #	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=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lX11
+ 
+ #	add name of library orderer - use ":" if none
+-RANLIB=:
++RANLIB=ranlib
+ 
+ #	add name of librarian
+ AR=ar
+@@ -36,7 +35,7 @@
+ 	rdfontfile.o rectclip.o rune.o segment.o string.o strwidth.o texture.o\
+ 	wrbitmap.o wrbitmapfile.o xtbinit.o
+ 
+-all install:	$(LIB)
++all :	$(LIB)
+ compile:	$(LIB)
+ test:	test.o
+ 	$(CC) -o $@ $? $(LIB) $(XLIBS) -lm
+@@ -47,10 +46,12 @@
+ nuke:	clean
+ 	rm -f $(LIB)
+ 
++install: ${LIB}
++	cp ${LIB} ${PREFIX}/lib/${LIB}
++	${RANLIB} ${PREFIX}/lib/${LIB}
++
+ $(LIB):	$(OBJS)
+ 	$(AR) rv $(LIB) $(OBJS)
+ 	$(RANLIB) $(LIB)
+-
+-$(LIB)(%.o): %.o
+ 
+ $(OBJS):	../include/libg.h libgint.h ../include/libc.h
diff --git a/editors/sam/patches/patch-ab b/editors/sam/patches/patch-ab
index 125291a9439..4f9f3c68587 100644
--- a/editors/sam/patches/patch-ab
+++ b/editors/sam/patches/patch-ab
@@ -1,48 +1,41 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:11:17 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/05/01 09:16:25 agc Exp $
 
-*** libframe/Makefile.orig	Fri Jul 28 14:08:32 1995
---- libframe/Makefile	Fri Jul 21 15:02:32 1995
-***************
-*** 1,21 ****
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype Makefile for libframe
-  #
-- #	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
-  
-  #	add name of library orderer - use ":" if none exists
-! RANLIB=:
-  
-  #	add name of library
-  AR=ar
---- 1,20 ----
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype BSDi Makefile for libframe
-! #	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
-  
-  #	add name of library orderer - use ":" if none exists
-! RANLIB=ranlib
-  
-  #	add name of library
-  AR=ar
+--- libframe/Makefile.orig	Tue May  1 09:42:03 2001
++++ libframe/Makefile	Tue May  1 09:46:03 2001
+@@ -1,21 +1,20 @@
+ #	Copyright (c) 1992 AT&T - All rights reserved.
+ #
+-#	Prototype Makefile for libframe
++#	Prototype BSDi Makefile for libframe
++#	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
+ 
+ #	add name of library orderer - use ":" if none exists
+-RANLIB=:
++RANLIB=ranlib
+ 
+ #	add name of library
+ AR=ar
+@@ -41,5 +40,7 @@
+ 	rm -f $(LIB)
+ 
+ install:	$(LIB)
++	cp ${LIB} ${PREFIX}/lib/${LIB}
++	${RANLIB} ${PREFIX}/lib/${LIB}
+ 
+ $(OBJ):	../include/u.h ../include/libc.h ../include/frame.h
diff --git a/editors/sam/patches/patch-af b/editors/sam/patches/patch-af
index ad052d09a59..4eaeee2123e 100644
--- a/editors/sam/patches/patch-af
+++ b/editors/sam/patches/patch-af
@@ -1,43 +1,41 @@
-$NetBSD: patch-af,v 1.3 2000/09/13 10:42:00 tron Exp $
+$NetBSD: patch-af,v 1.4 2001/05/01 09:16:25 agc Exp $
 
-*** Makefile.orig	Fri Aug 11 15:55:41 1995
---- Makefile	Fri Aug 11 16:08:35 1995
-***************
-*** 3,8 ****
---- 3,17 ----
-  #	master makefile for sam.  configure sub-makefiles first.
-  #
-  
-+ 
-+ MAN=man
-+ MAN1=sam
-+ MAN3=add balloc bitblt cachechars event frame graphics rgbpix rune
-+ MAN4=font keyboard utf
-+ MAN6=bitmap regexp
-+ APP_DEFAULT_DIR=${X11PREFIX}/lib/X11/app-defaults
-+ AD=Sam
-+ 
-  all:	lXg lframe samdir samtermdir
-  
-  lXg:
-***************
-*** 21,26 ****
---- 30,47 ----
-  	cd libframe; $(MAKE) install
-  	cd sam; $(MAKE) install
-  	cd samterm; $(MAKE) install
-+ 	pwd
-+ 	for i in $(MAN1); do cp doc/$$i.1 $(PREFIX)/$(MAN)/man1/$$i.1; done
-+ 	for i in $(MAN3); do cp doc/$$i.3 $(PREFIX)/$(MAN)/man3/$$i.3; done
-+ 	for i in $(MAN4); do cp doc/$$i.4 $(PREFIX)/$(MAN)/man4/$$i.4; done
-+ 	for i in $(MAN6); do cp doc/$$i.6 $(PREFIX)/$(MAN)/man6/$$i.6; done
-+ 	cp doc/$(AD).ad $(APP_DEFAULT_DIR)/$(AD)
-+ 	strip $(PREFIX)/bin/sam
-+ 	strip $(PREFIX)/bin/samterm
-+ 	for i in $(MAN1); do gzip -9nf $(PREFIX)/$(MAN)/man1/$$i.1; done
-+ 	for i in $(MAN3); do gzip -9nf $(PREFIX)/$(MAN)/man3/$$i.3; done
-+ 	for i in $(MAN4); do gzip -9nf $(PREFIX)/$(MAN)/man4/$$i.4; done
-+ 	for i in $(MAN6); do gzip -9nf $(PREFIX)/$(MAN)/man6/$$i.6; done
-  
-  clean:
-  	cd libXg; $(MAKE) clean
+--- Makefile.orig	Tue May  1 09:42:03 2001
++++ Makefile	Tue May  1 09:43:37 2001
+@@ -3,6 +3,15 @@
+ #	master makefile for sam.  configure sub-makefiles first.
+ #
+ 
++
++MAN=man
++MAN1=sam
++MAN3=add balloc bitblt cachechars event frame graphics rgbpix rune
++MAN4=font keyboard utf
++MAN6=bitmap regexp
++APP_DEFAULT_DIR=${X11PREFIX}/lib/X11/app-defaults
++AD=Sam
++
+ all:	lXg lframe samdir samtermdir
+ 
+ lXg:
+@@ -21,6 +30,20 @@
+ 	cd libframe; $(MAKE) install
+ 	cd sam; $(MAKE) install
+ 	cd samterm; $(MAKE) install
++	mkdir -p ${PREFIX}/include/sam
++	cp include/u.h include/libc.h include/libg.h include/frame.h ${PREFIX}/include/sam/
++	pwd
++	for i in $(MAN1); do cp doc/$$i.1 $(PREFIX)/$(MAN)/man1/$$i.1; done
++	for i in $(MAN3); do cp doc/$$i.3 $(PREFIX)/$(MAN)/man3/$$i.3; done
++	for i in $(MAN4); do cp doc/$$i.4 $(PREFIX)/$(MAN)/man4/$$i.4; done
++	for i in $(MAN6); do cp doc/$$i.6 $(PREFIX)/$(MAN)/man6/$$i.6; done
++	cp doc/$(AD).ad $(APP_DEFAULT_DIR)/$(AD)
++	strip $(PREFIX)/bin/sam
++	strip $(PREFIX)/bin/samterm
++	for i in $(MAN1); do gzip -9nf $(PREFIX)/$(MAN)/man1/$$i.1; done
++	for i in $(MAN3); do gzip -9nf $(PREFIX)/$(MAN)/man3/$$i.3; done
++	for i in $(MAN4); do gzip -9nf $(PREFIX)/$(MAN)/man4/$$i.4; done
++	for i in $(MAN6); do gzip -9nf $(PREFIX)/$(MAN)/man6/$$i.6; done
+ 
+ clean:
+ 	cd libXg; $(MAKE) clean
diff --git a/editors/sam/pkg/PLIST b/editors/sam/pkg/PLIST
index e7e74a229ee..539f700c8d3 100644
--- a/editors/sam/pkg/PLIST
+++ b/editors/sam/pkg/PLIST
@@ -1,8 +1,14 @@
-@comment $NetBSD: PLIST,v 1.8 2001/04/30 20:13:56 jtb Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/05/01 09:16:25 agc Exp $
 bin/sam
 bin/samterm
 bin/samsave
 bin/B
+include/sam/u.h
+include/sam/libc.h
+include/sam/libg.h
+include/sam/frame.h
+lib/libXg.a
+lib/libframe.a
 lib/X11/app-defaults/Sam
 man/man1/sam.1.gz
 man/man3/add.3.gz
@@ -19,3 +25,4 @@ man/man4/keyboard.4.gz
 man/man4/utf.4.gz
 man/man6/bitmap.6.gz
 man/man6/regexp.6.gz
+@dirrm include/sam