4 files changed, 15 insertions, 145 deletions

diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 288851a125ca..09ac4cefae84 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -3,21 +3,23 @@
 # Date created: 	8 November 1997
 # Whom:			jraynard
 #
-# $Id: Makefile,v 1.3 1997/11/29 03:08:01 jseger Exp $
+# $Id: Makefile,v 1.4 1997/12/11 01:09:53 jraynard Exp $
 #
 
-DISTNAME=	sfio97
-PKGNAME=	sfio-97
+DISTNAME=	sfio_1998
+PKGNAME=	sfio-98
 CATEGORIES=	devel
 #Users must register with AT&T before downloading tarball.
 #MASTER_SITES=	http://www.research.att.com/sw/tools/sfio/
-EXTRACT_SUFX=	.src.unix.tar.Z
+EXTRACT_SUFX=	.src.unix.cpio
+EXTRACT_CMD=	cpio
+EXTRACT_BEFORE_ARGS=	-idF
 
 MAINTAINER=	jraynard@freebsd.org
 
 NO_WRKSUBDIR=	yes
 IS_INTERACTIVE=	yes
-MAN3=		sfio.3 sfdisc.3
+MAN3=		cdt.3 sfio.3 vmalloc.3
 
 RESTRICTED=	Requires user to register with AT&T.
 
@@ -33,21 +35,18 @@ do-fetch:
 	fi
 
 # Remove a test that's too clever for its own good
-# from the distribution, and a junk binary while we're at it.
 post-extract:
 	@${RM} ${WRKDIR}/src/lib/sfio/Sfio_t/tmmap2read.c
-	@${RM} ${WRKDIR}/lib/libvdelta.a
 
 do-build:
 	@cd ${WRKDIR}/src/lib/sfio && ${MAKE} all -f makefile
-	@cd ${WRKDIR}/src/lib/sfdisc && ${MAKE} all
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/include/* ${PREFIX}/include
-	${INSTALL_DATA} ${WRKDIR}/lib/libsfdisc.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKDIR}/lib/libsfio.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKDIR}/lib/libstdio.a ${PREFIX}/lib
+	${INSTALL_MAN} ${WRKDIR}/man/man3/cdt.3 ${PREFIX}/man/man3
 	${INSTALL_MAN} ${WRKDIR}/man/man3/sfio.3 ${PREFIX}/man/man3
-	${INSTALL_MAN} ${WRKDIR}/man/man3/sfdisc.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKDIR}/man/man3/vmalloc.3 ${PREFIX}/man/man3
 
 .include <bsd.port.mk>
diff --git a/devel/sfio/distinfo b/devel/sfio/distinfo
index 858605d1845b..5d2f643e1750 100644
--- a/devel/sfio/distinfo
+++ b/devel/sfio/distinfo
@@ -1 +1 @@
-MD5 (sfio97.src.unix.tar.Z) = 25cf92a15ee55062fa5d715a434f8cf7
+MD5 (sfio_1998.src.unix.cpio) = 937a5bdafda8603d12b11341eebf6f49
diff --git a/devel/sfio/files/patch-aa b/devel/sfio/files/patch-aa
index eedcd29865b8..3591ba17fdcd 100644
--- a/devel/sfio/files/patch-aa
+++ b/devel/sfio/files/patch-aa
@@ -1,139 +1,12 @@
---- src/lib/sfio/makefile.orig	Sat Nov  8 12:15:30 1997
-+++ src/lib/sfio/makefile	Sat Nov  8 12:43:09 1997
-@@ -9,7 +9,7 @@
+--- src/lib/sfio/makefile.orig	Sat Nov  7 13:28:29 1998
++++ src/lib/sfio/makefile	Sat Nov  7 13:30:27 1998
+@@ -9,7 +9,8 @@
  # Compiler and flags to use
  CXFLAGS=
  CCMODE=	-O
 -CCFLAGS= -I. $(CCMODE) $(CXFLAGS)
-+CFLAGS+= -I. $(CXFLAGS)
++CCFLAGS= $(CFLAGS)
++CCFLAGS+= -I. 
  AR=	ar
  CC=	cc
  
-@@ -44,7 +44,7 @@
- 	Stdio_s/stdscanf.o Stdio_s/stdsprintf.o Stdio_s/stdvbuf.o
- 
- .c.o:
--	$(CC) -c $(CCFLAGS) $*.c
-+	$(CC) -c $(CFLAGS) $*.c
- 
- all:	install
- 
-@@ -56,12 +56,12 @@
- ast_common.h: features/ast_common
- 	export CC; CC=$(CC); $(BINDIR)/iffe - run features/ast_common > ast_common.h
- sfio_f:
--	cd Sfio_f; make -f Makefile CC="$(CC)" CCMODE="$(CCMODE)" CXFLAGS="$(CXFLAGS)"
-+	cd Sfio_f; make
- stdio_s:
--	cd Stdio_s; make -f Makefile CC="$(CC)" CCMODE="$(CCMODE)" CXFLAGS="$(CXFLAGS)"
-+	cd Stdio_s; make
- 
- libstdio.a:
--	cd Stdio_b; make -f Makefile CC="$(CC)" CCMODE="$(CCMODE)" CXFLAGS="$(CXFLAGS)"
-+	cd Stdio_b; make
- 
- install: libsfio.a libstdio.a
- 	cp sfio.h ast_common.h sfio_t.h Stdio_s/stdio.h $(INCDIR)
---- src/lib/sfio/sfhdr.h.orig	Sat Nov  8 12:18:29 1997
-+++ src/lib/sfio/sfhdr.h	Sat Nov  8 12:19:25 1997
-@@ -136,7 +136,7 @@
- #if _typ_long_double
- 
- #if _hdr_values
--#include	<values.h>
-+#include	<float.h>
- #endif
- #if _hdr_math
- #include	<math.h>
---- src/lib/sfdisc/Makefile.orig	Sat Nov  8 12:02:59 1997
-+++ src/lib/sfdisc/Makefile	Sat Nov  8 12:04:14 1997
-@@ -11,7 +11,7 @@
- # Compiler and flags to use
- CXFLAGS=
- CCMODE=	-O
--CCFLAGS= -I. -I$(INCDIR) $(CCMODE) $(CXFLAGS)
-+CFLAGS+= -I. -I$(INCDIR) $(CXFLAGS)
- AR=	ar
- CC=	cc
- 
-@@ -20,7 +20,7 @@
- OBJS=	sfdcfilter.o sfdclzw.o sfdcskable.o sfdcsubstream.o sfdctee.o sfdcunion.o
- 
- .c.o:
--	$(CC) -c $(CCFLAGS) $*.c
-+	$(CC) -c $(CFLAGS) $*.c
- 
- all:	install
- 
---- src/lib/sfio/Sfio_f/Makefile.orig	Sat Nov  8 14:29:20 1997
-+++ src/lib/sfio/Sfio_f/Makefile	Sat Nov  8 14:29:54 1997
-@@ -6,8 +6,7 @@
- AR=	ar
- CC=	cc
- CXFLAGS=
--CCMODE=	-O
--CCFLAGS= -I.. $(CCMODE) $(CXFLAGS)
-+CFLAGS+= -I.. $(CXFLAGS)
- 
- 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 \
-@@ -16,7 +17,7 @@
- 	_sfslen.o _sfstacked.o _sfulen.o _sfvalue.o
- 
- .c.o:
--	$(CC) -c $(CCFLAGS) $*.c
-+	$(CC) -c $(CFLAGS) $*.c
- 
- must:	$(OBJS)
- 
---- src/lib/sfio/Stdio_b/Makefile.orig	Sat Nov  8 14:30:33 1997
-+++ src/lib/sfio/Stdio_b/Makefile	Sat Nov  8 14:31:14 1997
-@@ -6,8 +6,7 @@
- AR=	ar
- CC=	cc
- CXFLAGS=
--CCMODE=	-O
--CCFLAGS= -I.. $(CCMODE) $(CXFLAGS)
-+CFLAGS+= -I.. $(CXFLAGS)
- BINDIR= ../../../../bin
- 
- SRCS=	doprnt.c doscan.c fclose.c fdopen.c fflush.c fgetc.c fgets.c filbuf.c \
-@@ -29,7 +28,7 @@
- 	cleanup.o vsnprintf.o snprintf.o
- 
- .c.o:
--	$(CC) -c $(CCFLAGS) $*.c
-+	$(CC) -c $(CFLAGS) $*.c
- 
- libstdio.a: FEATURE/stdio must $(OBJS)
- 	$(AR) cr libstdio.a $(OBJS)
---- src/lib/sfio/Stdio_s/Makefile.orig	Sat Nov  8 14:31:35 1997
-+++ src/lib/sfio/Stdio_s/Makefile	Sat Nov  8 14:32:06 1997
-@@ -6,14 +6,13 @@
- AR=	ar
- CC=	cc
- CXFLAGS=
--CCMODE=	-O
--CCFLAGS= -I.. $(CCMODE) $(CXFLAGS)
-+CFLAGS+= -I.. $(CXFLAGS)
- 
- SRCS=	stdgets.c stdopen.c stdprintf.c stdscanf.c stdsprintf.c stdvbuf.c
- OBJS=	stdgets.o stdopen.o stdprintf.o stdscanf.o stdsprintf.o stdvbuf.o
- 
- .c.o:
--	$(CC) -c $(CCFLAGS) $*.c
-+	$(CC) -c $(CFLAGS) $*.c
- 
- must:	$(OBJS)
- 
---- src/lib/sfio/Sfio_t/runtest.orig	Sat Nov  8 15:27:24 1997
-+++ src/lib/sfio/Sfio_t/runtest	Sat Nov  8 15:27:43 1997
-@@ -32,7 +32,7 @@
- 	if $CC -g -I.. -I$INCLUDE $i $LIB/libsfio.a -o t
- 	then
- 		if ./t
--		then	rm t; status=passed
-+		then	rm -f t; status=passed
- 		else	status=failed
- 		fi
- 	else	status="Not compiled"
diff --git a/devel/sfio/pkg-plist b/devel/sfio/pkg-plist
index 25cbf20994a4..e75b392c372d 100644
--- a/devel/sfio/pkg-plist
+++ b/devel/sfio/pkg-plist
@@ -1,8 +1,6 @@
 include/ast_common.h
-include/sfdisc.h
 include/sfio.h
 include/sfio_t.h
 include/stdio.h
-lib/libsfdisc.a
 lib/libsfio.a
 lib/libstdio.a