Fix build for -CURRENT (GCC3).

9 files changed, 175 insertions, 14 deletions

diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index 6e44fc8d0f43..96deea2a5e61 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -15,17 +15,13 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML to LaTeX to PDF Converter
 
-LIB_DEPENDS=	Magick:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	Magick.5:${PORTSDIR}/graphics/ImageMagick
 
-USE_REINPLACE=	yes
 USE_BISON=	yes
-MAKEFILE=	GNUmakefile
-CXXFLAGS+=	-I${LOCALBASE}/include -DUNIX
 USE_GMAKE=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,^CXXFLAGS,#CXXFLAGS,g ; \
-		s,^CXX,#CXX,g" ${WRKSRC}/${MAKEFILE}
+MAKEFILE=	GNUmakefile
+MAKE_ARGS=	CXX="${CXX}" \
+		CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include -DUNIX"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/h2l ${PREFIX}/bin
diff --git a/textproc/htmltolatex/files/patch-CH2L.cpp b/textproc/htmltolatex/files/patch-CH2L.cpp
new file mode 100644
index 000000000000..3bfbe9f2f8e4
--- /dev/null
+++ b/textproc/htmltolatex/files/patch-CH2L.cpp
@@ -0,0 +1,50 @@
+
+$FreeBSD$
+
+--- CH2L.cpp.orig	Sun Nov 11 21:03:19 2001
++++ CH2L.cpp	Fri Feb 21 03:08:09 2003
+@@ -18,6 +18,9 @@
+  * Boston, MA 02111-1307, USA.
+  *
+  */
++
++using namespace std;
++
+ #include "CH2L.h"
+ #include "util.h"
+ #include "safe_ostrstream.h"
+@@ -28,7 +31,6 @@
+ #include <assert.h>
+ #include <fstream>
+ 
+-using namespace std;
+ using namespace Magick;
+ 
+ #define ATTRIBUTENESTLIMIT	1000
+@@ -2086,7 +2088,7 @@
+ }
+ 
+ 
+-void CH2L::_implied_font_end(const string &tagdelimiter="",int iterations=1)
++void CH2L::_implied_font_end(const string &tagdelimiter,int iterations)
+ {
+ 	dump_text();
+ 	int cnt = 0;
+@@ -2225,7 +2227,7 @@
+ }
+ 
+ ////////////////////////
+-void CH2L::_implied_a_end(const string &tagdelimiter="",int iterations=1)
++void CH2L::_implied_a_end(const string &tagdelimiter,int iterations)
+ {
+ 	dump_text();
+ 
+@@ -3594,7 +3596,7 @@
+ }
+ 
+ 
+-void CH2L::_implied_div_end(const string &tagdelimiter="",int iterations=1) 
++void CH2L::_implied_div_end(const string &tagdelimiter,int iterations) 
+ { 
+ 	bool did_something = false;
+ 	bool alignment_changed = false;
diff --git a/textproc/htmltolatex/files/patch-CH2L.h b/textproc/htmltolatex/files/patch-CH2L.h
new file mode 100644
index 000000000000..2dc1a44afb3d
--- /dev/null
+++ b/textproc/htmltolatex/files/patch-CH2L.h
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- CH2L.h.orig	Fri Feb 21 01:22:49 2003
++++ CH2L.h	Fri Feb 21 02:08:08 2003
+@@ -189,6 +189,7 @@
+ 	///////////////////////////////////////////////
+ 
+ 	//////////////// spidering //////////////////
++public:
+ 	struct spider_info {
+ 		std::string	mUrl;
+ 		std::string mLocalTag;
+@@ -200,6 +201,7 @@
+ 		
+ 		friend std::ostream& operator<<(std::ostream &o,const spider_info &si);
+ 	};
++private:
+ 	typedef std::map<string,spider_info>	SpiderTable_t;
+ 	SpiderTable_t	mSpiderTable;
+ 	bool			mSpidering;	// not the first page
diff --git a/textproc/htmltolatex/files/patch-StyleTree.cpp b/textproc/htmltolatex/files/patch-StyleTree.cpp
new file mode 100644
index 000000000000..f3cfa566474e
--- /dev/null
+++ b/textproc/htmltolatex/files/patch-StyleTree.cpp
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- StyleTree.cpp.orig	Wed Oct 10 14:24:25 2001
++++ StyleTree.cpp	Fri Feb 21 22:10:03 2003
+@@ -18,8 +18,12 @@
+  * Boston, MA 02111-1307, USA.
+  *
+  */
++
++using namespace std;
++
+ #include "StyleTree.h"
+ #include <stdexcept>
++#include <ostream.h>
+ 
+ void StyleTag::set_from_unparsed_string(const string &s)
+ {
diff --git a/textproc/htmltolatex/files/patch-abstractTable.cpp b/textproc/htmltolatex/files/patch-abstractTable.cpp
new file mode 100644
index 000000000000..883ff69a1b9f
--- /dev/null
+++ b/textproc/htmltolatex/files/patch-abstractTable.cpp
@@ -0,0 +1,24 @@
+
+$FreeBSD$
+
+--- abstractTable.cpp.orig	Fri Feb 21 03:09:19 2003
++++ abstractTable.cpp	Fri Feb 21 03:09:34 2003
+@@ -18,15 +18,15 @@
+  * Boston, MA 02111-1307, USA.
+  *
+  */
++
++using namespace std;
++
+ #include "abstractTable.h"
+ #include "safe_ostrstream.h"
+ #include "util.h"
+ #include <stdio.h>
+ 
+ //#define DEBUG 1
+-
+-using namespace std;
+-
+ 
+ ostream& operator<<(ostream &o,const tabCell &c)
+ {
diff --git a/textproc/htmltolatex/files/patch-h2l.l b/textproc/htmltolatex/files/patch-h2l.l
index c37e6e01c41a..320b5f494960 100644
--- a/textproc/htmltolatex/files/patch-h2l.l
+++ b/textproc/htmltolatex/files/patch-h2l.l
@@ -1,6 +1,12 @@
---- h2l.l.orig	Sun Jan 20 14:47:49 2002
-+++ h2l.l	Sun Jan 20 14:47:56 2002
-@@ -2,7 +2,7 @@
+
+$FreeBSD$
+
+--- h2l.l.orig	Wed Oct 10 14:24:26 2001
++++ h2l.l	Fri Feb 21 03:10:30 2003
+@@ -1,8 +1,10 @@
+ %{
++using namespace std;
++
  #include "CLexData.h"
  #define YYSTYPE	CLexDataPtr
  
diff --git a/textproc/htmltolatex/files/patch-h2l.y b/textproc/htmltolatex/files/patch-h2l.y
index be13c7149aa6..c9f5f748fa78 100644
--- a/textproc/htmltolatex/files/patch-h2l.y
+++ b/textproc/htmltolatex/files/patch-h2l.y
@@ -1,6 +1,15 @@
---- h2l.y.orig	Sun Dec  1 22:57:58 2002
-+++ h2l.y	Sun Dec  1 22:58:30 2002
-@@ -136,6 +136,7 @@
+
+$FreeBSD$
+
+--- h2l.y.orig	Wed Oct 10 14:24:26 2001
++++ h2l.y	Fri Feb 21 03:11:01 2003
+@@ -1,4 +1,5 @@
+ %{
++using namespace std;
+ 
+ #include <iostream>
+ #include <stdio.h>
+@@ -136,6 +137,7 @@
  	;
  
  head_block_init:	TAG_HEAD_START	{ if (!gMainDataStart) InitiateMainData(); }
diff --git a/textproc/htmltolatex/files/patch-safe__ostrstream.cpp b/textproc/htmltolatex/files/patch-safe__ostrstream.cpp
new file mode 100644
index 000000000000..4776cdaaaa33
--- /dev/null
+++ b/textproc/htmltolatex/files/patch-safe__ostrstream.cpp
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- safe_ostrstream.cpp.orig	Fri Feb 21 03:11:22 2003
++++ safe_ostrstream.cpp	Fri Feb 21 03:11:51 2003
+@@ -20,6 +20,8 @@
+  */
+ #ifdef __GNUC__
+ 
++using namespace std;
++
+ #include	"safe_ostrstream.h"
+ #include	<stdio.h>
+ 
diff --git a/textproc/htmltolatex/files/patch-util.cpp b/textproc/htmltolatex/files/patch-util.cpp
new file mode 100644
index 000000000000..2d3409b99c07
--- /dev/null
+++ b/textproc/htmltolatex/files/patch-util.cpp
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- util.cpp.orig	Fri Feb 21 03:47:33 2003
++++ util.cpp	Fri Feb 21 03:47:46 2003
+@@ -18,6 +18,9 @@
+  * Boston, MA 02111-1307, USA.
+  *
+  */
++
++using namespace std;
++
+ #include "util.h"
+ #include <map>
+ #include <ctype.h>
+@@ -35,7 +38,6 @@
+ #include "fetch.h"
+ }
+ #endif
+-using namespace std;
+ 
+ static map<string,int> gsSpecialTable;
+