mirror of
https://git.freebsd.org/ports.git
synced 2025-07-07 12:29:16 -04:00
679a9ba5d4
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
18 lines
840 B
Text
18 lines
840 B
Text
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} )
|
|
|