Fri Nov 27 21:45:19 2015 UTC ()
Make really sure the local copy of boost and co is not used.


(joerg)
diff -r1.34 -r1.35 pkgsrc/textproc/FlightCrew/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/FlightCrew/distinfo
diff -r0 -r1.1 pkgsrc/textproc/FlightCrew/patches/patch-src_utf8-cpp_utf8_core.h
cvs diff -r1.34 -r1.35 pkgsrc/textproc/FlightCrew/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/FlightCrew/Makefile 2015/04/25 14:24:56 1.34
+++ pkgsrc/textproc/FlightCrew/Makefile 2015/11/27 21:45:19 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.34 2015/04/25 14:24:56 tnn Exp $ 1# $NetBSD: Makefile,v 1.35 2015/11/27 21:45:19 joerg Exp $
2# 2#
3 3
4DISTNAME= FlightCrew-0.7.2-Code 4DISTNAME= FlightCrew-0.7.2-Code
5PKGNAME= ${DISTNAME:S/-Code//} 5PKGNAME= ${DISTNAME:S/-Code//}
6PKGREVISION= 26 6PKGREVISION= 26
7CATEGORIES= textproc 7CATEGORIES= textproc
8MASTER_SITES= http://flightcrew.googlecode.com/files/ 8MASTER_SITES= http://flightcrew.googlecode.com/files/
9EXTRACT_SUFX= .zip 9EXTRACT_SUFX= .zip
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= http://code.google.com/p/flightcrew/ 12HOMEPAGE= http://code.google.com/p/flightcrew/
13COMMENT= EPUB validator 13COMMENT= EPUB validator
14LICENSE= gnu-lgpl-v3 AND cc-by-sa-v3.0 14LICENSE= gnu-lgpl-v3 AND cc-by-sa-v3.0
@@ -37,20 +37,23 @@ SUBST_FILES.d2u+= src/FlightCrew/tests/C @@ -37,20 +37,23 @@ SUBST_FILES.d2u+= src/FlightCrew/tests/C
37SUBST_FILES.d2u+= src/FlightCrew/Validators/Opf/ReachabilityAnalysis.cpp 37SUBST_FILES.d2u+= src/FlightCrew/Validators/Opf/ReachabilityAnalysis.cpp
38SUBST_FILTER_CMD.d2u= ${TR} -d '\r' 38SUBST_FILTER_CMD.d2u= ${TR} -d '\r'
39 39
40.include "../../mk/compiler.mk" 40.include "../../mk/compiler.mk"
41# GCC 4.4 and above needs this 41# GCC 4.4 and above needs this
42.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) 42.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*)
43_WRAP_EXTRA_ARGS.CXX+= -std=c++0x 43_WRAP_EXTRA_ARGS.CXX+= -std=c++0x
44CWRAPPERS_APPEND.cxx+= -std=c++0x 44CWRAPPERS_APPEND.cxx+= -std=c++0x
45.elif !empty(PKGSRC_COMPILER:Mclang) 45.elif !empty(PKGSRC_COMPILER:Mclang)
46_WRAP_EXTRA_ARGS.CXX+= -std=c++11 46_WRAP_EXTRA_ARGS.CXX+= -std=c++11
47CWRAPPERS_APPEND.cxx+= -std=c++11 47CWRAPPERS_APPEND.cxx+= -std=c++11
48.endif 48.endif
49 49
 50post-extract:
 51 ${RM} -rf ${WRKDIR}/src/BoostParts ${WRKDIR}/src/Xerces ${WRKDIR}/src/zlib ${WRKDIR}/src/googlemock
 52
50.include "../../devel/googletest/buildlink3.mk" 53.include "../../devel/googletest/buildlink3.mk"
51.include "../../devel/gmock/buildlink3.mk" 54.include "../../devel/gmock/buildlink3.mk"
52.include "../../textproc/xerces-c/buildlink3.mk" 55.include "../../textproc/xerces-c/buildlink3.mk"
53.include "../../devel/zlib/buildlink3.mk" 56.include "../../devel/zlib/buildlink3.mk"
54.include "../../devel/boost-libs/buildlink3.mk" 57.include "../../devel/boost-libs/buildlink3.mk"
55.include "../../x11/qt4-tools/buildlink3.mk" 58.include "../../x11/qt4-tools/buildlink3.mk"
56.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/FlightCrew/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/FlightCrew/distinfo 2015/11/04 01:59:17 1.5
+++ pkgsrc/textproc/FlightCrew/distinfo 2015/11/27 21:45:19 1.6
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.5 2015/11/04 01:59:17 agc Exp $ 1$NetBSD: distinfo,v 1.6 2015/11/27 21:45:19 joerg Exp $
2 2
3SHA1 (FlightCrew-0.7.2-Code.zip) = 16afdb4fcb30275070907c27857f89930bd8a322 3SHA1 (FlightCrew-0.7.2-Code.zip) = 16afdb4fcb30275070907c27857f89930bd8a322
4RMD160 (FlightCrew-0.7.2-Code.zip) = d6c71d8d1d9c79a0eaa211fea91cda5c1af84c7a 4RMD160 (FlightCrew-0.7.2-Code.zip) = d6c71d8d1d9c79a0eaa211fea91cda5c1af84c7a
5SHA512 (FlightCrew-0.7.2-Code.zip) = 6933cd85bab0300ee2258106225cbf23474516c4993bc1bcad6736676169eabcaf4a5b31a6cdfc2bf4ff3be8fee9432a8048615112f330d1ac55a04874d094aa 5SHA512 (FlightCrew-0.7.2-Code.zip) = 6933cd85bab0300ee2258106225cbf23474516c4993bc1bcad6736676169eabcaf4a5b31a6cdfc2bf4ff3be8fee9432a8048615112f330d1ac55a04874d094aa
6Size (FlightCrew-0.7.2-Code.zip) = 7794710 bytes 6Size (FlightCrew-0.7.2-Code.zip) = 7794710 bytes
7SHA1 (patch-CMakeLists.txt) = 8423ab7b53fad354e04fdfd159b070a8f8bf61f9 7SHA1 (patch-CMakeLists.txt) = 8423ab7b53fad354e04fdfd159b070a8f8bf61f9
8SHA1 (patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp) = 53fbd6e1b1b9a11739f16383406f10ddaa253293 8SHA1 (patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp) = 53fbd6e1b1b9a11739f16383406f10ddaa253293
9SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = a505955df3d6d1901f0a331311fa401ba9fec3ba 9SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = a505955df3d6d1901f0a331311fa401ba9fec3ba
10SHA1 (patch-src_XercesExtensions_LocationAwareDOMParser.cpp) = 5c49d264d7257ea988ef1a8f335ec59799ff3fce 10SHA1 (patch-src_XercesExtensions_LocationAwareDOMParser.cpp) = 5c49d264d7257ea988ef1a8f335ec59799ff3fce
 11SHA1 (patch-src_utf8-cpp_utf8_core.h) = 1ff6b89132f1ff671e48735ca11153d17d38fd17
File Added: pkgsrc/textproc/FlightCrew/patches/patch-src_utf8-cpp_utf8_core.h
$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
 {