From owner-svn-ports-all@FreeBSD.ORG Fri Apr 18 09:40:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73D11C33; Fri, 18 Apr 2014 09:40:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 54BD11A3C; Fri, 18 Apr 2014 09:40:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3I9eaB2065246; Fri, 18 Apr 2014 09:40:36 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3I9eZ6j065240; Fri, 18 Apr 2014 09:40:35 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201404180940.s3I9eZ6j065240@svn.freebsd.org> From: Max Brazhnikov Date: Fri, 18 Apr 2014 09:40:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351527 - in head/graphics/klatexformula: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2014 09:40:36 -0000 Author: makc Date: Fri Apr 18 09:40:35 2014 New Revision: 351527 URL: http://svnweb.freebsd.org/changeset/ports/351527 QAT: https://qat.redports.org/buildarchive/r351527/ Log: graphics/klatexformula: - Update to 3.2.8 - Add dependence on help2man and install man pages - Fix build with clang-3.4 Modified: head/graphics/klatexformula/Makefile head/graphics/klatexformula/distinfo head/graphics/klatexformula/files/patch-src__main.cpp head/graphics/klatexformula/pkg-plist Modified: head/graphics/klatexformula/Makefile ============================================================================== --- head/graphics/klatexformula/Makefile Fri Apr 18 09:38:03 2014 (r351526) +++ head/graphics/klatexformula/Makefile Fri Apr 18 09:40:35 2014 (r351527) @@ -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} Modified: head/graphics/klatexformula/distinfo ============================================================================== --- head/graphics/klatexformula/distinfo Fri Apr 18 09:38:03 2014 (r351526) +++ head/graphics/klatexformula/distinfo Fri Apr 18 09:40:35 2014 (r351527) @@ -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 Modified: head/graphics/klatexformula/files/patch-src__main.cpp ============================================================================== --- head/graphics/klatexformula/files/patch-src__main.cpp Fri Apr 18 09:38:03 2014 (r351526) +++ head/graphics/klatexformula/files/patch-src__main.cpp Fri Apr 18 09:40:35 2014 (r351527) @@ -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; Modified: head/graphics/klatexformula/pkg-plist ============================================================================== --- head/graphics/klatexformula/pkg-plist Fri Apr 18 09:38:03 2014 (r351526) +++ head/graphics/klatexformula/pkg-plist Fri Apr 18 09:40:35 2014 (r351527) @@ -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