50 files changed, 0 insertions, 1766 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index f2bbd9ed1372..0bc98a70cd17 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -273,7 +273,6 @@
     SUBDIR += lacheck
     SUBDIR += latex-service
     SUBDIR += latex2html
-    SUBDIR += latte
     SUBDIR += lemmatizer
     SUBDIR += lemmatizer2
     SUBDIR += libcroco
@@ -353,7 +352,6 @@
     SUBDIR += mxml
     SUBDIR += nb-aspell
     SUBDIR += nds-aspell
-    SUBDIR += nicetext
     SUBDIR += nl-aspell
     SUBDIR += nl-ispell
     SUBDIR += nltk
diff --git a/textproc/latte/Makefile b/textproc/latte/Makefile
deleted file mode 100644
index 7608e13d6855..000000000000
--- a/textproc/latte/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for:        latte
-# Date created:         15 August 1999
-# Whom:                 Dominik Rothert <dr@domix.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	latte
-PORTVERSION=	2.1
-PORTREVISION=	3
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.latte.org/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple language for marking up text in a very expressive way
-
-DEPRECATED=	unmaintained, does not work with current versions of GCC, needs gcc33 which fails to build
-EXPIRATION_DATE=2009-03-02
-
-USE_BISON=	build
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:213 libtool:15
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--enable-shared
-MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
-		AUTOHEADER="${TRUE}"
-USE_LDCONFIG=	yes
-USE_GCC=	3.3
-
-INFO=		latte liblatte
-
-CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT
-LDFLAGS=	-L${LOCALBASE}/lib
-
-.include <bsd.port.pre.mk>
-
-post-extract:
-	-@${RM} ${WRKSRC}/getopt*
-
-post-install:
-	@${LN} -sf latte-html ${PREFIX}/bin/latte
-	${INSTALL_DATA} ${WRKSRC}/latte.el ${PREFIX}/share/emacs/site-lisp
-	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp
-	${LN} -sf ${PREFIX}/share/emacs/site-lisp/latte.el \
-		  ${PREFIX}/lib/xemacs/site-lisp
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-	${TAR} -C ${WRKSRC} --exclude "*Makefile*" -cf - tests | \
-		${TAR} -C ${EXAMPLESDIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/textproc/latte/distinfo b/textproc/latte/distinfo
deleted file mode 100644
index a9e766a1a45f..000000000000
--- a/textproc/latte/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (latte-2.1.tar.gz) = 79673dfeb696c0d2c25ec9a548885ae1
-SHA256 (latte-2.1.tar.gz) = 9b935f87f09716714d1b5e2006607fa277a1d3388d9e25aefd82eb629a8cf818
-SIZE (latte-2.1.tar.gz) = 357842
diff --git a/textproc/latte/files/patch-FlexLexer.h b/textproc/latte/files/patch-FlexLexer.h
deleted file mode 100644
index 5551ee2c8746..000000000000
--- a/textproc/latte/files/patch-FlexLexer.h
+++ /dev/null
@@ -1,82 +0,0 @@
---- FlexLexer.h.orig	Tue Nov 10 06:19:23 1998
-+++ FlexLexer.h	Fri Mar 19 01:35:03 2004
-@@ -42,7 +42,7 @@
- #ifndef __FLEX_LEXER_H
- // Never included before - need to define base class.
- #define __FLEX_LEXER_H
--#include <iostream.h>
-+#include <iostream>
- 
- extern "C++" {
- 
-@@ -59,14 +59,14 @@
- 	virtual void
- 		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
- 	virtual struct yy_buffer_state*
--		yy_create_buffer( istream* s, int size ) = 0;
-+		yy_create_buffer( std::istream* s, int size ) = 0;
- 	virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
--	virtual void yyrestart( istream* s ) = 0;
-+	virtual void yyrestart( std::istream* s ) = 0;
- 
- 	virtual int yylex() = 0;
- 
- 	// Call yylex with new input/output sources.
--	int yylex( istream* new_in, ostream* new_out = 0 )
-+	int yylex( std::istream* new_in, std::ostream* new_out = 0 )
- 		{
- 		switch_streams( new_in, new_out );
- 		return yylex();
-@@ -74,8 +74,8 @@
- 
- 	// Switch to new input/output streams.  A nil stream pointer
- 	// indicates "keep the current one".
--	virtual void switch_streams( istream* new_in = 0,
--					ostream* new_out = 0 ) = 0;
-+	virtual void switch_streams( std::istream* new_in = 0,
-+					std::ostream* new_out = 0 ) = 0;
- 
- 	int lineno() const		{ return yylineno; }
- 
-@@ -102,17 +102,17 @@
- public:
- 	// arg_yyin and arg_yyout default to the cin and cout, but we
- 	// only make that assignment when initializing in yylex().
--	yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
-+	yyFlexLexer( std::istream* arg_yyin = 0, std::ostream* arg_yyout = 0 );
- 
- 	virtual ~yyFlexLexer();
- 
- 	void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
--	struct yy_buffer_state* yy_create_buffer( istream* s, int size );
-+	struct yy_buffer_state* yy_create_buffer( std::istream* s, int size );
- 	void yy_delete_buffer( struct yy_buffer_state* b );
--	void yyrestart( istream* s );
-+	void yyrestart( std::istream* s );
- 
- 	virtual int yylex();
--	virtual void switch_streams( istream* new_in, ostream* new_out );
-+	virtual void switch_streams( std::istream* new_in, std::ostream* new_out );
- 
- protected:
- 	virtual int LexerInput( char* buf, int max_size );
-@@ -123,7 +123,7 @@
- 	int yyinput();
- 
- 	void yy_load_buffer_state();
--	void yy_init_buffer( struct yy_buffer_state* b, istream* s );
-+	void yy_init_buffer( struct yy_buffer_state* b, std::istream* s );
- 	void yy_flush_buffer( struct yy_buffer_state* b );
- 
- 	int yy_start_stack_ptr;
-@@ -138,8 +138,8 @@
- 	yy_state_type yy_try_NUL_trans( yy_state_type current_state );
- 	int yy_get_next_buffer();
- 
--	istream* yyin;	// input source for default LexerInput
--	ostream* yyout;	// output sink for default LexerOutput
-+	std::istream* yyin;	// input source for default LexerInput
-+	std::ostream* yyout;	// output sink for default LexerOutput
- 
- 	struct yy_buffer_state* yy_current_buffer;
- 
diff --git a/textproc/latte/files/patch-Makefile.in b/textproc/latte/files/patch-Makefile.in
deleted file mode 100644
index 5951c8fdd2cf..000000000000
--- a/textproc/latte/files/patch-Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
---- Makefile.in.orig	Tue Oct 26 03:22:50 1999
-+++ Makefile.in	Fri Mar 19 02:21:31 2004
-@@ -596,11 +596,11 @@
- latte-html-cli.o: latte-html-cli.cxx latte-html.h latte.h latte-conf.h \
- 	shdeque.h latte-deque.h refcount.h mutable.h shstring.h \
- 	latte-string.h memo.h latte-stack.h latte-vector.h FlexLexer.h \
--	latte-log.h latte-fstream.h getopt.h
-+	latte-log.h latte-fstream.h
- latte-html.o: latte-html.cxx latte-html.h latte.h latte-conf.h shdeque.h \
- 	latte-deque.h refcount.h mutable.h shstring.h latte-string.h \
- 	memo.h latte-stack.h latte-vector.h FlexLexer.h latte-log.h \
--	restorer.h getopt.h
-+	restorer.h
- latte-log.lo latte-log.o : latte-log.cxx latte-log.h latte.h \
- 	latte-conf.h shdeque.h latte-deque.h refcount.h mutable.h \
- 	shstring.h latte-string.h memo.h latte-stack.h latte-vector.h \
-@@ -610,11 +610,11 @@
- latte-text-cli.o: latte-text-cli.cxx latte-text.h latte.h latte-conf.h \
- 	shdeque.h latte-deque.h refcount.h mutable.h shstring.h \
- 	latte-string.h memo.h latte-stack.h latte-vector.h FlexLexer.h \
--	latte-log.h latte-fstream.h getopt.h
-+	latte-log.h latte-fstream.h
- latte-text.o: latte-text.cxx latte-text.h latte.h latte-conf.h shdeque.h \
- 	latte-deque.h refcount.h mutable.h shstring.h latte-string.h \
- 	memo.h latte-stack.h latte-vector.h FlexLexer.h latte-log.h \
--	restorer.h getopt.h
-+	restorer.h
- latte.lo latte.o : latte.cxx latte.h latte-conf.h shdeque.h \
- 	latte-deque.h refcount.h mutable.h shstring.h latte-string.h \
- 	memo.h latte-stack.h latte-vector.h FlexLexer.h latte-log.h \
-@@ -624,8 +624,7 @@
- 	latte-stack.h latte-vector.h FlexLexer.h
- load.lo load.o : load.cxx latte.h latte-conf.h shdeque.h latte-deque.h \
- 	refcount.h mutable.h shstring.h latte-string.h memo.h \
--	latte-stack.h latte-vector.h FlexLexer.h latte-fstream.h \
--	getopt.h
-+	latte-stack.h latte-vector.h FlexLexer.h latte-fstream.h
- memo.lo memo.o : memo.cxx memo.h
- nested.lo nested.o : nested.cxx latte.h latte-conf.h shdeque.h \
- 	latte-deque.h refcount.h mutable.h shstring.h latte-string.h \
-@@ -647,7 +646,7 @@
- str.lo str.o : str.cxx latte.h latte-conf.h shdeque.h latte-deque.h \
- 	refcount.h mutable.h shstring.h latte-string.h memo.h \
- 	latte-stack.h latte-vector.h FlexLexer.h
--syntax.lo syntax.o : syntax.cxx latte-iosfwd.h getopt.h FlexLexer.h \
-+syntax.lo syntax.o : syntax.cxx latte-iosfwd.h FlexLexer.h \
- 	latte.h latte-conf.h shdeque.h latte-deque.h refcount.h \
- 	mutable.h shstring.h latte-string.h memo.h latte-stack.h \
- 	latte-vector.h grammar.tab.h
-@@ -681,7 +680,7 @@
- install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
- install-exec: install-exec-recursive
- 
--install-data-am: install-lispLISP install-pkgdataDATA \
-+install-data-am: install-pkgdataDATA \
- 		install-pkgincludeHEADERS
- install-data: install-data-recursive
- 
diff --git a/textproc/latte/files/patch-assignment.cxx b/textproc/latte/files/patch-assignment.cxx
deleted file mode 100644
index 8a5c745fdce0..000000000000
--- a/textproc/latte/files/patch-assignment.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- assignment.cxx.orig	Fri Oct 22 13:01:12 1999
-+++ assignment.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- Latte_Assignment::Latte_Assignment(const Latte_Wstate &ws,
- 			 const Latte_FileLoc &loc,
- 			 const shstring &name) :
diff --git a/textproc/latte/files/patch-boolean.cxx b/textproc/latte/files/patch-boolean.cxx
deleted file mode 100644
index 8312bcce6b13..000000000000
--- a/textproc/latte/files/patch-boolean.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- boolean.cxx.orig	Fri Oct 22 13:01:24 1999
-+++ boolean.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- const Refcounter<Latte_Obj> &
- latte_false()
- {
diff --git a/textproc/latte/files/patch-configure.in b/textproc/latte/files/patch-configure.in
deleted file mode 100644
index d131342eb4d9..000000000000
--- a/textproc/latte/files/patch-configure.in
+++ /dev/null
@@ -1,58 +0,0 @@
---- configure.in.orig	Tue Oct 26 02:52:28 1999
-+++ configure.in	Fri Mar 19 01:37:24 2004
-@@ -122,7 +122,7 @@
- AC_CACHE_CHECK([for two-iterator string constructor],
- 	       latte_cv_lib_two_iterator_string_ctor,
- 	       AC_TRY_COMPILE([#include <string>],
--			      [string s; string t(s.begin(), s.end());],
-+			      [std::string s; std::string t(s.begin(), s.end());],
- 			      [latte_cv_lib_two_iterator_string_ctor=yes],
- 			      [latte_cv_lib_two_iterator_string_ctor=no]))
- if test "x$latte_cv_lib_two_iterator_string_ctor" = xyes
-@@ -133,8 +133,8 @@
- AC_CACHE_CHECK([for November 96 deque],
- 	       latte_cv_lib_nov96deque,
- 	       AC_TRY_COMPILE([#include <deque>],
--			      [deque<int> d;
--			       deque<int> e(d.begin(), d.end());],
-+			      [std::deque<int> d;
-+			       std::deque<int> e(d.begin(), d.end());],
- 			      [latte_cv_lib_nov96deque=yes],
- 			      [latte_cv_lib_nov96deque=no]))
- if test "x$latte_cv_lib_nov96deque" = xyes
-@@ -145,7 +145,7 @@
- AC_CACHE_CHECK([for November 96 stack template],
- 	       latte_cv_lib_nov96stack,
- 	       AC_TRY_COMPILE([#include <stack>],
--			      [stack<int> s; s.push(7);],
-+			      [std::stack<int> s; s.push(7);],
- 			      [latte_cv_lib_nov96stack=yes],
- 			      [latte_cv_lib_nov96stack=no]))
- if test "x$latte_cv_lib_nov96stack" = xyes
-@@ -156,7 +156,7 @@
- AC_CACHE_CHECK([for vector::resize],
- 	       latte_cv_func_vector_resize,
- 	       AC_TRY_COMPILE([#include <vector>],
--			      [vector<char *> v; v.resize(8, "foo");],
-+			      [std::vector<char *> v; v.resize(8, "foo");],
- 			      [latte_cv_func_vector_resize=yes],
- 			      [latte_cv_func_vector_resize=no]))
- if test "x$latte_cv_func_vector_resize" = xyes
-@@ -167,7 +167,7 @@
- AC_CACHE_CHECK([for string::erase],
- 	       latte_cv_func_string_erase,
- 	       AC_TRY_COMPILE([#include <string>],
--			      [string s; s.erase(1);],
-+			      [std::string s; s.erase(1);],
- 			      [latte_cv_func_string_erase=yes],
- 			      [latte_cv_func_string_erase=no]))
- if test "x$latte_cv_func_string_erase" = xno
-@@ -175,7 +175,7 @@
-   AC_CACHE_CHECK([for string::remove],
- 		 latte_cv_func_string_remove,
- 		 AC_TRY_COMPILE([#include <string>],
--				[string s; s.remove(1);],
-+				[std::string s; s.remove(1);],
- 				[latte_cv_func_string_remove=yes],
- 				[latte_cv_func_string_remove=no]))
-   if test "x$latte_cv_func_string_remove" = xyes
diff --git a/textproc/latte/files/patch-definitions.cxx b/textproc/latte/files/patch-definitions.cxx
deleted file mode 100644
index 37a5685f5fc7..000000000000
--- a/textproc/latte/files/patch-definitions.cxx
+++ /dev/null
@@ -1,37 +0,0 @@
---- definitions.cxx.orig	Sat Oct 23 08:40:25 1999
-+++ definitions.cxx	Fri Mar 19 01:43:37 2004
-@@ -30,6 +30,8 @@
- # include <cmath>
- #endif // ENABLE_FLOATING_POINT
- 
-+using namespace std;
-+
- const shstring &
- Latte_Lambda::name() const
- {
-@@ -721,7 +723,7 @@
-       throw InsufficientArgs(*this, loc);
- 
-     const Refcounter<Latte_Obj> &obj = *i++;
--    Latte_Str *refstr = obj->as_str();
-+    const Latte_Str *refstr = obj->as_str();
- 
-     long argno = 0;
- 
-@@ -731,14 +733,14 @@
-     while (i != args_end) {
-       ++argno;
- 
--      Latte_Str *newstr = (*i++)->as_str();
-+      const Latte_Str *newstr = (*i++)->as_str();
- 
-       if (!newstr)
-         throw BadType(*this, argno, loc);
- 
-       if (m_greater) {
-         if (m_equal) {
--          if (!(*refstr >= *newstr))
-+          if (!(refstr >= newstr))
-             return latte_false();
-         } else {
-           if (!(*refstr > *newstr))
diff --git a/textproc/latte/files/patch-fileloc.cxx b/textproc/latte/files/patch-fileloc.cxx
deleted file mode 100644
index c8d543d15379..000000000000
--- a/textproc/latte/files/patch-fileloc.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- fileloc.cxx.orig	Thu Dec  3 07:54:01 1998
-+++ fileloc.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- Latte_FileLoc::Latte_FileLoc(const shstring &filename,
- 			     unsigned int lineno) :
-   m_filename(filename), m_lineno(lineno)
diff --git a/textproc/latte/files/patch-grammar.y b/textproc/latte/files/patch-grammar.y
deleted file mode 100644
index 3b2ca56b8cc0..000000000000
--- a/textproc/latte/files/patch-grammar.y
+++ /dev/null
@@ -1,11 +0,0 @@
---- grammar.y.orig	Fri Oct 22 12:47:11 1999
-+++ grammar.y	Fri Mar 19 01:17:52 2004
-@@ -24,6 +24,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- struct Tangible {
-   Tangible(const Latte_Wstate &w, const Latte_FileLoc &l) : ws(w), loc(l) {}
- 
diff --git a/textproc/latte/files/patch-group.cxx b/textproc/latte/files/patch-group.cxx
deleted file mode 100644
index 6b2ea3bc7e65..000000000000
--- a/textproc/latte/files/patch-group.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- group.cxx.orig	Fri Oct 22 13:01:48 1999
-+++ group.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- Latte_Group::Latte_Group(const Latte_Wstate &ws,
- 			 const Latte_FileLoc &loc) :
-   Latte_Tangible(ws, loc),
diff --git a/textproc/latte/files/patch-latte-conf.h b/textproc/latte/files/patch-latte-conf.h
deleted file mode 100644
index 08e6e373b19e..000000000000
--- a/textproc/latte/files/patch-latte-conf.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- latte-conf.h.orig	Tue Oct 26 02:52:03 1999
-+++ latte-conf.h	Fri Mar 19 01:17:52 2004
-@@ -30,7 +30,7 @@
- #define HAVE_VECTOR_RESIZE 1
- 
- // Define if compiler chokes on shdeque.h
--/* #undef SHDEQUE_IS_BEYOND_ME */
-+#define SHDEQUE_IS_BEYOND_ME 1
- 
- // Define if string<> has no erase() but has remove()
- /* #undef USE_STRING_REMOVE */
diff --git a/textproc/latte/files/patch-latte-deque.h b/textproc/latte/files/patch-latte-deque.h
deleted file mode 100644
index f6ced6aae01d..000000000000
--- a/textproc/latte/files/patch-latte-deque.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- latte-deque.h.orig	Fri Oct 22 13:03:19 1999
-+++ latte-deque.h	Fri Mar 19 01:17:52 2004
-@@ -26,13 +26,13 @@
- #include <deque>
- 
- template <class T>
--class latte_deque : public deque<T> {
-+class latte_deque : public std::deque<T> {
-  public:
-   latte_deque() {}
- 
- #ifdef HAVE_NOV96_DEQUE
-   latte_deque(const const_iterator &a,
--	      const const_iterator &b) : deque<T>(a, b) {}
-+	      const const_iterator &b) : std::deque<T>(a, b) {}
- #else // HAVE_NOV96_DEQUE
-   latte_deque(const const_iterator &a,
- 	      const const_iterator &b) {
diff --git a/textproc/latte/files/patch-latte-html-cli.cxx b/textproc/latte/files/patch-latte-html-cli.cxx
deleted file mode 100644
index 80f3c6615db9..000000000000
--- a/textproc/latte/files/patch-latte-html-cli.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- latte-html-cli.cxx.orig	Thu Oct 21 03:05:04 1999
-+++ latte-html-cli.cxx	Fri Mar 19 01:17:52 2004
-@@ -22,6 +22,8 @@
- #include <cstring>
- #include <unistd.h>
- 
-+using namespace std;
-+
- static void
- report_backtrace(const Latte_Error &err)
- {
diff --git a/textproc/latte/files/patch-latte-html.cxx b/textproc/latte/files/patch-latte-html.cxx
deleted file mode 100644
index ac1db63b2430..000000000000
--- a/textproc/latte/files/patch-latte-html.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- latte-html.cxx.orig	Fri Oct 22 13:02:02 1999
-+++ latte-html.cxx	Fri Mar 19 01:17:52 2004
-@@ -22,6 +22,8 @@
- #include <cstdlib>
- #include <ctime>
- 
-+using namespace std;
-+
- static bool in_pre = 0;
- static bool in_html = 0;
- 
diff --git a/textproc/latte/files/patch-latte-html.h b/textproc/latte/files/patch-latte-html.h
deleted file mode 100644
index 94eac8d70971..000000000000
--- a/textproc/latte/files/patch-latte-html.h
+++ /dev/null
@@ -1,30 +0,0 @@
---- latte-html.h.orig	Fri Oct 22 13:02:12 1999
-+++ latte-html.h	Fri Mar 19 01:17:52 2004
-@@ -46,13 +46,13 @@
- 
- class LatteHtml_HtmlVisitor : public Latte_Visitor {
-  public:
--  LatteHtml_HtmlVisitor(ostream &out, bool close_par = 0) :
-+  LatteHtml_HtmlVisitor(std::ostream &out, bool close_par = 0) :
-     m_out(out), m_close_par(close_par) {}
- 
-   void visit_str(Latte_Str &);
- 
-  private:
--  ostream &m_out;
-+  std::ostream &m_out;
-   bool m_close_par;
- };
- 
-@@ -60,8 +60,8 @@
- latte_html(const char *lang,
-            bool strict, bool fragment, bool no_default, bool close_par,
-            unsigned long log_flags,
--           const deque<latte_string>::const_iterator &loads_begin,
--           const deque<latte_string>::const_iterator &loads_end,
--           const char *filename, istream &in, ostream &out);
-+           const std::deque<latte_string>::const_iterator &loads_begin,
-+           const std::deque<latte_string>::const_iterator &loads_end,
-+           const char *filename, std::istream &in, std::ostream &out);
- 
- #endif // LATTE_HTML_H
diff --git a/textproc/latte/files/patch-latte-log.cxx b/textproc/latte/files/patch-latte-log.cxx
deleted file mode 100644
index 288fc748b928..000000000000
--- a/textproc/latte/files/patch-latte-log.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- latte-log.cxx.orig	Tue Nov 10 06:19:23 1998
-+++ latte-log.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte-log.h>
- 
-+using namespace std;
-+
- ostream &
- actual_latte_log()
- {
diff --git a/textproc/latte/files/patch-latte-log.h b/textproc/latte/files/patch-latte-log.h
deleted file mode 100644
index d85674ba9eec..000000000000
--- a/textproc/latte/files/patch-latte-log.h
+++ /dev/null
@@ -1,39 +0,0 @@
---- latte-log.h.orig	Fri Oct 22 13:02:36 1999
-+++ latte-log.h	Fri Mar 19 01:17:52 2004
-@@ -21,7 +21,7 @@
- # define LATTE_LOG_H
- 
- #include <latte.h>
--#include <iostream.h>
-+#include <iostream>
- 
- enum LatteLogFlags {
-   latte_log_EVAL =  1 << 0,
-@@ -30,8 +30,8 @@
- 
- extern unsigned long latte_log_flags;
- 
--class DevNull : public ostream {
--  class DevNullBuf : public streambuf {
-+class DevNull : public std::ostream {
-+  class DevNullBuf : public std::streambuf {
-    public:
-     DevNullBuf();
- 
-@@ -42,13 +42,13 @@
-   };
- 
-  public:
--  DevNull() : ostream(0) { ostream::init(&buf); }
-+  DevNull() : std::ostream(0) { std::ostream::init(&buf); }
- 
-  private:
-   DevNullBuf buf;
- };
- 
--extern ostream &LatteLog(unsigned long = ~((unsigned long) 0));
--extern ostream &LatteLog(unsigned long, const Latte_FileLoc &);
-+extern std::ostream &LatteLog(unsigned long = ~((unsigned long) 0));
-+extern std::ostream &LatteLog(unsigned long, const Latte_FileLoc &);
- 
- #endif // LATTE_LOG_H
diff --git a/textproc/latte/files/patch-latte-stack.h b/textproc/latte/files/patch-latte-stack.h
deleted file mode 100644
index fc6829a63d02..000000000000
--- a/textproc/latte/files/patch-latte-stack.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- latte-stack.h.orig	Fri Oct 22 13:03:40 1999
-+++ latte-stack.h	Fri Mar 19 01:17:52 2004
-@@ -28,7 +28,7 @@
- 
- # include <stack>
- template <class T>
--class latte_stack : public stack<T> {
-+class latte_stack : public std::stack<T> {
-   // empty (I wish there were template typedefs)
- };
- 
-@@ -37,7 +37,7 @@
- # include <deque>
- # include <stack>
- template <class T>
--class latte_stack : public stack< deque<T> > {
-+class latte_stack : public std::stack< std::deque<T> > {
-   // empty (I wish there were template typedefs)
- };
- 
diff --git a/textproc/latte/files/patch-latte-string.cxx b/textproc/latte/files/patch-latte-string.cxx
deleted file mode 100644
index bf9aeb0d5279..000000000000
--- a/textproc/latte/files/patch-latte-string.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- latte-string.cxx.orig	Thu Dec  3 07:54:01 1998
-+++ latte-string.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte-string.h>
- 
-+using namespace std;
-+
- #ifndef latte_use_intrinsic_string
- 
- // I shouldn't need to define these, but some compilers are stupid
diff --git a/textproc/latte/files/patch-latte-string.h b/textproc/latte/files/patch-latte-string.h
deleted file mode 100644
index bde24b945a62..000000000000
--- a/textproc/latte/files/patch-latte-string.h
+++ /dev/null
@@ -1,41 +0,0 @@
---- latte-string.h.orig	Fri Oct 22 13:03:49 1999
-+++ latte-string.h	Fri Mar 19 01:17:52 2004
-@@ -33,20 +33,20 @@
- 
- #ifdef latte_use_intrinsic_string
- 
--typedef string latte_string;
-+typedef std::string latte_string;
- 
- #else // latte_use_intrinsic_string
- 
--class latte_string : public string {
-+class latte_string : public std::string {
-  public:
-   latte_string() {}
--  latte_string(const char *str) : string(str) {}
--  latte_string(const char *str, size_t n) : string(str, n) {}
--  latte_string(const string &other) : string(other) {}
-+  latte_string(const char *str) : std::string(str) {}
-+  latte_string(const char *str, size_t n) : std::string(str, n) {}
-+  latte_string(const std::string &other) : std::string(other) {}
- 
- # ifdef HAVE_TWO_ITERATOR_STRING_CTOR
-   latte_string(const const_iterator &a, const const_iterator &b) :
--    string(a, b) {}
-+    std::string(a, b) {}
- # else // HAVE_TWO_ITERATOR_STRING_CTOR
-   latte_string(const const_iterator &a, const const_iterator &b) {
-     for (const_iterator i = a; i != b; ++i)
-@@ -59,9 +59,9 @@
- #endif // USE_STRING_REMOVE
- };
- 
--#include <iostream.h>
-+#include <iostream>
- 
--extern ostream &operator << (ostream &, const latte_string &);
-+extern std::ostream &operator << (std::ostream &, const latte_string &);
- 
- extern bool operator < (const latte_string &, const latte_string &);
- extern bool operator == (const latte_string &, const latte_string &);
diff --git a/textproc/latte/files/patch-latte-text-cli.cxx b/textproc/latte/files/patch-latte-text-cli.cxx
deleted file mode 100644
index a41030126072..000000000000
--- a/textproc/latte/files/patch-latte-text-cli.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- latte-text-cli.cxx.orig	Thu Oct  7 09:23:34 1999
-+++ latte-text-cli.cxx	Fri Mar 19 01:17:52 2004
-@@ -22,6 +22,8 @@
- #include <cstring>
- #include <unistd.h>
- 
-+using namespace std;
-+
- static void
- report_backtrace(const Latte_Error &err)
- {
diff --git a/textproc/latte/files/patch-latte-text.cxx b/textproc/latte/files/patch-latte-text.cxx
deleted file mode 100644
index b052411cf6fa..000000000000
--- a/textproc/latte/files/patch-latte-text.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- latte-text.cxx.orig	Sat Oct 16 16:37:18 1999
-+++ latte-text.cxx	Fri Mar 19 01:17:52 2004
-@@ -22,6 +22,8 @@
- #include <unistd.h>
- #include <ctime>
- 
-+using namespace std;
-+
- static bool in_pre = 0;
- static unsigned int left_margin = 0;
- 
diff --git a/textproc/latte/files/patch-latte-text.h b/textproc/latte/files/patch-latte-text.h
deleted file mode 100644
index 6c960642e233..000000000000
--- a/textproc/latte/files/patch-latte-text.h
+++ /dev/null
@@ -1,35 +0,0 @@
---- latte-text.h.orig	Sat Oct 16 03:24:33 1999
-+++ latte-text.h	Fri Mar 19 01:17:52 2004
-@@ -51,7 +51,7 @@
- 
- class LatteText_TextVisitor : public Latte_Visitor {
-  public:
--  LatteText_TextVisitor(ostream &out,
-+  LatteText_TextVisitor(std::ostream &out,
-                         unsigned int wrapcol = 72,
-                         const char *sentence_end_chars = 0,
-                         const char *sentence_end_transparent_chars = 0) :
-@@ -63,7 +63,7 @@
-   void visit_str(Latte_Str &);
- 
-  private:
--  ostream &m_out;
-+  std::ostream &m_out;
-   unsigned int m_wrapcol;
-   unsigned int m_column;
-   const char *m_sentence_end_chars;
-@@ -73,11 +73,11 @@
- 
- extern void
- latte_text(bool no_default, unsigned long log_flags,
--           const deque<latte_string>::const_iterator &loads_begin,
--           const deque<latte_string>::const_iterator &loads_end,
-+           const std::deque<latte_string>::const_iterator &loads_begin,
-+           const std::deque<latte_string>::const_iterator &loads_end,
-            unsigned int wrapcol,
-            const char *sentence_end_chars,
-            const char *sentence_end_transparent_chars,
--           const char *filename, istream &in, ostream &out);
-+           const char *filename, std::istream &in, std::ostream &out);
- 
- #endif // LATTE_TEXT_H
diff --git a/textproc/latte/files/patch-latte-vector.h b/textproc/latte/files/patch-latte-vector.h
deleted file mode 100644
index e0c0bde52418..000000000000
--- a/textproc/latte/files/patch-latte-vector.h
+++ /dev/null
@@ -1,19 +0,0 @@
---- latte-vector.h.orig	Fri Oct 22 13:04:00 1999
-+++ latte-vector.h	Fri Mar 19 01:17:52 2004
-@@ -28,14 +28,14 @@
- #ifdef HAVE_VECTOR_RESIZE
- 
- template <class T>
--class latte_vector : public vector<T> {
-+class latte_vector : public std::vector<T> {
-   // empty (I wish there were template typedefs)
- };
- 
- #else // HAVE_VECTOR_RESIZE
- 
- template <class T>
--class latte_vector : public vector<T> {
-+class latte_vector : public std::vector<T> {
-  public:
-   void resize(size_t n, const T &obj) {
-     if (n > size())
diff --git a/textproc/latte/files/patch-latte.cxx b/textproc/latte/files/patch-latte.cxx
deleted file mode 100644
index ec3d640ca1c1..000000000000
--- a/textproc/latte/files/patch-latte.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- latte.cxx.orig	Thu Oct  7 06:11:01 1999
-+++ latte.cxx	Fri Mar 19 01:17:52 2004
-@@ -19,6 +19,8 @@
- #include <latte-log.h>
- #include <restorer.h>
- 
-+using namespace std;
-+
- void
- latte_init(bool path)
- {
diff --git a/textproc/latte/files/patch-latte.h b/textproc/latte/files/patch-latte.h
deleted file mode 100644
index 844575447539..000000000000
--- a/textproc/latte/files/patch-latte.h
+++ /dev/null
@@ -1,158 +0,0 @@
---- latte.h.orig	Fri Oct 22 12:20:46 1999
-+++ latte.h	Fri Mar 19 01:40:45 2004
-@@ -76,11 +76,11 @@
-   unsigned int m_spaces;
-   unsigned int m_newlines;
- 
--  friend ostream &operator << (ostream &, const Latte_Wstate &);
-+  friend std::ostream &operator << (std::ostream &, const Latte_Wstate &);
- };
- 
--extern ostream &
--operator << (ostream &, const Latte_Wstate &);
-+extern std::ostream &
-+operator << (std::ostream &, const Latte_Wstate &);
- 
- class Latte_FileLoc {
-  public:
-@@ -100,8 +100,8 @@
-   unsigned int m_lineno;
- };
- 
--extern ostream &
--operator << (ostream &, const Latte_FileLoc &);
-+extern std::ostream &
-+operator << (std::ostream &, const Latte_FileLoc &);
- 
- class Latte_Error : public Latte_FileLoc {
-  public:
-@@ -238,19 +238,19 @@
- 
-   virtual void visit(Latte_Visitor &) = 0;
- 
--  virtual void render(ostream &out) const;
-+  virtual void render(std::ostream &out) const;
- 
-   Refcounter<Latte_Obj> eval(Latte_Activation &);
- 
-  protected:
-   virtual Refcounter<Latte_Obj> do_eval(Latte_Activation &);
- 
--  friend Latte_Nested;
--  friend Latte_WsNode;
-+  friend class Latte_Nested;
-+  friend class Latte_WsNode;
- };
- 
--extern ostream &
--operator << (ostream &, const Latte_Obj &);
-+extern std::ostream &
-+operator << (std::ostream &, const Latte_Obj &);
- 
- class Latte_Nested : virtual public Latte_Obj {
-  public:
-@@ -305,7 +305,7 @@
- 
-   void visit(Latte_Visitor &);
- 
--  void render(ostream &out) const { m_nested->render(out); }
-+  void render(std::ostream &out) const { m_nested->render(out); }
- 
-   void set_nested_obj(const Refcounter<Latte_Obj> &obj);
-   const Refcounter<Latte_Obj> &nested_obj() const { return m_nested; }
-@@ -344,9 +344,9 @@
-   memo<bool, SideEffectFn> m_side_effect;
-   memo<Latte_Operator *, GetOperatorFn> m_operator;
- 
--  friend SelfEvalFn;
--  friend SideEffectFn;
--  friend GetOperatorFn;
-+  friend class SelfEvalFn;
-+  friend class SideEffectFn;
-+  friend class GetOperatorFn;
- };
- 
- class Latte_WsNode : public Latte_Nested,
-@@ -381,7 +381,7 @@
- 
-   void visit(Latte_Visitor &);
- 
--  void render(ostream &) const;
-+  void render(std::ostream &) const;
- 
-  private:
-   bool m_val;
-@@ -430,7 +430,7 @@
- 
-   void visit(Latte_Visitor &);
- 
--  void render(ostream &) const;
-+  void render(std::ostream &) const;
- 
-   bool self_evaluating() const { return 0; }
-   bool side_effects() const;
-@@ -466,7 +466,7 @@
- 
-   void visit(Latte_Visitor &);
- 
--  void render(ostream &) const;
-+  void render(std::ostream &) const;
- 
-  private:
-   Type m_type;
-@@ -518,7 +518,7 @@
- 
-   void visit(Latte_Visitor &);
- 
--  void render(ostream &) const;
-+  void render(std::ostream &) const;
- 
-  protected:
-   Refcounter<Latte_Obj> do_eval(Latte_Activation &);
-@@ -560,7 +560,7 @@
-   bool self_evaluating() const { return m_self_eval.val(); }
-   void visit(Latte_Visitor &);
- 
--  void render(ostream &) const;
-+  void render(std::ostream &) const;
- 
-  protected:
-   Refcounter<Latte_Obj> do_eval(Latte_Activation &);
-@@ -729,7 +729,7 @@
- 
-   void visit(Latte_Visitor &);
- 
--  void render(ostream &) const;
-+  void render(std::ostream &) const;
- 
-   bool self_evaluating() const { return 0; }
- 
-@@ -755,7 +755,7 @@
- 
-   void visit(Latte_Visitor &);
- 
--  void render(ostream &) const;
-+  void render(std::ostream &) const;
- 
-  private:
-   mutable bool m_numval_known;
-@@ -780,7 +780,7 @@
- 
-   void visit(Latte_Visitor &);
- 
--  void render(ostream &) const;
-+  void render(std::ostream &) const;
- 
-   class Undefined : public Latte_Error {
-    public:
-@@ -866,8 +866,8 @@
- 
- class Latte_Reader : public latteFlexLexer {
-  public:
--  Latte_Reader(istream &, const shstring &);
--  Latte_Reader(istream &, const shstring &, Latte_Activation &);
-+  Latte_Reader(std::istream &, const shstring &);
-+  Latte_Reader(std::istream &, const shstring &, Latte_Activation &);
- 
-   int yylex();
-   void process(Latte_Visitor &);
diff --git a/textproc/latte/files/patch-list.cxx b/textproc/latte/files/patch-list.cxx
deleted file mode 100644
index e71f08e1bca7..000000000000
--- a/textproc/latte/files/patch-list.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- list.cxx.orig	Fri Oct 22 12:59:24 1999
-+++ list.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- Latte_List::Latte_List() :
-   m_self_eval(Latte_List::SelfEvalFn(*this)),
-   m_operator(Latte_List::GetOperatorFn(*this))
diff --git a/textproc/latte/files/patch-load.cxx b/textproc/latte/files/patch-load.cxx
deleted file mode 100644
index 03ffcff3a59e..000000000000
--- a/textproc/latte/files/patch-load.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- load.cxx.orig	Fri Oct 22 12:59:24 1999
-+++ load.cxx	Fri Mar 19 01:17:52 2004
-@@ -19,6 +19,8 @@
- #include <latte-fstream.h>
- #include <unistd.h>
- 
-+using namespace std;
-+
- class LoadVisitor : public Latte_Visitor {
-  public:
-   void visit_str(Latte_Str &) {}
diff --git a/textproc/latte/files/patch-param.cxx b/textproc/latte/files/patch-param.cxx
deleted file mode 100644
index 1a6c1539c658..000000000000
--- a/textproc/latte/files/patch-param.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- param.cxx.orig	Fri Oct 22 13:00:12 1999
-+++ param.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- Latte_Param::Latte_Param(const Latte_Wstate &ws,
- 			 const Latte_FileLoc &loc,
- 			 const shstring &name,
diff --git a/textproc/latte/files/patch-quote.cxx b/textproc/latte/files/patch-quote.cxx
deleted file mode 100644
index e27997679941..000000000000
--- a/textproc/latte/files/patch-quote.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- quote.cxx.orig	Fri Oct 22 13:00:12 1999
-+++ quote.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- Latte_Quote::Latte_Quote(const Latte_Wstate &ws,
-                          const Latte_FileLoc &loc,
-                          enum Latte_Quote::Type type) :
diff --git a/textproc/latte/files/patch-reader.cxx b/textproc/latte/files/patch-reader.cxx
deleted file mode 100644
index b2298a77b9c8..000000000000
--- a/textproc/latte/files/patch-reader.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- reader.cxx.orig	Sun Oct 17 22:40:42 1999
-+++ reader.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- Latte_Reader::Latte_Reader(istream &i, const shstring &f) :
-   yyFlexLexer(&i),
-   m_column(0), m_filename(f),
diff --git a/textproc/latte/files/patch-shstring.cxx b/textproc/latte/files/patch-shstring.cxx
deleted file mode 100644
index e109b1c55a26..000000000000
--- a/textproc/latte/files/patch-shstring.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
---- shstring.cxx.orig	Thu Dec  3 07:54:01 1998
-+++ shstring.cxx	Fri Mar 19 01:17:52 2004
-@@ -16,9 +16,11 @@
- // The Initial Developer of the Original Code is Zanshin, Inc.
- 
- #include <shstring.h>
--#include <iostream.h>
-+#include <iostream>
- #include <cstring>
- 
-+using namespace std;
-+
- shstring::shstring() : rep(0)
- {
- }
-@@ -105,6 +107,45 @@
-     return 1;
-   else
-     return 0;
-+}
-+
-+bool
-+shstring::operator <= (const shstring &other) const
-+{
-+  if (rep.get()) {
-+    if (other.rep.get())
-+      return rep->str() <= other.rep->str();
-+    return 0;
-+  } else if (other.rep.get())
-+    return 1;
-+  else
-+    return 0;
-+}
-+
-+bool
-+shstring::operator > (const shstring &other) const
-+{
-+  if (rep.get()) {
-+    if (other.rep.get())
-+      return rep->str() > other.rep->str();
-+    return 0;
-+  } else if (other.rep.get())
-+    return 0;
-+  else
-+    return 1;
-+}
-+
-+bool
-+shstring::operator >= (const shstring &other) const
-+{
-+  if (rep.get()) {
-+    if (other.rep.get())
-+      return rep->str() >= other.rep->str();
-+    return 0;
-+  } else if (other.rep.get())
-+    return 0;
-+  else
-+    return 1;
- }
- 
- bool
diff --git a/textproc/latte/files/patch-shstring.h b/textproc/latte/files/patch-shstring.h
deleted file mode 100644
index 2e2269c5e23b..000000000000
--- a/textproc/latte/files/patch-shstring.h
+++ /dev/null
@@ -1,63 +0,0 @@
---- shstring.h.orig	Fri Oct 22 13:04:38 1999
-+++ shstring.h	Fri Mar 19 01:17:52 2004
-@@ -26,7 +26,7 @@
- 
- #include <latte-string.h>
- #include <functional>
--#include <iostream.h>
-+#include <iostream>
- 
- #include <refcount.h>
- 
-@@ -38,7 +38,7 @@
-   shstring();
-   shstring(const char *);
-   shstring(const char *, size_t);
--  shstring(const string &);
-+  shstring(const std::string &);
-   shstring(const shstring &);
-   shstring(const const_iterator &, const const_iterator &);
- 
-@@ -51,7 +51,10 @@
-   bool empty() const { return null() || rep->empty(); }
- 
-   bool operator < (const shstring &) const;
-+  bool operator <= (const shstring &) const;
-   bool operator == (const shstring &other) const;
-+  bool operator > (const shstring &) const;
-+  bool operator >= (const shstring &) const;
- 
-   iterator begin() { return rep->begin(); }
-   const_iterator begin() const { return rep->begin(); }
-@@ -69,24 +72,24 @@
-    public:
-     Rep(const char *);
-     Rep(const char *, size_t);
--    Rep(const string &);
--    Rep(const string::const_iterator &,
--	const string::const_iterator &);
-+    Rep(const std::string &);
-+    Rep(const std::string::const_iterator &,
-+	const std::string::const_iterator &);
- 
-     latte_string &str() { return *this; }
-     const latte_string &str() const { return *this; }
- 
-    private:
--    friend ostream &operator << (ostream &, const shstring &);
-+    friend std::ostream &operator << (std::ostream &, const shstring &);
-     friend class shstring;
-   };
- 
-   Refcounter<Rep> rep;
- 
--  friend ostream &operator << (ostream &, const shstring &);
-+  friend std::ostream &operator << (std::ostream &, const shstring &);
- };
- 
--extern ostream &
--operator << (ostream &, const shstring &);
-+extern std::ostream &
-+operator << (std::ostream &, const shstring &);
- 
- #endif // SHSTRING_H
diff --git a/textproc/latte/files/patch-str.cxx b/textproc/latte/files/patch-str.cxx
deleted file mode 100644
index a3cc4214aaa8..000000000000
--- a/textproc/latte/files/patch-str.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- str.cxx.orig	Fri Oct 22 13:00:42 1999
-+++ str.cxx	Fri Mar 19 01:17:52 2004
-@@ -19,6 +19,8 @@
- #include <cstdio>
- #include <cstdlib>
- 
-+using namespace std;
-+
- Latte_Str::Latte_Str(const Latte_Wstate &ws,
- 		     const Latte_FileLoc &loc,
- 		     const shstring &str) :
diff --git a/textproc/latte/files/patch-syntax.cxx b/textproc/latte/files/patch-syntax.cxx
deleted file mode 100644
index 31adc2d13aa0..000000000000
--- a/textproc/latte/files/patch-syntax.cxx
+++ /dev/null
@@ -1,66 +0,0 @@
---- syntax.cxx.orig	Fri Oct 22 13:21:27 1999
-+++ syntax.cxx	Fri Mar 19 01:17:52 2004
-@@ -26,6 +26,9 @@
- #include <stdlib.h>
- #include <latte-iosfwd.h>
- #include <unistd.h>
-+#include <iostream>
-+
-+using namespace std;
- 
- /* Use prototypes in function declarations. */
- #define YY_USE_PROTOS
-@@ -145,7 +148,7 @@
- 
- struct yy_buffer_state
- 	{
--	istream* yy_input_file;
-+	std::istream* yy_input_file;
- 
- 	char *yy_ch_buf;		/* input buffer */
- 	char *yy_buf_pos;		/* current position in input buffer */
-@@ -945,7 +948,7 @@
- 		} /* end of scanning one token */
- 	} /* end of yylex */
- 
--yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout )
-+yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout )
- 	{
- 	yyin = arg_yyin;
- 	yyout = arg_yyout;
-@@ -980,7 +983,7 @@
- 	yy_delete_buffer( yy_current_buffer );
- 	}
- 
--void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out )
-+void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out )
- 	{
- 	if ( new_in )
- 		{
-@@ -1329,7 +1332,7 @@
- 	}
- 
- 
--void yyFlexLexer::yyrestart( istream* input_file )
-+void yyFlexLexer::yyrestart( std::istream* input_file )
- 	{
- 	if ( ! yy_current_buffer )
- 		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-@@ -1373,7 +1376,7 @@
- 	}
- 
- 
--YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size )
-+YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size )
- 	{
- 	YY_BUFFER_STATE b;
- 
-@@ -1414,7 +1417,7 @@
- 
- 
- extern "C" int isatty YY_PROTO(( int ));
--void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )
-+void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file )
- 
- 	{
- 	yy_flush_buffer( b );
diff --git a/textproc/latte/files/patch-varref.cxx b/textproc/latte/files/patch-varref.cxx
deleted file mode 100644
index eb9eba2ce0fe..000000000000
--- a/textproc/latte/files/patch-varref.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- varref.cxx.orig	Fri Oct 22 13:00:42 1999
-+++ varref.cxx	Fri Mar 19 01:17:52 2004
-@@ -19,6 +19,8 @@
- #include <latte-log.h>
- #include <mutable.h>
- 
-+using namespace std;
-+
- Latte_VarRef::Latte_VarRef(const Latte_Wstate &ws,
- 			   const Latte_FileLoc &loc,
- 			   const shstring &name) :
diff --git a/textproc/latte/files/patch-wstate.cxx b/textproc/latte/files/patch-wstate.cxx
deleted file mode 100644
index 7f19de06d811..000000000000
--- a/textproc/latte/files/patch-wstate.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- wstate.cxx.orig	Thu Dec  3 07:54:01 1998
-+++ wstate.cxx	Fri Mar 19 01:17:52 2004
-@@ -17,6 +17,8 @@
- 
- #include <latte.h>
- 
-+using namespace std;
-+
- unsigned int Latte_Wstate::tab_width = 8;
- 
- Latte_Wstate::Latte_Wstate() :
diff --git a/textproc/latte/pkg-descr b/textproc/latte/pkg-descr
deleted file mode 100644
index 22377468dfaa..000000000000
--- a/textproc/latte/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Latte is a simple language for marking up text in a very expressive
-way.  This distribution includes the Latte library, which allows you
-to build translators from Latte to any other text format you choose,
-and a demonstration application that converts Latte text into HTML,
-allowing you to write web pages in a much saner language than HTML.
-
-WWW: http://www.latte.org/
diff --git a/textproc/latte/pkg-plist b/textproc/latte/pkg-plist
deleted file mode 100644
index 541cc59072a6..000000000000
--- a/textproc/latte/pkg-plist
+++ /dev/null
@@ -1,115 +0,0 @@
-bin/latte
-bin/latte-html
-bin/latte-text
-include/latte/latte-conf.h
-include/latte/latte-deque.h
-include/latte/latte-fstream.h
-include/latte/latte-html.h
-include/latte/latte-iosfwd.h
-include/latte/latte-log.h
-include/latte/latte-stack.h
-include/latte/latte-string.h
-include/latte/latte-text.h
-include/latte/latte-vector.h
-include/latte/latte.h
-include/latte/memo.h
-include/latte/mutable.h
-include/latte/refcount.h
-include/latte/restorer.h
-include/latte/shdeque.h
-include/latte/shstring.h
-lib/liblatte.a
-lib/liblatte.la
-lib/liblatte.so
-lib/liblatte.so.5
-lib/xemacs/site-lisp/latte.el
-share/emacs/site-lisp/latte.el
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/a.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/a.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/add.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/add.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/and.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/and.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/append.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/append.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/apply.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/apply.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/car.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/car.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/case.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/case.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/concat.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/concat.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/cons.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/cons.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/def.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/def.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/divide.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/divide.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/empty.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/empty.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/equal.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/equal.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/explode.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/explode.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/file-contents.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/file-contents.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/greater.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/greater.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/group.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/group.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/if.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/if.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/img.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/img.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/include.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/include.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/include2.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/lambda.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/lambda.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/length.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/length.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/let.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/let.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/lmap.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/lmap.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/load-file.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/load-file.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/load-library.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/load-library.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/member.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/member.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/modulo.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/modulo.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/multiply.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/multiply.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/not.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/not.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/nth.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/nth.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/operator.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/operator.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/reverse.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/reverse.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/runtest.sh
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/set.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/set.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/string.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/string.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/subseq.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/subseq.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/substr.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/substr.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/undefined-x.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/undefined-x.latte
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/while.exp
-%%PORTDOCS%%%%EXAMPLESDIR%%/tests/while.latte
-%%DATADIR%%/html.latte
-%%DATADIR%%/standard.latte
-%%DATADIR%%/text.latte
-@dirrm include/latte
-@dirrm %%DATADIR%%
-@dirrmtry lib/xemacs/site-lisp
-@dirrmtry lib/xemacs
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tests
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/textproc/nicetext/Makefile b/textproc/nicetext/Makefile
deleted file mode 100644
index aa42cd4feb91..000000000000
--- a/textproc/nicetext/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# New ports collection makefile for:	nicetext
-# Date created:		20 February 1998
-# Whom:			Mark Chapman <markc@ctgi.net>
-#
-# $FreeBSD$
-
-PORTNAME=	nicetext
-PORTVERSION=	0.9
-PORTREVISION=	2
-CATEGORIES=	textproc
-MASTER_SITES=	http://www.mirrors.wiretapped.net/security/steganography/nicetext/ \
-		http://www.remoteassessment.com/archive/crypt/stego/SourceCode/ \
-		http://www.packetstormsecurity.org/crypt/stego/SourceCode/ \
-		http://www.theargon.com/achilles/steganography/SourceCode/ \
-		http://packetstorm.linuxexposed.com/crypt/stego/SourceCode/ \
-		http://sunsite.mff.cuni.cz/MIRRORS/utopia.hacktic.nl/pub/security/steganography/nicetext/ \
-		http://archiv.egocrew.de/packet/crypt/stego/SourceCode/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Convert files to pseudo-natural-language text and back again
-
-DEPRECATED=	unmaintained, does not work with current versions of GCC, needs gcc33 which fails to build
-EXPIRATION_DATE=2009-03-02
-
-USE_GCC=	3.3
-USE_GMAKE=	yes
-CFLAGS+=	-fpermissive
-
-MAN1=		bitcp.1 dct2mstr.1 expgram.1 genmodel.1 gramtest.1 impkimmo.1 \
-		impmsc.1 impwbstr.1 listword.1 nicetext.1 nttpd.1 printint.1 \
-		scramble.1 sortdct.1 txt2dct.1
-PROGRAMS=	bitcp dct2mstr expgram genmodel gramtest impkimmo impmsc \
-		impwbstr listword nicetext nttpd printint rinfo scramble \
-		sortdct txt2dct
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|gcc|$${CC}|g ; \
-		 s|g++|$${CXX}|g'
-
-post-install:
-	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd
-	@${ECHO_CMD} ${PREFIX}/bin/"nttpd -b " ${EXAMPLESDIR}/database >> ${WRKSRC}/bin/qstart-nttpd
-	${CHMOD} a+rx ${WRKSRC}/bin/qstart-nttpd
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/qstart-nttpd ${PREFIX}/bin/
-.for f in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${PREFIX}/man/man1
-.endfor
-.for f in ${PROGRAMS}
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin/
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/COPYRIGHT ${DOCSDIR}
-	${TAR} -C ${WRKSRC}/doc --exclude "*.bak" -cf - . | \
-		${TAR} -C ${DOCSDIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREMODE} ${DOCSDIR}
-	@${MKDIR} ${EXAMPLESDIR}
-	${TAR} -C ${WRKSRC}/examples --exclude "*.bak" -cf - . | \
-		${TAR} -C ${EXAMPLESDIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREMODE} ${EXAMPLESDIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/textproc/nicetext/distinfo b/textproc/nicetext/distinfo
deleted file mode 100644
index 93e5bbdd137b..000000000000
--- a/textproc/nicetext/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (nicetext-0.9.tar.gz) = 899e676513293e3643efa9c0365f6137
-SHA256 (nicetext-0.9.tar.gz) = 876598e49ddab158f52ae466ef0844c67c744cd63b0c59315b3ce421fec47123
-SIZE (nicetext-0.9.tar.gz) = 13212133
diff --git a/textproc/nicetext/files/patch-aa b/textproc/nicetext/files/patch-aa
deleted file mode 100644
index 68dc23a410d9..000000000000
--- a/textproc/nicetext/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- gendict/src/genmodel.cc.orig	Sat Jun 19 17:22:05 1999
-+++ gendict/src/genmodel.cc	Sat Jun 19 17:22:34 1999
-@@ -102,7 +102,7 @@
- #include <fstream.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <String.h>
-+#include <string.h>
- #include "../../mtc++/include/MTC++.h"
- #include "../../mtc++/include/mstring.h"
- #include "../../mtc++/include/errormsg.h"
diff --git a/textproc/nicetext/files/patch-ab b/textproc/nicetext/files/patch-ab
deleted file mode 100644
index 24c3e583e2b0..000000000000
--- a/textproc/nicetext/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- babble/src/bitcp.cc.orig	Sat Jun 19 17:24:53 1999
-+++ babble/src/bitcp.cc	Sat Jun 19 17:25:04 1999
-@@ -39,7 +39,7 @@
- #include <fstream.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <String.h>
-+#include <string.h>
- #include <unistd.h>
- #include "../../mtc++/include/MTC++.h"
- #include "../../mtc++/include/mstring.h"
diff --git a/textproc/nicetext/files/patch-impkimmo.l b/textproc/nicetext/files/patch-impkimmo.l
deleted file mode 100644
index 1c418c43c15b..000000000000
--- a/textproc/nicetext/files/patch-impkimmo.l
+++ /dev/null
@@ -1,54 +0,0 @@
---- import/src/impkimmo.l.orig	Tue Jul 14 01:23:53 1998
-+++ import/src/impkimmo.l	Thu Oct 30 18:23:07 2003
-@@ -123,8 +123,8 @@
- " "vform:" "*EN	return VFORM_EN;
- " "vform:" "*ING	return VFORM_ING;
- " "vform:" "*BASE  return VFORM_BASE;
--" "finite:" "*\+	return FINITE_PLUS;
--" "finite:" "*-	return FINITE_MINUS;
-+" "my_finite:" "*\+	return FINITE_PLUS;
-+" "my_finite:" "*-	return FINITE_MINUS;
- " "aform:" "*ABS	return AFORM_ABS;
- " "aform:" "*COMP	return AFORM_COMP;
- " "aform:" "*SUPER	return AFORM_SUPER;
-@@ -158,7 +158,7 @@
- MTCstring proper;
- MTCstring tense; 
- MTCstring vform;
--MTCstring finite;
-+MTCstring my_finite;
- MTCstring aform;
- MTCstring verbal; 
- MTCstring Case;
-@@ -318,11 +318,11 @@
- 			break;
- 		case FINITE_PLUS:
- 			defined=TRUE;
--			finite="Fin+";
-+			my_finite="Fin+";
- 			break;
- 		case FINITE_MINUS:
- 			defined=TRUE;
--			finite="Fin-";
-+			my_finite="Fin-";
- 			break;
- 		case AFORM_ABS:
- 			defined=TRUE;
-@@ -430,7 +430,7 @@
- 	proper=NULL;
- 	tense=NULL;
- 	vform=NULL;
--	finite=NULL;
-+	my_finite=NULL;
- 	aform=NULL;
- 	verbal=NULL;
- 	Case=NULL;
-@@ -459,7 +459,7 @@
- 		temp+=proper;
- 		temp+=tense;
- 		temp+=vform;
--		temp+=finite;
-+		temp+=my_finite;
- 		temp+=aform;
- 		temp+=verbal;
- 		temp+=Case;
diff --git a/textproc/nicetext/files/patch-nttpd.cc b/textproc/nicetext/files/patch-nttpd.cc
deleted file mode 100644
index 0f1306403223..000000000000
--- a/textproc/nicetext/files/patch-nttpd.cc
+++ /dev/null
@@ -1,234 +0,0 @@
---- nttpd/src/nttpd.cc.orig	Fri Aug 28 01:16:30 1998
-+++ nttpd/src/nttpd.cc	Thu Oct 30 18:37:05 2003
-@@ -98,7 +98,7 @@
- #include <unistd.h>
- #include <iostream.h>
- #include <fstream.h>
--#include <strstream.h>
-+#include <strstream>
- #include <signal.h>
- #include "../../mtc++/include/MTC++.h"
- #include "../../mtc++/include/mstring.h"
-@@ -608,37 +608,37 @@
- BOOL sendInitial(MTCstringList &os)
- {
- 	DEBUGMSG(cout << "INITIAL REQUEST." << endl;)
-- 	os.add("<HTML> 
--<HEAD> 
--<TITLE>NICETEXT Primary Input Screen</TITLE> 
--</HEAD> 
--<BODY BGCOLOR=\"#AAAAAA\"> 
--<H2>NICETEXT Web-Sampler &copy; 1998  -  Primary Input Screen</H2>
--<P>The purpose of this demo is to convert your message into something 
--completely different. The same message can be changed into many
--different texts - even with the same style and dictionary.  What's more, 
--you will have the opportunity to convert the <I>nicetext</I> back into
--your original message!</P> 
--<FORM METHOD=POST ACTION=\"nicetext?\"> 
--<INPUT TYPE=HIDDEN NAME=NTTPDATA VALUE=\"INITIAL\">
--<H3>Enter a Message:</H3>
--<P>
--<TEXTAREA NAME=PLAINTEXT COLS=80 ROWS=12></TEXTAREA> 
--</P> 
--<H3>Select the <B>NICETEXT</B> Style:
--<SELECT NAME=STYLE> 
--<OPTION VALUE=\"Shakespeare\"> Shakespeare 
--<OPTION VALUE=\"Asoep's Fables\"> Asoep's Fables 
--<OPTION VALUE=\"Wizard of OZ\"> Wizard of OZ 
--</SELECT> 
--<INPUT TYPE=CHECKBOX NAME=BIGDICT VALUE=\"YES\"> Use a larger dictionary
--</H3>
--</P>
--<INPUT TYPE=SUBMIT VALUE=\" Convert my message \"> 
--<INPUT TYPE=RESET  VALUE=\" Clear \"> 
--</FORM> 
--<P>For more information please see the <A HREF=\"http://www.ctgi.net/nicetext/\">Official NICETEXT Home Page</A></P> 
--</BODY> 
-+ 	os.add("<HTML>\n\
-+<HEAD>\n\
-+<TITLE>NICETEXT Primary Input Screen</TITLE>\n\
-+</HEAD>\n\
-+<BODY BGCOLOR=\"#AAAAAA\">\n\
-+<H2>NICETEXT Web-Sampler &copy; 1998  -  Primary Input Screen</H2>\n\
-+<P>The purpose of this demo is to convert your message into something\n\
-+completely different. The same message can be changed into many\n\
-+different texts - even with the same style and dictionary.  What's more,\n\
-+you will have the opportunity to convert the <I>nicetext</I> back into\n\
-+your original message!</P>\n\
-+<FORM METHOD=POST ACTION=\"nicetext?\">\n\
-+<INPUT TYPE=HIDDEN NAME=NTTPDATA VALUE=\"INITIAL\">\n\
-+<H3>Enter a Message:</H3>\n\
-+<P>\n\
-+<TEXTAREA NAME=PLAINTEXT COLS=80 ROWS=12></TEXTAREA>\n\
-+</P>\n\
-+<H3>Select the <B>NICETEXT</B> Style:\n\
-+<SELECT NAME=STYLE>\n\
-+<OPTION VALUE=\"Shakespeare\"> Shakespeare\n\
-+<OPTION VALUE=\"Asoep's Fables\"> Asoep's Fables\n\
-+<OPTION VALUE=\"Wizard of OZ\"> Wizard of OZ\n\
-+</SELECT>\n\
-+<INPUT TYPE=CHECKBOX NAME=BIGDICT VALUE=\"YES\"> Use a larger dictionary\n\
-+</H3>\n\
-+</P>\n\
-+<INPUT TYPE=SUBMIT VALUE=\" Convert my message \">\n\
-+<INPUT TYPE=RESET  VALUE=\" Clear \">\n\
-+</FORM>\n\
-+<P>For more information please see the <A HREF=\"http://www.ctgi.net/nicetext/\">Official NICETEXT Home Page</A></P>\n\
-+</BODY>\n\
- </HTML>");
- 
- 	return TRUE;
-@@ -877,23 +877,23 @@
- 
- BOOL sendNiceText(MTCstringList &os, MTCRBT<MTCpostData> &pdSet)
- {
--	os.add("<HTML> 
--<HEAD> 
--<TITLE>NICETEXT Output Screen</TITLE> 
--</HEAD> 
--<BODY BGCOLOR=\"#AAAAAA\"> 
--<H2>NICETEXT Web-Sampler &copy; 1998  -  <I>Nicetext</I> Output Screen</H2>
--<P>This is the result of the <I>nicetext</I> operation on the message
--you selected.  If you <I>scramble</I> the unmodified text below then  
--the software will recover your original message on the next page.
--But, if you modify the text - who knows what you will end up with?  Also,
--if you are not satisfied with the quality of the <I>nicetext</I> then 
--use the reload button on your browser for another try!</P>
--<FORM METHOD=POST ACTION=\"scramble?\"> 
--<INPUT TYPE=HIDDEN NAME=NTTPDATA VALUE=\"NICETEXT\">
--<P>
--<H3>Here is the <I>NICETEXT</I>:</H3>
--<TEXTAREA NAME=PLAINTEXT COLS=80 ROWS=12>
-+	os.add("<HTML>\n\
-+<HEAD>\n\
-+<TITLE>NICETEXT Output Screen</TITLE>\n\
-+</HEAD>\n\
-+<BODY BGCOLOR=\"#AAAAAA\">\n\
-+<H2>NICETEXT Web-Sampler &copy; 1998  -  <I>Nicetext</I> Output Screen</H2>\n\
-+<P>This is the result of the <I>nicetext</I> operation on the message\n\
-+you selected.  If you <I>scramble</I> the unmodified text below then\n\
-+the software will recover your original message on the next page.\n\
-+But, if you modify the text - who knows what you will end up with?  Also,\n\
-+if you are not satisfied with the quality of the <I>nicetext</I> then\n\
-+use the reload button on your browser for another try!</P>\n\
-+<FORM METHOD=POST ACTION=\"scramble?\">\n\
-+<INPUT TYPE=HIDDEN NAME=NTTPDATA VALUE=\"NICETEXT\">\n\
-+<P>\n\
-+<H3>Here is the <I>NICETEXT</I>:</H3>\n\
-+<TEXTAREA NAME=PLAINTEXT COLS=80 ROWS=12>\n\
- ");
- 
- 	MTCstring plainTextFileName(tempnam(tmpDir.c_str(), "nttp-pt"));
-@@ -1023,9 +1023,9 @@
- 		}
- 	}
- 
--	os.add("</TEXTAREA> 
--</P> 
--<H3>
-+	os.add("</TEXTAREA>\n\
-+</P>\n\
-+<H3>\n\
- <INPUT TYPE=HIDDEN NAME=STYLE VALUE=\"");
- 
- 	os.add(formStyle.c_str());
-@@ -1038,16 +1038,16 @@
- 
- 	if (formDict.length()!=0)
- 	{
--		os.add("... with a larger dictionary.
-+		os.add("... with a larger dictionary.\n\
- <INPUT TYPE=HIDDEN NAME=BIGDICT VALUE=\"YES\">");
- 	}
- 
--	os.add("</H3>
--<INPUT TYPE=SUBMIT VALUE=\" Scramble this message \"> 
--<INPUT TYPE=RESET  VALUE=\" Reset \"> 
--</FORM> 
--</BODY>
--</HTML>
-+	os.add("</H3>\n\
-+<INPUT TYPE=SUBMIT VALUE=\" Scramble this message \">\n\
-+<INPUT TYPE=RESET  VALUE=\" Reset \">\n\
-+</FORM>\n\
-+</BODY>\n\
-+</HTML>\n\
- ");
- }
- 
-@@ -1073,23 +1073,23 @@
- 
- BOOL sendScramText(MTCstringList &os, MTCRBT<MTCpostData> &pdSet)
- {
--	os.add("<HTML> 
--<HEAD> 
--<TITLE>SCRAMBLED Output Screen</TITLE> 
--</HEAD> 
--<BODY BGCOLOR=\"#AAAAAA\"> 
--
--<H2>NICETEXT Web-Sampler &copy; 1998  -  <I>Scrambled</I> Output Screen</H2>
--<P>This page contains the <I>scrambled</I> version of the <I>nicetext</I>
--on the previous page.  If you did not modify the <I>nicetext</I> then this
--should be your original message! (If it does NOT match your original message
--then rest assured that it is because of the poor implementation of HTTP/1.0
--rather than a problem with the basic transformation software.)</P>
--<H3>Here is the SCRAMBLED Text:</H3> 
--<FORM METHOD=POST ACTION=\"index.html\"> 
--<INPUT TYPE=HIDDEN NAME=NTTPDATA VALUE=\"INITIAL\">
--<P>
--<TEXTAREA NAME=PLAINTEXT COLS=80 ROWS=12 READONLY=\"YES\">
-+	os.add("<HTML>\n\
-+<HEAD>\n\
-+<TITLE>SCRAMBLED Output Screen</TITLE>\n\
-+</HEAD>\n\
-+<BODY BGCOLOR=\"#AAAAAA\">\n\
-+\n\
-+<H2>NICETEXT Web-Sampler &copy; 1998  -  <I>Scrambled</I> Output Screen</H2>\n\
-+<P>This page contains the <I>scrambled</I> version of the <I>nicetext</I>\n\
-+on the previous page.  If you did not modify the <I>nicetext</I> then this\n\
-+should be your original message! (If it does NOT match your original message\n\
-+then rest assured that it is because of the poor implementation of HTTP/1.0\n\
-+rather than a problem with the basic transformation software.)</P>\n\
-+<H3>Here is the SCRAMBLED Text:</H3>\n\
-+<FORM METHOD=POST ACTION=\"index.html\">\n\
-+<INPUT TYPE=HIDDEN NAME=NTTPDATA VALUE=\"INITIAL\">\n\
-+<P>\n\
-+<TEXTAREA NAME=PLAINTEXT COLS=80 ROWS=12 READONLY=\"YES\">\n\
- ");
- 
- 	MTCstring plainTextFileName(tempnam(tmpDir.c_str(), "nttp-pt"));
-@@ -1207,15 +1207,15 @@
- 		}
- 	}
- 
--	os.add("
--</TEXTAREA> 
--</P>
--</FORM> 
--<P>
--<A HREF=\"start.html\">GO BACK TO START PAGE...</A>
--</P>
--</BODY>
--</HTML>
-+	os.add("\n\
-+</TEXTAREA>\n\
-+</P>\n\
-+</FORM>\n\
-+<P>\n\
-+<A HREF=\"start.html\">GO BACK TO START PAGE...</A>\n\
-+</P>\n\
-+</BODY>\n\
-+</HTML>\n\
- ");
- }
- 
-@@ -1236,8 +1236,7 @@
- 
-         if (gettimeofday(&t, &tz)==-1)
-         {
--                errorMsg(EMT_WARNING, "random seed generation failed...no big de
--al though...", "randomize()");
-+                errorMsg(EMT_WARNING, "random seed generation failed...no big deal though...", "randomize()");
-         }
- 
-         srandom(t.tv_sec|t.tv_usec);
diff --git a/textproc/nicetext/files/patch-txt2bits.cc b/textproc/nicetext/files/patch-txt2bits.cc
deleted file mode 100644
index a70a35e52220..000000000000
--- a/textproc/nicetext/files/patch-txt2bits.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- babble/src/txt2bits.cc.orig	Fri Feb 20 04:31:27 1998
-+++ babble/src/txt2bits.cc	Thu Oct 30 18:17:38 2003
-@@ -264,8 +264,7 @@
- 	if (((dictRecRBT.getCount()==0)&&(getSmallMode()==FALSE))
- 	|| (dictRecRAOF==NULL)||(dictRecRAOF->getCount()==0))
- 	{
--		errorMsg(EMT_ERROR, "The dictionary specified is empty", "MTCtex
--tToBits::openDictName()");
-+		errorMsg(EMT_ERROR, "The dictionary specified is empty", "MTCtextToBits::openDictName()");
- 		return FALSE;
- 	}
- 
diff --git a/textproc/nicetext/pkg-descr b/textproc/nicetext/pkg-descr
deleted file mode 100644
index 57f7c8836cc7..000000000000
--- a/textproc/nicetext/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-NICETEXT - is a package that converts any file into pseudo- 
-natural-language text.  It also can recover the original file 
-from the text!  
-
-The expandable set of tools allows experimentation with custom dictionaries, 
-automatic simulation of writing style, and the use of Context-Free-Grammars
-to control text generation.
-
-It is the result of Masters Thesis research at the University of 
-Wisconsin, Milwaukee under the advisement of Dr. George Davida.  
-
-The concepts were publicly presented at the International Conference 
-on Information and Computer Security 1997 (ICICS97) in Beijing, 
-China back in November, 1997. 
- 
-WWW: http://www.nicetext.com/
-
-Read the QUICKSTART file to get up-and-running very quickly!
-
-- Mark
-markc@ctgi.net
diff --git a/textproc/nicetext/pkg-plist b/textproc/nicetext/pkg-plist
deleted file mode 100644
index d221837a7a09..000000000000
--- a/textproc/nicetext/pkg-plist
+++ /dev/null
@@ -1,158 +0,0 @@
-bin/bitcp
-bin/dct2mstr
-bin/expgram
-bin/genmodel
-bin/gramtest
-bin/impkimmo
-bin/impmsc
-bin/impwbstr
-bin/listword
-bin/nicetext
-bin/nttpd
-bin/printint
-bin/qstart-nttpd
-bin/rinfo
-bin/scramble
-bin/sortdct
-bin/txt2dct
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README.TXT
-%%PORTDOCS%%%%DOCSDIR%%/distribution.txt
-%%PORTDOCS%%%%DOCSDIR%%/icics97.pdf
-%%PORTDOCS%%%%DOCSDIR%%/icics97.ps
-%%PORTDOCS%%%%DOCSDIR%%/icics97.txt
-%%PORTDOCS%%%%DOCSDIR%%/thesis.pdf
-%%PORTDOCS%%%%DOCSDIR%%/thesis.ps
-%%PORTDOCS%%%%DOCSDIR%%/thesis.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/fabldict.alt
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/fabldict.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/fabldict.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/fablmodel.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/fablmodel.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/fabltype.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/fabltype.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/jfkdict.alt
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/jfkdict.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/jfkdict.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/jfkmodel.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/jfkmodel.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/jfktype.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/jfktype.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/mstrdict.alt
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/mstrdict.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/mstrdict.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/mstrtype.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/mstrtype.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/shakdict.alt
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/shakdict.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/shakdict.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/shakmodel.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/shakmodel.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/shaktype.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/shaktype.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/wizozdict.alt
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/wizozdict.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/wizozdict.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/wizozmodel.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/wizozmodel.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/wizoztype.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/database/wizoztype.jmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/texts/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/texts/fabl/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/texts/fabl/aesop11.txt.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/texts/jfk/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/texts/jfk/jfk11.txt.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/texts/shak/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/texts/shak/shaks12.txt.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/texts/wizoz/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/texts/wizoz/wizoz10.txt.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/1/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/1/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/1/dict.raw
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/1/sample.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/1/secret.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/sample.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/secret.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/conjunction
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/name_family
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/name_female
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/name_male
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/name_other
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/num_cardinal_digits
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/num_cardinal_words
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/num_roman_digits
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/num_years_digits
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/place
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/prepin
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/prepto
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/verbmeet
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/verbmet
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/2/words/verbwent
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/3/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/3/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/3/gram1.def
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/3/gram2.inc
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/3/secret.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/impkimmo/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/impkimmo/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/impkimmo/kimmo.twlist.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/mitlist/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/mitlist/name_family
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/mitlist/name_female
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/mitlist/name_male
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/mitlist/name_other
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/mitlist/place
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/mitlist/pos.awk
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/mitlist/posplr.awk
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/numeric/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/numeric/num_cardinal_digits
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/numeric/num_cardinal_words
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/numeric/num_roman_digits
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/numeric/num_years_digits
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/rhyme/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/rhyme/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/rhyme/cmudict.0.4.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/rhyme/extract.awk
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/rhyme/gt3.awk
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/rhyme/rev2.awk
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/twlist/rhyme/rhyme.twlist.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/wlist/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/wlist/gutenberg/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/wlist/gutenberg/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/wlist/gutenberg/create
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/wlist/gutenberg/words.out.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/wlist/web2/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/wlist/web2/README.TXT
-%%PORTDOCS%%%%EXAMPLESDIR%%/words/wlist/web2/words.gz
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/words/wlist/web2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/words/wlist/gutenberg
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/words/wlist
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/words/twlist/rhyme
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/words/twlist/numeric
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/words/twlist/mitlist
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/words/twlist/impkimmo
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/words/twlist
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/words
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial/3
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial/2/words
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial/2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial/1
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/texts/wizoz
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/texts/shak
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/texts/jfk
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/texts/fabl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/texts
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/database
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%