From owner-svn-ports-all@FreeBSD.ORG Sun May 10 17:46:02 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0CC16610; Sun, 10 May 2015 17:46:02 +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 E2E721701; Sun, 10 May 2015 17:46:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4AHk1xk062340; Sun, 10 May 2015 17:46:01 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4AHk0Or062329; Sun, 10 May 2015 17:46:00 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201505101746.t4AHk0Or062329@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 10 May 2015 17:46:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385970 - in head/textproc/sigil: . 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.20 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: Sun, 10 May 2015 17:46:02 -0000 Author: jbeich Date: Sun May 10 17:46:00 2015 New Revision: 385970 URL: https://svnweb.freebsd.org/changeset/ports/385970 Log: textproc/sigil: update to 0.8.6 and improve - Convert to system minizip & utf8-cpp, which are newer - Prevent accidentally mixing bundled/system headers - Prefer ninja over make(1) to max out CPU during build - Turn off asserts in bundled tidyLib - Check actual compiler when disabling PCH and fix cmake warning - Drop some unused RUN_DEPENDS (qmake, moc, linguist*) - Sort LIB_DEPENDS according to port origin - Require devel/pcre with pcre16 support - Pet portlint (DATADIR, makepatch) Changes: https://github.com/user-none/Sigil/blob/0.8.6/ChangeLog.txt Deleted: head/textproc/sigil/files/patch-CMakeLists head/textproc/sigil/files/patch-src_minizip_ioapi.h Modified: head/textproc/sigil/Makefile (contents, props changed) head/textproc/sigil/distinfo (contents, props changed) head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt (contents, props changed) head/textproc/sigil/pkg-plist (contents, props changed) Modified: head/textproc/sigil/Makefile ============================================================================== --- head/textproc/sigil/Makefile Sun May 10 17:34:44 2015 (r385969) +++ head/textproc/sigil/Makefile Sun May 10 17:46:00 2015 (r385970) @@ -2,35 +2,57 @@ # $FreeBSD$ PORTNAME= sigil -PORTVERSION= 0.6.0 -PORTREVISION= 5 +PORTVERSION= 0.8.6 CATEGORIES= textproc MAINTAINER= ports@FreeBSD.org COMMENT= WYSIWYG ePub editor -LICENSE= GPLv3 +LICENSE= GPLv3 # or any later version -LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ - libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \ +BUILD_DEPENDS= ${LOCALBASE}/include/utf8.h:${PORTSDIR}/devel/utf8cpp +LIB_DEPENDS= libminizip.so:${PORTSDIR}/archivers/minizip \ + libboost_thread.so:${PORTSDIR}/devel/boost-libs \ + libpcre16.so:${PORTSDIR}/devel/pcre \ libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ - libpcre.so:${PORTSDIR}/devel/pcre + libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 USE_GITHUB= yes GH_ACCOUNT= user-none GH_PROJECT= Sigil -USES= cmake compiler desktop-file-utils pkgconfig -USE_QT4= qmake gui svg webkit xml moc uic rcc imageformats linguist +USES= cmake compiler:c++11-lib desktop-file-utils dos2unix \ + ninja pkgconfig python:run shebangfix +USE_QT5= qmake_build buildtools_build linguisttools_build \ + concurrent gui network printsupport svg webkit \ + widgets xml xmlpatterns +EXCLUDE= BoostParts Xerces hunspell minizip pcre utf8-cpp zlib +EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude src/,} +DOS2UNIX_FILES= src/FlightCrew/CMakeLists.txt +SHEBANG_FILES= src/Sigil/Resource_Files/plugin_launchers/python/*.py +python_OLD_CMD= /usr/bin/env python + +OPTIONS_DEFINE= DEBUG +DEBUG_CFLAGS_OFF= -DNDEBUG # tidyLib .include post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/CMakeLists.txt -.if ${COMPILER_TYPE} == gcc + @${REINPLACE_CMD} -e 's|../utf8-cpp|${LOCALBASE}/include|' \ + ${WRKSRC}/src/FlightCrew/CMakeLists.txt +# Gentoo: sigil tries to copy non-needed qt libs for deb package, safe +# to ignore this completely + @${REINPLACE_CMD} -e '/set( QT_LIBS/d' \ + ${WRKSRC}/src/Sigil/CMakeLists.txt +.if ${CHOSEN_COMPILER_TYPE} == gcc # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html - @${REINPLACE_CMD} -e '/precompiled_header/d' \ + @${REINPLACE_CMD} -i .gch.bak \ + -e '/precompiled_header/d' \ + -e '/add_depend.*PCH/d' \ ${WRKSRC}/src/FlightCrew/CMakeLists.txt .endif +post-install: + ${STRIP_CMD} ${STAGEDIR}${DATADIR}/${PORTNAME}-real + .include Modified: head/textproc/sigil/distinfo ============================================================================== --- head/textproc/sigil/distinfo Sun May 10 17:34:44 2015 (r385969) +++ head/textproc/sigil/distinfo Sun May 10 17:46:00 2015 (r385970) @@ -1,2 +1,2 @@ -SHA256 (user-none-Sigil-0.6.0_GH0.tar.gz) = 1ed9f614428c67e0418a733997cb4ca039e380fe657d96fabe456314b6ac470a -SIZE (user-none-Sigil-0.6.0_GH0.tar.gz) = 10361000 +SHA256 (user-none-Sigil-0.8.6_GH0.tar.gz) = 5f89b47abbf0a7befa4e776083db5426456f8ef1ef50bd168dc98d621fb2ad26 +SIZE (user-none-Sigil-0.8.6_GH0.tar.gz) = 19394568 Modified: head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt ============================================================================== --- head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt Sun May 10 17:34:44 2015 (r385969) +++ head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt Sun May 10 17:46:00 2015 (r385970) @@ -1,9 +1,9 @@ See ports/180350: if archivers/libzip is installed there's a conflict because /usr/local/include ends up being included before the minizip directory inside the port. ---- src/Sigil/CMakeLists.txt.orig 2012-10-27 20:24:40.000000000 +0300 -+++ src/Sigil/CMakeLists.txt 2014-01-18 19:08:50.000000000 +0200 -@@ -594,11 +594,11 @@ +--- src/Sigil/CMakeLists.txt.orig 2015-04-12 15:08:13 UTC ++++ src/Sigil/CMakeLists.txt +@@ -606,11 +606,11 @@ include_directories( BEFORE ${HUNSPELL_INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} ${tidyLib_SOURCE_DIR} Modified: head/textproc/sigil/pkg-plist ============================================================================== --- head/textproc/sigil/pkg-plist Sun May 10 17:34:44 2015 (r385969) +++ head/textproc/sigil/pkg-plist Sun May 10 17:46:00 2015 (r385970) @@ -1,44 +1,74 @@ bin/sigil share/applications/sigil.desktop share/pixmaps/sigil.png -share/sigil/examples/clip_entries.ini -share/sigil/examples/search_entries.ini -share/sigil/hunspell_dictionaries/About.txt -share/sigil/hunspell_dictionaries/de_DE.aff -share/sigil/hunspell_dictionaries/de_DE.dic -share/sigil/hunspell_dictionaries/en_GB.aff -share/sigil/hunspell_dictionaries/en_GB.dic -share/sigil/hunspell_dictionaries/en_US.aff -share/sigil/hunspell_dictionaries/en_US.dic -share/sigil/hunspell_dictionaries/es.aff -share/sigil/hunspell_dictionaries/es.dic -share/sigil/hunspell_dictionaries/fr.aff -share/sigil/hunspell_dictionaries/fr.dic -share/sigil/hunspell_dictionaries/hyph_de_DE.dic -share/sigil/hunspell_dictionaries/hyph_en_GB.dic -share/sigil/hunspell_dictionaries/hyph_en_US.dic -share/sigil/hunspell_dictionaries/hyph_es.dic -share/sigil/hunspell_dictionaries/hyph_fr.dic -share/sigil/translations/sigil_cs.qm -share/sigil/translations/sigil_da_DK.qm -share/sigil/translations/sigil_de.qm -share/sigil/translations/sigil_el_GR.qm -share/sigil/translations/sigil_en.qm -share/sigil/translations/sigil_es_ES.qm -share/sigil/translations/sigil_fr.qm -share/sigil/translations/sigil_gl.qm -share/sigil/translations/sigil_id_ID.qm -share/sigil/translations/sigil_it.qm -share/sigil/translations/sigil_ja.qm -share/sigil/translations/sigil_km.qm -share/sigil/translations/sigil_ko.qm -share/sigil/translations/sigil_nl.qm -share/sigil/translations/sigil_pl.qm -share/sigil/translations/sigil_pt_BR.qm -share/sigil/translations/sigil_ro_RO.qm -share/sigil/translations/sigil_ru.qm -share/sigil/translations/sigil_sk.qm -share/sigil/translations/sigil_tr_TR.qm -share/sigil/translations/sigil_ug.qm -share/sigil/translations/sigil_zh_CN.qm -share/sigil/translations/sigil_zh_TW.qm +%%DATADIR%%/examples/clip_entries.ini +%%DATADIR%%/examples/search_entries.ini +%%DATADIR%%/hunspell_dictionaries/About.txt +%%DATADIR%%/hunspell_dictionaries/de_DE.aff +%%DATADIR%%/hunspell_dictionaries/de_DE.dic +%%DATADIR%%/hunspell_dictionaries/en_GB.aff +%%DATADIR%%/hunspell_dictionaries/en_GB.dic +%%DATADIR%%/hunspell_dictionaries/en_US.aff +%%DATADIR%%/hunspell_dictionaries/en_US.dic +%%DATADIR%%/hunspell_dictionaries/es.aff +%%DATADIR%%/hunspell_dictionaries/es.dic +%%DATADIR%%/hunspell_dictionaries/fr.aff +%%DATADIR%%/hunspell_dictionaries/fr.dic +%%DATADIR%%/hunspell_dictionaries/hyph_de_DE.dic +%%DATADIR%%/hunspell_dictionaries/hyph_en_GB.dic +%%DATADIR%%/hunspell_dictionaries/hyph_en_US.dic +%%DATADIR%%/hunspell_dictionaries/hyph_es.dic +%%DATADIR%%/hunspell_dictionaries/hyph_fr.dic +%%DATADIR%%/plugin_launchers/python/bookcontainer.py +%%DATADIR%%/plugin_launchers/python/compatibility_utils.py +%%DATADIR%%/plugin_launchers/python/epub_utils.py +%%DATADIR%%/plugin_launchers/python/inputcontainer.py +%%DATADIR%%/plugin_launchers/python/launcher.py +%%DATADIR%%/plugin_launchers/python/opf_parser.py +%%DATADIR%%/plugin_launchers/python/outputcontainer.py +%%DATADIR%%/plugin_launchers/python/preferences.py +%%DATADIR%%/plugin_launchers/python/quickparser.py +%%DATADIR%%/plugin_launchers/python/unipath.py +%%DATADIR%%/plugin_launchers/python/validationcontainer.py +%%DATADIR%%/plugin_launchers/python/validationresult.py +%%DATADIR%%/plugin_launchers/python/wrapper.py +%%DATADIR%%/sigil-real +%%DATADIR%%/translations/sigil_bg.qm +%%DATADIR%%/translations/sigil_ca.qm +%%DATADIR%%/translations/sigil_cmn.qm +%%DATADIR%%/translations/sigil_cs.qm +%%DATADIR%%/translations/sigil_da_DK.qm +%%DATADIR%%/translations/sigil_de.qm +%%DATADIR%%/translations/sigil_el_GR.qm +%%DATADIR%%/translations/sigil_en.qm +%%DATADIR%%/translations/sigil_es.qm +%%DATADIR%%/translations/sigil_es_419.qm +%%DATADIR%%/translations/sigil_fi.qm +%%DATADIR%%/translations/sigil_fr.qm +%%DATADIR%%/translations/sigil_gl.qm +%%DATADIR%%/translations/sigil_he.qm +%%DATADIR%%/translations/sigil_hu_HU.qm +%%DATADIR%%/translations/sigil_id_ID.qm +%%DATADIR%%/translations/sigil_is.qm +%%DATADIR%%/translations/sigil_it.qm +%%DATADIR%%/translations/sigil_ja.qm +%%DATADIR%%/translations/sigil_kk.qm +%%DATADIR%%/translations/sigil_km.qm +%%DATADIR%%/translations/sigil_ko.qm +%%DATADIR%%/translations/sigil_lv_LV.qm +%%DATADIR%%/translations/sigil_nl.qm +%%DATADIR%%/translations/sigil_pl.qm +%%DATADIR%%/translations/sigil_pt.qm +%%DATADIR%%/translations/sigil_pt_BR.qm +%%DATADIR%%/translations/sigil_ro_RO.qm +%%DATADIR%%/translations/sigil_ru.qm +%%DATADIR%%/translations/sigil_sk.qm +%%DATADIR%%/translations/sigil_sv.qm +%%DATADIR%%/translations/sigil_tr_TR.qm +%%DATADIR%%/translations/sigil_ug.qm +%%DATADIR%%/translations/sigil_uk.qm +%%DATADIR%%/translations/sigil_uk_UA.qm +%%DATADIR%%/translations/sigil_vi.qm +%%DATADIR%%/translations/sigil_vi_VN.qm +%%DATADIR%%/translations/sigil_zh_CN.qm +%%DATADIR%%/translations/sigil_zh_TW.qm