Index: head/textproc/htmltolatex/Makefile
===================================================================
--- head/textproc/htmltolatex/Makefile	(revision 459395)
+++ head/textproc/htmltolatex/Makefile	(revision 459396)
@@ -1,47 +1,47 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	htmltolatex
 PORTVERSION=	1
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	textproc
 MASTER_SITES=	http://people.FreeBSD.org/~foxfair/distfiles/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	HTML to LaTeX to PDF Converter
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copying.txt
 
 LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick
 
 BROKEN_powerpc64=	fails to link: libGraphicsMagick++.so: undefined reference to std::__cxx11::basic_string
 
 USES=		bison gmake
 MAKEFILE=	GNUmakefile
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ARGS=	CXX="${CXX}" \
 		CXXFLAGS="${CXXFLAGS} -DUNIX \
 		    `GraphicsMagick++-config --cppflags`"
 
 post-configure:
 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g'	\
 	    -e 's,-lMagick,-lGraphicsMagick,g'	\
 	    -e 's,-lstdc++,,'	\
 	    -e 's,{quote},{tightquote},' ${WRKSRC}/QA/test1*_baseline*.tex \
 		${WRKSRC}/${MAKEFILE}
 
 post-build test:
 	@if ! cd ${WRKSRC}/QA && ./run_tests;	\
 	then	\
 		${CAT} ${WRKSRC}/QA/*.diff;	\
 		exit 1;	\
 	fi
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/h2l ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/nmr.tex ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
Index: head/textproc/htmltolatex/files/patch-CH2L.cpp
===================================================================
--- head/textproc/htmltolatex/files/patch-CH2L.cpp	(revision 459395)
+++ head/textproc/htmltolatex/files/patch-CH2L.cpp	(revision 459396)
@@ -1,47 +1,56 @@
---- CH2L.cpp.orig	Sun Nov 11 21:03:19 2001
-+++ CH2L.cpp	Fri Feb 21 03:08:09 2003
+--- CH2L.cpp.orig	2001-11-11 21:03:19.000000000 +0100
++++ CH2L.cpp	2018-01-19 07:07:05.786197000 +0100
 @@ -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;
+@@ -3945,7 +3947,7 @@
+ 
+ 		mTableDimensionsFileName = tsp;
+ 		mTableDimensionsFile.open(tsp.c_str());
+-		return mTableDimensionsFile;
++		return true;
+ 		}
+ 	else 
+ 		{