6 files changed, 109 insertions, 54 deletions

diff --git a/editors/the/Makefile b/editors/the/Makefile
index 3f2b80449b07..dcc7d90b60aa 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -1,25 +1,30 @@
 # New ports collection makefile for:	THE
-# Version required:	2.8
+# Version required:	3.0
 # Date created:		7 May 1999
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	THE-2.8
-PKGNAME=	the-2.8
+DISTNAME=	THE-3.0
+PKGNAME=	the-3.0
 CATEGORIES=	editors
 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
 
 BUILD_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-imc
+RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-imc
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rexximc --with-ncurses
 
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/THE
+	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/THE
+.endif
+
 .include <bsd.port.mk>
diff --git a/editors/the/distinfo b/editors/the/distinfo
index 658b51b85a31..1eb4e0891bb8 100644
--- a/editors/the/distinfo
+++ b/editors/the/distinfo
@@ -1 +1 @@
-MD5 (THE-2.8.tar.gz) = 4564ec9cbbce7a16f6dfb453b80d3da3
+MD5 (THE-3.0.tar.gz) = d6505635a68f16a225fd4c7bac3536a3
diff --git a/editors/the/files/patch-aa b/editors/the/files/patch-aa
index 62d7358ed20c..d7370bda1fa1 100644
--- a/editors/the/files/patch-aa
+++ b/editors/the/files/patch-aa
@@ -1,41 +1,53 @@
-*** Makefile.in.orig	Mon Aug  2 18:24:26 1999
---- Makefile.in	Mon Sep  6 21:22:42 1999
+*** Makefile.in.orig	Sat Jan 15 13:37:34 2000
+--- Makefile.in	Tue Feb  1 20:31:45 2000
 ***************
-*** 16,22 ****
+*** 16,28 ****
   srcdir		= @srcdir@
   prefix		= @prefix@
   exec_prefix	= @exec_prefix@
 ! libdir		= $(exec_prefix)/lib
   includedir		= $(exec_prefix)/include
   docdir		= $(srcdir)/doc
+  contribdir		= $(srcdir)/contrib
   thisdir		=@thisdir@
---- 16,22 ----
+  
+! INSTALL		= @INSTALL@
+  INSTALL_DATA	= @INSTALL_DATA@
+  
+  HTML_EXT		= @HTML_EXT@
+--- 16,28 ----
   srcdir		= @srcdir@
   prefix		= @prefix@
   exec_prefix	= @exec_prefix@
-! datadir		= $(exec_prefix)/share
+! libdir		= $(exec_prefix)/libdata
   includedir		= $(exec_prefix)/include
   docdir		= $(srcdir)/doc
+  contribdir		= $(srcdir)/contrib
   thisdir		=@thisdir@
+  
+! INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+  INSTALL_DATA	= @INSTALL_DATA@
+  
+  HTML_EXT		= @HTML_EXT@
 ***************
-*** 30,36 ****
+*** 31,37 ****
   CFLAGS		= @CFLAGS@
   
   INCDIR		= $(srcdir)
 ! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(prefix)/THE/\"
   
-  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_CURSES_INC@ @MH_REXX_INC@
+  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_REXX_INC@ @MH_CURSES_INC@
   
---- 30,36 ----
+--- 31,37 ----
   CFLAGS		= @CFLAGS@
   
   INCDIR		= $(srcdir)
-! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(datadir)/THE/\"
+! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(libdir)/THE/\"
   
-  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_CURSES_INC@ @MH_REXX_INC@
+  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_REXX_INC@ @MH_CURSES_INC@
   
 ***************
-*** 163,185 ****
+*** 186,208 ****
   
   install: the the.man THE_Help.txt
   	$(INSTALL_DATA) -m 755 -d $(exec_prefix)/bin
@@ -58,28 +70,28 @@
 ! 	$(INSTALL_DATA) $(srcdir)/THE_Help.txt $(prefix)/THE/THE_Help.txt
   
   clean:
-  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new
---- 163,185 ----
+  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new config.log config.cache config.status
+--- 186,208 ----
   
   install: the the.man THE_Help.txt
   	$(INSTALL_DATA) -m 755 -d $(exec_prefix)/bin
-! 	$(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
+! 	$(INSTALL_DATA) -m 755 -d $(libdir)/THE
+! 	$(INSTALL_PROGRAM) ./the $(exec_prefix)/bin/the
+! 	$(INSTALL_DATA) ./the.man $(libdir)/THE/the.man
+! 	$(INSTALL_DATA) $(srcdir)/append.the   $(libdir)/THE/append.the
+! 	$(INSTALL_DATA) $(srcdir)/comm.the     $(libdir)/THE/comm.the
+! 	$(INSTALL_DATA) $(srcdir)/build.the    $(libdir)/THE/build.the
+! 	$(INSTALL_DATA) $(srcdir)/setbuild.the $(libdir)/THE/setbuild.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
   
   clean:
-  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new
+  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new config.log config.cache config.status
diff --git a/editors/the/files/patch-ab b/editors/the/files/patch-ab
new file mode 100644
index 000000000000..07fdd557d0c8
--- /dev/null
+++ b/editors/the/files/patch-ab
@@ -0,0 +1,22 @@
+*** execute.c.orig	Thu Dec 23 19:20:28 1999
+--- execute.c	Tue Feb  1 20:40:04 2000
+***************
+*** 4253,4258 ****
+--- 4253,4259 ----
+           draw_cursor(FALSE);
+           default_button = 0;
+           editfield_col = -1;
++ #if defined(PDCURSES_MOUSE_ENABLED) || defined(NCURSES_MOUSE_VERSION)
+           if ( rc == RC_READV_TERM_MOUSE )
+           {
+              /*
+***************
+*** 4267,4272 ****
+--- 4268,4274 ----
+           {
+              continue;
+           }
++ #endif
+        }
+        else
+        {
diff --git a/editors/the/pkg-descr b/editors/the/pkg-descr
index b70ed2fd1533..781c2a7ed09e 100644
--- a/editors/the/pkg-descr
+++ b/editors/the/pkg-descr
@@ -2,4 +2,4 @@ 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/
+WWW: http://www.lightlink.com/hessling/THE/
diff --git a/editors/the/pkg-plist b/editors/the/pkg-plist
index 53f366e620c5..11fb3d396543 100644
--- a/editors/the/pkg-plist
+++ b/editors/the/pkg-plist
@@ -1,17 +1,33 @@
 bin/the
-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
+libdata/THE/THE_Help.txt
+libdata/THE/append.the
+libdata/THE/build.the
+libdata/THE/comm.the
+libdata/THE/compile.the
+libdata/THE/demo.the
+libdata/THE/l.the
+libdata/THE/match.the
+libdata/THE/rm.the
+libdata/THE/setbuild.the
+libdata/THE/spell.the
+libdata/THE/the.man
+libdata/THE/total.the
+libdata/THE/uncomm.the
+libdata/THE/words.the
+share/doc/THE/app1.html
+share/doc/THE/app2.html
+share/doc/THE/app3.html
+share/doc/THE/app4.html
+share/doc/THE/app5.html
+share/doc/THE/app6.html
+share/doc/THE/comm.html
+share/doc/THE/commset.html
+share/doc/THE/commsos.html
+share/doc/THE/glossary.html           
+share/doc/THE/history.html           
+share/doc/THE/index.html           
+share/doc/THE/overview.html           
+share/doc/THE/query.html           
+share/doc/THE/quickref.html           
+@dirrm share/doc/THE
+@dirrm libdata/THE