Date: Sat, 18 Jan 2014 17:56:47 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340198 - in head/textproc/sigil: . files Message-ID: <201401181756.s0IHulHB067303@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat Jan 18 17:56:47 2014 New Revision: 340198 URL: http://svnweb.freebsd.org/changeset/ports/340198 QAT: https://qat.redports.org/buildarchive/r340198/ Log: - Allow the port to build with archivers/libzip installed. libzip installs /usr/local/include/zip.h, and -I/usr/local/include ended up being passed to the compiler before -I<path-to-internal-minizip-copy>, which caused problems. [1] While here, modernize the Makefile: - Move LICENSE to the appropriate place. - Remove USE_DOS2UNIX: the files it was supposed to fix are not DOS-encoded anymore. - Support staging. - Convert from manually calling update-desktop-database and USE_GNOME=desktopfileutils to USES=desktop-file-utils. PR: ports/180350 [1] Approved by: maintainer timeout (no activity since the original report 7 months ago) MFH: 2014Q1 Added: head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt (contents, props changed) Modified: head/textproc/sigil/Makefile Modified: head/textproc/sigil/Makefile ============================================================================== --- head/textproc/sigil/Makefile Sat Jan 18 16:47:31 2014 (r340197) +++ head/textproc/sigil/Makefile Sat Jan 18 17:56:47 2014 (r340198) @@ -11,25 +11,19 @@ DISTNAME= Sigil-${PORTVERSION}-Code MAINTAINER= jonc@chen.org.nz COMMENT= WYSIWYG ePub editor +LICENSE= GPLv3 + LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \ libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ libpcre.so:${PORTSDIR}/devel/pcre -LICENSE= GPLv3 - USE_ZIP= yes -USES= cmake pkgconfig -USE_DOS2UNIX= CMakeLists.txt DirEnumerator.cpp ZipFile_stl.cpp ZipPlatform_lnx.cpp +USES= cmake desktop-file-utils pkgconfig NO_WRKSUBDIR= yes USE_QT4= qmake gui svg webkit xml moc uic rcc imageformats linguist -USE_GNOME= desktopfileutils -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/CMakeLists.txt -post-install: - @-update-desktop-database > /dev/null - .include <bsd.port.mk> Added: head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt Sat Jan 18 17:56:47 2014 (r340198) @@ -0,0 +1,18 @@ +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 @@ + ${HUNSPELL_INCLUDE_DIRS} + ${PCRE_INCLUDE_DIRS} + ${tidyLib_SOURCE_DIR} +- ${MINIZIP_INCLUDE_DIRS} + ${ZLIB_INCLUDE_DIRS} + ${XERCESEXTENSIONS_INCLUDE_DIRS} + ${XERCES_INCLUDE_DIRS} + ${BOOST_INCLUDE_DIRS} ++ ${MINIZIP_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401181756.s0IHulHB067303>