Backout previous commit by flathill.

All it did was to remove the PLIST_SUB functionality that makes upgrading this
port easier, and added a MASTER_SITE that had the same IP address as the other
one.

2 files changed, 61 insertions, 60 deletions

diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index a3e3752c0ed..a0a04524fd4 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -3,17 +3,18 @@
 # Date created:		4 January 1997
 # Whom:			mike@binghamton.edu
 #
-# $Id: Makefile,v 1.11 1998/08/21 03:06:54 jseger Exp $
+# $Id: Makefile,v 1.12 1998/12/09 05:03:11 jseger Exp $
 #
 
 DISTNAME=	tf-40g2
 PKGNAME=	tf-4.0g2
 CATEGORIES=	net games
-MASTER_SITES=	ftp://tf.tcp.com/pub/tinyfugue/ \
-		ftp://laurel.actlab.utexas.edu/pub/tinyfugue/
+MASTER_SITES=	ftp://tf.tcp.com/pub/tinyfugue/
 
 MAINTAINER=	jseger@FreeBSD.org
 
+PLIST_SUB=	DISTNAME=${DISTNAME}
+
 MAKEFILE=	${WRKSRC}/unix/Makefile
 MAKE_ENV=	TFVER=${DISTNAME:S/^tf-//}
 
diff --git a/net/tinyfugue/pkg-plist b/net/tinyfugue/pkg-plist
index ce1143ccd8c..ec826aca23d 100644
--- a/net/tinyfugue/pkg-plist
+++ b/net/tinyfugue/pkg-plist
@@ -1,58 +1,58 @@
 bin/tf
-bin/tf-40g2
-lib/tf-40g2-lib/CHANGES
-lib/tf-40g2-lib/README
-lib/tf-40g2-lib/alias.tf
-lib/tf-40g2-lib/at.tf
-lib/tf-40g2-lib/bind-bash.tf
-lib/tf-40g2-lib/bind-emacs.tf
-lib/tf-40g2-lib/changes.tf
-lib/tf-40g2-lib/color.tf
-lib/tf-40g2-lib/complete.tf
-lib/tf-40g2-lib/completion.tf
-lib/tf-40g2-lib/examples.old
-lib/tf-40g2-lib/factoral.tf
-lib/tf-40g2-lib/factorial.tf
-lib/tf-40g2-lib/file-xfer.tf
-lib/tf-40g2-lib/filexfer.tf
-lib/tf-40g2-lib/finger.tf
-lib/tf-40g2-lib/grep.tf
-lib/tf-40g2-lib/hanoi.tf
-lib/tf-40g2-lib/kb-bash.tf
-lib/tf-40g2-lib/kb-emacs.tf
-lib/tf-40g2-lib/kb-os2.tf
-lib/tf-40g2-lib/kbbind.tf
-lib/tf-40g2-lib/kbfunc.tf
-lib/tf-40g2-lib/kbregion.tf
-lib/tf-40g2-lib/kbstack.tf
-lib/tf-40g2-lib/lisp.tf
-lib/tf-40g2-lib/local-eg.tf
-lib/tf-40g2-lib/local.tf.sample
-lib/tf-40g2-lib/map.tf
-lib/tf-40g2-lib/pcmd.tf
-lib/tf-40g2-lib/pref-shell.tf
-lib/tf-40g2-lib/psh.tf
-lib/tf-40g2-lib/quoter.tf
-lib/tf-40g2-lib/relog.tf
-lib/tf-40g2-lib/rwho.tf
-lib/tf-40g2-lib/self.tf
-lib/tf-40g2-lib/space_page.tf
-lib/tf-40g2-lib/spc-page.tf
-lib/tf-40g2-lib/spedwalk.tf
-lib/tf-40g2-lib/speedwalk.tf
-lib/tf-40g2-lib/spell.tf
-lib/tf-40g2-lib/stack-q.tf
-lib/tf-40g2-lib/stack_queue.tf
-lib/tf-40g2-lib/stdlib.tf
-lib/tf-40g2-lib/textutil.tf
-lib/tf-40g2-lib/tf-help
-lib/tf-40g2-lib/tf-help.idx
-lib/tf-40g2-lib/tfrc
-lib/tf-40g2-lib/tick.tf
-lib/tf-40g2-lib/tintin.tf
-lib/tf-40g2-lib/tools.tf
-lib/tf-40g2-lib/tr.tf
-lib/tf-40g2-lib/watch.tf
-lib/tf-40g2-lib/world-q.tf
-lib/tf-40g2-lib/worldqueue.tf
-@dirrm lib/tf-40g2-lib
+bin/%%DISTNAME%%
+lib/%%DISTNAME%%-lib/CHANGES
+lib/%%DISTNAME%%-lib/README
+lib/%%DISTNAME%%-lib/alias.tf
+lib/%%DISTNAME%%-lib/at.tf
+lib/%%DISTNAME%%-lib/bind-bash.tf
+lib/%%DISTNAME%%-lib/bind-emacs.tf
+lib/%%DISTNAME%%-lib/changes.tf
+lib/%%DISTNAME%%-lib/color.tf
+lib/%%DISTNAME%%-lib/complete.tf
+lib/%%DISTNAME%%-lib/completion.tf
+lib/%%DISTNAME%%-lib/examples.old
+lib/%%DISTNAME%%-lib/factoral.tf
+lib/%%DISTNAME%%-lib/factorial.tf
+lib/%%DISTNAME%%-lib/file-xfer.tf
+lib/%%DISTNAME%%-lib/filexfer.tf
+lib/%%DISTNAME%%-lib/finger.tf
+lib/%%DISTNAME%%-lib/grep.tf
+lib/%%DISTNAME%%-lib/hanoi.tf
+lib/%%DISTNAME%%-lib/kb-bash.tf
+lib/%%DISTNAME%%-lib/kb-emacs.tf
+lib/%%DISTNAME%%-lib/kb-os2.tf
+lib/%%DISTNAME%%-lib/kbbind.tf
+lib/%%DISTNAME%%-lib/kbfunc.tf
+lib/%%DISTNAME%%-lib/kbregion.tf
+lib/%%DISTNAME%%-lib/kbstack.tf
+lib/%%DISTNAME%%-lib/lisp.tf
+lib/%%DISTNAME%%-lib/local-eg.tf
+lib/%%DISTNAME%%-lib/local.tf.sample
+lib/%%DISTNAME%%-lib/map.tf
+lib/%%DISTNAME%%-lib/pcmd.tf
+lib/%%DISTNAME%%-lib/pref-shell.tf
+lib/%%DISTNAME%%-lib/psh.tf
+lib/%%DISTNAME%%-lib/quoter.tf
+lib/%%DISTNAME%%-lib/relog.tf
+lib/%%DISTNAME%%-lib/rwho.tf
+lib/%%DISTNAME%%-lib/self.tf
+lib/%%DISTNAME%%-lib/space_page.tf
+lib/%%DISTNAME%%-lib/spc-page.tf
+lib/%%DISTNAME%%-lib/spedwalk.tf
+lib/%%DISTNAME%%-lib/speedwalk.tf
+lib/%%DISTNAME%%-lib/spell.tf
+lib/%%DISTNAME%%-lib/stack-q.tf
+lib/%%DISTNAME%%-lib/stack_queue.tf
+lib/%%DISTNAME%%-lib/stdlib.tf
+lib/%%DISTNAME%%-lib/textutil.tf
+lib/%%DISTNAME%%-lib/tf-help
+lib/%%DISTNAME%%-lib/tf-help.idx
+lib/%%DISTNAME%%-lib/tfrc
+lib/%%DISTNAME%%-lib/tick.tf
+lib/%%DISTNAME%%-lib/tintin.tf
+lib/%%DISTNAME%%-lib/tools.tf
+lib/%%DISTNAME%%-lib/tr.tf
+lib/%%DISTNAME%%-lib/watch.tf
+lib/%%DISTNAME%%-lib/world-q.tf
+lib/%%DISTNAME%%-lib/worldqueue.tf
+@dirrm lib/%%DISTNAME%%-lib