Upgrade, 3.5a16 -> 3.5b1.

Submitted by:	 Mike Peck <mike@falcon.binghamton.edu>
Reviewed & Modified by:	max
(Closing PR #2374.)

4 files changed, 95 insertions, 81 deletions

diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index 49575d97d042..4b70a32b8242 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:	tinyfugue
-# Version required:	3.5a16
-# Date created:		22 Mar 1996
+# Version required:	3.5b1
+# Date created:		4 January 1997
 # Whom:			mike@binghamton.edu
 #
-# $Id: Makefile,v 1.1.1.1 1996/03/25 10:12:09 asami Exp $
+# $Id$
 #
 
-DISTNAME=	tf-35a16
+DISTNAME=	tf-35b1
+PKGNAME=	tf-3.5b1
 CATEGORIES=	net games
 MASTER_SITES=	ftp://tf.tcp.com/pub/tinyfugue/ \
 		ftp://ftp.tcp.com/pub/mud/Clients/tf/ \
-		ftp://ftp7.freebsd.org/pub/tf/
+		http://dsmuse.binghamton.edu/archives/clients/tinyfugue/
 
 MAINTAINER=	mike@binghamton.edu
 
-# Here's my cute little hack to make it use its proprietary
-# program thing insteada make. :) This is probably a stupid way
-# to do it so email me if you know of a better way.
+MAN1=		tf.1
+MAKEFILE=	${WRKSRC}/unix/Makefile
+ALL_TARGET=	${MAKE_ARGS} all
+INSTALL_TARGET=	${MAKE_ARGS} install
 
-USE_GMAKE=yes
-GMAKE= ./unixmake
+MAKE_ARGS=	TFVER=${DISTNAME:S/^tf-//}
 
 .include <bsd.port.mk>
-
-BUILD_DEPENDS=
diff --git a/net/tinyfugue/distinfo b/net/tinyfugue/distinfo
index 4749c3d636d8..205a60eaaf7e 100644
--- a/net/tinyfugue/distinfo
+++ b/net/tinyfugue/distinfo
@@ -1 +1 @@
-MD5 (tf-35a16.tar.gz) = 0df40f2711272cf505ff05faff096545
+MD5 (tf-35b1.tar.gz) = b02420be6bb44d26b4754cd3db28d0d7
diff --git a/net/tinyfugue/files/patch-ab b/net/tinyfugue/files/patch-ab
index a7179020dd9d..f91d26487bfc 100644
--- a/net/tinyfugue/files/patch-ab
+++ b/net/tinyfugue/files/patch-ab
@@ -1,14 +1,26 @@
---- tfio.c.old	Fri Mar 22 17:40:03 1996
-+++ src/tfio.c	Fri Mar 22 17:27:44 1996
-@@ -19,9 +19,9 @@
- #include "config.h"
- #include <errno.h>
- #include <ctype.h>
--#ifdef SYS_SELECT_H
-+/*#ifdef SYS_SELECT_H
- # include <sys/select.h>
--#endif
-+#endif*/
- #include <sys/types.h>
- #include <sys/time.h>   /* for struct timeval, in select() */
- #define SYS_TIME_H      /* to prevent <time.h> in "port.h" */
+--- Config.old	Sat Jan  4 12:48:06 1997
++++ unix/Config	Sat Jan  4 12:50:59 1997
+@@ -33,9 +33,9 @@
+ #   even if an old version is currently in use.  You can remove
+ #   the old version manually later when it is no longer in use.
+ 
+-# EXE="/usr/local/bin/tf-${TFVER}"
+-# LIBDIR="/usr/local/lib/tf-${TFVER}-lib"
+-# SYMLINK="/usr/local/bin/tf"
++EXE="${PREFIX}/bin/tf-${TFVER}"
++LIBDIR="${PREFIX}/lib/tf-${TFVER}-lib"
++SYMLINK="${PREFIX}/bin/tf"
+ 
+ 
+ ### Manual Page.
+@@ -44,8 +44,8 @@
+ # uses nroff format; set MANTYPE=cat if your man uses pre-formatted
+ # vt100 "catman" pages.  Default is "cat".
+ 
+-# MANTYPE="nroff"
+-# MANPAGE="/usr/local/man/man1/tf.1"
++MANTYPE="nroff"
++MANPAGE="${PREFIX}/man/man1/tf.1"
+ 
+ 
+ ### Flags.
diff --git a/net/tinyfugue/pkg-plist b/net/tinyfugue/pkg-plist
index a1b9358dc9ab..1401f83dc8e4 100644
--- a/net/tinyfugue/pkg-plist
+++ b/net/tinyfugue/pkg-plist
@@ -1,55 +1,58 @@
 bin/tf
-lib/tf-lib/README
-lib/tf-lib/watch.tf
-lib/tf-lib/tr.tf
-lib/tf-lib/tools.tf
-lib/tf-lib/tintin.tf
-lib/tf-lib/tick.tf
-lib/tf-lib/tfrc
-lib/tf-lib/tf-help.idx
-lib/tf-lib/tf-help
-lib/tf-lib/stdlib.tf
-lib/tf-lib/stack-q.tf
-lib/tf-lib/spell.tf
-lib/tf-lib/spedwalk.tf
-lib/tf-lib/spc-page.tf
-lib/tf-lib/self.tf
-lib/tf-lib/rwho.tf
-lib/tf-lib/replace.tf
-lib/tf-lib/relog.tf
-lib/tf-lib/quoter.tf
-lib/tf-lib/psh.tf
-lib/tf-lib/pcmd.tf
-lib/tf-lib/map.tf
-lib/tf-lib/local-eg.tf
-lib/tf-lib/lisp.tf
-lib/tf-lib/kbstack.tf
-lib/tf-lib/kbregion.tf
-lib/tf-lib/kbfunc.tf
-lib/tf-lib/kbbind.tf
-lib/tf-lib/kb-os2.tf
-lib/tf-lib/kb-emacs.tf
-lib/tf-lib/kb-bash.tf
-lib/tf-lib/hanoi.tf
-lib/tf-lib/finger.tf
-lib/tf-lib/filexfer.tf
-lib/tf-lib/factoral.tf
-lib/tf-lib/examples.old
-lib/tf-lib/complete.tf
-lib/tf-lib/color.tf
-lib/tf-lib/changes.tf
-lib/tf-lib/at.tf
-lib/tf-lib/alias.tf
-lib/tf-lib/world-q.tf
-lib/tf-lib/CHANGES
-lib/tf-lib/bind-bash.tf
-lib/tf-lib/bind-emacs.tf
-lib/tf-lib/completion.tf
-lib/tf-lib/factorial.tf
-lib/tf-lib/file-xfer.tf
-lib/tf-lib/local.tf.sample
-lib/tf-lib/pref-shell.tf
-lib/tf-lib/space_page.tf
-lib/tf-lib/speedwalk.tf
-lib/tf-lib/stack_queue.tf
-lib/tf-lib/worldqueue.tf
+bin/tf-35b1
+man/man1/tf.1.gz
+lib/tf-35b1-lib/README
+lib/tf-35b1-lib/watch.tf
+lib/tf-35b1-lib/tr.tf
+lib/tf-35b1-lib/tools.tf
+lib/tf-35b1-lib/tintin.tf
+lib/tf-35b1-lib/tick.tf
+lib/tf-35b1-lib/tfrc
+lib/tf-35b1-lib/tf-help.idx
+lib/tf-35b1-lib/tf-help
+lib/tf-35b1-lib/stdlib.tf
+lib/tf-35b1-lib/stack-q.tf
+lib/tf-35b1-lib/spell.tf
+lib/tf-35b1-lib/spedwalk.tf
+lib/tf-35b1-lib/spc-page.tf
+lib/tf-35b1-lib/self.tf
+lib/tf-35b1-lib/rwho.tf
+lib/tf-35b1-lib/replace.tf
+lib/tf-35b1-lib/relog.tf
+lib/tf-35b1-lib/quoter.tf
+lib/tf-35b1-lib/psh.tf
+lib/tf-35b1-lib/pcmd.tf
+lib/tf-35b1-lib/map.tf
+lib/tf-35b1-lib/local-eg.tf
+lib/tf-35b1-lib/lisp.tf
+lib/tf-35b1-lib/kbstack.tf
+lib/tf-35b1-lib/kbregion.tf
+lib/tf-35b1-lib/kbfunc.tf
+lib/tf-35b1-lib/kbbind.tf
+lib/tf-35b1-lib/kb-os2.tf
+lib/tf-35b1-lib/kb-emacs.tf
+lib/tf-35b1-lib/kb-bash.tf
+lib/tf-35b1-lib/hanoi.tf
+lib/tf-35b1-lib/grep.tf
+lib/tf-35b1-lib/finger.tf
+lib/tf-35b1-lib/filexfer.tf
+lib/tf-35b1-lib/factoral.tf
+lib/tf-35b1-lib/examples.old
+lib/tf-35b1-lib/complete.tf
+lib/tf-35b1-lib/color.tf
+lib/tf-35b1-lib/changes.tf
+lib/tf-35b1-lib/at.tf
+lib/tf-35b1-lib/alias.tf
+lib/tf-35b1-lib/world-q.tf
+lib/tf-35b1-lib/CHANGES
+lib/tf-35b1-lib/bind-bash.tf
+lib/tf-35b1-lib/bind-emacs.tf
+lib/tf-35b1-lib/completion.tf
+lib/tf-35b1-lib/factorial.tf
+lib/tf-35b1-lib/file-xfer.tf
+lib/tf-35b1-lib/local.tf.sample
+lib/tf-35b1-lib/pref-shell.tf
+lib/tf-35b1-lib/space_page.tf
+lib/tf-35b1-lib/speedwalk.tf
+lib/tf-35b1-lib/stack_queue.tf
+lib/tf-35b1-lib/worldqueue.tf