- Update to 0.7.6

Note that in ports/99972, pkg-plist is not complete.
The fix is given by maintainer via irc.

PR:		99972
Submitted by:	maintainer

6 files changed, 199 insertions, 78 deletions

diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index e70140ae60ae..2f283273cd08 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gtkmathview
-PORTVERSION=	0.5.1
-PORTREVISION=	5
+PORTVERSION=	0.7.6
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://helm.cs.unibo.it/mml-widget/sources/
 
@@ -18,7 +17,9 @@ COMMENT=	A GTK Widget to Render MathML Documents
 LIB_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv \
 		t1:${PORTSDIR}/devel/t1lib \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		gmetadom_gdome_cpp_smart:${PORTSDIR}/textproc/gmetadom
+		gmetadom_gdome_cpp_smart:${PORTSDIR}/textproc/gmetadom \
+		popt.0:${PORTSDIR}/devel/popt \
+		xslt.2:${PORTSDIR}/textproc/libxslt
 
 USE_GETOPT_LONG=	yes
 USE_X_PREFIX=	yes
@@ -30,11 +31,12 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
-MAN1=	mathmlviewer.1 mathml2ps.1
+MAN1=	mathmlviewer.1
 
-post-patch:
-.for file in src/stringAux.cc src/PS_T1_FontManager.cc
-	@${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/${file}
-.endfor
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if ${OSVERSION} < 600000
+IGNORE= is unsupported on versions prior to FreeBSD 6.0
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/gtkmathview/distinfo b/x11-toolkits/gtkmathview/distinfo
index 0533430890c5..46ef0eef4a6f 100644
--- a/x11-toolkits/gtkmathview/distinfo
+++ b/x11-toolkits/gtkmathview/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtkmathview-0.5.1.tar.gz) = 64313fd6d06bf8cd9d8f12087b7fab1c
-SHA256 (gtkmathview-0.5.1.tar.gz) = 4e0f713aa4e8e96d247c348864b611cb595dd05e04cbd3cf74730f2781022b5b
-SIZE (gtkmathview-0.5.1.tar.gz) = 480292
+MD5 (gtkmathview-0.7.6.tar.gz) = 4bb348c98367228f0de0a2216a13d48f
+SHA256 (gtkmathview-0.7.6.tar.gz) = 4b104ab94774ca429aa639a1a6f0adec1ca1443bfd444f2100c063e3cf70e6bb
+SIZE (gtkmathview-0.7.6.tar.gz) = 953213
diff --git a/x11-toolkits/gtkmathview/files/patch-src::String.cc b/x11-toolkits/gtkmathview/files/patch-src::String.cc
deleted file mode 100644
index 6f24fd391bd1..000000000000
--- a/x11-toolkits/gtkmathview/files/patch-src::String.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/String.cc.orig	Mon Jul 14 08:01:23 2003
-+++ src/String.cc	Mon Jul 14 08:05:56 2003
-@@ -34,6 +34,12 @@
- #include "String.hh"
- #include "Globals.hh"
- 
-+#ifdef __FreeBSD__
-+#if (__FreeBSD_version < 500000)
-+#define iswspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\n')
-+#endif
-+#endif
-+
- #ifdef DEBUG
- int String::counter = 0;
- #endif
diff --git a/x11-toolkits/gtkmathview/files/patch-src::StringTokenizer.cc b/x11-toolkits/gtkmathview/files/patch-src::StringTokenizer.cc
deleted file mode 100644
index 38455e3a004b..000000000000
--- a/x11-toolkits/gtkmathview/files/patch-src::StringTokenizer.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/StringTokenizer.cc.orig	Mon Jul 14 08:15:49 2003
-+++ src/StringTokenizer.cc	Mon Jul 14 08:18:44 2003
-@@ -34,6 +34,14 @@
- #include "MathMLAttribute.hh"
- #include "StringTokenizer.hh"
- 
-+#ifdef __FreeBSD__
-+#if (__FreeBSD_version < 500000)
-+#define iswxdigit isxdigit
-+#define towupper toupper
-+#define iswdigit isdigit
-+#endif
-+#endif
-+
- static unsigned hexOfChar(Char ch)
- {
-   assert(iswxdigit(ch));
diff --git a/x11-toolkits/gtkmathview/files/patch-src::T1_FontManager.cc b/x11-toolkits/gtkmathview/files/patch-src::T1_FontManager.cc
deleted file mode 100644
index 941c007e2dba..000000000000
--- a/x11-toolkits/gtkmathview/files/patch-src::T1_FontManager.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/T1_FontManager.cc.orig	Thu Jul 17 18:18:13 2003
-+++ src/T1_FontManager.cc	Thu Oct 16 15:09:23 2003
-@@ -77,8 +77,8 @@
- int
- T1_FontManager::SearchT1FontId(const char* fileName) const
- {
--  //int n = T1_GetNoFonts(); // version 5.0 of t1lib
--  int n = T1_Get_no_fonts();
-+  int n = T1_GetNoFonts(); // version 5.0 of t1lib
-+  //int n = T1_Get_no_fonts();
-   int i;
-   for (i = 0; i < n && strcmp(fileName, T1_GetFontFileName(i)); i++) ;
- 
diff --git a/x11-toolkits/gtkmathview/pkg-plist b/x11-toolkits/gtkmathview/pkg-plist
index ca77400a4d65..d2fffe458b77 100644
--- a/x11-toolkits/gtkmathview/pkg-plist
+++ b/x11-toolkits/gtkmathview/pkg-plist
@@ -1,29 +1,193 @@
-bin/gtkmathview-config
-bin/mathml2ps
+bin/mathmlsvg
 bin/mathmlviewer
-include/gtkmathview/defs.h
-include/gtkmathview/gtkmathview.h
-@dirrm include/gtkmathview
-lib/libgtkmathview.a
-lib/libgtkmathview.la
-lib/libgtkmathview.so
-lib/libgtkmathview.so.5
-libdata/pkgconfig/gtkmathview.pc
+etc/gtkmathview/gtkmathview.conf.xml
+include/gtkmathview/MathView/AbstractLogger.hh
+include/gtkmathview/MathView/Area.hh
+include/gtkmathview/MathView/AreaFactory.hh
+include/gtkmathview/MathView/AreaId.hh
+include/gtkmathview/MathView/AreaIdAux.hh
+include/gtkmathview/MathView/Backend.hh
+include/gtkmathview/MathView/BinContainerArea.hh
+include/gtkmathview/MathView/BoundingBox.hh
+include/gtkmathview/MathView/BoundingBoxAux.hh
+include/gtkmathview/MathView/BoxArea.hh
+include/gtkmathview/MathView/BoxGraphicDevice.hh
+include/gtkmathview/MathView/BoxMLElement.hh
+include/gtkmathview/MathView/BoxMLNamespaceContext.hh
+include/gtkmathview/MathView/BoxedLayoutArea.hh
+include/gtkmathview/MathView/CachedShapedString.hh
+include/gtkmathview/MathView/Char.hh
+include/gtkmathview/MathView/ColorArea.hh
+include/gtkmathview/MathView/ComputerModernFamily.hh
+include/gtkmathview/MathView/ComputerModernShaper.hh
+include/gtkmathview/MathView/Configuration.hh
+include/gtkmathview/MathView/ContainerArea.hh
+include/gtkmathview/MathView/Element.hh
+include/gtkmathview/MathView/FastScopedHashMap.hh
+include/gtkmathview/MathView/FillerArea.hh
+include/gtkmathview/MathView/FormattingContext.hh
+include/gtkmathview/MathView/GlyphArea.hh
+include/gtkmathview/MathView/GlyphSpec.hh
+include/gtkmathview/MathView/GlyphStringArea.hh
+include/gtkmathview/MathView/GlyphWrapperArea.hh
+include/gtkmathview/MathView/GraphicDevice.hh
+include/gtkmathview/MathView/Gtk_Backend.hh
+include/gtkmathview/MathView/HashMap.hh
+include/gtkmathview/MathView/HideArea.hh
+include/gtkmathview/MathView/HorizontalArrayArea.hh
+include/gtkmathview/MathView/HorizontalFillerArea.hh
+include/gtkmathview/MathView/HorizontalSpaceArea.hh
+include/gtkmathview/MathView/IdArea.hh
+include/gtkmathview/MathView/IgnoreArea.hh
+include/gtkmathview/MathView/Init.hh
+include/gtkmathview/MathView/InkArea.hh
+include/gtkmathview/MathView/Length.hh
+include/gtkmathview/MathView/LengthAux.hh
+include/gtkmathview/MathView/LinearContainerArea.hh
+include/gtkmathview/MathView/Logger.hh
+include/gtkmathview/MathView/MathGraphicDevice.hh
+include/gtkmathview/MathView/MathMLElement.hh
+include/gtkmathview/MathView/MathMLNamespaceContext.hh
+include/gtkmathview/MathView/MathMLOperatorDictionary.hh
+include/gtkmathview/MathView/MathVariant.hh
+include/gtkmathview/MathView/MathVariantMap.hh
+include/gtkmathview/MathView/NamespaceContext.hh
+include/gtkmathview/MathView/Node.hh
+include/gtkmathview/MathView/NullShaper.hh
+include/gtkmathview/MathView/Object.hh
+include/gtkmathview/MathView/OverlapArrayArea.hh
+include/gtkmathview/MathView/Point.hh
+include/gtkmathview/MathView/PointAux.hh
+include/gtkmathview/MathView/RGBColor.hh
+include/gtkmathview/MathView/RGBColorAux.hh
+include/gtkmathview/MathView/Rectangle.hh
+include/gtkmathview/MathView/RenderingContext.hh
+include/gtkmathview/MathView/SVG_Backend.hh
+include/gtkmathview/MathView/SVG_RenderingContext.hh
+include/gtkmathview/MathView/SVG_StreamRenderingContext.hh
+include/gtkmathview/MathView/ScopedHashMap.hh
+include/gtkmathview/MathView/SearchingContext.hh
+include/gtkmathview/MathView/Shaper.hh
+include/gtkmathview/MathView/ShaperManager.hh
+include/gtkmathview/MathView/ShapingContext.hh
+include/gtkmathview/MathView/ShiftArea.hh
+include/gtkmathview/MathView/SimpleArea.hh
+include/gtkmathview/MathView/SmartPtr.hh
+include/gtkmathview/MathView/SpaceShaper.hh
+include/gtkmathview/MathView/SparseMap.hh
+include/gtkmathview/MathView/StandardSymbolsShaper.hh
+include/gtkmathview/MathView/StepArea.hh
+include/gtkmathview/MathView/String.hh
+include/gtkmathview/MathView/StringAux.hh
+include/gtkmathview/MathView/StringHash.hh
+include/gtkmathview/MathView/T1Font.hh
+include/gtkmathview/MathView/TFMComputerModernMathGraphicDevice.hh
+include/gtkmathview/MathView/TFMComputerModernShaper.hh
+include/gtkmathview/MathView/TFMFont.hh
+include/gtkmathview/MathView/TFMFontManager.hh
+include/gtkmathview/MathView/TFMGlyphArea.hh
+include/gtkmathview/MathView/TemplateElementIterator.hh
+include/gtkmathview/MathView/TemplateElementValidator.hh
+include/gtkmathview/MathView/TemplateNodeIterator.hh
+include/gtkmathview/MathView/Utils.hh
+include/gtkmathview/MathView/Value.hh
+include/gtkmathview/MathView/ValueConversion.hh
+include/gtkmathview/MathView/Variant.hh
+include/gtkmathview/MathView/VerticalArrayArea.hh
+include/gtkmathview/MathView/VerticalFillerArea.hh
+include/gtkmathview/MathView/VerticalSpaceArea.hh
+include/gtkmathview/MathView/View.hh
+include/gtkmathview/MathView/WeakPtr.hh
+include/gtkmathview/MathView/WrapperArea.hh
+include/gtkmathview/MathView/c_customXmlReader.h
+include/gtkmathview/MathView/custom_reader_MathView.hh
+include/gtkmathview/MathView/defs.h
+include/gtkmathview/MathView/fixed.hh
+include/gtkmathview/MathView/gmetadom_MathView.hh
+include/gtkmathview/MathView/gmetadom_Model.hh
+include/gtkmathview/MathView/gmv_defines.h
+include/gtkmathview/MathView/libxml2_MathView.hh
+include/gtkmathview/MathView/libxml2_Model.hh
+include/gtkmathview/MathView/libxml2_reader_MathView.hh
+include/gtkmathview/MathView/scaled.hh
+include/gtkmathview/MathView/scaledAux.hh
+include/gtkmathview/MathView/t1lib_T1Font.hh
+include/gtkmathview/MathView/t1lib_T1FontManager.hh
+include/gtkmathview/MathView/t1lib_TFM_T1Font.hh
+include/gtkmathview/MathView/t1lib_TFM_T1FontManager.hh
+include/gtkmathview/gtk/gtkmathview.h
+include/gtkmathview/gtk/gtkmathview_common.h
+include/gtkmathview/gtk/gtkmathview_custom_reader.h
+include/gtkmathview/gtk/gtkmathview_decorators.h
+include/gtkmathview/gtk/gtkmathview_decorators_common.h
+include/gtkmathview/gtk/gtkmathview_gmetadom.h
+include/gtkmathview/gtk/gtkmathview_libxml2.h
+include/gtkmathview/gtk/gtkmathview_libxml2_reader.h
+lib/libgtkmathview_custom_reader.a
+lib/libgtkmathview_custom_reader.la
+lib/libgtkmathview_custom_reader.so
+lib/libgtkmathview_custom_reader.so.7
+lib/libgtkmathview_gmetadom.a
+lib/libgtkmathview_gmetadom.la
+lib/libgtkmathview_gmetadom.so
+lib/libgtkmathview_gmetadom.so.7
+lib/libgtkmathview_libxml2.a
+lib/libgtkmathview_libxml2.la
+lib/libgtkmathview_libxml2.so
+lib/libgtkmathview_libxml2.so.7
+lib/libgtkmathview_libxml2_reader.a
+lib/libgtkmathview_libxml2_reader.la
+lib/libgtkmathview_libxml2_reader.so
+lib/libgtkmathview_libxml2_reader.so.7
+lib/libmathview.a
+lib/libmathview.la
+lib/libmathview.so
+lib/libmathview.so.7
+lib/libmathview_backend_gtk.a
+lib/libmathview_backend_gtk.la
+lib/libmathview_backend_gtk.so
+lib/libmathview_backend_gtk.so.7
+lib/libmathview_backend_svg.a
+lib/libmathview_backend_svg.la
+lib/libmathview_backend_svg.so
+lib/libmathview_backend_svg.so.7
+lib/libmathview_frontend_custom_reader.a
+lib/libmathview_frontend_custom_reader.la
+lib/libmathview_frontend_custom_reader.so
+lib/libmathview_frontend_custom_reader.so.7
+lib/libmathview_frontend_gmetadom.a
+lib/libmathview_frontend_gmetadom.la
+lib/libmathview_frontend_gmetadom.so
+lib/libmathview_frontend_gmetadom.so.7
+lib/libmathview_frontend_libxml2.a
+lib/libmathview_frontend_libxml2.la
+lib/libmathview_frontend_libxml2.so
+lib/libmathview_frontend_libxml2.so.7
+lib/libmathview_frontend_libxml2_reader.a
+lib/libmathview_frontend_libxml2_reader.la
+lib/libmathview_frontend_libxml2_reader.so
+lib/libmathview_frontend_libxml2_reader.so.7
+libdata/pkgconfig/gtkmathview-custom-reader.pc
+libdata/pkgconfig/gtkmathview-gmetadom.pc
+libdata/pkgconfig/gtkmathview-libxml2-reader.pc
+libdata/pkgconfig/gtkmathview-libxml2.pc
+libdata/pkgconfig/mathview-backend-gtk.pc
+libdata/pkgconfig/mathview-backend-svg.pc
+libdata/pkgconfig/mathview-core.pc
+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
 share/gtkmathview/dictionary-combining.xml
 share/gtkmathview/dictionary-local.xml
 share/gtkmathview/dictionary.dtd
 share/gtkmathview/dictionary.xml
 share/gtkmathview/entities-table.dtd
 share/gtkmathview/entities-table.xml
-share/gtkmathview/font-configuration-adobe.xml
-share/gtkmathview/font-configuration-bh.xml
-share/gtkmathview/font-configuration-euclid.xml
-share/gtkmathview/font-configuration-mt.xml
-share/gtkmathview/font-configuration-tex.xml
-share/gtkmathview/font-configuration-wri.xml
-share/gtkmathview/font-configuration.dtd
-share/gtkmathview/font-configuration.xml
-share/gtkmathview/math-engine-configuration.dtd
-share/gtkmathview/math-engine-configuration.xml
-share/gtkmathview/t1.config
+share/gtkmathview/gtkmathview.conf.dtd
+share/gtkmathview/mathml-entities.dtd
 @dirrm share/gtkmathview
+@dirrm include/gtkmathview/MathView
+@dirrm include/gtkmathview/gtk
+@dirrm include/gtkmathview
+@dirrm etc/gtkmathview