Date: Fri, 4 Oct 2013 13:38:44 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329306 - in head/x11-toolkits/gtkmathview: . files Message-ID: <201310041338.r94DciKg074201@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Fri Oct 4 13:38:44 2013 New Revision: 329306 URL: http://svnweb.freebsd.org/changeset/ports/329306 Log: Use new LIB_DEPEND syntax, USE_GMAKE=>USES=gmake, stageify. Update comment to remove indefinite article Fix build on HEAD. This port uses pangox-compat. Added: head/x11-toolkits/gtkmathview/files/ head/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc (contents, props changed) head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc (contents, props changed) head/x11-toolkits/gtkmathview/files/patch-src_Makefile.in (contents, props changed) head/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib-T1FontManager.cc (contents, props changed) head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh (contents, props changed) head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh (contents, props changed) head/x11-toolkits/gtkmathview/files/patch-src_view_Makefile.in (contents, props changed) Modified: head/x11-toolkits/gtkmathview/Makefile head/x11-toolkits/gtkmathview/pkg-plist Modified: head/x11-toolkits/gtkmathview/Makefile ============================================================================== --- head/x11-toolkits/gtkmathview/Makefile Fri Oct 4 13:26:28 2013 (r329305) +++ head/x11-toolkits/gtkmathview/Makefile Fri Oct 4 13:38:44 2013 (r329306) @@ -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 - -USES= pathfix pkgconfig -USE_GNOME= gtk20 libxml2 -USE_GMAKE= yes +LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt \ + libt1.so:${PORTSDIR}/devel/t1lib \ + libgmetadom_gdome_cpp_smart.so:${PORTSDIR}/textproc/gmetadom + +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> Added: head/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtkmathview/files/patch-mathmlps_main.cc Fri Oct 4 13:38:44 2013 (r329306) @@ -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> + Added: head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtkmathview/files/patch-mathmlsvg_main.cc Fri Oct 4 13:38:44 2013 (r329306) @@ -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> + Added: head/x11-toolkits/gtkmathview/files/patch-src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtkmathview/files/patch-src_Makefile.in Fri Oct 4 13:38:44 2013 (r329306) @@ -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 Added: head/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib-T1FontManager.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtkmathview/files/patch-src_backend_common_t1lib-T1FontManager.cc Fri Oct 4 13:38:44 2013 (r329306) @@ -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> Added: head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateBuilder.hh Fri Oct 4 13:38:44 2013 (r329306) @@ -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; + } + } Added: head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtkmathview/files/patch-src_frontend_common_TemplateElementIterator.hh Fri Oct 4 13:38:44 2013 (r329306) @@ -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(); + } + Added: head/x11-toolkits/gtkmathview/files/patch-src_view_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/gtkmathview/files/patch-src_view_Makefile.in Fri Oct 4 13:38:44 2013 (r329306) @@ -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 Modified: head/x11-toolkits/gtkmathview/pkg-plist ============================================================================== --- head/x11-toolkits/gtkmathview/pkg-plist Fri Oct 4 13:26:28 2013 (r329305) +++ head/x11-toolkits/gtkmathview/pkg-plist Fri Oct 4 13:38:44 2013 (r329306) @@ -188,6 +188,7 @@ libdata/pkgconfig/mathview-frontend-cust 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310041338.r94DciKg074201>