Date: Sat, 20 Mar 2004 01:30:35 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64473: Update port: textproc/latte to 2.1 Message-ID: <20040320013035.39882dc4.tkato@prontomail.com> Resent-Message-ID: <200403191640.i2JGeHIZ011402@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64473 >Category: ports >Synopsis: Update port: textproc/latte to 2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 19 08:40:17 PST 2004 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.9-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 2.1 New file: files/patch-FlexLexer.h files/patch-Makefile.in files/patch-assignment.cxx files/patch-boolean.cxx files/patch-configure.in files/patch-definitions.cxx files/patch-fileloc.cxx files/patch-grammar.y files/patch-group.cxx files/patch-latte-conf.h files/patch-latte-deque.h files/patch-latte-html-cli.cxx files/patch-latte-html.cxx files/patch-latte-html.h files/patch-latte-log.cxx files/patch-latte-log.h files/patch-latte-stack.h files/patch-latte-string.cxx files/patch-latte-string.h files/patch-latte-text-cli.cxx files/patch-latte-text.cxx files/patch-latte-text.h files/patch-latte-vector.h files/patch-latte.cxx files/patch-latte.h files/patch-list.cxx files/patch-load.cxx files/patch-param.cxx files/patch-quote.cxx files/patch-reader.cxx files/patch-shstring.cxx files/patch-shstring.h files/patch-str.cxx files/patch-syntax.cxx files/patch-varref.cxx files/patch-wstate.cxx >How-To-Repeat: >Fix: diff -urN /usr/ports/textproc/latte/Makefile textproc/latte/Makefile --- /usr/ports/textproc/latte/Makefile Sun Mar 14 18:18:19 2004 +++ textproc/latte/Makefile Fri Mar 19 02:47:13 2004 @@ -6,7 +6,7 @@ # PORTNAME= latte -PORTVERSION= 1.1 +PORTVERSION= 2.1 CATEGORIES= textproc MASTER_SITES= http://www.latte.org/ \ ftp://ftp.brasslantern.com/pub/zanshin/latte/ @@ -14,19 +14,31 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Simple language for marking up text in a very expressive way -USE_LIBTOOL_VER=13 -MAKE_FLAGS= CONF_ARGS="--prefix=${PREFIX}" -CONFIGURE_ARGS+= --enable-shared +USE_GETOPT_LONG= yes +USE_GMAKE= yes +USE_AUTOCONF_VER= 213 +USE_LIBTOOL_VER= 13 +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS= --enable-shared +MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ + AUTOHEADER="${TRUE}" -.include <bsd.port.pre.mk> +INFO= latte liblatte -.if ${OSVERSION} >= 502102 -BROKEN= "Configure fails" -.endif +CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT +LDFLAGS= -L${LOCALBASE}/lib + +post-extract: + -@${RM} ${WRKSRC}/getopt* post-install: - ${LN} -sf ${PREFIX}/bin/latte-html ${PREFIX}/bin/latte - ${CP} -Rp ${WRKSRC}/tests ${PREFIX}/share/latte/ + @${LN} -sf latte-html ${PREFIX}/bin/latte ${INSTALL_DATA} ${WRKSRC}/latte.el ${PREFIX}/share/emacs/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> +.include <bsd.port.mk> diff -urN /usr/ports/textproc/latte/distinfo textproc/latte/distinfo --- /usr/ports/textproc/latte/distinfo Thu Mar 18 13:57:30 2004 +++ textproc/latte/distinfo Fri Mar 19 01:09:57 2004 @@ -1,2 +1,2 @@ -MD5 (latte-1.1.tar.gz) = 44679ea2b9a2a168cf281095b0ad0aaf -SIZE (latte-1.1.tar.gz) = 280339 +MD5 (latte-2.1.tar.gz) = 79673dfeb696c0d2c25ec9a548885ae1 +SIZE (latte-2.1.tar.gz) = 357842 diff -urN /usr/ports/textproc/latte/files/patch-FlexLexer.h textproc/latte/files/patch-FlexLexer.h --- /usr/ports/textproc/latte/files/patch-FlexLexer.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-FlexLexer.h Fri Mar 19 01:35:14 2004 @@ -0,0 +1,82 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-Makefile.in textproc/latte/files/patch-Makefile.in --- /usr/ports/textproc/latte/files/patch-Makefile.in Sun Feb 22 19:10:44 2004 +++ textproc/latte/files/patch-Makefile.in Fri Mar 19 02:21:39 2004 @@ -1,19 +1,58 @@ ---- Makefile.in.bak Wed Nov 11 07:58:13 1998 -+++ Makefile.in Fri Feb 13 11:03:24 2004 -@@ -345,16 +345,6 @@ +--- 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-lispLISP: $(lisp_LISP) $(ELCFILES) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(lispdir) -- @list='$(lisp_LISP)'; for p in $$list; do \ -- if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ -- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p"; \ -- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(lispdir)/$$p; \ -- if test -f $${p}c; then \ -- echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c"; \ -- $(INSTALL_DATA) $${p}c $(DESTDIR)$(lispdir)/$${p}c; \ -- else : ; fi; \ -- done +-install-data-am: install-lispLISP install-pkgdataDATA \ ++install-data-am: install-pkgdataDATA \ + install-pkgincludeHEADERS + install-data: install-data-recursive - uninstall-lispLISP: - @$(NORMAL_UNINSTALL) diff -urN /usr/ports/textproc/latte/files/patch-assignment.cxx textproc/latte/files/patch-assignment.cxx --- /usr/ports/textproc/latte/files/patch-assignment.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-assignment.cxx Fri Mar 19 01:18:34 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-boolean.cxx textproc/latte/files/patch-boolean.cxx --- /usr/ports/textproc/latte/files/patch-boolean.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-boolean.cxx Fri Mar 19 01:18:50 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-configure.in textproc/latte/files/patch-configure.in --- /usr/ports/textproc/latte/files/patch-configure.in Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-configure.in Fri Mar 19 02:55:57 2004 @@ -0,0 +1,58 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-definitions.cxx textproc/latte/files/patch-definitions.cxx --- /usr/ports/textproc/latte/files/patch-definitions.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-definitions.cxx Fri Mar 19 01:43:58 2004 @@ -0,0 +1,37 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-fileloc.cxx textproc/latte/files/patch-fileloc.cxx --- /usr/ports/textproc/latte/files/patch-fileloc.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-fileloc.cxx Fri Mar 19 01:19:15 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-grammar.y textproc/latte/files/patch-grammar.y --- /usr/ports/textproc/latte/files/patch-grammar.y Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-grammar.y Fri Mar 19 01:19:28 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-group.cxx textproc/latte/files/patch-group.cxx --- /usr/ports/textproc/latte/files/patch-group.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-group.cxx Fri Mar 19 01:19:40 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-conf.h textproc/latte/files/patch-latte-conf.h --- /usr/ports/textproc/latte/files/patch-latte-conf.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-conf.h Fri Mar 19 01:19:57 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-deque.h textproc/latte/files/patch-latte-deque.h --- /usr/ports/textproc/latte/files/patch-latte-deque.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-deque.h Fri Mar 19 01:20:12 2004 @@ -0,0 +1,18 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-html-cli.cxx textproc/latte/files/patch-latte-html-cli.cxx --- /usr/ports/textproc/latte/files/patch-latte-html-cli.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-html-cli.cxx Fri Mar 19 01:20:31 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-html.cxx textproc/latte/files/patch-latte-html.cxx --- /usr/ports/textproc/latte/files/patch-latte-html.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-html.cxx Fri Mar 19 01:20:49 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-html.h textproc/latte/files/patch-latte-html.h --- /usr/ports/textproc/latte/files/patch-latte-html.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-html.h Fri Mar 19 01:21:03 2004 @@ -0,0 +1,30 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-log.cxx textproc/latte/files/patch-latte-log.cxx --- /usr/ports/textproc/latte/files/patch-latte-log.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-log.cxx Fri Mar 19 01:21:20 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-log.h textproc/latte/files/patch-latte-log.h --- /usr/ports/textproc/latte/files/patch-latte-log.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-log.h Fri Mar 19 01:21:32 2004 @@ -0,0 +1,39 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-stack.h textproc/latte/files/patch-latte-stack.h --- /usr/ports/textproc/latte/files/patch-latte-stack.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-stack.h Fri Mar 19 01:21:50 2004 @@ -0,0 +1,20 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-string.cxx textproc/latte/files/patch-latte-string.cxx --- /usr/ports/textproc/latte/files/patch-latte-string.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-string.cxx Fri Mar 19 01:22:04 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-string.h textproc/latte/files/patch-latte-string.h --- /usr/ports/textproc/latte/files/patch-latte-string.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-string.h Fri Mar 19 01:22:11 2004 @@ -0,0 +1,41 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-text-cli.cxx textproc/latte/files/patch-latte-text-cli.cxx --- /usr/ports/textproc/latte/files/patch-latte-text-cli.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-text-cli.cxx Fri Mar 19 01:22:38 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-text.cxx textproc/latte/files/patch-latte-text.cxx --- /usr/ports/textproc/latte/files/patch-latte-text.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-text.cxx Fri Mar 19 01:22:51 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-text.h textproc/latte/files/patch-latte-text.h --- /usr/ports/textproc/latte/files/patch-latte-text.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-text.h Fri Mar 19 01:22:58 2004 @@ -0,0 +1,35 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte-vector.h textproc/latte/files/patch-latte-vector.h --- /usr/ports/textproc/latte/files/patch-latte-vector.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte-vector.h Fri Mar 19 01:23:10 2004 @@ -0,0 +1,19 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte.cxx textproc/latte/files/patch-latte.cxx --- /usr/ports/textproc/latte/files/patch-latte.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte.cxx Fri Mar 19 01:23:23 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-latte.h textproc/latte/files/patch-latte.h --- /usr/ports/textproc/latte/files/patch-latte.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-latte.h Fri Mar 19 01:40:56 2004 @@ -0,0 +1,158 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-list.cxx textproc/latte/files/patch-list.cxx --- /usr/ports/textproc/latte/files/patch-list.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-list.cxx Fri Mar 19 01:23:32 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-load.cxx textproc/latte/files/patch-load.cxx --- /usr/ports/textproc/latte/files/patch-load.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-load.cxx Fri Mar 19 01:23:44 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-param.cxx textproc/latte/files/patch-param.cxx --- /usr/ports/textproc/latte/files/patch-param.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-param.cxx Fri Mar 19 01:23:54 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-quote.cxx textproc/latte/files/patch-quote.cxx --- /usr/ports/textproc/latte/files/patch-quote.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-quote.cxx Fri Mar 19 01:24:04 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-reader.cxx textproc/latte/files/patch-reader.cxx --- /usr/ports/textproc/latte/files/patch-reader.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-reader.cxx Fri Mar 19 01:24:16 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-shstring.cxx textproc/latte/files/patch-shstring.cxx --- /usr/ports/textproc/latte/files/patch-shstring.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-shstring.cxx Fri Mar 19 01:24:31 2004 @@ -0,0 +1,61 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-shstring.h textproc/latte/files/patch-shstring.h --- /usr/ports/textproc/latte/files/patch-shstring.h Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-shstring.h Fri Mar 19 01:24:37 2004 @@ -0,0 +1,63 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-str.cxx textproc/latte/files/patch-str.cxx --- /usr/ports/textproc/latte/files/patch-str.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-str.cxx Fri Mar 19 01:24:46 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-syntax.cxx textproc/latte/files/patch-syntax.cxx --- /usr/ports/textproc/latte/files/patch-syntax.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-syntax.cxx Fri Mar 19 01:25:01 2004 @@ -0,0 +1,66 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-varref.cxx textproc/latte/files/patch-varref.cxx --- /usr/ports/textproc/latte/files/patch-varref.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-varref.cxx Fri Mar 19 01:25:12 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/files/patch-wstate.cxx textproc/latte/files/patch-wstate.cxx --- /usr/ports/textproc/latte/files/patch-wstate.cxx Thu Jan 1 09:00:00 1970 +++ textproc/latte/files/patch-wstate.cxx Fri Mar 19 01:25:24 2004 @@ -0,0 +1,11 @@ +--- 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 -urN /usr/ports/textproc/latte/pkg-plist textproc/latte/pkg-plist --- /usr/ports/textproc/latte/pkg-plist Fri Feb 27 19:05:06 2004 +++ textproc/latte/pkg-plist Fri Mar 19 02:45:12 2004 @@ -1,11 +1,6 @@ -bin/latte-html bin/latte -info/latte.info -info/liblatte.info -lib/liblatte.a -lib/liblatte.so -lib/liblatte.so.4 -include/latte/FlexLexer.h +bin/latte-html +bin/latte-text include/latte/latte-conf.h include/latte/latte-deque.h include/latte/latte-fstream.h @@ -14,100 +9,102 @@ 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 -share/latte/html.latte -share/latte/standard.latte -share/latte/tests/Makefile -share/latte/tests/Makefile.am -share/latte/tests/Makefile.in -share/latte/tests/a.exp -share/latte/tests/a.latte -share/latte/tests/add.exp -share/latte/tests/add.latte -share/latte/tests/and.exp -share/latte/tests/and.latte -share/latte/tests/append.exp -share/latte/tests/append.latte -share/latte/tests/apply.exp -share/latte/tests/apply.latte -share/latte/tests/car.exp -share/latte/tests/car.latte -share/latte/tests/case.exp -share/latte/tests/case.latte -share/latte/tests/concat.exp -share/latte/tests/concat.latte -share/latte/tests/cons.exp -share/latte/tests/cons.latte -share/latte/tests/def.exp -share/latte/tests/def.latte -share/latte/tests/divide.exp -share/latte/tests/divide.latte -share/latte/tests/empty.exp -share/latte/tests/empty.latte -share/latte/tests/equal.exp -share/latte/tests/equal.latte -share/latte/tests/explode.exp -share/latte/tests/explode.latte -share/latte/tests/file-contents.exp -share/latte/tests/file-contents.latte -share/latte/tests/greater.exp -share/latte/tests/greater.latte -share/latte/tests/group.exp -share/latte/tests/group.latte -share/latte/tests/if.exp -share/latte/tests/if.latte -share/latte/tests/img.exp -share/latte/tests/img.latte -share/latte/tests/include.exp -share/latte/tests/include.latte -share/latte/tests/include2.latte -share/latte/tests/lambda.exp -share/latte/tests/lambda.latte -share/latte/tests/length.exp -share/latte/tests/length.latte -share/latte/tests/let.exp -share/latte/tests/let.latte -share/latte/tests/lmap.exp -share/latte/tests/lmap.latte -share/latte/tests/load-file.exp -share/latte/tests/load-file.latte -share/latte/tests/load-library.exp -share/latte/tests/load-library.latte -share/latte/tests/member.exp -share/latte/tests/member.latte -share/latte/tests/modulo.exp -share/latte/tests/modulo.latte -share/latte/tests/multiply.exp -share/latte/tests/multiply.latte -share/latte/tests/not.exp -share/latte/tests/not.latte -share/latte/tests/nth.exp -share/latte/tests/nth.latte -share/latte/tests/operator.exp -share/latte/tests/operator.latte -share/latte/tests/reverse.exp -share/latte/tests/reverse.latte -share/latte/tests/runtest.sh -share/latte/tests/set.exp -share/latte/tests/set.latte -share/latte/tests/string.exp -share/latte/tests/string.latte -share/latte/tests/subseq.exp -share/latte/tests/subseq.latte -share/latte/tests/substr.exp -share/latte/tests/substr.latte -share/latte/tests/undefined-x.exp -share/latte/tests/undefined-x.latte -share/latte/tests/varref.exp -share/latte/tests/varref.latte -share/latte/tests/while.exp -share/latte/tests/while.latte +lib/liblatte.a +lib/liblatte.so +lib/liblatte.so.5 share/emacs/site-lisp/latte.el -@dirrm include/latte -@dirrm share/latte/tests -@dirrm share/latte +%%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 %%DATADIR%% +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tests +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040320013035.39882dc4.tkato>