svn commit: r340210 - in branches/2014Q1/textproc/sigil: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sat Jan 18 19:49:05 2014
New Revision: 340210
URL: http://svnweb.freebsd.org/changeset/ports/340210
QAT: https://qat.redports.org/buildarchive/r340210/

Log:
  MFH: r340198
  
  - 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)
  
  Approved by:	portmgr (mat)

Added:
  branches/2014Q1/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt
     - copied unchanged from r340198, head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt
Modified:
  branches/2014Q1/textproc/sigil/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/textproc/sigil/Makefile
==============================================================================
--- branches/2014Q1/textproc/sigil/Makefile	Sat Jan 18 19:47:13 2014	(r340209)
+++ branches/2014Q1/textproc/sigil/Makefile	Sat Jan 18 19:49:05 2014	(r340210)
@@ -11,25 +11,19 @@ DISTNAME=	Sigil-${PORTVERSION}-Code
 MAINTAINER=	jonc at 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>

Copied: branches/2014Q1/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt (from r340198, head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2014Q1/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt	Sat Jan 18 19:49:05 2014	(r340210, copy of r340198, head/textproc/sigil/files/patch-src_Sigil_CMakeLists.txt)
@@ -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} )
+