Convert this package to use native Makefiles.

Sync the manual page with reality.

12 files changed, 207 insertions, 40 deletions

diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index fcd1d762ae3..d90e90e7da4 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/11/02 14:43:17 agc Exp $
+# $NetBSD: Makefile,v 1.2 1998/11/02 21:18:13 agc Exp $
 #
 
 DISTNAME=       sfio_1998.src.unix
@@ -16,4 +16,9 @@ do-extract:
 	@${MKDIR} ${WRKDIR}
 	cd ${WRKDIR} ; pax -r < ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
+post-patch:
+	${MV} ${WRKSRC}/man/man3/sfio.3 ${WRKSRC}/man/man3/sfio.3.in
+	${SED} -e 's|@prefix@|${PREFIX}|g' ${WRKSRC}/man/man3/sfio.3.in \
+			> ${WRKSRC}/man/man3/sfio.3
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/sfio/patches/patch-aa b/devel/sfio/patches/patch-aa
index ce9f95e63db..a95558c31ae 100644
--- a/devel/sfio/patches/patch-aa
+++ b/devel/sfio/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/11/02 14:43:17 agc Exp $
+$NetBSD: patch-aa,v 1.2 1998/11/02 21:18:14 agc Exp $
+
+Make sure we get iffe from its correct location.
 
 --- src/lib/sfio/Makefile	1998/10/27 17:01:58	1.1
 +++ src/lib/sfio/Makefile	1998/10/27 17:03:57
diff --git a/devel/sfio/patches/patch-ab b/devel/sfio/patches/patch-ab
index 7c33e6034eb..0e931fc9711 100644
--- a/devel/sfio/patches/patch-ab
+++ b/devel/sfio/patches/patch-ab
@@ -1,20 +1,32 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/11/02 14:43:17 agc Exp $
+$NetBSD: patch-ab,v 1.2 1998/11/02 21:18:14 agc Exp $
 
-Installation commands, mainly.
+Build and installation commands.
 
 --- /dev/null	Tue Oct 27 17:12:04 1998
 +++ Makefile	Tue Oct 27 17:16:13 1998
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,25 @@
 +all:
-+	cd src/lib/sfio; make
++	cd src/lib/sfio; make -f sfio.mk
++	cd src/lib/sfio/Stdio_b; make -f stdio.mk
 +
 +install:
-+	${INSTALL} -c -m 0644 lib/libsfio.a ${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/libsfio.a ${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/libsfio_p.a ${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/libsfio_pic.a ${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/libsfio.so.1.0 ${PREFIX}/lib
 +	${RANLIB} ${PREFIX}/lib/libsfio.a
-+	${INSTALL} -c -m 0644 lib/libstdio.a ${PREFIX}/lib
++	${RANLIB} ${PREFIX}/lib/libsfio_p.a
++	${RANLIB} ${PREFIX}/lib/libsfio_pic.a
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio.a ${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio_p.a ${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio_pic.a ${PREFIX}/lib
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_b/libstdio.so.1.0 ${PREFIX}/lib
 +	${RANLIB} ${PREFIX}/lib/libstdio.a
++	${RANLIB} ${PREFIX}/lib/libstdio_p.a
++	${RANLIB} ${PREFIX}/lib/libstdio_pic.a
 +	${INSTALL} -c -m 0644 man/man3/sfio.3 ${PREFIX}/man/man3
-+	-mkdir ${PREFIX}/include/sfio
-+	for f in ast_common.h sfio.h sfio_t.h stdio.h; do \
-+		${INSTALL} -c -m 0644 include/$$f ${PREFIX}/include/sfio; \
++	-/bin/mkdir ${PREFIX}/include/sfio
++	for f in ast_common.h sfio.h sfio_t.h; do \
++		${INSTALL} -c -m 0644 src/lib/sfio/$$f ${PREFIX}/include/sfio/$$f; \
 +	done
++	${INSTALL} -c -m 0644 src/lib/sfio/Stdio_s/stdio.h ${PREFIX}/include/sfio/stdio.h
diff --git a/devel/sfio/patches/patch-ac b/devel/sfio/patches/patch-ac
index 82c1001cbf7..98712ae664d 100644
--- a/devel/sfio/patches/patch-ac
+++ b/devel/sfio/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 1998/11/02 14:43:17 agc Exp $
+$NetBSD: patch-ac,v 1.2 1998/11/02 21:18:14 agc Exp $
 
 We install the sfio header files into their own directory, to protect
 any casual compilation which includes the standard include/ directory,
@@ -6,39 +6,20 @@ and so update the documentation to reflect this.
 
 --- man/man3/sfio.3	1998/11/02 14:29:31	1.1
 +++ man/man3/sfio.3	1998/11/02 14:29:57
-@@ -15,7 +15,7 @@
- .ta 1.0i 2.0i 3.0i 4.0i 5.0i
+@@ -16,6 +16,7 @@
  .nf
  .ft 5
--#include   <sfio.h>
-+#include   <sfio/sfio.h>
+ #include   <sfio.h>
++cc -I@prefix@/include/sfio ... -L@prefix@/lib -lsfio
  .ft 1
  .fi
  .Ss "DATA TYPES"
-@@ -175,7 +175,7 @@
- .Ss "FULL STRUCTURE SFIO_T"
+@@ -198,7 +199,7 @@
  .nf
  .ft 5
--#include   <sfio_t.h>
-+#include   <sfio/sfio_t.h>
- #define    SFNEW(buf,size,file,flags,disc)
+ #include   <stdio.h>
+-cc ... -lstdio -lsfio
++cc -I@prefix@/include/sfio ... -L@prefix@/lib -lstdio -lsfio
  .ft 1
  .fi
-@@ -197,7 +197,7 @@
- .Ss "STDIO-COMPATIBILITY"
- .nf
- .ft 5
--#include   <stdio.h>
-+#include   <sfio/stdio.h>
- cc ... -lstdio -lsfio
- .ft 1
- .fi
-@@ -1642,7 +1642,7 @@
- .PP
- .Ss "FULL STRUCTURE SFIO_T"
- .PP
--.Ss "  #include <sfio_t.h>"
-+.Ss "  #include <sfio/sfio_t.h>"
- Most applications based on \fISfio\fP only need to include
- the header file \f5sfio.h\fP which defines an abbreviated \f5Sfio_t\fP
- structure without certain fields private to \fISfio\fP.
+ .SH DESCRIPTION
diff --git a/devel/sfio/patches/patch-ad b/devel/sfio/patches/patch-ad
new file mode 100644
index 00000000000..2a08235d40f
--- /dev/null
+++ b/devel/sfio/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 1998/11/02 21:18:14 agc Exp $
+
+Avoid a compiler warning.
+
+--- src/lib/sfio/sfvscanf.c	1998/11/02 17:38:38	1.1
++++ src/lib/sfio/sfvscanf.c	1998/11/02 17:55:11
+@@ -641,7 +641,7 @@
+ 			{	n_assign += 1;
+ 
+ 				if(fmt == 'p')
+-					*((Void_t**)value) = (Void_t*)argv.lu;
++					(void) memcpy(value, &argv.lu, sizeof(value));
+ #if !_ast_intmax_long
+ 				else if(FMTCMP(size,Sflong_t))
+ 					*((Sflong_t*)value) = argv.ll;
diff --git a/devel/sfio/patches/patch-ae b/devel/sfio/patches/patch-ae
new file mode 100644
index 00000000000..0dcc81d8aff
--- /dev/null
+++ b/devel/sfio/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 1998/11/02 21:18:14 agc Exp $
+
+Avoid compiler warning.
+
+--- src/lib/sfio/sfwr.c	1998/11/02 17:49:14	1.1
++++ src/lib/sfio/sfwr.c	1998/11/02 17:52:14
+@@ -30,10 +30,14 @@
+ 			sp = buf+1;
+ 			if(buf[0] == 0 && buf[_Sfpage-1] == 0)
+ 			{	/* check byte at a time until int-aligned */
+-				while(((Sfulong_t)sp)%sizeof(int))
++				Sfulong_t	dumbo;
++
++				(void) memcpy(&dumbo, sp, sizeof(dumbo));
++				while(dumbo % sizeof(int) != 0)
+ 				{	if(*sp != 0)
+ 						goto chk_hole;
+ 					sp += 1;
++					(void) memcpy(&dumbo, sp, sizeof(dumbo));
+ 				}
+ 
+ 				/* check using int to speed up */
diff --git a/devel/sfio/patches/patch-af b/devel/sfio/patches/patch-af
new file mode 100644
index 00000000000..c1752dd4c8f
--- /dev/null
+++ b/devel/sfio/patches/patch-af
@@ -0,0 +1,50 @@
+$NetBSD: patch-af,v 1.1 1998/11/02 21:18:14 agc Exp $
+
+NetBSD Makefile for sfio.
+
+--- /dev/null	Mon Nov  2 17:57:38 1998
++++ src/lib/sfio/sfio.mk	Mon Nov  2 17:46:11 1998
+@@ -0,0 +1,43 @@
++# sfio Makefile for NetBSD make
++
++LIB=	sfio
++
++SHLIB_MAJOR=	1
++SHLIB_MINOR=	0
++
++CPPFLAGS+=	-I${.CURDIR}
++
++SRCS=	sfexit.c sfclose.c sfclrlock.c sfcvt.c sfdlen.c sfexcept.c sfextern.c \
++	sffilbuf.c sfflsbuf.c sfprints.c sfgetd.c sfgetl.c sfgetr.c sfgetu.c \
++	sfllen.c sfmode.c sfmove.c sfnew.c sfnputc.c sfopen.c \
++	sfpool.c sfpopen.c sfprintf.c sfputd.c sfputl.c sfputr.c sfputu.c \
++	sfpkrd.c sfread.c sfscanf.c sfseek.c sfset.c sfsetbuf.c sfdisc.c \
++	sfstack.c sfstrtod.c sfsync.c sftable.c sftell.c sftmp.c \
++	sfungetc.c sfvprintf.c sfvscanf.c sfwrite.c sfnotify.c sfsetfd.c \
++	sfrd.c sfwr.c sfsk.c sfsize.c sfpurge.c sfpoll.c sfreserve.c \
++	sfswap.c sfraise.c
++
++BINDIR=	../../../bin
++
++NOLINT=	1
++
++ast_common.h : features/common
++	${BINDIR}/iffe - run features/common > ast_common.h
++sfstdgen : sfstdio.c
++	$(CC) -I. $(*) -o sfstdgen
++sfstdhdr.h :
++	Stdio_b/sfstdhdr.sh $(CC)
++sfstdio.h :	sfstdgen
++	$(*) > $(<)
++	rm sfstdgen sfstdhdr.h 
++
++sfexit.c: ast_common.h FEATURE/sfio
++
++FEATURE/sfio: features/sfio
++	$(BINDIR)/iffe set cc $(CC) : run features/sfio
++
++.include "${.CURDIR}/Sfio_f/Makefile.inc"
++.include "${.CURDIR}/Stdio_s/Makefile.inc"
++.include "${.CURDIR}/Sfio_dc/Makefile.inc"
++
++.include <bsd.lib.mk>
diff --git a/devel/sfio/patches/patch-ag b/devel/sfio/patches/patch-ag
new file mode 100644
index 00000000000..8d961573a24
--- /dev/null
+++ b/devel/sfio/patches/patch-ag
@@ -0,0 +1,11 @@
+$NetBSD: patch-ag,v 1.1 1998/11/02 21:18:14 agc Exp $
+
+NetBSD included Makefile for line disciplines
+
+--- /dev/null	Mon Nov  2 17:57:38 1998
++++ src/lib/sfio/Sfio_dc/Makefile.inc	Mon Nov  2 17:23:17 1998
+@@ -0,0 +1,4 @@
++.PATH: ${.CURDIR}/Sfio_dc
++
++SRCS+=	sfdcdio.c sfdcdos.c sfdcfilter.c sfdclzw.c sfdcseekable.c sfdcslow.c \
++	sfdcsubstream.c sfdctee.c sfdcunion.c
diff --git a/devel/sfio/patches/patch-ah b/devel/sfio/patches/patch-ah
new file mode 100644
index 00000000000..a17bbf0db2b
--- /dev/null
+++ b/devel/sfio/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 1998/11/02 21:18:14 agc Exp $
+
+NetBSD included Makefile for sfio functions
+
+--- /dev/null	Mon Nov  2 17:57:38 1998
++++ src/lib/sfio/Sfio_f/Makefile.inc	Mon Nov  2 17:26:53 1998
+@@ -0,0 +1,5 @@
++.PATH: ${.CURDIR}/Sfio_f
++
++SRCS+=	_sfclrerr.c _sfdlen.c _sfeof.c _sferror.c _sffileno.c _sfgetc.c \
++	_sfgetl.c _sfgetu.c _sfllen.c _sfputc.c _sfputd.c _sfputl.c _sfputu.c \
++	_sfslen.c _sfstacked.c _sfulen.c _sfvalue.c
diff --git a/devel/sfio/patches/patch-ai b/devel/sfio/patches/patch-ai
new file mode 100644
index 00000000000..c5c90902e05
--- /dev/null
+++ b/devel/sfio/patches/patch-ai
@@ -0,0 +1,11 @@
+$NetBSD: patch-ai,v 1.1 1998/11/02 21:18:14 agc Exp $
+
+NetBSD included Makefile for stdio stubs.
+
+--- /dev/null	Mon Nov  2 17:57:38 1998
++++ src/lib/sfio/Stdio_s/Makefile.inc	Mon Nov  2 17:26:59 1998
+@@ -0,0 +1,4 @@
++.PATH: ${.CURDIR}/Stdio_s
++
++SRCS+=	stdgets.c stdopen.c stdprintf.c stdscanf.c stdsprintf.c stdvbuf.c \
++	stdputc.c stdgetc.c
diff --git a/devel/sfio/patches/patch-aj b/devel/sfio/patches/patch-aj
new file mode 100644
index 00000000000..62db32195a2
--- /dev/null
+++ b/devel/sfio/patches/patch-aj
@@ -0,0 +1,40 @@
+$NetBSD: patch-aj,v 1.1 1998/11/02 21:18:14 agc Exp $
+
+NetBSD Makefile for stdio-compatible library.
+
+--- /dev/null	Mon Nov  2 19:32:07 1998
++++ src/lib/sfio/Stdio_b/stdio.mk	Mon Nov  2 19:31:50 1998
+@@ -0,0 +1,33 @@
++# NetBSD Makefile for stdio
++
++LIB=	stdio
++
++CPPFLAGS+=	-I${.CURDIR} -I${.CURDIR}/..
++
++BINDIR=	${.CURDIR}/../../../../bin
++
++SHLIB_MAJOR=	1
++SHLIB_MINOR=	0
++
++NOLINT=		1
++
++SRCS=	doprnt.c doscan.c fclose.c fdopen.c fflush.c fgetc.c fgets.c filbuf.c \
++	flsbuf.c fopen.c fprintf.c fputc.c fputs.c fread.c freopen.c fscanf.c \
++	fseek.c ftell.c fwrite.c getc.c getchar.c gets.c getw.c pclose.c popen.c \
++	printf.c putc.c putchar.c puts.c putw.c rewind.c scanf.c setbuf.c setbuffer.c \
++	setlinebuf.c setvbuf.c sprintf.c sscanf.c stdextern.c stdstream.c \
++	tmpfile.c ungetc.c vfprintf.c vfscanf.c vprintf.c vscanf.c vsprintf.c \
++	vsscanf.c fileno.c feof.c ferror.c clearerr.c fpurge.c fgetpos.c fsetpos.c \
++	cleanup.c vsnprintf.c snprintf.c
++
++doprnt.o: FEATURE/stdio must
++
++FEATURE/stdio: features/stdio
++	$(BINDIR)/iffe set cc $(CC) : run features/stdio
++
++must:
++	./sfstdhdr.sh $(CC)
++	$(CC) ${CPPFLAGS} sfstdio.c -o sfstdgen >/dev/null 2>&1
++	./sfstdgen > sfstdio.h; rm sfstdgen sfstdhdr.h
++
++.include <bsd.lib.mk>
diff --git a/devel/sfio/pkg/PLIST b/devel/sfio/pkg/PLIST
index 8cafdb0f630..affc0a6d385 100644
--- a/devel/sfio/pkg/PLIST
+++ b/devel/sfio/pkg/PLIST
@@ -1,6 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/11/02 14:43:17 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/11/02 21:18:14 agc Exp $
 lib/libsfio.a
+lib/libsfio_p.a
+lib/libsfio_pic.a
+lib/libsfio.so.1.0
 lib/libstdio.a
+lib/libstdio_p.a
+lib/libstdio_pic.a
+lib/libstdio.so.1.0
 include/sfio/ast_common.h
 include/sfio/sfio.h
 include/sfio/sfio_t.h