9 files changed, 109 insertions, 11 deletions

diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index 01b860f4d93d..54fb767bcd42 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -3,28 +3,24 @@
 
 PORTNAME=	gtkmathview
 PORTVERSION=	0.8.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://helm.cs.unibo.it/mml-widget/sources/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A GTK Widget to Render MathML Documents
+COMMENT=	GTK Widget to Render MathML Documents
 
 BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-		t1:${PORTSDIR}/devel/t1lib \
-		gmetadom_gdome_cpp_smart:${PORTSDIR}/textproc/gmetadom
+LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
+		libt1.so:${PORTSDIR}/devel/t1lib \
+		libgmetadom_gdome_cpp_smart.so:${PORTSDIR}/textproc/gmetadom
 
-USES=		pathfix pkgconfig
-USE_GNOME=	gtk20 libxml2
-USE_GMAKE=	yes
+USES=		gmake pathfix pkgconfig
+USE_GNOME=	gtk20 libxml2 pangox-compat
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
-MAN1=		mathmlviewer.1
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc b/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc
new file mode 100644
index 000000000000..c9ca5b5c2449
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc
@@ -0,0 +1,10 @@
+--- mathmlps/main.cc.orig	2013-10-04 15:05:03.000000000 +0200
++++ mathmlps/main.cc	2013-10-04 15:05:17.000000000 +0200
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <unistd.h>
+ #include <cassert>
+ #include <fstream>
+ 
diff --git a/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc b/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc
new file mode 100644
index 000000000000..f479be675a53
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc
@@ -0,0 +1,10 @@
+--- mathmlsvg/main.cc.orig	2013-10-04 15:04:01.000000000 +0200
++++ mathmlsvg/main.cc	2013-10-04 15:04:19.000000000 +0200
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <unistd.h>
+ #include <cassert>
+ #include <fstream>
+ 
diff --git a/x11-toolkits/gtkmathview/files/patch-src_Makefile.in b/x11-toolkits/gtkmathview/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..0d321de019d0
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_Makefile.in
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	2013-10-04 15:01:01.000000000 +0200
++++ src/Makefile.in	2013-10-04 15:01:12.000000000 +0200
+@@ -285,7 +285,6 @@
+   $(MAYBE_BOXML_LIBADD) \
+   $(top_builddir)/src/engine/common/libengine_common.la \
+   $(top_builddir)/src/common/libcommon.la \
+-  -lstdc++ \
+   $(NULL)
+ 
+ all: all-recursive
diff --git a/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib-T1FontManager.cc b/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib-T1FontManager.cc
new file mode 100644
index 000000000000..3dac6bdf7ecb
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib-T1FontManager.cc
@@ -0,0 +1,11 @@
+--- src/backend/common/t1lib_T1FontManager.cc.orig	2013-10-04 14:47:31.000000000 +0200
++++ src/backend/common/t1lib_T1FontManager.cc	2013-10-04 14:48:31.000000000 +0200
+@@ -25,6 +25,8 @@
+ #include "t1lib_T1Font.hh"
+ #include "t1lib_T1FontManager.hh"
+ 
++#include <cstdlib>
++
+ bool t1lib_T1FontManager::firstTime = true;
+ 
+ // #include <iostream>
diff --git a/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh b/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh
new file mode 100644
index 000000000000..fbca99d158e7
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh
@@ -0,0 +1,18 @@
+--- src/frontend/common/TemplateBuilder.hh.orig	2013-10-04 14:50:03.000000000 +0200
++++ src/frontend/common/TemplateBuilder.hh	2013-10-04 14:55:16.000000000 +0200
+@@ -47,12 +47,12 @@
+   SmartPtr<typename ElementBuilder::type>
+   getElement(const typename Model::Element& el) const
+   {
+-    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+       return elem;
+     else
+       {
+-	SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+-	linkerAdd(el, elem);
++	elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++	this->linkerAdd(el, elem);
+ 	return elem;
+       }
+   }
diff --git a/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh b/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh
new file mode 100644
index 000000000000..3c67d40d3b8b
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh
@@ -0,0 +1,11 @@
+--- src/frontend/common/TemplateElementIterator.hh.orig	2013-10-04 14:59:19.000000000 +0200
++++ src/frontend/common/TemplateElementIterator.hh	2013-10-04 14:59:40.000000000 +0200
+@@ -43,7 +43,7 @@
+   findValidNodeForward(const typename Model::Node& p0) const
+   {
+     for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
+-      if (valid(p)) return Model::asElement(p);
++      if (this->valid(p)) return Model::asElement(p);
+     return typename Model::Element();
+   }
+     
diff --git a/x11-toolkits/gtkmathview/files/patch-src_view_Makefile.in b/x11-toolkits/gtkmathview/files/patch-src_view_Makefile.in
new file mode 100644
index 000000000000..bec718995823
--- /dev/null
+++ b/x11-toolkits/gtkmathview/files/patch-src_view_Makefile.in
@@ -0,0 +1,31 @@
+--- src/view/Makefile.in.orig	2013-10-04 15:02:02.000000000 +0200
++++ src/view/Makefile.in	2013-10-04 15:02:20.000000000 +0200
+@@ -305,28 +305,24 @@
+   $(top_builddir)/src/frontend/libxml2_reader/libfrontend_libxml2_reader.la \
+   $(top_builddir)/src/frontend/custom_reader/libfrontend_custom_reader.la \
+   $(top_builddir)/src/libmathview.la \
+-  -lstdc++ \
+   $(NULL)
+ 
+ libmathview_frontend_libxml2_reader_la_LIBADD = \
+   $(XML_LIBS) \
+   $(top_builddir)/src/frontend/libxml2_reader/libfrontend_libxml2_reader.la \
+   $(top_builddir)/src/libmathview.la \
+-  -lstdc++ \
+   $(NULL)
+ 
+ libmathview_frontend_libxml2_la_LIBADD = \
+   $(XML_LIBS) \
+   $(top_builddir)/src/frontend/libxml2/libfrontend_libxml2.la \
+   $(top_builddir)/src/libmathview.la \
+-  -lstdc++ \
+   $(NULL)
+ 
+ libmathview_frontend_gmetadom_la_LIBADD = \
+   $(DOM_LIBS) \
+   $(top_builddir)/src/frontend/gmetadom/libfrontend_gmetadom.la \
+   $(top_builddir)/src/libmathview.la \
+-  -lstdc++ \
+   $(NULL)
+ 
+ libmathview_frontend_custom_reader_la_CPPFLAGS = -DGMV_FrontEnd_DLL
diff --git a/x11-toolkits/gtkmathview/pkg-plist b/x11-toolkits/gtkmathview/pkg-plist
index e7b3ff0bdbc9..d46061f59dd2 100644
--- a/x11-toolkits/gtkmathview/pkg-plist
+++ b/x11-toolkits/gtkmathview/pkg-plist
@@ -188,6 +188,7 @@ libdata/pkgconfig/mathview-frontend-custom-reader.pc
 libdata/pkgconfig/mathview-frontend-gmetadom.pc
 libdata/pkgconfig/mathview-frontend-libxml2-reader.pc
 libdata/pkgconfig/mathview-frontend-libxml2.pc
+man/man1/mathmlviewer.1.gz
 %%DATADIR%%/dictionary-combining.xml
 %%DATADIR%%/dictionary-local.xml
 %%DATADIR%%/dictionary.dtd