4 files changed, 7 insertions, 88 deletions

diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
index 5950c452582b..949768aa7ca3 100644
--- a/graphics/klatexformula/Makefile
+++ b/graphics/klatexformula/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	klatexformula
-PORTVERSION=	3.2.8
+PORTVERSION=	3.2.11
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -10,7 +10,7 @@ COMMENT=	Convert LaTeX formula to image
 
 BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
 
-USES=		cmake:outsource shared-mime-info
+USES=		cmake:outsource desktop-file-utils shared-mime-info
 USE_QT4=	gui xml dbus designer_build linguist_build \
 		qmake_build moc_build rcc_build uic_build
 USE_TEX=	latex dvipsk
diff --git a/graphics/klatexformula/distinfo b/graphics/klatexformula/distinfo
index 0672675a43c3..2a59a50edc78 100644
--- a/graphics/klatexformula/distinfo
+++ b/graphics/klatexformula/distinfo
@@ -1,2 +1,2 @@
-SHA256 (klatexformula-3.2.8.tar.gz) = fc5dae18785557f274024c4ed6f09c425a3f7700def5dc93de94ab82f5896186
-SIZE (klatexformula-3.2.8.tar.gz) = 3233051
+SHA256 (klatexformula-3.2.11.tar.gz) = 8f0c26926c24e4987e785b69af30a35424b2fb98e7308c2dbbb606887842d5f2
+SIZE (klatexformula-3.2.11.tar.gz) = 3234019
diff --git a/graphics/klatexformula/files/patch-src__main.cpp b/graphics/klatexformula/files/patch-src__main.cpp
deleted file mode 100644
index 2501114689cf..000000000000
--- a/graphics/klatexformula/files/patch-src__main.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
---- ./src/main.cpp.orig	2013-06-23 10:52:34.000000000 +0000
-+++ ./src/main.cpp	2014-04-05 20:24:47.184482481 +0000
-@@ -241,8 +241,8 @@
-     fprintf(ftty, "Interrupt\n");
-     if (ftty != stderr)  fprintf(stderr, "*** Interrupt\n");
- 
--    static long last_sigint_time = 0;
--    long curtime;
-+    static time_t last_sigint_time = 0;
-+    time_t curtime;
-     time(&curtime);
-     bool isInsisted = (curtime - last_sigint_time <= 2); // re-pressed Ctrl-C after less than 2 secs
-     if (!isInsisted && qApp != NULL) {
-@@ -446,6 +446,30 @@
-   KLFBackend::saveOutputToFile(klfoutput, f_output, format);
- }
- 
-+void dumpDir(const QDir& d, int indent = 0)
-+{
-+  char sindent[] = "                                                               ";
-+  uint nindent = indent*2; // 2 spaces per indentation
-+  if (nindent < strlen(sindent))
-+    sindent[nindent] = '\0';
-+
-+  QStringList dchildren = d.entryList(QDir::Dirs);
-+
-+  int k;
-+  for (k = 0; k < dchildren.size(); ++k) {
-+    // skip system ":/trolltech"
-+    if (indent == 0 && dchildren[k] == "trolltech")
-+      continue;
-+    qDebug("%s%s/", sindent, qPrintable(dchildren[k]));
-+    dumpDir(QDir(d.absoluteFilePath(dchildren[k])), indent+1);
-+  }
-+
-+  QStringList fchildren = d.entryList(QDir::Files);
-+  for (k = 0; k < fchildren.size(); ++k) {
-+    qDebug("%s%s", sindent, qPrintable(fchildren[k]));
-+  }
-+}
-+
- void main_load_extra_resources()
- {
-   KLF_DEBUG_BLOCK(KLF_FUNC_NAME) ;
-@@ -518,36 +542,11 @@
-   // set the global "can-import" flag
-   klf_addons_canimport = klfsettings_can_import;
- 
--  void dumpDir(const QDir&, int = 0);
-   klfDbg( "dump of :/ :" ) ;
-   dumpDir(QDir(":/"));
- }
- 
- 
--void dumpDir(const QDir& d, int indent = 0)
--{
--  char sindent[] = "                                                               ";
--  uint nindent = indent*2; // 2 spaces per indentation
--  if (nindent < strlen(sindent))
--    sindent[nindent] = '\0';
--
--  QStringList dchildren = d.entryList(QDir::Dirs);
--
--  int k;
--  for (k = 0; k < dchildren.size(); ++k) {
--    // skip system ":/trolltech"
--    if (indent == 0 && dchildren[k] == "trolltech")
--      continue;
--    qDebug("%s%s/", sindent, qPrintable(dchildren[k]));
--    dumpDir(QDir(d.absoluteFilePath(dchildren[k])), indent+1);
--  }
--
--  QStringList fchildren = d.entryList(QDir::Files);
--  for (k = 0; k < fchildren.size(); ++k) {
--    qDebug("%s%s", sindent, qPrintable(fchildren[k]));
--  }
--}
--
- /** \internal */
- class VersionCompareWithPrefixGreaterThan {
-   int prefixLen;
diff --git a/graphics/klatexformula/pkg-descr b/graphics/klatexformula/pkg-descr
index f54b785d59fa..02ec4df587e6 100644
--- a/graphics/klatexformula/pkg-descr
+++ b/graphics/klatexformula/pkg-descr
@@ -1,7 +1,7 @@
-KLatexFormula is a Qt4 program to easily get an image from a LaTeX
+KLatexFormula is a Qt 4 program to easily get an image from a LaTeX
 formula. Just enter a formula, click "Evaluate", then you can
-drag&drop or copy the resulting image to another location (an
+drag & drop or copy the resulting image to another location (an
 OpenOffice document, for example) or save it as an image (many
 formats are available).
 
-WWW:	http://klatexformula.sourceforge.net
+WWW: http://klatexformula.sourceforge.net