summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjoerg <joerg>2015-11-27 21:45:19 +0000
committerjoerg <joerg>2015-11-27 21:45:19 +0000
commit87e1d0476dabdfa3122139c3b0797447a26d8f41 (patch)
tree27d1c1b83ee63f3098c59b7ee71099dcc813b289 /textproc
parentbc00bd5a758743e456cdd8f2a339fb9f90bbbcaf (diff)
downloadpkgsrc-87e1d0476dabdfa3122139c3b0797447a26d8f41.tar.gz
Make really sure the local copy of boost and co is not used.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/FlightCrew/Makefile5
-rw-r--r--textproc/FlightCrew/distinfo3
-rw-r--r--textproc/FlightCrew/patches/patch-src_utf8-cpp_utf8_core.h13
3 files changed, 19 insertions, 2 deletions
diff --git a/textproc/FlightCrew/Makefile b/textproc/FlightCrew/Makefile
index 190f31e58d1..35608c547ff 100644
--- a/textproc/FlightCrew/Makefile
+++ b/textproc/FlightCrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/04/25 14:24:56 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2015/11/27 21:45:19 joerg Exp $
#
DISTNAME= FlightCrew-0.7.2-Code
@@ -47,6 +47,9 @@ _WRAP_EXTRA_ARGS.CXX+= -std=c++11
CWRAPPERS_APPEND.cxx+= -std=c++11
.endif
+post-extract:
+ ${RM} -rf ${WRKDIR}/src/BoostParts ${WRKDIR}/src/Xerces ${WRKDIR}/src/zlib ${WRKDIR}/src/googlemock
+
.include "../../devel/googletest/buildlink3.mk"
.include "../../devel/gmock/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
diff --git a/textproc/FlightCrew/distinfo b/textproc/FlightCrew/distinfo
index 86f2e55db2f..7cea6d37277 100644
--- a/textproc/FlightCrew/distinfo
+++ b/textproc/FlightCrew/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 01:59:17 agc Exp $
+$NetBSD: distinfo,v 1.6 2015/11/27 21:45:19 joerg Exp $
SHA1 (FlightCrew-0.7.2-Code.zip) = 16afdb4fcb30275070907c27857f89930bd8a322
RMD160 (FlightCrew-0.7.2-Code.zip) = d6c71d8d1d9c79a0eaa211fea91cda5c1af84c7a
@@ -8,3 +8,4 @@ SHA1 (patch-CMakeLists.txt) = 8423ab7b53fad354e04fdfd159b070a8f8bf61f9
SHA1 (patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp) = 53fbd6e1b1b9a11739f16383406f10ddaa253293
SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = a505955df3d6d1901f0a331311fa401ba9fec3ba
SHA1 (patch-src_XercesExtensions_LocationAwareDOMParser.cpp) = 5c49d264d7257ea988ef1a8f335ec59799ff3fce
+SHA1 (patch-src_utf8-cpp_utf8_core.h) = 1ff6b89132f1ff671e48735ca11153d17d38fd17
diff --git a/textproc/FlightCrew/patches/patch-src_utf8-cpp_utf8_core.h b/textproc/FlightCrew/patches/patch-src_utf8-cpp_utf8_core.h
new file mode 100644
index 00000000000..1730119a650
--- /dev/null
+++ b/textproc/FlightCrew/patches/patch-src_utf8-cpp_utf8_core.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_utf8-cpp_utf8_core.h,v 1.1 2015/11/27 21:45:19 joerg Exp $
+
+--- src/utf8-cpp/utf8/core.h.orig 2015-11-27 17:25:18.000000000 +0000
++++ src/utf8-cpp/utf8/core.h
+@@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE.
+ #define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+ #include <iterator>
+-#include "../../BoostParts/boost/cstdint.hpp"
++#include <boost/cstdint.hpp>
+
+ namespace utf8
+ {