graphics/klatexformula:

- Update to 3.2.8
- Add dependence on help2man and install man pages
- Fix build with clang-3.4

4 files changed, 80 insertions, 7 deletions

diff --git a/graphics/klatexformula/Makefile b/graphics/klatexformula/Makefile
index 6c60e3ac21af..a67dcb4fbcd1 100644
--- a/graphics/klatexformula/Makefile
+++ b/graphics/klatexformula/Makefile
@@ -1,23 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	klatexformula
-PORTVERSION=	3.2.7
+PORTVERSION=	3.2.8
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Convert LaTeX formula to image
 
+BUILD_DEPENDS=	help2man:${PORTSDIR}/misc/help2man
+
 USES=		cmake:outsource shared-mime-info
 USE_QT4=	gui xml dbus designer_build linguist_build \
 		qmake_build moc_build rcc_build uic_build
 USE_TEX=	latex dvipsk
-HAS_CONFIGURE=	yes
-USE_GHOSTSCRIPT=	yes
+USE_GHOSTSCRIPT_RUN=	yes
 CMAKE_ARGS=	-DQT_QMAKE_EXECUTABLE_FINDQT=${QMAKE} \
 		-DKLF_BUILD_KTEXTEDITORPLUGIN=off \
-		-DKLF_INSTALL_POST_UPDATEMIMEDATABASE=off
+		-DKLF_INSTALL_POST_UPDATEMIMEDATABASE=off \
+		-DKLF_INSTALL_SHARE_MAN1_DIR=man/man1
 CXXFLAGS=	-I${LOCALBASE}/include
+MAKE_ENV=	HOME=/dev/null
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git a/graphics/klatexformula/distinfo b/graphics/klatexformula/distinfo
index a551a68626a6..0672675a43c3 100644
--- a/graphics/klatexformula/distinfo
+++ b/graphics/klatexformula/distinfo
@@ -1,2 +1,2 @@
-SHA256 (klatexformula-3.2.7.tar.gz) = 828fec5c94f97f6d6c13247c48db294fed7554caf9d52d45cfbf3488c3b84c0b
-SIZE (klatexformula-3.2.7.tar.gz) = 3237476
+SHA256 (klatexformula-3.2.8.tar.gz) = fc5dae18785557f274024c4ed6f09c425a3f7700def5dc93de94ab82f5896186
+SIZE (klatexformula-3.2.8.tar.gz) = 3233051
diff --git a/graphics/klatexformula/files/patch-src__main.cpp b/graphics/klatexformula/files/patch-src__main.cpp
index 42343b9f0451..2501114689cf 100644
--- a/graphics/klatexformula/files/patch-src__main.cpp
+++ b/graphics/klatexformula/files/patch-src__main.cpp
@@ -1,5 +1,5 @@
 --- ./src/main.cpp.orig	2013-06-23 10:52:34.000000000 +0000
-+++ ./src/main.cpp	2013-10-30 17:20:58.186667121 +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");
@@ -11,3 +11,71 @@
      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-plist b/graphics/klatexformula/pkg-plist
index bfd2450ca97f..42a6783ac5d0 100644
--- a/graphics/klatexformula/pkg-plist
+++ b/graphics/klatexformula/pkg-plist
@@ -36,6 +36,8 @@ include/klftools/qtcolortriangle.h
 lib/libklfapp.a
 lib/libklfbackend.a
 lib/libklftools.a
+man/man1/klatexformula.1.gz
+man/man1/klatexformula_cmdl.1.gz
 share/applications/klatexformula.desktop
 share/klatexformula/rccresources/klfbaseplugins-%%VERSION%%.rcc
 share/mime/packages/klatexformula-mime.xml