4 files changed, 105 insertions, 136 deletions

diff --git a/editors/the/Makefile b/editors/the/Makefile
index d49108ba582a..a7a0daf5a0f0 100644
--- a/editors/the/Makefile
+++ b/editors/the/Makefile
@@ -19,7 +19,9 @@ BUILD_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-imc
 RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-imc
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-rexximc --with-ncurses
+CONFIGURE_ARGS=	--with-ncurses --with-rexximc \
+		--with-rexxincdir=${LOCALBASE}/include \
+		--with-rexxlibdir=${LOCALBASE}/lib
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/editors/the/files/patch-aa b/editors/the/files/patch-aa
index d7370bda1fa1..a6bab8c7914f 100644
--- a/editors/the/files/patch-aa
+++ b/editors/the/files/patch-aa
@@ -1,97 +1,68 @@
-*** Makefile.in.orig	Sat Jan 15 13:37:34 2000
---- Makefile.in	Tue Feb  1 20:31:45 2000
-***************
-*** 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@
-  
-! INSTALL		= @INSTALL@
-  INSTALL_DATA	= @INSTALL_DATA@
-  
-  HTML_EXT		= @HTML_EXT@
---- 16,28 ----
-  srcdir		= @srcdir@
-  prefix		= @prefix@
-  exec_prefix	= @exec_prefix@
-! 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@
-***************
-*** 31,37 ****
-  CFLAGS		= @CFLAGS@
-  
-  INCDIR		= $(srcdir)
-! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(prefix)/THE/\"
-  
-  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_REXX_INC@ @MH_CURSES_INC@
-  
---- 31,37 ----
-  CFLAGS		= @CFLAGS@
-  
-  INCDIR		= $(srcdir)
-! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(libdir)/THE/\"
-  
-  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_REXX_INC@ @MH_CURSES_INC@
-  
-***************
-*** 186,208 ****
-  
-  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) ./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 *$(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 $(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 config.log config.cache config.status
+--- Makefile.in.orig	Sat Jan 15 13:37:34 2000
++++ Makefile.in	Wed Aug 16 00:05:20 2000
+@@ -16,13 +16,13 @@
+ srcdir		= @srcdir@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+-libdir		= $(exec_prefix)/lib
++datadir		= $(exec_prefix)/share
+ includedir		= $(exec_prefix)/include
+ docdir		= $(srcdir)/doc
+ contribdir		= $(srcdir)/contrib
+ thisdir		=@thisdir@
+ 
+-INSTALL		= @INSTALL@
++INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+ INSTALL_DATA	= @INSTALL_DATA@
+ 
+ HTML_EXT		= @HTML_EXT@
+@@ -31,7 +31,7 @@
+ CFLAGS		= @CFLAGS@
+ 
+ INCDIR		= $(srcdir)
+-CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(prefix)/THE/\"
++CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(datadir)/THE/\"
+ 
+ CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_REXX_INC@ @MH_CURSES_INC@
+ 
+@@ -186,23 +186,23 @@
+ 
+ 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) ./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
++	$(INSTALL_DATA) -m 755 -d $(datadir)/THE
++	$(INSTALL_PROGRAM) ./the $(exec_prefix)/bin/the
++	$(INSTALL_DATA) ./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 *$(HTML_EXT) *.new config.log config.cache config.status
diff --git a/editors/the/files/patch-ab b/editors/the/files/patch-ab
index 07fdd557d0c8..7892df55605c 100644
--- a/editors/the/files/patch-ab
+++ b/editors/the/files/patch-ab
@@ -1,22 +1,18 @@
-*** 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
-        {
+--- execute.c.orig	Thu Dec 23 19:20:28 1999
++++ execute.c	Wed Aug 16 00:05:21 2000
+@@ -4253,6 +4253,7 @@
+          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,6 +4268,7 @@
+          {
+             continue;
+          }
++#endif
+       }
+       else
+       {
diff --git a/editors/the/pkg-plist b/editors/the/pkg-plist
index 11fb3d396543..e4cb2be5c154 100644
--- a/editors/the/pkg-plist
+++ b/editors/the/pkg-plist
@@ -1,19 +1,19 @@
 bin/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/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
 share/doc/THE/app1.html
 share/doc/THE/app2.html
 share/doc/THE/app3.html
@@ -30,4 +30,4 @@ share/doc/THE/overview.html
 share/doc/THE/query.html           
 share/doc/THE/quickref.html           
 @dirrm share/doc/THE
-@dirrm libdata/THE
+@dirrm share/THE