5 files changed, 84 insertions, 55 deletions

diff --git a/editors/the/Makefile b/editors/the/Makefile
index f3e66274b061..3f2b80449b07 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	THE
-# Version required:	2.7
+# Version required:	2.8
 # Date created:		7 May 1999
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=       THE-2.7
-PKGNAME=	the-2.7
+DISTNAME=	THE-2.8
+PKGNAME=	the-2.8
 CATEGORIES=	editors
-MASTER_SITES=   ftp://ftp.lightlink.com/pub/hessling/THE/	\
+MASTER_SITES=	ftp://ftp.lightlink.com/pub/hessling/THE/	\
 		ftp://uiarchive.cso.uiuc.edu/pub/packages/THE/	\
 		ftp://ftp.qut.edu.au/pub/markh/THE/		\
 		ftp://ftp.rzg.mpg.de/pub/software/the/THE/	\
 		ftp://ftp.wu-wien.ac.at/pub/src/Editors/THE/
 
-MAINTAINER=     ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-imc
 
diff --git a/editors/the/distinfo b/editors/the/distinfo
index 604f83f6e64d..658b51b85a31 100644
--- a/editors/the/distinfo
+++ b/editors/the/distinfo
@@ -1 +1 @@
-MD5 (THE-2.7.tar.gz) = 9a64251ee126854e45926326dcf8920f
+MD5 (THE-2.8.tar.gz) = 4564ec9cbbce7a16f6dfb453b80d3da3
diff --git a/editors/the/files/patch-aa b/editors/the/files/patch-aa
index 8fd06348605e..62d7358ed20c 100644
--- a/editors/the/files/patch-aa
+++ b/editors/the/files/patch-aa
@@ -1,7 +1,24 @@
-*** Makefile.in.orig	Sat Dec 19 23:53:42 1998
---- Makefile.in	Sun Mar 28 17:49:45 1999
+*** Makefile.in.orig	Mon Aug  2 18:24:26 1999
+--- Makefile.in	Mon Sep  6 21:22:42 1999
 ***************
-*** 28,34 ****
+*** 16,22 ****
+  srcdir		= @srcdir@
+  prefix		= @prefix@
+  exec_prefix	= @exec_prefix@
+! libdir		= $(exec_prefix)/lib
+  includedir		= $(exec_prefix)/include
+  docdir		= $(srcdir)/doc
+  thisdir		=@thisdir@
+--- 16,22 ----
+  srcdir		= @srcdir@
+  prefix		= @prefix@
+  exec_prefix	= @exec_prefix@
+! datadir		= $(exec_prefix)/share
+  includedir		= $(exec_prefix)/include
+  docdir		= $(srcdir)/doc
+  thisdir		=@thisdir@
+***************
+*** 30,36 ****
   CFLAGS		= @CFLAGS@
   
   INCDIR		= $(srcdir)
@@ -9,54 +26,60 @@
   
   CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_CURSES_INC@ @MH_REXX_INC@
   
---- 28,34 ----
+--- 30,36 ----
   CFLAGS		= @CFLAGS@
   
   INCDIR		= $(srcdir)
-! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(libdir)/THE/\"
+! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(datadir)/THE/\"
   
   CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_CURSES_INC@ @MH_REXX_INC@
   
 ***************
-*** 122,141 ****
+*** 163,185 ****
   
-  install: ./the help
+  install: the the.man THE_Help.txt
   	$(INSTALL_DATA) -m 755 -d $(exec_prefix)/bin
 ! 	$(INSTALL_DATA) -m 755 -d $(prefix)/THE
-  	$(INSTALL) -m 755 ./the $(exec_prefix)/bin/the
-! 	$(INSTALL_DATA) $(srcdir)/append.the  $(prefix)/THE/append.the
-! 	$(INSTALL_DATA) $(srcdir)/comm.the    $(prefix)/THE/comm.the
-! 	$(INSTALL_DATA) $(srcdir)/uncomm.the  $(prefix)/THE/uncomm.the
-! 	$(INSTALL_DATA) $(srcdir)/total.the   $(prefix)/THE/total.the
-! 	$(INSTALL_DATA) $(srcdir)/match.the   $(prefix)/THE/match.the
-! 	$(INSTALL_DATA) $(srcdir)/rm.the      $(prefix)/THE/rm.the
-! 	$(INSTALL_DATA) $(srcdir)/words.the   $(prefix)/THE/words.the
-! 	$(INSTALL_DATA) $(srcdir)/l.the       $(prefix)/THE/l.the
-! 	$(INSTALL_DATA) $(srcdir)/compile.the $(prefix)/THE/compile.the
-! 	$(INSTALL_DATA) $(srcdir)/spell.the   $(prefix)/THE/spell.the
-! 	$(INSTALL_DATA) $(srcdir)/demo.the    $(prefix)/THE/demo.the
+! 	$(INSTALL) -m 755 ./the $(exec_prefix)/bin/the
+! 	$(INSTALL_DATA) ./the.man $(prefix)/THE/the.man
+! 	$(INSTALL_DATA) $(srcdir)/append.the   $(prefix)/THE/append.the
+! 	$(INSTALL_DATA) $(srcdir)/comm.the     $(prefix)/THE/comm.the
+! 	$(INSTALL_DATA) $(srcdir)/build.the    $(prefix)/THE/build.the
+! 	$(INSTALL_DATA) $(srcdir)/setbuild.the $(prefix)/THE/setbuild.the
+! 	$(INSTALL_DATA) $(srcdir)/uncomm.the   $(prefix)/THE/uncomm.the
+! 	$(INSTALL_DATA) $(srcdir)/total.the    $(prefix)/THE/total.the
+! 	$(INSTALL_DATA) $(srcdir)/match.the    $(prefix)/THE/match.the
+! 	$(INSTALL_DATA) $(srcdir)/rm.the       $(prefix)/THE/rm.the
+! 	$(INSTALL_DATA) $(srcdir)/words.the    $(prefix)/THE/words.the
+! 	$(INSTALL_DATA) $(srcdir)/l.the        $(prefix)/THE/l.the
+! 	$(INSTALL_DATA) $(srcdir)/compile.the  $(prefix)/THE/compile.the
+! 	$(INSTALL_DATA) $(srcdir)/spell.the    $(prefix)/THE/spell.the
+! 	$(INSTALL_DATA) $(srcdir)/demo.the     $(prefix)/THE/demo.the
 ! 	$(INSTALL_DATA) $(srcdir)/THE_Help.txt $(prefix)/THE/THE_Help.txt
   
   clean:
-  	-rm -f *.o trace the manext *.man *.htm THE_Help* *.gif
---- 122,141 ----
+  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new
+--- 163,185 ----
   
-  install: ./the help
+  install: the the.man THE_Help.txt
   	$(INSTALL_DATA) -m 755 -d $(exec_prefix)/bin
-! 	$(INSTALL_DATA) -m 755 -d $(libdir)/THE
-  	$(INSTALL) -m 755 ./the $(exec_prefix)/bin/the
-! 	$(INSTALL_DATA) $(srcdir)/append.the  $(libdir)/THE/append.the
-! 	$(INSTALL_DATA) $(srcdir)/comm.the    $(libdir)/THE/comm.the
-! 	$(INSTALL_DATA) $(srcdir)/uncomm.the  $(libdir)/THE/uncomm.the
-! 	$(INSTALL_DATA) $(srcdir)/total.the   $(libdir)/THE/total.the
-! 	$(INSTALL_DATA) $(srcdir)/match.the   $(libdir)/THE/match.the
-! 	$(INSTALL_DATA) $(srcdir)/rm.the      $(libdir)/THE/rm.the
-! 	$(INSTALL_DATA) $(srcdir)/words.the   $(libdir)/THE/words.the
-! 	$(INSTALL_DATA) $(srcdir)/l.the       $(libdir)/THE/l.the
-! 	$(INSTALL_DATA) $(srcdir)/compile.the $(libdir)/THE/compile.the
-! 	$(INSTALL_DATA) $(srcdir)/spell.the   $(libdir)/THE/spell.the
-! 	$(INSTALL_DATA) $(srcdir)/demo.the    $(libdir)/THE/demo.the
-! 	$(INSTALL_DATA) $(srcdir)/THE_Help.txt $(libdir)/THE/THE_Help.txt
+! 	$(INSTALL_DATA) -m 755 -d $(datadir)/THE
+! 	$(INSTALL) -m 755 $(srcdir)/the $(exec_prefix)/bin/the
+! 	$(INSTALL_DATA) $(srcdir)/the.man $(datadir)/THE/the.man
+! 	$(INSTALL_DATA) $(srcdir)/append.the   $(datadir)/THE/append.the
+! 	$(INSTALL_DATA) $(srcdir)/comm.the     $(datadir)/THE/comm.the
+! 	$(INSTALL_DATA) $(srcdir)/build.the    $(datadir)/THE/build.the
+! 	$(INSTALL_DATA) $(srcdir)/setbuild.the $(datadir)/THE/setbuild.the
+! 	$(INSTALL_DATA) $(srcdir)/uncomm.the   $(datadir)/THE/uncomm.the
+! 	$(INSTALL_DATA) $(srcdir)/total.the    $(datadir)/THE/total.the
+! 	$(INSTALL_DATA) $(srcdir)/match.the    $(datadir)/THE/match.the
+! 	$(INSTALL_DATA) $(srcdir)/rm.the       $(datadir)/THE/rm.the
+! 	$(INSTALL_DATA) $(srcdir)/words.the    $(datadir)/THE/words.the
+! 	$(INSTALL_DATA) $(srcdir)/l.the        $(datadir)/THE/l.the
+! 	$(INSTALL_DATA) $(srcdir)/compile.the  $(datadir)/THE/compile.the
+! 	$(INSTALL_DATA) $(srcdir)/spell.the    $(datadir)/THE/spell.the
+! 	$(INSTALL_DATA) $(srcdir)/demo.the     $(datadir)/THE/demo.the
+! 	$(INSTALL_DATA) $(srcdir)/THE_Help.txt $(datadir)/THE/THE_Help.txt
   
   clean:
-  	-rm -f *.o trace the manext *.man *.htm THE_Help* *.gif
+  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new
diff --git a/editors/the/pkg-descr b/editors/the/pkg-descr
index 1324b331faa5..b70ed2fd1533 100644
--- a/editors/the/pkg-descr
+++ b/editors/the/pkg-descr
@@ -1,3 +1,5 @@
 THE is a text editor that uses both command line commands and key bindings
 to operate. It is intended to be similar to the VM/CMS System Product
 Editor, XEDIT and to Mansfield Software's, KEDIT.
+
+WWW: http://www.lightlink.com/hessling/
diff --git a/editors/the/pkg-plist b/editors/the/pkg-plist
index e8354b898806..53f366e620c5 100644
--- a/editors/the/pkg-plist
+++ b/editors/the/pkg-plist
@@ -1,13 +1,17 @@
 bin/the
-lib/THE/append.the
-lib/THE/comm.the
-lib/THE/uncomm.the
-lib/THE/total.the
-lib/THE/match.the
-lib/THE/rm.the
-lib/THE/words.the
-lib/THE/l.the
-lib/THE/compile.the
-lib/THE/spell.the
-lib/THE/demo.the
-lib/THE/THE_Help.txt
+share/THE/THE_Help.txt
+share/THE/append.the
+share/THE/build.the
+share/THE/comm.the
+share/THE/compile.the
+share/THE/demo.the
+share/THE/l.the
+share/THE/match.the
+share/THE/rm.the
+share/THE/setbuild.the
+share/THE/spell.the
+share/THE/the.man
+share/THE/total.the
+share/THE/uncomm.the
+share/THE/words.the
+@dirrm share/THE