* This port is no longer restricted.

* Make description formatting nicer and add WWW link.

PR:		20826
Submitted by:	Trevor Johnson <trevor@jpj.net>

2 files changed, 39 insertions, 22 deletions

diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index eed23295ed4e..8d972720df99 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -9,8 +9,39 @@
 PORTNAME=	sfio
 PORTVERSION=	1999
 CATEGORIES=	devel
-#Users must register with AT&T before downloading tarball.
-#MASTER_SITES=	http://www.research.att.com/sw/tools/sfio/
+#real master site is http://www.research.att.com/sw/tools/sfio/
+MASTER_SITES=	\
+	ftp://ftp.netbsd.org/pub${SUB} \
+	ftp://ftp.netbsd.org/pub${SUB2} \
+	ftp://gatekeeper.dec.com/pub/BSD${SUB} \
+	ftp://gatekeeper.dec.com/pub/BSD${SUB2} \
+	ftp://ftp.planix.com/pub${SUB} \
+	ftp://ftp.planix.com/pub${SUB2} \
+	ftp://ftp.plig.net/pub${SUB} \
+	ftp://ftp.plig.net/pub${SUB2} \
+	ftp://ftp.csua.berkeley.edu/pub/.1/ports/distfiles/ \
+	ftp://ftp.iastate.edu/pub/netbsd/packages/distfiles/ \
+	ftp://ftp.iastate.edu/pub/netbsd/packages/distfiles/LOCAL_PORTS/ \
+	ftp://ftp.tuwien.ac.at/zaux024/opsys${SUB} \
+	ftp://ftp.tuwien.ac.at/zaux024/opsys${SUB2} \
+	ftp://sunsite.cnlab-switch.ch/mirror${SUB} \
+	ftp://ftp.unina.it/pub/Unix${SUB} \
+	ftp://ftp.unina.it/pub/Unix${SUB2} \
+	ftp://ftp.sunsite.org.uk/Mirrors/ftp.netbsd.org/pub${SUB} \
+	ftp://ftp.sunsite.org.uk/Mirrors/ftp.netbsd.org/pub${SUB2} \
+	ftp://ftp.dti.ad.jp/pub${SUB} \
+	ftp://ftp.dti.ad.jp/pub${SUB2} \
+	ftp://ftp.jaist.ac.jp/.arc07${SUB} \
+	ftp://ftp.jaist.ac.jp/.arc07${SUB2} \
+	ftp://ftp.tokyonet.ad.jp${SUB} \
+	ftp://ftp.sra.co.jp/pub/os${SUB} \
+	ftp://ftp.sra.co.jp/pub/os${SUB2} \
+	ftp://ftp.u-aizu.ac.jp/pub/os${SUB} \
+	ftp://ftp.u-aizu.ac.jp/pub/os${SUB2} \
+	ftp://ftp.nectec.or.th/pub/bsd-distributions${SUB}
+SUB=	/NetBSD/packages/distfiles/
+SUB2=	${SUB}LOCAL_PORTS/
+
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.src.unix.cpio
 
@@ -20,23 +51,9 @@ EXTRACT_CMD=	cpio
 EXTRACT_BEFORE_ARGS=	-idF
 EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
-IS_INTERACTIVE=	yes
 MAN1=		iffe.1
 MAN3=		sfio.3
 
-RESTRICTED=	Requires user to register with AT\&T
-
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
-	  ${ECHO} ""; \
-	  ${ECHO} "Please read http://www.research.att.com/sw/tools/sfio/"; \
-	  ${ECHO} "for details of how to obtain the SFIO source.  Put the"; \
-	  ${ECHO} "file ${DISTNAME}${EXTRACT_SUFX} in the directory"; \
-	  ${ECHO} "${DISTDIR} and run make again."; \
-	  ${ECHO} ""; \
-	  exit 1;\
-	fi
-
 # Remove a test that's too clever for its own good
 post-extract:
 	@${MV} ${WRKDIR}/src/lib/sfio/Sfio_t/tmmap2read.c \
diff --git a/devel/sfio/pkg-descr b/devel/sfio/pkg-descr
index 480b4e8385bc..b3fcf5bff8ce 100644
--- a/devel/sfio/pkg-descr
+++ b/devel/sfio/pkg-descr
@@ -1,15 +1,15 @@
 This is a portable library for performing stream I/O.  It provides similar
-functionality to the ANSI C Standard  I/O functions collectively known as
+functionality to the ANSI C Standard I/O functions collectively known as
 Stdio.  However, it is generally faster and more robust than most Stdio
 implementations.
 
-This version of the
-library has been ported to all known UNIX platforms including various
-flavors of IRIX, SUNOS, Solaris, Ultrix, MVS/OpenEdition, Linux and BSDI.
-The library handles 64-bit streams on platforms that support 64-bit files. 
+This version of the library has been ported to all known UNIX platforms
+including various flavors of IRIX, SUNOS, Solaris, Ultrix, Linux, BSDI,
+and MVS/OpenEdition.  The library handles 64-bit streams on platforms that
+support 64-bit files.
 
 A set of regression tests is available in the subdirectory
 $(WRKDIR)/src/lib/sfio/Sfio_t.  These tests can be exercised by running
 the shell script runtest after building the library.
 
-See $(WRKDIR)/NOTICE/sfio.notice for copyright.
+WWW:  http://www.research.att.com/sw/tools/sfio/